From: jabarros <jabarros@solidgear.es>
Date: Tue, 9 Sep 2014 11:17:41 +0000 (+0200)
Subject: Merge branch 'develop' into ADFS_auth_support
X-Git-Tag: oc-android-1.7.0_signed~193^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ba6c6375cfc0feb7104d79ab98e2dcd198eb7dc1?hp=--cc

Merge branch 'develop' into ADFS_auth_support

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

ba6c6375cfc0feb7104d79ab98e2dcd198eb7dc1
diff --cc res/values/strings.xml
index 2be944da,13c7bbe3..58e38d28
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -286,7 -286,14 +286,16 @@@
  	<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="saml_authentication_required_text">Authentication required</string>
 +	<string name="saml_authentication_wrong_pass">Wrong password</string>
+ 	<string name="actionbar_move">Move</string>
+ 	<string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
+ 	<string name="move_choose_button_text">Choose</string>
+ 
+ 	<string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
+ 	<string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
+ 	<string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
+ 	<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>
  
  </resources>