diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml
index 0aba6e4dd00ed..548f55cdb5ff3 100644
--- a/app/code/Magento/Analytics/etc/adminhtml/system.xml
+++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml
@@ -15,7 +15,7 @@
For more information, see our
+ "Go to Advanced Reporting" link. For more information, see our
terms and conditions.]]>
@@ -46,7 +46,7 @@
Learn more about Learn more about Magento BI Essentials and BI Pro tiers.]]>Magento\Analytics\Block\Adminhtml\System\Config\AdditionalComment
diff --git a/app/code/Magento/Analytics/i18n/en_US.csv b/app/code/Magento/Analytics/i18n/en_US.csv
index 9e86e8ce072c5..57115dc6a97a3 100644
--- a/app/code/Magento/Analytics/i18n/en_US.csv
+++ b/app/code/Magento/Analytics/i18n/en_US.csv
@@ -36,20 +36,20 @@ Configuration,Configuration
"BI Essentials","BI Essentials"
"This service provides a dynamic suite of reports with rich insights about your business.
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
- ""Go to Advanced Reporting"" link. For more information, see our
+ ""Go to Advanced Reporting"" link. For more information, see our
terms and conditions.
","This service provides a dynamic suite of reports with rich insights about your business.
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
- ""Go to Advanced Reporting"" link. For more information, see our
+ ""Go to Advanced Reporting"" link. For more information, see our
terms and conditions."
"Advanced Reporting Service","Advanced Reporting Service"
Industry,Industry
"Time of day to send data","Time of day to send data"
"Get more insights from Magento Business Intelligence","Get more insights from Magento Business Intelligence"
"Magento Business Intelligence provides you with a simple and clear path to
- becoming more data driven. Learn more about Learn more about BI Essentials tier.","Magento Business Intelligence provides you with a simple and clear path to
- becoming more data driven. Learn more about Learn more about BI Essentials tier."
"Auto Parts","Auto Parts"
"Baby/Children’s Apparel, Gear and Toys","Baby/Children’s Apparel, Gear and Toys"
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
index e9034c8050383..e32937853003c 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
@@ -94,7 +94,7 @@ public function execute()
$errors = $fileUploader->validate();
if (true !== $errors) {
- $errorMessage = implode('', $errors);
+ $errorMessage = implode(' ', $errors);
throw new LocalizedException(__($errorMessage));
}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php
index 833a0504a8236..75d0cb56e29e3 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php
@@ -86,7 +86,7 @@ public function execute()
$errors = $fileUploader->validate();
if (true !== $errors) {
- $errorMessage = implode('', $errors);
+ $errorMessage = implode(' ', $errors);
throw new LocalizedException(__($errorMessage));
}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
index 0b263e2d79a64..1c20840e5dbf1 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
@@ -232,7 +232,7 @@ public function testExecuteWithErrors()
$resultJson->expects($this->once())
->method('setData')
->with([
- 'error' => implode('', $errors),
+ 'error' => implode(' ', $errors),
'errorcode' => 0,
])
->willReturnSelf();
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Customer/UploadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Customer/UploadTest.php
index 080ffcf3a5992..c0ea5392595c7 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Customer/UploadTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Customer/UploadTest.php
@@ -226,7 +226,7 @@ public function testExecuteWithErrors()
$resultJson->expects($this->once())
->method('setData')
->with([
- 'error' => implode('', $errors),
+ 'error' => implode(' ', $errors),
'errorcode' => 0,
])
->willReturnSelf();
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php b/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
index c1a2f9dc925e8..4bb1c091c2fa8 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
@@ -134,7 +134,7 @@ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::O
$output = $values;
break;
case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_HTML:
- $output = implode(" ", $values);
+ $output = implode(" ", $values);
break;
case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ONELINE:
$output = implode(" ", $values);
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
index 784e140041004..2b40f5f09fe09 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
@@ -11,7 +11,7 @@
-
+
@@ -77,7 +77,7 @@
sales/store/logo_htmlsales/store/logo_html
- (jpeg, gif, png)]]>
+ (jpeg, gif, png)]]>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index ada5cb36cdbb0..eb654d5d46c47 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -84,7 +84,7 @@ $catalogHelper =$block->getData('catalogHelper');
getValueProperties() ?> rowspan="1">
= /* @noEscape */ $_order->formatPrice($amount) ?>
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 62103f59bfa95..eadc6d1349763 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -115,7 +115,7 @@ protected function _addThemeCssFieldset()
'href' => $this->getDownloadUrl($fileId, $this->_getCurrentTheme()->getId()),
'label' => $fileId,
'title' => $asset->getPath(),
- 'delimiter' => ' ',
+ 'delimiter' => ' ',
];
}
$themeFieldset->addField(
@@ -260,7 +260,7 @@ protected function _getUploadCssFileNote()
$messages[] = __('Something is wrong with the file upload settings.');
}
- return implode(' ', $messages);
+ return implode(' ', $messages);
}
/**
diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv
index 4919f9aefc300..d46765baa2c3e 100644
--- a/app/code/Magento/User/i18n/en_US.csv
+++ b/app/code/Magento/User/i18n/en_US.csv
@@ -109,8 +109,8 @@ username,username
Custom,Custom
All,All
Resources,Resources
-"Warning! This action will remove this user from already assigned role. Are you sure?","Warning! This action will remove this user from already assigned role. Are you sure?"
-"Warning! This action will remove those users from already assigned roles. Are you sure?","Warning! This action will remove those users from already assigned roles. Are you sure?"
+"Warning! This action will remove this user from already assigned role. Are you sure?","Warning! This action will remove this user from already assigned role. Are you sure?"
+"Warning! This action will remove those users from already assigned roles. Are you sure?","Warning! This action will remove those users from already assigned roles. Are you sure?"
"New admin user '%user_name' created","New admin user '%user_name' created"
"Hello,","Hello,"
"A new admin account was created for %first_name, %last_name using %email.","A new admin account was created for %first_name, %last_name using %email."
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
index a62570d4e8cd7..7f2a2c203f227 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
@@ -6,6 +6,6 @@
?>