Merge remote-tracking branch 'origin/feature/better-feedback-for-failed-uploads' into feature/better-feedback-for-failed-uploads

app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -206,14 +206,12 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
         loadUploadItemsFromDb();
     }
 
-    public OCUpload selectedOCUpload;
 
     @Override
     public void onBindViewHolder(SectionedViewHolder holder, int section, int relativePosition, int absolutePosition) {
         ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
 
         OCUpload item = uploadGroups[section].getItem(relativePosition);
-        selectedOCUpload = item;
 
         itemViewHolder.binding.uploadName.setText(item.getLocalPath());
 

app/src/main/res/values/strings.xml

@@ -913,7 +913,7 @@
     <string name="failed_to_start_editor">Failed to start editor</string>
     <string name="create_rich_workspace">Add folder info</string>
     <string name="creates_rich_workspace">creates folder info</string>
-    <string name="uploader_local_files_uploaded">All local files uploaded</string>
+    <string name="uploader_local_files_uploaded">Try to upload local files again</string>
     <string name="uploader_file_not_found_on_server_message">We couldnt locate the file on server. Another user may have deleted the file</string>
     <string name="uploader_file_not_found_message">File not found. Are you sure this file exist or conflict not solved before?</string>
     <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>