From: jabarros <jabarros@solidgear.es>
Date: Mon, 20 Oct 2014 12:54:46 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~140
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3a8ff76d0a68d0ba18513c177b69bb8cb38e4189?ds=inline;hp=-c

Merge branch 'master' into develop

Conflicts:
	owncloud-android-library
---

3a8ff76d0a68d0ba18513c177b69bb8cb38e4189
diff --combined owncloud-android-library
index c29631b8,d7097983..5bd0d738
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c29631b8bfea22e5f0b448aab8ffff959ae4de66
 -Subproject commit d7097983594347167b5bde3fa5b2b4ad1d843392
++Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd
diff --combined res/values/strings.xml
index b021ed7e,03b53623..389db1da
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -251,7 -251,6 +251,7 @@@
      <string name="preview_image_error_unknown_format">This image cannot be shown</string>
      
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
 +    <string name="prefs_instant_upload_path_title">Upload Path</string>
  
  	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
  		administrator.</string>
@@@ -284,7 -283,7 +284,7 @@@
  
  	<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 an unsecured route.</string>
+ 	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
  
  	<string name="actionbar_logger">Logs</string>
  	<string name="log_send_history_button">Send History</string>
@@@ -303,7 -302,4 +303,7 @@@
  	<string name="move_file_error">An error occurred while trying to move this file or folder</string>
  	<string name="forbidden_permissions_move">to move this file</string>
  
 +	<string name="prefs_category_instant_uploading">Instant Uploads</string>
 +	<string name="prefs_category_security">Security</string>
 +
  </resources>