Fix untranslatable concatenated strings (i.e. "Default "+"To:"),

normalize few uses of header names in UI.

diff --git a/src/compose.c b/src/compose.c
index 26fd9ece487777aabf123a2daca105f9285fae6d..fc02ba75c3f8ddc2814072955378c7c1898a2e72 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5036,7 +5036,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
                                gtk_widget_show_all(compose->window);
                        }
                        aval = alertpanel(_("Send"),
-                                         _("The only recipient is the default CC address. Send anyway?"),
+                                         _("The only recipient is the default Cc address. Send anyway?"),
                                          GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
                        if (aval != G_ALERTALTERNATE)
                                return FALSE;

diff --git a/src/messageview.c b/src/messageview.c
index 1476fe1526677aed54d17a971ab9731747b29789..05bf9565ab163f23527958130b701d34c4e436a5 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -866,7 +866,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                AlertValue val = 
                alertpanel_full(_("Warning"),
                  _("This message is asking for a return receipt notification\n"
-                   "but according to its 'To:' and 'CC:' headers it was not\n"
+                   "but according to its 'To' and 'Cc' headers it was not\n"
                    "officially addressed to you.\n"
                    "It is advised to not send the return receipt."),
                  _("_Don't Send"), _("_Send"), NULL, FALSE,

diff --git a/src/prefs_account.c b/src/prefs_account.c
index c54afcf052cc421baf7b66894f6ff56103a9fdce..9fc9616827673d49f3c9d80da323cde9adde2481 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2027,7 +2027,7 @@ static void compose_create_widget_func(PrefsPage * _page,
        gtk_table_set_col_spacings (GTK_TABLE (table), 8);
 
        autocc_checkbtn = gtk_check_button_new_with_label (
-                               prefs_common_translated_header_name("Cc"));
+                               prefs_common_translated_header_name("Cc:"));
        gtk_widget_show (autocc_checkbtn);
        gtk_table_attach (GTK_TABLE (table), autocc_checkbtn, 0, 1, 0, 1,
                          GTK_FILL, 0, 0, 0);
@@ -2041,7 +2041,7 @@ static void compose_create_widget_func(PrefsPage * _page,
        SET_TOGGLE_SENSITIVITY (autocc_checkbtn, autocc_entry);
 
        autobcc_checkbtn = gtk_check_button_new_with_label (
-                               prefs_common_translated_header_name("Bcc"));
+                               prefs_common_translated_header_name("Bcc:"));
        gtk_widget_show (autobcc_checkbtn);
        gtk_table_attach (GTK_TABLE (table), autobcc_checkbtn, 0, 1, 1, 2,
                          GTK_FILL, 0, 0, 0);
@@ -2055,7 +2055,7 @@ static void compose_create_widget_func(PrefsPage * _page,
        SET_TOGGLE_SENSITIVITY (autobcc_checkbtn, autobcc_entry);
 
        autoreplyto_checkbtn = gtk_check_button_new_with_label (
-                               prefs_common_translated_header_name("Reply-To"));
+                               prefs_common_translated_header_name("Reply-To:"));
        gtk_widget_show (autoreplyto_checkbtn);
        gtk_table_attach (GTK_TABLE (table), autoreplyto_checkbtn, 0, 1, 2, 3,
                          GTK_FILL, 0, 0, 0);

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 404aba93d8ad94ddc4e54ec2315e29d45cead028..b52187b44cfceac6d9df92b30f3a5496366bbc65 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default To */
-               text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"), NULL);
+               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"), NULL);
                checkbtn_default_to = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -942,7 +942,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default address to reply to */
-               text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"),
+               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"),
                                 _(" for replies"), NULL);
                checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
@@ -966,7 +966,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default Cc */
-               text = g_strconcat(_("Default "), prefs_common_translated_header_name("Cc:"), NULL);
+               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"), NULL);
                checkbtn_default_cc = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -989,7 +989,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default Bcc */
-               text = g_strconcat(_("Default "), prefs_common_translated_header_name("Bcc:"), NULL);
+               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Bcc:"));
                checkbtn_default_bcc = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1012,7 +1012,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default Reply-to */
-               text = g_strconcat(_("Default "), prefs_common_translated_header_name("Reply-To:"), NULL);
+               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"), NULL);
                checkbtn_default_replyto = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index 90592907b33c3e0ad0d5cd7538172f386a56ef6e..673be3850b7a892dcddb248e6abe50b3190adf9c 100644 (file)
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -309,7 +309,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
                gtk_widget_show (hbox3);
                gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
 
-               label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+               label_from = gtk_label_new (prefs_common_translated_header_name("From:"));
                gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
                gtk_widget_show (label_from);
                gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
@@ -439,7 +439,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
                gtk_widget_show (hbox3);
                gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
 
-               label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+               label_from = gtk_label_new (prefs_common_translated_header_name("From:"));
                gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
                gtk_widget_show (label_from);
                gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);