diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-03 15:50:32 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-03 15:50:32 +0200 |
| commit | 657df841551cecc8ade139c6313fdee6b4d01ebd (patch) | |
| tree | b49a6abfe28cea9975385eb54fa05ed612dad70f /res/values | |
| parent | 41dde747c2b9cfe24469dee3ce888cfe20071476 (diff) | |
| parent | cedc1f40b37aaecfef60f0bf63d30d24fa280e82 (diff) | |
Merge branch 'feature/xep-0333' into development
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 16 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 16 insertions, 2 deletions
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> |