diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 21:48:55 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 21:48:55 +0200 |
| commit | ae520c29573a5ae4b9129685ad9766f335ab6f26 (patch) | |
| tree | b028684fc852e933372dcaf47445e08b6233d3e2 /src/main/res | |
| parent | 94a669fcb861d9cff4414d98abb289d1452c9300 (diff) | |
differ between received and read message
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 5e75f55c..1233817f 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -113,8 +113,10 @@ <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">Lese- und Empfangsbestätigung senden</string> - <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</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_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/strings.xml b/src/main/res/values/strings.xml index f6abfc66..2cd67077 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -116,7 +116,9 @@ <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 and read a message</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_ui_options">UI Options</string> <string name="pref_parse_emoticons">Parse Emoticons</string> <string name="pref_parse_emoticons_summary">Replace emoticons with smilies.</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index adc15c6f..7318734a 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -30,6 +30,12 @@ android:title="@string/pref_confirm_messages" /> <CheckBoxPreference + android:defaultValue="true" + android:key="confirm_read_message" + android:summary="@string/pref_confirm_read_messages_summary" + android:title="@string/pref_confirm_read_messages" /> + + <CheckBoxPreference android:defaultValue="false" android:key="chat_states" android:summary="@string/pref_chat_states_summary" |