diff options
| author | lookshe <github@lookshe.org> | 2015-04-14 23:48:28 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-14 23:48:28 +0200 |
| commit | 549810783ce651f27bdd386488b6690195522372 (patch) | |
| tree | be050d54e7c591370c5c0dc9667ab6eb5056887b /src/main/res/values/strings.xml | |
| parent | 8932dd9fb320b4641e707ae44de2c1d00996c358 (diff) | |
changed received and read confirmation setting to one list and put it to settings class
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 7 |
1 files changed, 4 insertions, 3 deletions
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> |