aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-04 18:44:15 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-04 18:44:15 +0200
commit7e4e7426eeaf2f958820845e48c0d24a92f9bc07 (patch)
tree205a35b503a0fb14fa0fd9fe313a2a37a8d0617a /res/values
parentba2ad82c7e1ae05d9648c069b3537ddda1b1f438 (diff)
received and displayed messages (xep 333) are now marked properly
Diffstat (limited to '')
-rw-r--r--res/values/arrays.xml12
-rw-r--r--res/values/strings.xml4
2 files changed, 2 insertions, 14 deletions
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>