aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-10-20 00:03:32 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-10-20 00:03:32 +0200
commit0b61fb01299c43c0cb50d817072dc050ac8fec50 (patch)
treee63bd7ccee41ae27410117132dcc8fababb05b30 /res/values
parent8263e073362aed2ebfda910df8ddad1e84302db1 (diff)
parent99ee049115587b8d914d2df707d8bf152fdd42f6 (diff)
Merge pull request #554 from SamWhited/tls
Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3
Diffstat (limited to '')
-rw-r--r--res/values/strings.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bc3fc6e4..ac77ca66 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -249,8 +249,10 @@
<string name="pref_force_encryption">Force end-to-end encryption</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>
+ <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+ <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+ <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
+ <string name="pref_expert_options">Expert options</string>
<string name="pref_expert_options_summary">Please be very careful with those</string>
<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>