[evolution] Revert UI part of the change for bug 788916 (Use of localized Fwd/Re)

[Milan Crha <mcrha src gnome org>]

commit 7ad73ba8eedd9062ba63007c595132cb6c4cf1b0
Author: Milan Crha <mcrha redhat com>
Date:   Mon Oct 30 12:29:28 2017 +0100

    Revert UI part of the change for bug 788916 (Use of localized Fwd/Re)
    
    Make the change to use localized Fwd/Re hidden from the UI, because
    it can break things in an international environment and the RFC 5256
    section 7 suggests not to localize those. As this is eventually bad
    option, it should not be shown in the UI (there are more interesting
    options hidden in gsettings without their UI counter parts too).

 src/mail/mail-config.ui              |   45 ++++++++++-----------------------
 src/modules/mail/em-composer-prefs.c |    6 ----
 2 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/src/mail/mail-config.ui b/src/mail/mail-config.ui
index ee94553..3613380 100644
--- a/src/mail/mail-config.ui
+++ b/src/mail/mail-config.ui
@@ -518,23 +518,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkUseLocalizedFwdRe">
-                        <property name="label" translatable="yes" comments="Translators: Do not localize the 
'Fwd' and 'Re' here, but feel free to show what it would be in your locale at the end of the string">Use 
_localized “Fwd”/“Re” in message Subject of Forwards and Replies</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options"/>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkCheckButton" id="chkReplyStartBottom">
                         <property name="label" translatable="yes">Start _typing at the bottom</property>
                         <property name="visible">True</property>
@@ -546,8 +529,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
@@ -563,8 +546,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
@@ -580,8 +563,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
@@ -597,8 +580,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
@@ -614,8 +597,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
+                        <property name="top_attach">6</property>
+                        <property name="bottom_attach">7</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
@@ -631,8 +614,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
+                        <property name="top_attach">7</property>
+                        <property name="bottom_attach">8</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
@@ -648,8 +631,8 @@
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
+                        <property name="top_attach">8</property>
+                        <property name="bottom_attach">9</property>
                         <property name="y_options"/>
                       </packing>
                     </child>
diff --git a/src/modules/mail/em-composer-prefs.c b/src/modules/mail/em-composer-prefs.c
index 89115ca..31d5484 100644
--- a/src/modules/mail/em-composer-prefs.c
+++ b/src/modules/mail/em-composer-prefs.c
@@ -1192,12 +1192,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
                widget, "active",
                G_SETTINGS_BIND_DEFAULT);
 
-       widget = e_builder_get_widget (prefs->builder, "chkUseLocalizedFwdRe");
-       g_settings_bind (
-               settings, "composer-use-localized-fwd-re",
-               widget, "active",
-               G_SETTINGS_BIND_DEFAULT);
-
        widget = e_builder_get_widget (prefs->builder, "chkReplyStartBottom");
        g_settings_bind (
                settings, "composer-reply-start-bottom",