Revert "Revert g9737584." and fix it ;)

This reverts commit 834ee304 which was reverting a previous
commit which broke build because of an extra comma. This
reverts the revert and removes the comma.

diff --git a/src/messageview.c b/src/messageview.c
index b07813e32d362307e93bc686b2435ab0bc1070c0..a62b86373a777f2e9dbc2256457a4f8a0354dccb 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -866,7 +866,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                AlertValue val;
                gchar *text;
                text = g_strdup_printf(
                AlertValue val;
                gchar *text;
                text = g_strdup_printf(

-                 _("This message is asking for a return receipt notification\n"
+                 C_("'%s' stands for 'To' then 'Cc'",
+                   "This message is asking for a return receipt notification\n"

                    "but according to its '%s' and '%s' headers it was not\n"
                    "officially addressed to you.\n"
                    "It is advised to not send the return receipt."),
                    "but according to its '%s' and '%s' headers it was not\n"
                    "officially addressed to you.\n"
                    "It is advised to not send the return receipt."),

diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 93a39f1d0d01a40be193e99cc96be072124e7a13..118899c8584bf3c1c02c4a5f427340b3ab479741 100644 (file)
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -142,7 +142,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
        gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
        gtk_widget_show(keep_to_checkbox);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
        gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
        gtk_widget_show(keep_to_checkbox);

-       text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+       text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+                       "Keep addresses which appear in '%s' headers"),

                        prefs_common_translated_header_name("To"));
        CLAWS_SET_TIP(keep_to_checkbox, text);
        g_free(text);
                        prefs_common_translated_header_name("To"));
        CLAWS_SET_TIP(keep_to_checkbox, text);
        g_free(text);


@@ -154,7 +155,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
        gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
        gtk_widget_show(keep_cc_checkbox);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
        gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
        gtk_widget_show(keep_cc_checkbox);

-       text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+       text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+                       "Keep addresses which appear in '%s' headers"),

                        prefs_common_translated_header_name("Cc"));
        CLAWS_SET_TIP(keep_cc_checkbox, text);
        g_free(text);
                        prefs_common_translated_header_name("Cc"));
        CLAWS_SET_TIP(keep_cc_checkbox, text);
        g_free(text);


@@ -166,7 +168,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
        gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
        gtk_widget_show(keep_bcc_checkbox);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
        gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
        gtk_widget_show(keep_bcc_checkbox);

-       text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+       text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+                       "Keep addresses which appear in '%s' headers"),

                        prefs_common_translated_header_name("Bcc"));
        CLAWS_SET_TIP(keep_bcc_checkbox, text);
        g_free(text);
                        prefs_common_translated_header_name("Bcc"));
        CLAWS_SET_TIP(keep_bcc_checkbox, text);
        g_free(text);

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index dab8eb3e873040bc88ad603c69c233d21dd27882..cc3905dc3847b6317a7bc007e36a9e155773c740 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default To */
                rowcount++;
 
                /* Default To */

-               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"));
+               text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+                                "Default %s"), prefs_common_translated_header_name("To:"));

                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);
                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 +943,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default address to reply to */
                rowcount++;
 
                /* Default address to reply to */

-               text = g_strdup_printf(_("Default %s for replies"), prefs_common_translated_header_name("To:"));
+               text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+                                "Default %s for replies"), prefs_common_translated_header_name("To:"));

                checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
                checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);


@@ -965,7 +967,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default Cc */
                rowcount++;
 
                /* Default Cc */

-               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"));
+               text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+                                "Default %s"), prefs_common_translated_header_name("Cc:"));

                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);
                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);


@@ -988,7 +991,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default Bcc */
                rowcount++;
 
                /* Default Bcc */

-               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Bcc:"));
+               text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+                                "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);
                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);


@@ -1011,7 +1015,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default Reply-to */
                rowcount++;
 
                /* Default Reply-to */

-               text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"));
+               text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+                                "Default %s"), prefs_common_translated_header_name("Reply-To:"));

                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);
                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);