Merge remote-tracking branch 'origin/MAGETWO-18366' into BUGS

Author: slavvka

app/code/Magento/Wishlist/i18n/de_DE.csv

@@ -1,5 +1,5 @@
 Back,Zurück
-Product,Produkt
+Product Name,Produkt
 Quantity,Quantity
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,Nachricht
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description","Anwender Beschreibung"
+"User Description","Anwender Beschreibung"
 "Product Details and Comment","Produktangaben und Kommentare"

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

@@ -1,5 +1,5 @@
 Back,Back
-Product,Product
+Product Name,Product Name
 Quantity,Quantity
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,Message
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description","User description"
+"User Description","User Description"
 "Product Details and Comment","Product Details and Comment"

app/code/Magento/Wishlist/i18n/es_ES.csv

@@ -1,5 +1,5 @@
 Back,Volver
-Product,Producto
+Product Name,Producto
 Quantity,Quantity
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,Mensaje
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description","Descripción del usuario"
+"User Description","Descripción del usuario"
 "Product Details and Comment","Detalles del producto y comentarios"

app/code/Magento/Wishlist/i18n/fr_FR.csv

@@ -1,5 +1,5 @@
 Back,Retour
-Product,Produit
+Product Name,Produit
 Quantity,Quantity
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,Message
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description","Description utilisateur"
+"User Description","Description utilisateur"
 "Product Details and Comment","Détails et commentaires sur le produit"

app/code/Magento/Wishlist/i18n/nl_NL.csv

@@ -1,5 +1,5 @@
 Back,Terug
-Product,Product
+Product Name,Product
 Quantity,Quantity
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,Boodschap
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description","Gebruikers beschrijving"
+"User Description","Gebruikers beschrijving"
 "Product Details and Comment","Product Details en het Commentaar"

app/code/Magento/Wishlist/i18n/pt_BR.csv

@@ -1,5 +1,5 @@
 Back,Voltar
-Product,Produto
+Product Name,Produto
 Quantity,Quant.
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,Mensagem
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description","Descrição do usuário"
+"User Description","Descrição do usuário"
 "Product Details and Comment","Detalhes de produto e comentários"

app/code/Magento/Wishlist/i18n/zh_CN.csv

@@ -1,5 +1,5 @@
 Back,返回
-Product,产品
+Product Name,产品
 Quantity,Quantity
 Configure,Configure
 "You added %1 to your shopping cart.","You added %1 to your shopping cart."
@@ -101,5 +101,5 @@ Message,信息
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
-"User description",用户描述
+"User Description",用户描述
 "Product Details and Comment",产品详情与评论

app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml

@@ -32,7 +32,7 @@
                 </arguments>
                 <block class="Magento\Backend\Block\Widget\Grid\Column" as="product_name">
                     <arguments>
-                        <argument name="header" xsi:type="string" translate="true">Product</argument>
+                        <argument name="header" xsi:type="string" translate="true">Product Name</argument>
                         <argument name="id" xsi:type="string">product_name</argument>
                         <argument name="index" xsi:type="string">product_name</argument>
                         <argument name="filter" xsi:type="string">Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text</argument>
@@ -43,7 +43,7 @@
                 </block>
                 <block class="Magento\Backend\Block\Widget\Grid\Column" as="description">
                     <arguments>
-                        <argument name="header" xsi:type="string" translate="true">User description</argument>
+                        <argument name="header" xsi:type="string" translate="true">User Description</argument>
                         <argument name="index" xsi:type="string">description</argument>
                         <argument name="id" xsi:type="string">description</argument>
                         <argument name="renderer" xsi:type="string">Magento\Customer\Block\Adminhtml\Edit\Tab\Wishlist\Grid\Renderer\Description</argument>

dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/test_default/Magento_Backend/layout_test_grid_handle.xml

@@ -21,7 +21,7 @@
                 </block>
                 <block class="Magento\Backend\Block\Widget\Grid\Column" as="description" output="1">
                     <arguments>
-                        <header>User description</header>
+                        <header>User Description</header>
                         <index>description</index>
                         <type>text</type>
                     </arguments>