Merge branch 'master' of https://github.com/loripino21/android into instant_upload_pa...

diff --combined res/values/strings.xml
index 4c7cf34,61f902f..0202130
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -33,7 -33,8 +33,7 @@@
      <string name="prefs_imprint">Imprint</string>
      
        <string name="recommend_subject">"Try %1$s on your smartphone!"</string>
 -      <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"
 -      </string>
 +      <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>
  
      <string name="auth_check_server">Check Server</string>
      <string name="auth_host_url">Server address https://…</string>
@@@ -52,9 -53,7 +52,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>
@@@ -251,12 -250,13 +251,13 @@@
      <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>
 -      <string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
 +      <string name="share_link_file_no_exist">Unable to share. Please check whether the file exists</string>
        <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
 -      <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
 +      <string name="unshare_link_file_no_exist">Unable to unshare. Please check whether the file exists</string>
        <string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
  
        <string name="activity_chooser_send_file_title">Send</string>
@@@ -270,36 -270,5 +271,36 @@@
        <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>
 +      <string name="forbidden_permissions_delete">to delete this file</string>
 +      <string name="share_link_forbidden_permissions">to share this file</string>
 +      <string name="unshare_link_forbidden_permissions">to unshare this file</string>
 +      <string name="forbidden_permissions_create">to create the file</string>
 +      <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 an unsecured route.</string>
 +
 +      <string name="actionbar_logger">Logs</string>
 +      <string name="log_send_history_button">Send History</string>
 +      <string name="log_mail_subject">ownCloud Android app logs</string>
 +      <string name="log_progress_dialog_text">Loading data...</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>

diff --combined res/xml/preferences.xml
index 945e853,83756dd..9543cfc
--- 1/res/xml/preferences.xml
--- 2/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -18,15 -18,14 +18,15 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 -      <PreferenceCategory android:title="@string/prefs_category_general">
 +    <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
 +    </PreferenceCategory>
      
 +      <PreferenceCategory android:title="@string/prefs_category_general">
      <!-- ListPreference
          android:key="select_oc_account"
          android:title="@string/prefs_select_oc_account"
          android:summary="@string/prefs_summary_select_oc_account" 
          / -->
 -    <com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_manage_accounts" android:key="manage_account" />
      <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
                          android:summary="@string/prefs_pincode_summary"/>
      <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 
@@@ -36,6 -35,11 +36,11 @@@
                                        android:disableDependentsState="true" 
                                        android:title="@string/instant_upload_on_wifi" 
                                        android:key="instant_upload_on_wifi"/>
+         <EditTextPreference android:dependency="instant_uploading" 
+                                       android:disableDependentsState="true"
+                                       android:title="@string/prefs_instant_upload_path_title" 
+                                       android:defaultValue="@string/instant_upload_path"
+                                       android:key="instant_upload_path"/>
      <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading" 
                          android:title="@string/prefs_instant_video_upload"  
                          android:summary="@string/prefs_instant_video_upload_summary"/>
@@@ -65,4 -69,4 +70,4 @@@
        </PreferenceCategory>
      
  
- </PreferenceScreen>
+ </PreferenceScreen>