Merge remote-tracking branch 'upstream/develop' into develop

Author: Joan He

app/code/Magento/AdminNotification/Block/Window.php

@@ -76,7 +76,7 @@ protected function _toHtml()
         if ($this->canShow()) {
             $this->setHeaderText($this->escapeHtml(__('Incoming Message')));
             $this->setCloseText($this->escapeHtml(__('close')));
-            $this->setReadDetailsText($this->escapeHtml(__('Read details')));
+            $this->setReadDetailsText($this->escapeHtml(__('Read Details')));
             $this->setNoticeMessageText($this->escapeHtml($this->_getLatestItem()->getTitle()));
             $this->setNoticeMessageUrl($this->escapeUrl($this->_getLatestItem()->getUrl()));
             $this->setSeverityText('critical');

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -120,7 +120,7 @@ public function getText()
     {
         return __(
             '{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure '
-            . 'URL / Base Secure URL. It is highly recommended to change this value in your Magento '
+            . 'URL / Base Secure URL. We highly recommend changing this value in your Magento '
             . '<a href="%1">configuration</a>.',
             $this->_getConfigUrl()
         );

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

@@ -34,8 +34,7 @@ protected function _shouldBeDisplayed()
     public function getText()
     {
         return __(
-            'One or more media files failed to be synchronized during the media storages synchronization process. '
-            . 'Refer to the log file for details.'
+            'We were unable to synchronize one or more media files. Please refer to the log file for details.'
         );
     }
 }

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -135,8 +135,8 @@ public function isDisplayed()
     public function getText()
     {
         return __(
-            'Your web server is configured incorrectly. As a result, configuration files '
-            . ' with sensitive information are accessible from the outside. Please contact your hosting provider.'
+            'Your web server is set up incorrectly and allows unauthorized access to sensitive files. '
+            . 'Please contact your hosting provider.'
         );
     }
 

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -39,7 +39,7 @@ protected function setUp()
 
     public function testGetText()
     {
-        $messageText = 'One or more media files failed to be synchronized';
+        $messageText = 'We were unable to synchronize one or more media files.';
 
         $this->assertContains($messageText, (string)$this->_model->getText());
     }

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

@@ -90,7 +90,7 @@ public function isDisplayedDataProvider()
 
     public function testGetText()
     {
-        $messageStart = 'Your web server is configured incorrectly.';
+        $messageStart = 'Your web server is set up incorrectly';
 
         $this->assertStringStartsWith($messageStart, (string)$this->_messageModel->getText());
     }

app/code/Magento/Authorization/Model/Acl/AclRetriever.php

@@ -76,7 +76,7 @@ public function getAllowedResourcesByUser($userType, $userId)
             $role = $this->_getUserRole($userType, $userId);
             if (!$role) {
                 throw new AuthorizationException(
-                    __('The role associated with the specified user cannot be found.')
+                    __('We can\'t find the role for the user you wanted.')
                 );
             }
             $allowedResources = $this->getAllowedResourcesByRole($role->getId());
@@ -85,7 +85,10 @@ public function getAllowedResourcesByUser($userType, $userId)
         } catch (\Exception $e) {
             $this->logger->critical($e);
             throw new LocalizedException(
-                __('Error happened while getting a list of allowed resources. Check exception log for details.')
+                __(
+                    'Something went wrong while compiling a list of allowed resources. '
+                    . 'You can find out more in the exceptions log.'
+                )
             );
         }
         return $allowedResources;

app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php

@@ -57,7 +57,7 @@ public function testGetAllowedResourcesByUserTypeCustomer()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthorizationException
-     * @expectedExceptionMessage The role associated with the specified user cannot be found.
+     * @expectedExceptionMessage We can't find the role for the user you wanted.
      */
     public function testGetAllowedResourcesByUserRoleNotFound()
     {

app/code/Magento/Backend/Block/Cache.php

@@ -27,7 +27,7 @@ protected function _construct()
             ]
         );
 
-        $message = __('Cache storage may contain additional data. Are you sure that you want flush it?');
+        $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
         $this->buttonList->add(
             'flush_system',
             [

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -57,7 +57,7 @@ public function execute()
             if ($password !== '') {
                 $user->sendPasswordResetNotificationEmail();
             }
-            $this->messageManager->addSuccess(__('The account has been saved.'));
+            $this->messageManager->addSuccess(__('You saved the account.'));
         } catch (ValidatorException $e) {
             $this->messageManager->addMessages($e->getMessages());
             if ($e->getMessage()) {