Merge pull request #12286 from nextcloud/rakekniven-patch-1

fix(i18n): Fixed typo and changed grammar

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

@@ -915,7 +915,7 @@
     <string name="creates_rich_workspace">creates folder info</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_file_not_found_message">File not found. Are you sure that this file exists or has a previous conflict not been resolved?</string>
     <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>
     <string name="uploader_upload_failed_sync_conflict_error_content">Pick which version to keep of %1$s</string>
     <string name="upload_list_resolve_conflict">Resolve conflict</string>