MAGETWO-52831: [Github] Export / Import #4315

Author: Yaroslav Onischenko

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php

@@ -55,7 +55,7 @@ public function execute()
                 $errorAggregator = $import->getErrorAggregator();
                 if (!$validationResult) {
                     $resultBlock->addError(
-                        __('Data validation failed. Please fix the following errors upload the file again.')
+                        __('Data validation failed. Please fix the following errors and upload the file again.')
                     );
                     $this->addErrorMessages($resultBlock, $errorAggregator);
                 } else {

app/code/Magento/ImportExport/Model/Import.php

@@ -280,7 +280,7 @@ public function getOperationResultMessages(ProcessingErrorAggregatorInterface $v
         $messages = [];
         if ($this->getProcessedRowsCount()) {
             if ($validationResult->getErrorsCount()) {
-                $messages[] = __('Data validation failed. Please fix the following errors upload the file again.');
+                $messages[] = __('Data validation failed. Please fix the following errors and upload the file again.');
 
                 // errors info
                 foreach ($validationResult->getRowsGroupedByErrorCode() as $errorMessage => $rows) {

app/code/Magento/ImportExport/i18n/en_US.csv

@@ -37,7 +37,7 @@ Status,Status
 "Maximum error count has been reached or system error is occurred!","Maximum error count has been reached or system error is occurred!"
 "Import successfully done","Import successfully done"
 "This file is empty. Please try another one.","This file is empty. Please try another one."
-"Data validation failed. Please fix the following errors upload the file again.","Data validation failed. Please fix the following errors upload the file again."
+"Data validation failed. Please fix the following errors and upload the file again.","Data validation failed. Please fix the following errors and upload the file again."
 "File is valid! To start import process press ""Import"" button","File is valid! To start import process press ""Import"" button"
 "The file is valid, but we can\'t import it for some reason.","The file is valid, but we can\'t import it for some reason."
 "Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
@@ -72,7 +72,7 @@ Status,Status
 "The destination directory is not writable.","The destination directory is not writable."
 "Destination file is not writable","Destination file is not writable"
 "The header column names are already set.","The header column names are already set."
-"Data validation failed. Please fix the following errors upload the file again.","Data validation failed. Please fix the following errors upload the file again."
+"Data validation failed. Please fix the following errors and upload the file again.","Data validation failed. Please fix the following errors and upload the file again."
 "in row(s)","in row(s)"
 "The validation is complete.","The validation is complete."
 "This file does not contain any data.","This file does not contain any data."