gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert g9737584.

Browse source
This commit is contained in:
wwp 2016-12-27 12:57:37 +01:00
parent 9737584876
commit 834ee30437
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/messageview.c
View file

@ -866,8 +866,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
AlertValue val;
gchar *text;
text = g_strdup_printf(
C_("'%s' stands for 'To' then 'Cc'",
"This message is asking for a return receipt notification\n"
_("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."),

9
src/plugins/address_keeper/address_keeper_prefs.c
View file

@ -142,8 +142,7 @@ 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);
text = g_strdup_printf(C_("address keeper: %s stands for a header name",
"Keep addresses which appear in '%s' headers"),
text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
prefs_common_translated_header_name("To"));
CLAWS_SET_TIP(keep_to_checkbox, text);
g_free(text);
@ -155,8 +154,7 @@ 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);
text = g_strdup_printf(C_("address keeper: %s stands for a header name",
"Keep addresses which appear in '%s' headers"),
text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
prefs_common_translated_header_name("Cc"));
CLAWS_SET_TIP(keep_cc_checkbox, text);
g_free(text);
@ -168,8 +166,7 @@ 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);
text = g_strdup_printf(C_("address keeper: %s stands for a header name",,
"Keep addresses which appear in '%s' headers"),
text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
prefs_common_translated_header_name("Bcc"));
CLAWS_SET_TIP(keep_bcc_checkbox, text);
g_free(text);

15
src/prefs_folder_item.c
View file

@ -919,8 +919,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default To */
text = g_strdup_printf(C_("folder properties: %s stands for a header name",
"Default %s"), prefs_common_translated_header_name("To:"));
text = g_strdup_printf(_("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);
@ -943,8 +942,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default address to reply to */
text = g_strdup_printf(C_("folder properties: %s stands for a header name",
"Default %s for replies"), prefs_common_translated_header_name("To:"));
text = g_strdup_printf(_("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);
@ -967,8 +965,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default Cc */
text = g_strdup_printf(C_("folder properties: %s stands for a header name",
"Default %s"), prefs_common_translated_header_name("Cc:"));
text = g_strdup_printf(_("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);
@ -991,8 +988,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default Bcc */
text = g_strdup_printf(C_("folder properties: %s stands for a header name",
"Default %s"), prefs_common_translated_header_name("Bcc:"));
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);
@ -1015,8 +1011,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default Reply-to */
text = g_strdup_printf(C_("folder properties: %s stands for a header name",
"Default %s"), prefs_common_translated_header_name("Reply-To:"));
text = g_strdup_printf(_("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);