Merge branch 'develop' into accounts_view

Conflicts:
	res/values/strings.xml

diff --combined res/values/strings.xml
index c9927ec,79b1d2f..a8179bb
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -53,7 -53,9 +53,9 @@@
      <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
      <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
      <string name="uploader_info_uploading">Uploading</string>
-     <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
+     <string name="file_list_empty">Nothing in here. Upload something!</string>
+     <string name="file_list_loading">Loading...</string>
+     <string name="local_file_list_empty">There are no files in this folder.</string>
      <string name="filedetails_select_file">Tap on a file to display additional information.</string>
      <string name="filedetails_size">Size:</string>
      <string name="filedetails_type">Type:</string>
@@@ -269,6 -271,7 +271,7 @@@
        <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
        <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
        <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
+       <string name="empty"></string>
        
        <string name="forbidden_permissions">You do not have permission %s</string>
        <string name="forbidden_permissions_rename">to rename this file</string>
@@@ -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>