From: jabarros <jabarros@solidgear.es>
Date: Thu, 7 Aug 2014 15:34:15 +0000 (+0200)
Subject: Merge branch 'develop' into accounts_view
X-Git-Tag: oc-android-1.7.0_signed~227^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b154fba6ee7e2dfb77ff10e20c20c080758d2a1d?ds=inline

Merge branch 'develop' into accounts_view

Conflicts:
	res/values/strings.xml
---

b154fba6ee7e2dfb77ff10e20c20c080758d2a1d
diff --cc res/values/strings.xml
index c9927ec4,79b1d2f9..a8179bb8
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -279,7 -282,6 +282,8 @@@
  	<string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
  	<string name="downloader_download_file_not_found">The file is no longer available on the server</string>
  
 +	<string name="prefs_category_accounts">Accounts</string>
 +	<string name="prefs_add_account">Add account</string>
+ 	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through a non secure route.</string>
  
  </resources>