From d290db9ab6db021dc297474f83faa59fd8af3d3b Mon Sep 17 00:00:00 2001
From: Dominique Hazael-Massieux <dom@w3.org>
Date: Mon, 10 Feb 2014 15:00:01 +0100
Subject: [PATCH 1/3] allow multi-line checkbox for preferences with long
 titles inspired from
 http://stackoverflow.com/questions/2408708/show-extra-info-for-preference-screens-when-checkboxpreference-summary-field-is

---
 .../ui/CheckBoxPreferenceWithLongTitle.java   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java

diff --git a/src/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java b/src/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java
new file mode 100644
index 0000000000..bcde48d6d1
--- /dev/null
+++ b/src/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java
@@ -0,0 +1,45 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.ui;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+import android.preference.CheckBoxPreference;
+
+public class CheckBoxPreferenceWithLongTitle extends CheckBoxPreference{
+
+    public CheckBoxPreferenceWithLongTitle(Context context) {
+        super(context);
+    }
+
+    public CheckBoxPreferenceWithLongTitle(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public CheckBoxPreferenceWithLongTitle(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        TextView titleView = (TextView) view.findViewById(android.R.id.title);
+	titleView.setSingleLine(false);
+        titleView.setMaxLines(3);
+    }
+}
\ No newline at end of file

From 59fdac1d26c480f83072f02849c89caadf55ba6c Mon Sep 17 00:00:00 2001
From: Dominique Hazael-Massieux <dom@w3.org>
Date: Thu, 13 Feb 2014 19:08:26 +0100
Subject: [PATCH 2/3] using longtitle checkboxes

---
 res/xml/preferences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index a7f76f5bd8..26c00a1084 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -28,10 +28,10 @@
     <Preference android:title="@string/prefs_manage_accounts" android:key="manage_account" />
     <CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" 
                         android:summary="@string/prefs_pincode_summary"/>
-    <CheckBoxPreference android:key="instant_uploading" 
+    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 
                         android:title="@string/prefs_instant_upload"  
                         android:summary="@string/prefs_instant_upload_summary"/>
-    <CheckBoxPreference android:dependency="instant_uploading" 
+    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading" 
         				android:disableDependentsState="true" 
         				android:title="@string/instant_upload_on_wifi" 
         				android:key="instant_upload_on_wifi"/>

From ee28694a31aad8cf1bc15aad94eff1523ef075a7 Mon Sep 17 00:00:00 2001
From: "Mr. Jenkins" <jenkins@owncloud.org>
Date: Tue, 18 Mar 2014 01:14:30 -0400
Subject: [PATCH 3/3] [tx-robot] updated from transifex

---
 res/values-en-rGB/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 720220d5b9..e40c01d266 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>