From 2e063d8696b7a5e798a4a4d614ee522fbed12124 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Mon, 18 Apr 2016 15:07:15 +0200
Subject: Related to FS#199: fixed merge hickups (message correction setting
 removed, key for other expert settings readded)

---
 src/main/res/values/strings.xml  | 2 --
 src/main/res/xml/preferences.xml | 7 +------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/main')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8ead4363..b6aa8899 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -295,8 +295,6 @@
 	<string name="pref_security_settings">Security</string>
 	<string name="pref_force_encryption">Force end-to-end encryption</string>
 	<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
-	<string name="pref_allow_message_correction">Allow message correction</string>
-	<string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</string>
 	<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
 	<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
 	<string name="pref_expert_options">Expert settings</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index bd5d3ebb..44b66ab7 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -199,11 +199,6 @@
                     android:key="remove_trusted_certificates"
                     android:summary="@string/pref_remove_trusted_certificates_summary"
                     android:title="@string/pref_remove_trusted_certificates_title"/>
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="allow_message_correction"
-                    android:title="@string/pref_allow_message_correction"
-                    android:summary="@string/pref_allow_message_correction_summary"/>
             </PreferenceCategory>
             <PreferenceCategory
                 android:key="connection_options"
@@ -244,7 +239,7 @@
                     android:title="@string/pref_treat_vibrate_as_silent"
                     android:summary="@string/pref_treat_vibrate_as_silent_summary"/>
             </PreferenceCategory>
-            <PreferenceCategory android:title="@string/pref_expert_options_other">
+            <PreferenceCategory android:key="other_expert_settings" android:title="@string/pref_expert_options_other">
                 <CheckBoxPreference
                     android:key="autojoin"
                     android:defaultValue="true"
-- 
cgit v1.2.3