From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 19 Mar 2014 15:58:10 +0000 (+0100)
Subject: Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
X-Git-Tag: oc-android-1.5.5~5^2~8^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/68482e5f664b24cecfbe3bb403ddaa44f6f7734f?hp=d10c10532fcb9fae3eef6d69741dae0147969b06

Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
---

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>