From: jabarros <jabarros@solidgear.es>
Date: Thu, 28 Aug 2014 10:32:39 +0000 (+0200)
Subject: Merge branch 'develop' into move_files_and_folders
X-Git-Tag: oc-android-1.7.0_signed~197^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/28614af18dd95821206b1309c960042606f22366

Merge branch 'develop' into move_files_and_folders
---

28614af18dd95821206b1309c960042606f22366
diff --cc res/values/strings.xml
index 69417069,b6cfbe67..143fce8d
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -284,15 -284,6 +284,15 @@@
  
  	<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>
+ 	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</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_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>