From 7e4e7426eeaf2f958820845e48c0d24a92f9bc07 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 4 Jun 2014 18:44:15 +0200
Subject: received and displayed messages (xep 333) are now marked properly

---
 res/values/arrays.xml  | 12 ------------
 res/values/strings.xml |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'res/values')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 15ec940f..f9a198b2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -19,16 +19,4 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
-    <string-array name="message_acks">
-        <item>never</item>
-        <item>when received</item>
-        <item>when read</item>
-        <item>when received and when read</item>
-    </string-array>
-    <string-array name="message_acks_values">
-		<item>0</item>
-		<item>1</item>
-		<item>2</item>
-		<item>3</item>        
-    </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d469caf3..6767568e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -145,8 +145,8 @@
     <string name="pref_advanced_options">Advanced Options</string>
     <string name="pref_never_send_crash">Never send crash reports</string>
     <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
-    <string name="pref_auto_acknowledge_messages">Acknowledge Messages</string>
-    <string name="pref_auto_acknowledge_messages_summary">Allows your contact to know whether or not you have received or read a specific message</string>
+    <string name="pref_confirm_messages">Confirm Messages</string>
+    <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
     <string name="openpgp_error">OpenKeychain reporeted an error</string>
     <string name="error_decrypting_file">I/O Error decrypting file</string>
     <string name="error_copying_image_file">Error copying image file.</string>
-- 
cgit v1.2.3