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/strings.xml | |
| parent | 41dde747c2b9cfe24469dee3ce888cfe20071476 (diff) | |
| parent | cedc1f40b37aaecfef60f0bf63d30d24fa280e82 (diff) | |
Merge branch 'feature/xep-0333' into development
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
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> |