changed received and read confirmation setting to one list and put it to settings class

3 files changed, 21 insertions, 7 deletions

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9b48bfd5..ccb3c990 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -119,10 +119,11 @@
     <string name="pref_advanced_options">Erweiterte Optionen</string>
     <string name="pref_never_send_crash">Sende niemals Absturzberichte</string>
     <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
-  <string name="pref_confirm_messages">Empfangsbestätigung senden</string>
-  <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen hast</string>
-    <string name="pref_confirm_read_messages">Lesebestätigung senden</string>
-    <string name="pref_confirm_read_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht gelesen hast</string>
+  <string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string>
+  <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen oder gelesen hast</string>
+    <string name="pref_confirm_messages_none">Keine Bestätigungen</string>
+    <string name="pref_confirm_messages_received">Nur Empfangsbestätigung</string>
+    <string name="pref_confirm_messages_read_and_received">Lese- und Empfangsbestätigung</string>
     <string name="pref_ui_options">Benutzeroberfläche</string>
     <string name="pref_parse_emoticons">Smilies ersetzen</string>
     <string name="pref_parse_emoticons_summary">Zeige Smilie-Bilder anstelle von Emoticons.</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index c413a3c4..942117d8 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -40,4 +40,16 @@
 		<item>-1</item>
 	</integer-array>
 
+    <string-array name="confirm_strings">
+        <item>@string/pref_confirm_messages_none</item>
+        <item>@string/pref_confirm_messages_received</item>
+        <item>@string/pref_confirm_messages_read_and_received</item>
+    </string-array>
+
+    <string-array name="confirm_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 03c1386f..d454cc1f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -122,9 +122,10 @@
     <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_confirm_messages">Confirm Messages</string>
-    <string name="pref_confirm_messages_summary">Let your contact know when you have received a message</string>
-    <string name="pref_confirm_read_messages">Confirm Read Messages</string>
-    <string name="pref_confirm_read_messages_summary">Let your contact know when you have read a message</string>
+    <string name="pref_confirm_messages_summary">Let your contact know when you have received or read a message</string>
+    <string name="pref_confirm_messages_none">No confirmation</string>
+    <string name="pref_confirm_messages_received">Confirmation for received message</string>
+    <string name="pref_confirm_messages_read_and_received">Confirmation for received and read message</string>
     <string name="pref_ui_options">UI Options</string>
     <string name="pref_parse_emoticons">Parse Emoticons</string>
     <string name="pref_parse_emoticons_summary">Replace emoticons with smilies.</string>