From: masensio <masensio@solidgear.es>
Date: Tue, 18 Mar 2014 13:21:26 +0000 (+0100)
Subject: Merge branch 'develop' into regular_authentication_in_saml_server
X-Git-Tag: oc-android-1.5.5~5^2~1^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3806916a484dc1075f29e2717018291627bdfebf?hp=92c904909187722a3affc6d311265e61ba313c5b

Merge branch 'develop' into regular_authentication_in_saml_server
---

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 720220d5..e40c01d2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -208,6 +208,8 @@
   <string name="ssl_validator_label_validity_to">To:</string>
   <string name="ssl_validator_label_signature">Signature:</string>
   <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
+  <string name="ssl_validator_null_cert">The certificate could not be shown.</string>
+  <string name="ssl_validator_no_info_about_error">- No information about the error</string>
   <string name="placeholder_sentence">This is a placeholder</string>
   <string name="placeholder_filename">placeholder.txt</string>
   <string name="placeholder_filetype">PNG Image</string>