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 --
 1 file changed, 2 deletions(-)

(limited to 'src/main/res/values/strings.xml')

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>
-- 
cgit v1.2.3