Merge remote-tracking branch 'tango-ce/MAGETWO-33061' into MAGETWO-32571

Author: Yuri Kovsher

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -66,7 +66,7 @@ public function getUnreadMessages()
     /**
      * Retrieve popup title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getPopupTitle()
     {

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

@@ -114,7 +114,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

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

@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

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

@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

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

@@ -129,7 +129,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/Backend/Block/System/Account/Edit.php

@@ -27,7 +27,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Backend/Block/System/Store/Delete.php

@@ -49,7 +49,7 @@ protected function _construct()
     /**
      * Get edit form container header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Backend/Block/System/Variable/Edit.php

@@ -97,7 +97,7 @@ public function getFormHtml()
     /**
      * Return translated header text depending on creating/editing action
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php

@@ -83,7 +83,7 @@ protected function _getShowEmptyStoresLabelFlag()
      * Render row store views
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -135,7 +135,7 @@ public function render(\Magento\Framework\Object $row)
      * Render row store views for export
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function renderExport(\Magento\Framework\Object $row)

app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php

@@ -42,7 +42,7 @@ public function __construct(StoreManagerInterface $storeManager)
      * Translate element attribute
      *
      * @param string $code
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     protected function _getTranslatedAttribute($code)
     {