git.olowe.co

Commit Diff

Commit:: d2754705178a0be211c1185d8b659cd903b20a91
From:: Oliver Lowe <o@olowe.co>
Date:: Mon Sep 1 02:40:47 2025 UTC
Message:: Remove translated header pref
Actions:: Patch | Tree
commit - 3b3a7256bb228b0a95d8c7539630f13fe270a938
commit + d2754705178a0be211c1185d8b659cd903b20a91
blob - a8b11338b194e11fcc43574e317495df3018c41f
blob + cd59bb852e33d5d1467073822158c5a238934851
--- src/addressbook.c
+++ src/addressbook.c
@@ -1058,15 +1058,15 @@ static void addressbook_create(void)
 			 G_CALLBACK(addressbook_lup_clicked), NULL);
 
 	to_btn = gtk_button_new_with_label
-		(prefs_common_translated_header_name("To:"));
+		("To:");
 	gtk_widget_set_can_default(to_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
 	cc_btn = gtk_button_new_with_label
-		(prefs_common_translated_header_name("Cc:"));
+		("Cc:");
 	gtk_widget_set_can_default(cc_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
 	bcc_btn = gtk_button_new_with_label
-		(prefs_common_translated_header_name("Bcc:"));
+		("Bcc:");
 	gtk_widget_set_can_default(bcc_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
 
blob - 6f98c97301aca335badd0a6e265d2314c1c779d1
blob + 375008232cbfa3a579c800e1bf45f90843a02c43
--- src/addrgather.c
+++ src/addrgather.c
@@ -337,8 +337,7 @@ static void addrgather_page_fields(gint pageNum, gchar
 	gtk_container_set_border_width(GTK_CONTAINER(vboxf), 8);
 
 	for (i = 0; i < NUM_FIELDS; i++) {
-		PACK_CHECK_BUTTON(vboxf, checkHeader[i],
-			prefs_common_translated_header_name(_harv_headerNames_[i]));
+		PACK_CHECK_BUTTON(vboxf, checkHeader[i], _harv_headerNames_[i]);
 		addrgather_dlg.checkHeader[i] = checkHeader[i];
 	}
 
blob - bc2780846cb47ed71d5d87f452ea6d184c5d0951
blob + 72cdc546d374aed023619d5a538b0a97af7e70fb
--- src/compose.c
+++ src/compose.c
@@ -2272,7 +2272,6 @@ void compose_entry_append(Compose *compose, const gcha
 		header = N_("To:");
 		break;
 	}
-	header = prefs_common_translated_header_name(header);
 
 	cur = begin = (gchar *)address;
 
@@ -4549,7 +4548,7 @@ gboolean compose_check_for_valid_recipient(Compose *co
 		g_strstrip(header);
 		if (entry[0] != '\0') {
 			for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
-				if (!g_ascii_strcasecmp(header, prefs_common_translated_header_name(*strptr))) {
+				if (!g_ascii_strcasecmp(header, *strptr)) {
 					compose->to_list = address_list_append(compose->to_list, entry);
 					recipient_found = TRUE;
 				}
@@ -4575,7 +4574,7 @@ static gboolean compose_check_for_set_recipients(Compo
 			g_strstrip(entry);
 			g_strstrip(header);
 			if (strcmp(entry, compose->account->auto_cc)
-			||  strcmp(header, prefs_common_translated_header_name("Cc:"))) {
+			||  strcmp(header, "Cc:")) {
 				found_other = TRUE;
 				g_free(entry);
 				break;
@@ -4590,7 +4589,7 @@ static gboolean compose_check_for_set_recipients(Compo
 				gtk_widget_show_all(compose->window);
 			}
 			text = g_strdup_printf(_("The only recipient is the default '%s' address. Send anyway?"),
-					   prefs_common_translated_header_name("Cc"));
+					   "Cc");
 			aval = alertpanel(_("Send"),
 					  text,
 					  NULL, _("_Cancel"), NULL, _("_Send"), NULL, NULL, ALERTFOCUS_SECOND);
@@ -4611,7 +4610,7 @@ static gboolean compose_check_for_set_recipients(Compo
 			g_strstrip(entry);
 			g_strstrip(header);
 			if (strcmp(entry, compose->account->auto_bcc)
-			||  strcmp(header, prefs_common_translated_header_name("Bcc:"))) {
+			||  strcmp(header, "Bcc:")) {
 				found_other = TRUE;
 				g_free(entry);
 				g_free(header);
@@ -4627,7 +4626,7 @@ static gboolean compose_check_for_set_recipients(Compo
 				gtk_widget_show_all(compose->window);
 			}
 			text = g_strdup_printf(_("The only recipient is the default '%s' address. Send anyway?"),
-					   prefs_common_translated_header_name("Bcc"));
+					   "Bcc");
 			aval = alertpanel(_("Send"),
 					  text,
 					  NULL, _("_Cancel"), NULL, _("_Send"), NULL, NULL, ALERTFOCUS_SECOND);
@@ -4694,8 +4693,8 @@ static gboolean compose_check_entries(Compose *compose
 			g_strstrip(header);
 			g_strstrip(entry);
 			if ((entry[0] != '\0') &&
-			    (!strcmp(header, prefs_common_translated_header_name("To:")) ||
-			     !strcmp(header, prefs_common_translated_header_name("Cc:")))) {
+			    (!strcmp(header, "To:") ||
+			     !strcmp(header, "Cc:"))) {
 				cnt++;
 			}
 			g_free(header);
@@ -4930,8 +4929,8 @@ static gint compose_redirect_write_headers_from_header
 
 	debug_print("Writing redirect header\n");
 
-	cc_hdr = prefs_common_translated_header_name("Cc:");
- 	to_hdr = prefs_common_translated_header_name("To:");
+	cc_hdr = "Cc:";
+ 	to_hdr = "To:";
 
 	first_to_address = TRUE;
 	for (list = compose->header_list; list; list = list->next) {
@@ -5959,7 +5958,7 @@ static void compose_add_headerfield_from_headerlist(Co
 	fieldstr = g_string_sized_new(64);
 
 	fieldname_w_colon = g_strconcat(fieldname, ":", NULL);
-	trans_fieldname = prefs_common_translated_header_name(fieldname_w_colon);
+	trans_fieldname = fieldname_w_colon;
 
 	for (list = compose->header_list; list; list = list->next) {
     		headerentry = ((ComposeHeaderEntry *)list->data);
@@ -6007,7 +6006,6 @@ static gchar *compose_get_manual_headers_info(Compose 
 		gchar *tmp;
 		gchar *headername;
 		gchar *headername_wcolon;
-		const gchar *headername_trans;
 		gchar **string;
 		gboolean standard_header = FALSE;
 
@@ -6031,8 +6029,7 @@ static gchar *compose_get_manual_headers_info(Compose 
 
 		string = std_headers;
 		while (*string != NULL) {
-			headername_trans = prefs_common_translated_header_name(*string);
-			if (!strcmp(headername_trans, headername_wcolon))
+			if (!strcmp(*string, headername_wcolon))
 				standard_header = TRUE;
 			string++;
 		}
@@ -6207,7 +6204,6 @@ static gchar *compose_get_header(Compose *compose)
 		gchar *tmp;
 		gchar *headername;
 		gchar *headername_wcolon;
-		const gchar *headername_trans;
 		gchar *headervalue;
 		gchar **string;
 		gboolean standard_header = FALSE;
@@ -6243,9 +6239,7 @@ static gchar *compose_get_header(Compose *compose)
 		if (*headervalue != '\0') {
 			string = std_headers;
 			while (*string != NULL && !standard_header) {
-				headername_trans = prefs_common_translated_header_name(*string);
-				/* support mixed translated and untranslated headers */
-				if (!strcmp(headername_trans, headername_wcolon) || !strcmp(*string, headername_wcolon))
+				if (!strcmp(*string, headername_wcolon))
 					standard_header = TRUE;
 				string++;
 			}
@@ -6434,15 +6428,15 @@ static void compose_create_header_entry(Compose *compo
 
 	/* Combo box model */
 	model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
-	COMBOBOX_ADD(model, prefs_common_translated_header_name("To:"),
+	COMBOBOX_ADD(model, "To:",
 			COMPOSE_TO);
-	COMBOBOX_ADD(model, prefs_common_translated_header_name("Cc:"),
+	COMBOBOX_ADD(model, "Cc:",
 			COMPOSE_CC);
-	COMBOBOX_ADD(model, prefs_common_translated_header_name("Bcc:"),
+	COMBOBOX_ADD(model, "Bcc:",
 			COMPOSE_BCC);
-	COMBOBOX_ADD(model, prefs_common_translated_header_name("Reply-To:"),
+	COMBOBOX_ADD(model, "Reply-To:",
 			COMPOSE_REPLYTO);
-	COMBOBOX_ADD(model, prefs_common_translated_header_name("Followup-To:"),
+	COMBOBOX_ADD(model, "Followup-To:",
 			COMPOSE_FOLLOWUPTO);
 	compose_add_extra_header_entries(model);
 
@@ -6464,7 +6458,7 @@ static void compose_create_header_entry(Compose *compo
 				GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))));
 		string = headers;
 		while (*string != NULL) {
-			if (!strcmp(prefs_common_translated_header_name(*string), last_header_entry))
+			if (!strcmp(*string, last_header_entry))
 				standard_header = TRUE;
 			string++;
 		}
@@ -6474,7 +6468,7 @@ static void compose_create_header_entry(Compose *compo
 	if (!compose->header_last || !standard_header) {
 		switch(compose->account->protocol) {
 			default:
-				header = prefs_common_translated_header_name("To:");
+				header = "To:";
 				break;
 		}
 	}
@@ -6557,12 +6551,9 @@ static void compose_add_header_entry(Compose *compose,
 	gchar *tmp = g_strdup(text), *email;
 	gboolean replyto_hdr;
 
-	replyto_hdr = (!strcasecmp(header,
-				prefs_common_translated_header_name("Reply-To:")) ||
-			!strcasecmp(header,
-				prefs_common_translated_header_name("Followup-To:")) ||
-			!strcasecmp(header,
-				prefs_common_translated_header_name("In-Reply-To:")));
+	replyto_hdr = (!strcasecmp(header, "Reply-To:") ||
+			!strcasecmp(header, "Followup-To:") ||
+			!strcasecmp(header, "In-Reply-To:"));
 
 	extract_address(tmp);
 	email = g_utf8_strdown(tmp, -1);
@@ -6577,7 +6568,7 @@ static void compose_add_header_entry(Compose *compose,
 		return;
 	}
 
-	if (!strcasecmp(header, prefs_common_translated_header_name("In-Reply-To:")))
+	if (!strcasecmp(header, "In-Reply-To:"))
 		gtk_entry_set_text(GTK_ENTRY(
 			gtk_bin_get_child(GTK_BIN(last_header->combo))), header);
 	else
@@ -7306,7 +7297,7 @@ static Compose *compose_create(PrefsAccount *account,
 		compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO, PREF_ACCOUNT);
 
 	cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/ReplyMode", compose->mode == COMPOSE_REPLY);
-	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))), prefs_common_translated_header_name("To:"));
+	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))), "To:");
 
 	addressbook_set_target_compose(compose);
 
@@ -10686,7 +10677,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compo
 		gchar *entry = gtk_editable_get_chars(
 								GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
 
-		if ( strcasecmp(header, prefs_common_translated_header_name("To:")) == 0 ) {
+		if ( strcasecmp(header, "To:") == 0 ) {
 			if ( newmsginfo->to == NULL ) {
 				newmsginfo->to = g_strdup(entry);
 			} else if (entry && *entry) {
@@ -10695,7 +10686,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compo
 				newmsginfo->to = tmp;
 			}
 		} else
-		if ( strcasecmp(header, prefs_common_translated_header_name("Cc:")) == 0 ) {
+		if ( strcasecmp(header, "Cc:") == 0 ) {
 			if ( newmsginfo->cc == NULL ) {
 				newmsginfo->cc = g_strdup(entry);
 			} else if (entry && *entry) {
blob - c072697764a61d5a0bf74f4899f64cdcf10cb951
blob + 57c5c8537c81317f51a4766c89a4a7f4a8f1be2d
--- src/matcher.c
+++ src/matcher.c
@@ -203,14 +203,14 @@ void matcher_init(void)
 	if (context_str[CONTEXT_SUBJECT] != NULL)
 		return;
 
-	context_str[CONTEXT_SUBJECT] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Subject:"));
-	context_str[CONTEXT_FROM] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("From:"));
-	context_str[CONTEXT_TO] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
-	context_str[CONTEXT_CC] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
-	context_str[CONTEXT_NEWSGROUPS] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Newsgroups:"));
-	context_str[CONTEXT_MESSAGEID] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Message-ID:"));
-	context_str[CONTEXT_IN_REPLY_TO] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("In-Reply-To:"));
-	context_str[CONTEXT_REFERENCES] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("References:"));
+	context_str[CONTEXT_SUBJECT] = g_strdup_printf(_("%s header"), "Subject:");
+	context_str[CONTEXT_FROM] = g_strdup_printf(_("%s header"), "From:");
+	context_str[CONTEXT_TO] = g_strdup_printf(_("%s header"), "To:");
+	context_str[CONTEXT_CC] = g_strdup_printf(_("%s header"), "Cc:");
+	context_str[CONTEXT_NEWSGROUPS] = g_strdup_printf(_("%s header"), "Newsgroups:");
+	context_str[CONTEXT_MESSAGEID] = g_strdup_printf(_("%s header"), "Message-ID:");
+	context_str[CONTEXT_IN_REPLY_TO] = g_strdup_printf(_("%s header"), "In-Reply-To:");
+	context_str[CONTEXT_REFERENCES] = g_strdup_printf(_("%s header"), "References:");
 	context_str[CONTEXT_HEADER] = g_strdup(_("header"));
 	context_str[CONTEXT_HEADER_LINE] = g_strdup(_("header line"));
 	context_str[CONTEXT_BODY_LINE] = g_strdup(_("body line"));
blob - c9452e2fcb5675f1302f2378906caa41b9a103a6
blob + be0645c39396429c38d93e9b8aaa67cdbe84094e
--- src/prefs_account.c
+++ src/prefs_account.c
@@ -2140,8 +2140,7 @@ static void compose_create_widget_func(PrefsPage * _pa
 	gtk_grid_set_row_spacing(GTK_GRID(table), VSPACING_NARROW_2);
 	gtk_grid_set_column_spacing(GTK_GRID(table), 8);
 
-	autocc_checkbtn = gtk_check_button_new_with_label (
-				prefs_common_translated_header_name("Cc:"));
+	autocc_checkbtn = gtk_check_button_new_with_label("Cc:");
 	gtk_widget_show (autocc_checkbtn);
 	gtk_grid_attach(GTK_GRID(table), autocc_checkbtn, 0, 0, 1, 1);
 
@@ -2153,8 +2152,7 @@ static void compose_create_widget_func(PrefsPage * _pa
 
 	SET_TOGGLE_SENSITIVITY (autocc_checkbtn, autocc_entry);
 
-	autobcc_checkbtn = gtk_check_button_new_with_label (
-				prefs_common_translated_header_name("Bcc:"));
+	autobcc_checkbtn = gtk_check_button_new_with_label("Bcc:");
 	gtk_widget_show (autobcc_checkbtn);
 	gtk_grid_attach(GTK_GRID(table), autobcc_checkbtn, 0, 1, 1, 1);
 
@@ -2166,8 +2164,7 @@ static void compose_create_widget_func(PrefsPage * _pa
 
 	SET_TOGGLE_SENSITIVITY (autobcc_checkbtn, autobcc_entry);
 
-	autoreplyto_checkbtn = gtk_check_button_new_with_label (
-				prefs_common_translated_header_name("Reply-To:"));
+	autoreplyto_checkbtn = gtk_check_button_new_with_label("Reply-To:");
 	gtk_widget_show (autoreplyto_checkbtn);
 	gtk_grid_attach(GTK_GRID(table), autoreplyto_checkbtn, 0, 2, 1, 1);
 
blob - 1882f1fb121ef813a77b5bfbd149c51c8793ac25
blob + dede93ff027877e2d83ffbed3031ac87762cced8
--- src/prefs_common.c
+++ src/prefs_common.c
@@ -222,14 +222,6 @@ static PrefParam param[] = {
 	 &prefs_common.display_folder_unread, P_INT,
 	 NULL, NULL, NULL},
 
-#ifdef ENABLE_NLS
-	{"translate_header", "TRUE", &prefs_common.trans_hdr, P_BOOL,
-	 NULL, NULL, NULL},
-#else
-	{"translate_header", "FALSE", &prefs_common.trans_hdr, P_BOOL,
-	 NULL, NULL, NULL},
-#endif
-
 	/* Display: Summary View */
 	{"default_sort_key", "3", &prefs_common.default_sort_key, P_ENUM,
 	 NULL, NULL, NULL},
@@ -1268,12 +1260,6 @@ gboolean prefs_common_unsafe_ssl_certs(void)
 	return prefs_common.unsafe_ssl_certs;
 }
 
-/* TODO(otl): delete this no-op */
-const gchar *prefs_common_translated_header_name(const gchar *header_name)
-{
-	return header_name;
-}
-
 const gchar *prefs_common_get_uri_cmd(void)
 {
 	gchar *tmp = NULL;
blob - 3646ac5ff6cd6294a0041073f88a1278be39bb92
blob + 0d6281d5c2fcb60deb3d4676bc66521e39f7c8f0
--- src/prefs_common.h
+++ src/prefs_common.h
@@ -215,7 +215,6 @@ struct _PrefsCommon
 	/* program colors */
 	GdkRGBA color[COL_LAST_COLOR_INDEX];
 
-	gboolean trans_hdr;
 	gint display_folder_unread;
 
 	gboolean show_searchbar;
@@ -532,7 +531,6 @@ void pref_set_textview_from_pref(GtkTextView *textview
 void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt);
 gchar *pref_get_pref_from_textview(GtkTextView *textview);
 gchar *pref_get_pref_from_entry(GtkEntry *entry);
-const gchar *prefs_common_translated_header_name(const gchar *header_name);
 const gchar *prefs_common_get_uri_cmd(void);
 const gchar *prefs_common_get_ext_editor_cmd(void);
 
blob - 05662b67ecbef633a987b2581c11f91bdef77ccc
blob + ff89c77b4483af717c8ea8ec12c252a1cb2f3a0d
--- src/prefs_compose_writing.c
+++ src/prefs_compose_writing.c
@@ -209,22 +209,13 @@ static void prefs_compose_writing_create_widget(PrefsP
 	gtk_box_pack_start (GTK_BOX (hbox_warn_large_insert),
 			label_warn_large_insert_size, FALSE, FALSE, 0);
 
-	/* Replying */
-	vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Replying"));
+	vbox2 = gtkut_get_options_frame(vbox1, &frame, "Replying");
+	PACK_CHECK_BUTTON (vbox2, checkbtn_reply_with_quote, "Quote reply by default");
+	PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list, "Reply button invokes mailing list reply");
 
-	PACK_CHECK_BUTTON (vbox2, checkbtn_reply_with_quote,
-			   _("Reply will quote by default"));
-
-	PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list,
-			   _("Reply button invokes mailing list reply"));
-
-	vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Forwarding"));
-
-	PACK_CHECK_BUTTON (vbox2, checkbtn_forward_as_attachment,
-			   _("Forward as attachment"));
-
-	text = g_strdup_printf(_("Keep the original '%s' header when redirecting"),
-			prefs_common_translated_header_name("From"));
+	vbox2 = gtkut_get_options_frame(vbox1, &frame, "Forwarding");
+	PACK_CHECK_BUTTON (vbox2, checkbtn_forward_as_attachment, "Forward as attachment");
+	text = "Keep the original 'From' header when redirecting";
 	PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from, text);
 	g_free(text);
 
blob - 0c5be41499087611cb91f81a53bbe9d56ef8f29b
blob + 3f030ebb7e351000152710a2baa7280ce06fe9e8
--- src/prefs_folder_item.c
+++ src/prefs_folder_item.c
@@ -838,7 +838,7 @@ static void prefs_folder_item_compose_create_widget_fu
 		/* Default From */
 		tr = g_strdup(C_("folder properties: %s stands for a header name",
 				 	  "Default %s"));
-		text = g_strdup_printf(tr, prefs_common_translated_header_name("From:"));
+		text = g_strdup_printf(tr, "From:");
 		checkbtn_default_from = gtk_check_button_new_with_label(text);
 		gtk_grid_attach(GTK_GRID(table), checkbtn_default_from, 0, rowcount, 1, 1);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_from),
@@ -863,7 +863,7 @@ static void prefs_folder_item_compose_create_widget_fu
 		/* Default To */
 		tr = g_strdup(C_("folder properties: %s stands for a header name",
 				 	  "Default %s"));
-		text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(tr, "To:");
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_grid_attach(GTK_GRID(table), checkbtn_default_to, 0, rowcount, 1, 1);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to),
@@ -888,7 +888,7 @@ static void prefs_folder_item_compose_create_widget_fu
 		/* Default address to reply to */
 		tr = g_strdup(C_("folder properties: %s stands for a header name",
 				 	  "Default %s for replies"));
-		text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(tr, "To:");
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_grid_attach(GTK_GRID(table), checkbtn_default_reply_to, 0, rowcount, 1, 1);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to),
@@ -913,7 +913,7 @@ static void prefs_folder_item_compose_create_widget_fu
 		/* Default Cc */
 		tr = g_strdup(C_("folder properties: %s stands for a header name",
 				 	  "Default %s"));
-		text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc:"));
+		text = g_strdup_printf(tr, "Cc:");
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_grid_attach(GTK_GRID(table), checkbtn_default_cc, 0, rowcount, 1, 1);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc),
@@ -938,7 +938,7 @@ static void prefs_folder_item_compose_create_widget_fu
 		/* Default Bcc */
 		tr = g_strdup(C_("folder properties: %s stands for a header name",
 				 	  "Default %s"));
-		text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc:"));
+		text = g_strdup_printf(tr, "Bcc:");
 		checkbtn_default_bcc = gtk_check_button_new_with_label(text);
 		gtk_grid_attach(GTK_GRID(table), checkbtn_default_bcc, 0, rowcount, 1, 1);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc),
@@ -963,7 +963,7 @@ static void prefs_folder_item_compose_create_widget_fu
 		/* Default Reply-to */
 		tr = g_strdup(C_("folder properties: %s stands for a header name",
 				 	  "Default %s"));
-		text = g_strdup_printf(tr, prefs_common_translated_header_name("Reply-To:"));
+		text = g_strdup_printf(tr, "Reply-To:");
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_grid_attach(GTK_GRID(table), checkbtn_default_replyto, 0, rowcount, 1, 1);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto),
blob - cf6237b2593d3b91ff9c2e67b1f6e9ce0af12a68
blob + b5042c5697a1dee5a3537b5b7789a346bf9026a2
--- src/prefs_other.c
+++ src/prefs_other.c
@@ -60,7 +60,6 @@ typedef struct _OtherPage
 	GtkWidget *checkbtn_gtk_enable_accels;
 	GtkWidget *checkbtn_real_time_sync;
 	GtkWidget *entry_attach_save_chmod;
-	GtkWidget *checkbtn_transhdr;
 } OtherPage;
 
 struct KeyBind {
@@ -350,7 +349,6 @@ static void prefs_other_create_widget(PrefsPage *_page
 	GtkAdjustment *spinbtn_iotimeout_adj;
 
 	GtkWidget *vbox2;
-	GtkWidget *checkbtn_transhdr;
 	GtkWidget *checkbtn_askonclean;
 	GtkWidget *checkbtn_real_time_sync;
 	GtkWidget *label_attach_save_chmod;
@@ -430,11 +428,6 @@ static void prefs_other_create_widget(PrefsPage *_page
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-	PACK_CHECK_BUTTON(vbox2, checkbtn_transhdr,
-			   _("Translate header names"));
-	CLAWS_SET_TIP(checkbtn_transhdr,
-			     _("The display of standard headers (such as 'From:', 'Subject:') "
-			     "will be translated into your language"));
 	PACK_CHECK_BUTTON (vbox2, checkbtn_askonclean,
 			   _("Ask before emptying trash"));
 	PACK_CHECK_BUTTON (vbox2, checkbtn_real_time_sync,
@@ -482,8 +475,6 @@ static void prefs_other_create_widget(PrefsPage *_page
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_iotimeout),
 		prefs_common.io_timeout_secs);
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
-		prefs_common.trans_hdr);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_real_time_sync),
 		prefs_common.real_time_sync);
 
@@ -495,7 +486,6 @@ static void prefs_other_create_widget(PrefsPage *_page
 	prefs_other->checkbtn_askonclean = checkbtn_askonclean;
 	prefs_other->checkbtn_warnqueued = checkbtn_warnqueued;
 	prefs_other->spinbtn_iotimeout = spinbtn_iotimeout;
-	prefs_other->checkbtn_transhdr = checkbtn_transhdr;
 	prefs_other->checkbtn_gtk_enable_accels = checkbtn_gtk_enable_accels;
 	prefs_other->checkbtn_real_time_sync = checkbtn_real_time_sync;
 	prefs_other->entry_attach_save_chmod = entry_attach_save_chmod;
@@ -523,8 +513,6 @@ static void prefs_other_save(PrefsPage *_page)
 		GTK_SPIN_BUTTON(page->spinbtn_iotimeout));
 	sock_set_io_timeout(prefs_common.io_timeout_secs);
 	imap_main_set_timeout(prefs_common.io_timeout_secs);
-	prefs_common.trans_hdr = gtk_toggle_button_get_active(
-			GTK_TOGGLE_BUTTON(page->checkbtn_transhdr));
 	prefs_common.real_time_sync =
 		gtk_toggle_button_get_active(
 			GTK_TOGGLE_BUTTON(page->checkbtn_real_time_sync));
blob - 0397a44e42f355a0c7f699dc0430a7082ba9f904
blob + 027a60392c240c682c4aec2ae41d228430884712
--- src/quote_fmt.c
+++ src/quote_fmt.c
@@ -179,7 +179,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *pa
 		gtk_widget_show (hbox2_format);
 		gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0);
 
-		label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+		label_from = gtk_label_new ("From");
 		gtk_label_set_xalign(GTK_LABEL(label_from), 1.0);
 		gtk_widget_show (label_from);
 		gtk_box_pack_start (GTK_BOX (hbox2_format), label_from, FALSE, FALSE, 0);
@@ -197,7 +197,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *pa
 	gtk_widget_show (hbox_format);
 	gtk_box_pack_start (GTK_BOX (vbox_format), hbox_format, FALSE, FALSE, 0);
 
-	label_subject = gtk_label_new (prefs_common_translated_header_name("Subject"));
+	label_subject = gtk_label_new ("Subject");
 	gtk_label_set_xalign(GTK_LABEL(label_subject), 1.0);
 	gtk_widget_show (label_subject);
 	gtk_box_pack_start (GTK_BOX (hbox_format), label_subject, FALSE, FALSE, 0);
@@ -289,7 +289,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *pare
 		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 ("From:");
 		gtk_label_set_xalign(GTK_LABEL(label_from), 1.0);
 		gtk_widget_show (label_from);
 		gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
@@ -390,7 +390,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *pa
 		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 ("From:");
 		gtk_label_set_xalign(GTK_LABEL(label_from), 1.0);
 		gtk_widget_show (label_from);
 		gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);