aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-22 22:32:05 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-11-22 22:32:05 +0100
commit4720ac94d39af262fdcc249a88b118443f7cac68 (patch)
treebf938a99a7041a15870628085dca5d899e474f3d /src
parent07fe434cc753ee59916adc4bf3c5d5bc03a58bf9 (diff)
parent1c31b9692027269c8036908aee3df2cdf05369e0 (diff)
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src')
-rw-r--r--src/main/res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7e829439..b67aa23f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -123,14 +123,14 @@
<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 contacts know when you have received and read their messages</string>
<string name="pref_ui_options">UI</string>
<string name="openpgp_error">OpenKeychain reported an error</string>
<string name="error_decrypting_file">I/O Error decrypting file</string>
<string name="accept">Accept</string>
<string name="error">An error has occurred</string>
<string name="pref_grant_presence_updates">Grant presence updates</string>
- <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string>
+ <string name="pref_grant_presence_updates_summary">Preemptively grant and request presence subscriptions for contacts you have created</string>
<string name="subscriptions">Subscriptions</string>
<string name="your_account">Your account</string>
<string name="keys">Keys</string>
@@ -505,7 +505,7 @@
<string name="contact_is_typing">%s is typing…</string>
<string name="contact_has_stopped_typing">%s has stopped typing</string>
<string name="pref_chat_states">Typing notifications</string>
- <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string>
+ <string name="pref_chat_states_summary">Let your contacts know when you are writing messages to them</string>
<string name="send_location">Send location</string>
<string name="show_location">Show location</string>
<string name="no_application_found_to_display_location">No application found to display location</string>