Merge remote-tracking branch 'origin/sync_review_2'

diff --cc res/values/strings.xml
index 77b7a32,88a93eb..3d99144
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -115,8 -116,20 +115,20 @@@
        <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
      <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
        <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
+       <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
+       <string name="sync_foreign_files_forgotten_content">%1$d files out of the ownCloud directory could not be copied into</string>
+       <string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
+     
+     <string name="foreign_files_move">"Move all"</string>
+     <string name="foreign_files_success">"All files were moved"</string>
+     <string name="foreign_files_fail">"Some files could not be moved"</string>
+     <string name="foreign_files_local_text">"Local: %1$s"</string>
+       <string name="foreign_files_remote_text">"Remote: %1$s"</string>
+ 
+       <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>       
+       
        <string name="use_ssl">Use Secure Connection</string>
 -    <string name="location_no_provider">ownCloud cannot track your device. Please check your location settings</string>
 +    <string name="location_no_provider">%1$s cannot track your device. Please check your location settings</string>
      
      <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
      <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>

diff --cc src/com/owncloud/android/Uploader.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge