aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-09-19 10:29:15 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-09-19 10:29:15 +0200
commit756832ce8ee94844a7a2c1488f579f5e0916f144 (patch)
tree4b8bd0bafe6aada2560ed83566801699e96ef012 /res/values
parent3fb38e6f0846afb25dbeb5a633be7b9a51e70fd2 (diff)
parentb773c4636de5f14363cd026d772b24941e31063d (diff)
Merge pull request #467 from qooob/development
Localization update to 0.7.1
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75eb3b4d..c3e465ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -247,7 +247,7 @@
<string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
<string name="pref_encryption_settings">Encryption settings</string>
<string name="pref_force_encryption">Force end-to-end encryption</string>
- <string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string>
+ <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
<string name="pref_expert_options">Expert options</string>
@@ -255,6 +255,6 @@
<string name="pref_use_larger_font">Increase font size</string>
<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_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
-</resources> \ No newline at end of file
+</resources>