From cedc1f40b37aaecfef60f0bf63d30d24fa280e82 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 3 Jun 2014 15:48:51 +0200
Subject: answer to xep 184 message receipts. fixes #95

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

(limited to 'res/values')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 09fd3cc7..15ec940f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <array name="resources">
+    <string-array name="resources">
         <item>Mobile</item>
         <item>Phone</item>
         <item>Tablet</item>
         <item>Conversations</item>
         <item>Android</item>
-    </array>
+    </string-array>
     <string-array name="filesizes">
         <item>never</item>
         <item>256 KB</item>
@@ -19,4 +19,16 @@
         <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 d3a7a91c..d469caf3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -145,6 +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="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