Merge branch 'develop' into move_files_and_folders

diff --combined res/values/strings.xml
index 6941706,b6cfbe6..143fce8
--- 1/res/values/strings.xml
--- 2/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>