commit 57ee5bbe01242b606b92afabf25b332dc3b26fff
parent d1140486af22f8e7d51a3aaf53ac005f07aa0d75
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Fri, 16 Nov 2012 23:42:15 +0000
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_.
Diffstat:
14 files changed, 115 insertions(+), 97 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,20 @@
+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_.
+
2012-11-16 [colin] 3.9.0cvs10
* src/foldersel.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4508,3 +4508,4 @@
( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/advsearch.c; ) > 3.9.0cvs8.patchset
( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/advsearch.c; ) > 3.9.0cvs9.patchset
( cvs diff -u -r 1.26.2.49 -r 1.26.2.50 src/foldersel.c; cvs diff -u -r 1.60.2.83 -r 1.60.2.84 src/prefs_actions.c; cvs diff -u -r 1.1.4.80 -r 1.1.4.81 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.97 -r 1.43.2.98 src/prefs_matcher.c; cvs diff -u -r 1.8.2.47 -r 1.8.2.48 src/quote_fmt.c; cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/description_window.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/description_window.h; cvs diff -u -r 1.2.2.49 -r 1.2.2.50 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/manage_window.c; cvs diff -u -r 1.1.2.120 -r 1.1.2.121 src/gtk/quicksearch.c; ) > 3.9.0cvs10.patchset
+( cvs diff -u -r 1.61.2.106 -r 1.61.2.107 src/account.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/addrcustomattr.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/edittags.c; cvs diff -u -r 1.59.2.93 -r 1.59.2.94 src/prefs_filtering.c; cvs diff -u -r 1.43.2.98 -r 1.43.2.99 src/prefs_matcher.c; cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/prefs_msg_colors.c; cvs diff -u -r 1.43.2.131 -r 1.43.2.132 src/toolbar.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/uri_opener.c; cvs diff -u -r 1.1.2.88 -r 1.1.2.89 src/wizard.c; cvs diff -u -r 1.36.2.208 -r 1.36.2.209 src/common/utils.c; cvs diff -u -r 1.4.2.86 -r 1.4.2.87 src/gtk/about.c; ) > 3.9.0cvs11.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/account.c b/src/account.c
@@ -1534,7 +1534,7 @@ static void account_create_list_view_columns(GtkWidget *list_view)
"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);
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
@@ -466,7 +466,7 @@ static void custom_attr_window_create(void)
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);
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -4956,47 +4956,47 @@ static void init_time_names(void)
{
int i = 0;
- daynames[0] = Q_("Complete day name for use by strftime|Sunday");
- daynames[1] = Q_("Complete day name for use by strftime|Monday");
- daynames[2] = Q_("Complete day name for use by strftime|Tuesday");
- daynames[3] = Q_("Complete day name for use by strftime|Wednesday");
- daynames[4] = Q_("Complete day name for use by strftime|Thursday");
- daynames[5] = Q_("Complete day name for use by strftime|Friday");
- daynames[6] = Q_("Complete day name for use by strftime|Saturday");
-
- monthnames[0] = Q_("Complete month name for use by strftime|January");
- monthnames[1] = Q_("Complete month name for use by strftime|February");
- monthnames[2] = Q_("Complete month name for use by strftime|March");
- monthnames[3] = Q_("Complete month name for use by strftime|April");
- monthnames[4] = Q_("Complete month name for use by strftime|May");
- monthnames[5] = Q_("Complete month name for use by strftime|June");
- monthnames[6] = Q_("Complete month name for use by strftime|July");
- monthnames[7] = Q_("Complete month name for use by strftime|August");
- monthnames[8] = Q_("Complete month name for use by strftime|September");
- monthnames[9] = Q_("Complete month name for use by strftime|October");
- monthnames[10] = Q_("Complete month name for use by strftime|November");
- monthnames[11] = Q_("Complete month name for use by strftime|December");
-
- s_daynames[0] = Q_("Abbr. day name for use by strftime|Sun");
- s_daynames[1] = Q_("Abbr. day name for use by strftime|Mon");
- s_daynames[2] = Q_("Abbr. day name for use by strftime|Tue");
- s_daynames[3] = Q_("Abbr. day name for use by strftime|Wed");
- s_daynames[4] = Q_("Abbr. day name for use by strftime|Thu");
- s_daynames[5] = Q_("Abbr. day name for use by strftime|Fri");
- s_daynames[6] = Q_("Abbr. day name for use by strftime|Sat");
+ daynames[0] = C_("Complete day name for use by strftime", "Sunday");
+ daynames[1] = C_("Complete day name for use by strftime", "Monday");
+ daynames[2] = C_("Complete day name for use by strftime", "Tuesday");
+ daynames[3] = C_("Complete day name for use by strftime", "Wednesday");
+ daynames[4] = C_("Complete day name for use by strftime", "Thursday");
+ daynames[5] = C_("Complete day name for use by strftime", "Friday");
+ daynames[6] = C_("Complete day name for use by strftime", "Saturday");
+
+ monthnames[0] = C_("Complete month name for use by strftime", "January");
+ monthnames[1] = C_("Complete month name for use by strftime", "February");
+ monthnames[2] = C_("Complete month name for use by strftime", "March");
+ monthnames[3] = C_("Complete month name for use by strftime", "April");
+ monthnames[4] = C_("Complete month name for use by strftime", "May");
+ monthnames[5] = C_("Complete month name for use by strftime", "June");
+ monthnames[6] = C_("Complete month name for use by strftime", "July");
+ monthnames[7] = C_("Complete month name for use by strftime", "August");
+ monthnames[8] = C_("Complete month name for use by strftime", "September");
+ monthnames[9] = C_("Complete month name for use by strftime", "October");
+ monthnames[10] = C_("Complete month name for use by strftime", "November");
+ monthnames[11] = C_("Complete month name for use by strftime", "December");
+
+ s_daynames[0] = C_("Abbr. day name for use by strftime", "Sun");
+ s_daynames[1] = C_("Abbr. day name for use by strftime", "Mon");
+ s_daynames[2] = C_("Abbr. day name for use by strftime", "Tue");
+ s_daynames[3] = C_("Abbr. day name for use by strftime", "Wed");
+ s_daynames[4] = C_("Abbr. day name for use by strftime", "Thu");
+ s_daynames[5] = C_("Abbr. day name for use by strftime", "Fri");
+ s_daynames[6] = C_("Abbr. day name for use by strftime", "Sat");
- s_monthnames[0] = Q_("Abbr. month name for use by strftime|Jan");
- s_monthnames[1] = Q_("Abbr. month name for use by strftime|Feb");
- s_monthnames[2] = Q_("Abbr. month name for use by strftime|Mar");
- s_monthnames[3] = Q_("Abbr. month name for use by strftime|Apr");
- s_monthnames[4] = Q_("Abbr. month name for use by strftime|May");
- s_monthnames[5] = Q_("Abbr. month name for use by strftime|Jun");
- s_monthnames[6] = Q_("Abbr. month name for use by strftime|Jul");
- s_monthnames[7] = Q_("Abbr. month name for use by strftime|Aug");
- s_monthnames[8] = Q_("Abbr. month name for use by strftime|Sep");
- s_monthnames[9] = Q_("Abbr. month name for use by strftime|Oct");
- s_monthnames[10] = Q_("Abbr. month name for use by strftime|Nov");
- s_monthnames[11] = Q_("Abbr. month name for use by strftime|Dec");
+ s_monthnames[0] = C_("Abbr. month name for use by strftime", "Jan");
+ s_monthnames[1] = C_("Abbr. month name for use by strftime", "Feb");
+ s_monthnames[2] = C_("Abbr. month name for use by strftime", "Mar");
+ s_monthnames[3] = C_("Abbr. month name for use by strftime", "Apr");
+ s_monthnames[4] = C_("Abbr. month name for use by strftime", "May");
+ s_monthnames[5] = C_("Abbr. month name for use by strftime", "Jun");
+ s_monthnames[6] = C_("Abbr. month name for use by strftime", "Jul");
+ s_monthnames[7] = C_("Abbr. month name for use by strftime", "Aug");
+ s_monthnames[8] = C_("Abbr. month name for use by strftime", "Sep");
+ s_monthnames[9] = C_("Abbr. month name for use by strftime", "Oct");
+ s_monthnames[10] = C_("Abbr. month name for use by strftime", "Nov");
+ s_monthnames[11] = C_("Abbr. month name for use by strftime", "Dec");
for (i = 0; i < 7; i++) {
daynames_len[i] = strlen(daynames[i]);
@@ -5007,21 +5007,21 @@ static void init_time_names(void)
s_monthnames_len[i] = strlen(s_monthnames[i]);
}
- s_am_up = Q_("For use by strftime (morning)|AM");
- s_pm_up = Q_("For use by strftime (afternoon)|PM");
- s_am_low = Q_("For use by strftime (morning, lowercase)|am");
- s_pm_low = Q_("For use by strftime (afternoon, lowercase)|pm");
+ s_am_up = C_("For use by strftime (morning)", "AM");
+ s_pm_up = C_("For use by strftime (afternoon)", "PM");
+ s_am_low = C_("For use by strftime (morning, lowercase)", "am");
+ s_pm_low = C_("For use by strftime (afternoon, lowercase)", "pm");
s_am_up_len = strlen(s_am_up);
s_pm_up_len = strlen(s_pm_up);
s_am_low_len = strlen(s_am_low);
s_pm_low_len = strlen(s_pm_low);
- def_loc_format = Q_("For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y");
- date_loc_format = Q_("For use by strftime (default date format)|%m/%d/%y");
- time_loc_format = Q_("For use by strftime (default time format)|%H:%M:%S");
+ def_loc_format = C_("For use by strftime (default date+time format)", "%a %b %e %H:%M:%S %Y");
+ date_loc_format = C_("For use by strftime (default date format)", "%m/%d/%y");
+ time_loc_format = C_("For use by strftime (default time format)", "%H:%M:%S");
- time_am_pm = Q_("For use by strftime (default 12-hour time format)|%I:%M:%S %p");
+ time_am_pm = C_("For use by strftime (default 12-hour time format)", "%I:%M:%S %p");
time_names_init_done = TRUE;
}
diff --git a/src/edittags.c b/src/edittags.c
@@ -526,7 +526,7 @@ static void apply_window_create(void)
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);
diff --git a/src/gtk/about.c b/src/gtk/about.c
@@ -413,7 +413,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("compface|adds support for the X-Face header\n"), -1);
+ (gchar *)C_("compface", "adds support for the X-Face header\n"), -1);
#if USE_ENCHANT
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -423,7 +423,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" Enchant "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("Enchant|adds support for spell checking\n"), -1);
+ (gchar *)C_("Enchant", "adds support for spell checking\n"), -1);
#if USE_GNUTLS
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -433,7 +433,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GnuTLS "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("GnuTLS|adds support for encrypted connections to servers\n"), -1);
+ (gchar *)C_("GnuTLS", "adds support for encrypted connections to servers\n"), -1);
#if INET6
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -443,7 +443,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new Internet "
+ (gchar *)C_("IPv6", "adds support for IPv6 addresses, the new Internet "
"addressing protocol\n"), -1);
#if HAVE_ICONV
@@ -454,7 +454,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1);
+ (gchar *)C_("iconv", "allows converting to and from different character sets\n"), -1);
#if USE_JPILOT
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -464,7 +464,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" JPilot "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("JPilot|adds support for PalmOS addressbooks\n"), -1);
+ (gchar *)C_("JPilot", "adds support for PalmOS addressbooks\n"), -1);
#if USE_LDAP
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -474,7 +474,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1);
+ (gchar *)C_("LDAP", "adds support for LDAP shared addressbooks\n"), -1);
#if HAVE_LIBETPAN
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -484,7 +484,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" libetpan "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("libetpan|adds support for IMAP and NNTP servers\n"), -1);
+ (gchar *)C_("libetpan", "adds support for IMAP and NNTP servers\n"), -1);
#if HAVE_LIBSM
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -494,7 +494,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" libSM "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("libSM|adds support for session handling\n"), -1);
+ (gchar *)C_("libSM", "adds support for session handling\n"), -1);
#if HAVE_NETWORKMANAGER_SUPPORT
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -504,7 +504,7 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" NetworkManager "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("NetworkManager|adds support for detection of network connection changes\n"), -1);
+ (gchar *)C_("NetworkManager", "adds support for detection of network connection changes\n"), -1);
return scrolledwin;
}
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -263,7 +263,7 @@ static void prefs_filtering_account_option_menu_populate(void)
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 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
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 @@ static gint prefs_filtering_list_view_set_row(gint row, FilteringProp * prop)
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)
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -695,7 +695,7 @@ static void prefs_matcher_create(void)
/* 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 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
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 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
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 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
/* 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");
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
@@ -201,7 +201,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
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 @@ 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(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 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
/* 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 */
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -368,7 +368,7 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source)
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 @@ const gchar *toolbar_get_short_text(int action) {
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");
diff --git a/src/uri_opener.c b/src/uri_opener.c
@@ -178,7 +178,7 @@ static void uri_opener_create(void)
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);
diff --git a/src/wizard.c b/src/wizard.c
@@ -536,7 +536,7 @@ static void write_welcome_email(WizardWindow *wizard)
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)),
