aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-15 14:41:44 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-15 14:41:44 +0200
commit299a5074aee7604101fc4009ed65357a1afb6941 (patch)
treea3ae083b1ec130d69e5b329126ae97f58e4d7583
parent9d960f27415c009db0549f309c3e847d9570e1d5 (diff)
parentfefce2a72ba6f99d3081ba19936a24cd0e9dd3d1 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
-rw-r--r--res/values/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 900d6db4..22622f60 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,7 +256,7 @@
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
<string name="pref_use_indicate_received">Request message receipts</string>
- <string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string>
+ <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string>
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
<string name="pref_expert_options_other">Other</string>
<string name="pref_conference_name">Conference name</string>
@@ -268,4 +268,4 @@
<string name="using_account">using account %s</string>
<string name="checking_image">Checking image on HTTP host</string>
-</resources> \ No newline at end of file
+</resources>