aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-10-20 19:30:38 +0200
committerChristian S <christian@pix-art.de>2015-10-20 19:30:38 +0200
commit9d6b7bc032e600cbac12d0f9253cbf67c7b5cc93 (patch)
tree05e623a346581f8255a1ca5a96f53ef799d13477 /src/main/res/values
parenteb8a7d660eb190a67b48d258cb6a354ec80a3e46 (diff)
parentf4a33a007c777eaacd6d55048346b2a4be850ee5 (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 90aa7a8e5..9331bb752 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -548,5 +548,5 @@
<string name="action_renew_certificate">Renew certificate</string>
<string name="error_fetching_omemo_key">Error fetching OMEMO key!</string>
<string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string>
-
+ <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string>
</resources>