Merge branch 'PR' into checkout

Olexii Korshenko · Olexii Korshenko · commit 71ff1c94dbc3 · 2015-07-03T11:37:33.000+03:00
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
@@ -43,7 +43,7 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
-        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Set Name')]);
+        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Product Template Name')]);
         $fieldset->addField(
             'attribute_set_name',
             'text',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -27,7 +27,7 @@ protected function _prepareLayout()
             'addButton',
             'Magento\Backend\Block\Widget\Button',
             [
-                'label' => __('Add New Set'),
+                'label' => __('Add Product Template'),
                 'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/add') . '\')',
                 'class' => 'add primary add-set'
             ]
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
@@ -37,7 +37,7 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Catalog::catalog_products');
-        $resultPage->getConfig()->getTitle()->set((__('Products')));
+        $resultPage->getConfig()->getTitle()->prepend(__('Catalog'));
         return $resultPage;
     }
 }
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -129,8 +129,8 @@ protected function _prepareForm()
             'text',
             [
                 'name' => 'frontend_label[0]',
-                'label' => __('Attribute Label'),
-                'title' => __('Attribute Label'),
+                'label' => __('Default label'),
+                'title' => __('Default label'),
                 'required' => true,
                 'value' => is_array($labels) ? $labels[0] : $labels
             ]
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
@@ -53,7 +53,7 @@ protected function _prepareColumns()
         $this->addColumn(
             'frontend_label',
             [
-                'header' => __('Attribute Label'),
+                'header' => __('Default label'),
                 'sortable' => true,
                 'index' => 'frontend_label',
                 'header_css_class' => 'col-label',
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
@@ -66,7 +66,7 @@ protected function _prepareForm()
                 [
                     'name' => 'price_rule_type',
                     'options' => [__('Any'), __('Specified')],
-                    'label' => __('Shopping Cart Price Rule')
+                    'label' => __('Cart Price Rule')
                 ]
             );
 
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
@@ -20,7 +20,7 @@ class Quote extends \Magento\Backend\Block\Widget\Grid\Container
     protected function _construct()
     {
         $this->_controller = 'promo_quote';
-        $this->_headerText = __('Shopping Cart Price Rules');
+        $this->_headerText = __('Cart Price Rules');
         $this->_addButtonLabel = __('Add New Rule');
         parent::_construct();
     }
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
@@ -20,7 +20,8 @@
 use Magento\Store\Model\System\Store;
 
 /**
- * Shopping Cart Price Rule General Information Tab
+ * Cart Price Rule General Information Tab
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @author Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php
@@ -6,7 +6,7 @@
 namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Main\Renderer;
 
 /**
- * Renderer for specific checkbox that is used on Rule Information tab in Shopping cart price rules
+ * Renderer for specific checkbox that is used on Rule Information tab in Cart Price Rules
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tabs.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tabs.php
@@ -22,6 +22,6 @@ protected function _construct()
         parent::_construct();
         $this->setId('promo_catalog_edit_tabs');
         $this->setDestElementId('edit_form');
-        $this->setTitle(__('Shopping Cart Price Rule'));
+        $this->setTitle(__('Cart Price Rule'));
     }
 }
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -65,7 +65,7 @@ public function loadPrimaryByRule($rule)
     }
 
     /**
-     * Load Shopping Cart Price Rule by coupon code
+     * Load Cart Price Rule by coupon code
      *
      * @param string $couponCode
      * @return $this
diff --git a/app/code/Magento/SalesRule/Model/Observer.php b/app/code/Magento/SalesRule/Model/Observer.php
@@ -190,7 +190,7 @@ protected function _checkSalesRulesAvailability($attributeCode)
         if ($disabledRulesCount) {
             $this->messageManager->addWarning(
                 __(
-                    '%1 Shopping Cart Price Rules based on "%2" attribute have been disabled.',
+                    '%1 Cart Price Rules based on "%2" attribute have been disabled.',
                     $disabledRulesCount,
                     $attributeCode
                 )
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ObserverTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ObserverTest.php
@@ -339,7 +339,7 @@ protected function checkSalesRuleAvailability($attributeCode)
 
         $this->messageManager->expects($this->once())
             ->method('addWarning')
-            ->with(sprintf('1 Shopping Cart Price Rules based on "%s" attribute have been disabled.', $attributeCode));
+            ->with(sprintf('1 Cart Price Rules based on "%s" attribute have been disabled.', $attributeCode));
     }
 
     public function testCatalogAttributeSaveAfter()
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -29,7 +29,7 @@ protected function _construct()
 
         $this->removeButton('reset');
         $this->removeButton('back');
-        $this->buttonList->update('save', 'label', __('Insert Widget'));
+        $this->buttonList->update('save', 'label', __('Insert Frontend App'));
         $this->buttonList->update('save', 'class', 'action-primary add-widget');
         $this->buttonList->update('save', 'id', 'insert_button');
         $this->buttonList->update('save', 'onclick', 'wWidget.insertWidget()');
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
@@ -46,14 +46,14 @@ protected function _prepareForm()
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
 
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => __('Widget')]);
+        $fieldset = $form->addFieldset('base_fieldset', ['legend' => __('Frontend App')]);
 
         $fieldset->addField(
             'select_widget_type',
             'select',
             [
-                'label' => __('Widget Type'),
-                'title' => __('Widget Type'),
+                'label' => __('Frontend App Type'),
+                'title' => __('Frontend App Type'),
                 'name' => 'widget_type',
                 'required' => true,
                 'onchange' => "wWidget.validateField()",
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
@@ -24,6 +24,6 @@ protected function _construct()
         $this->_controller = 'adminhtml_widget_instance';
         $this->_headerText = __('Manage Widget Instances');
         parent::_construct();
-        $this->buttonList->update('add', 'label', __('Add New Widget Instance'));
+        $this->buttonList->update('add', 'label', __('Add Frontend App'));
     }
 }
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -162,8 +162,8 @@ protected function _prepareForm()
             'text',
             [
                 'name' => 'title',
-                'label' => __('Widget Instance Title'),
-                'title' => __('Widget Instance Title'),
+                'label' => __('Frontend App Title'),
+                'title' => __('Frontend App Title'),
                 'class' => '',
                 'required' => true
             ]
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -33,7 +33,7 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
      */
     public function getTabLabel()
     {
-        return __('Widget Options');
+        return __('Frontend App Options');
     }
 
     /**
@@ -43,7 +43,7 @@ public function getTabLabel()
      */
     public function getTabTitle()
     {
-        return __('Widget Options');
+        return __('Frontend App Options');
     }
 
     /**
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
@@ -23,6 +23,6 @@ protected function _construct()
         parent::_construct();
         $this->setId('widget_instace_tabs');
         $this->setDestElementId('edit_form');
-        $this->setTitle(__('Widget Instance'));
+        $this->setTitle(__('Frontend App'));
     }
 }
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -95,7 +95,7 @@ public function getMainFieldset()
         $this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
         $fieldset = $this->getForm()->addFieldset(
             $mainFieldsetHtmlId,
-            ['legend' => __('Widget Options'), 'class' => 'fieldset-wide']
+            ['legend' => __('Frontend App Options'), 'class' => 'fieldset-wide']
         );
         $this->setData('main_fieldset', $fieldset);
 
@@ -116,7 +116,7 @@ public function addFields()
     {
         // get configuration node and translation helper
         if (!$this->getWidgetType()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a Widget Type.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a Frontend App Type.'));
         }
         $config = $this->_widget->getConfigAsObject($this->getWidgetType());
         if (!$config->getParameters()) {
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
@@ -27,15 +27,15 @@
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\Column" as="instance_id">
                         <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Widget ID</argument>
+                            <argument name="header" xsi:type="string" translate="true">Frontend App ID</argument>
                             <argument name="index" xsi:type="string">instance_id</argument>
                             <argument name="column_css_class" xsi:type="string">col-id</argument>
                             <argument name="header_css_class" xsi:type="string">col-id</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Backend\Block\Widget\Grid\Column" as="title">
                         <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Widget Instance</argument>
+                            <argument name="header" xsi:type="string" translate="true">Frontend App</argument>
                             <argument name="index" xsi:type="string">title</argument>
                         </arguments>
                     </block>
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -3771,7 +3771,7 @@ input.no-display,
     }
 
     //
-    //  Shopping Cart Price Rule
+    //  Cart Price Rule
     //  --------------------------------------
 
     .fieldset .field-coupon_code,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
@@ -24,7 +24,7 @@
  * 1. Log in to Backend.
  * 2. Navigate to Stores > Attributes > Product Template.
  * 3. Open created Product Template.
- * 4. Click 'Delete Attribute Set' button.
+ * 4. Click 'Delete' button.
  * 5. Perform all assertions.
  *
  * @group Product_Attributes_(MX)
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php
@@ -39,7 +39,7 @@ class Content extends Tab
     protected $addVariableButton = ".add-variable";
 
     /**
-     * Insert Widget button selector.
+     * Insert Frontend App button selector.
      *
      * @var string
      */
@@ -73,7 +73,7 @@ public function clickInsertVariable()
     }
 
     /**
-     * Clicking in content tab 'Insert Widget' button.
+     * Clicking in content tab 'Insert Frontend App' button.
      *
      * @return void
      */
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\SalesRule\Test\Repository\SalesRule">
         <dataset name="active_sales_rule_with_percent_price_discount_coupon">
-            <field name="name" xsi:type="string">Shopping Cart Price Rule with Specific Coupon %isolation%</field>
+            <field name="name" xsi:type="string">Cart Price Rule with Specific Coupon %isolation%</field>
             <field name="description" xsi:type="string">Description for Cart Price Rule</field>
             <field name="is_active" xsi:type="string">Active</field>
             <field name="website_ids" xsi:type="array">
@@ -22,8 +22,8 @@
             <field name="simple_action" xsi:type="string">Percent of product price discount</field>
             <field name="discount_amount" xsi:type="string">50</field>
             <field name="store_labels" xsi:type="array">
-                <item name="0" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
-                <item name="1" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
+                <item name="0" xsi:type="string">Cart Price Rule with Specific Coupon</item>
+                <item name="1" xsi:type="string">Cart Price Rule with Specific Coupon</item>
             </field>
         </dataset>
 
@@ -43,7 +43,7 @@
         </dataset>
 
         <dataset name="active_sales_rule_with_fixed_price_discount_coupon">
-            <field name="name" xsi:type="string">Shopping Cart Price Rule with Specific Coupon %isolation%</field>
+            <field name="name" xsi:type="string">Cart Price Rule with Specific Coupon %isolation%</field>
             <field name="description" xsi:type="string">Description for Cart Price Rule</field>
             <field name="is_active" xsi:type="string">Active</field>
             <field name="website_ids" xsi:type="array">
@@ -58,13 +58,13 @@
             <field name="simple_action" xsi:type="string">Fixed amount discount</field>
             <field name="discount_amount" xsi:type="string">50</field>
             <field name="store_labels" xsi:type="array">
-                <item name="0" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
-                <item name="1" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
+                <item name="0" xsi:type="string">Cart Price Rule with Specific Coupon</item>
+                <item name="1" xsi:type="string">Cart Price Rule with Specific Coupon</item>
             </field>
         </dataset>
 
         <dataset name="active_sales_rule_for_retailer">
-            <field name="name" xsi:type="string">Shopping Cart Price Rule %isolation%</field>
+            <field name="name" xsi:type="string">Cart Price Rule %isolation%</field>
             <field name="description" xsi:type="string">Description for Cart Price Rule</field>
             <field name="is_active" xsi:type="string">Active</field>
             <field name="website_ids" xsi:type="array">
@@ -80,8 +80,8 @@
         </dataset>
 
         <dataset name="active_sales_rule_with_complex_conditions">
-            <field name="name" xsi:type="string">Shopping Cart Price Rule with with complex conditions %isolation%</field>
-            <field name="description" xsi:type="string">Shopping Cart Price Rule with with complex conditions</field>
+            <field name="name" xsi:type="string">Cart Price Rule with with complex conditions %isolation%</field>
+            <field name="description" xsi:type="string">Cart Price Rule with with complex conditions</field>
             <field name="is_active" xsi:type="string">Active</field>
             <field name="website_ids" xsi:type="array">
                 <item name="0" xsi:type="string">Main Website</item>
@@ -113,8 +113,8 @@
             <field name="stop_rules_processing" xsi:type="string">Yes</field>
             <field name="simple_free_shipping" xsi:type="string">For matching items only</field>
             <field name="store_labels" xsi:type="array">
-                <item name="0" xsi:type="string">Shopping Cart Price Rule with with complex conditions</item>
-                <item name="1" xsi:type="string">Shopping Cart Price Rule with with complex conditions</item>
+                <item name="0" xsi:type="string">Cart Price Rule with with complex conditions</item>
+                <item name="1" xsi:type="string">Cart Price Rule with with complex conditions</item>
             </field>
         </dataset>
 
@@ -133,7 +133,7 @@
         </dataset>
 
         <dataset name="active_sales_rule_for_all_groups">
-            <field name="name" xsi:type="string">Shopping Cart Price Rule with Specific Coupon %isolation%</field>
+            <field name="name" xsi:type="string">Cart Price Rule with Specific Coupon %isolation%</field>
             <field name="description" xsi:type="string">Description for Cart Price Rule</field>
             <field name="is_active" xsi:type="string">Active</field>
             <field name="website_ids" xsi:type="array">
@@ -150,13 +150,13 @@
             <field name="simple_action" xsi:type="string">Percent of product price discount</field>
             <field name="discount_amount" xsi:type="string">50</field>
             <field name="store_labels" xsi:type="array">
-                <item name="0" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
-                <item name="1" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
+                <item name="0" xsi:type="string">Cart Price Rule with Specific Coupon</item>
+                <item name="1" xsi:type="string">Cart Price Rule with Specific Coupon</item>
             </field>
         </dataset>
 
         <dataset name="active_sales_rule_for_all_groups_no_coupon">
-            <field name="name" xsi:type="string">Shopping Cart Price Rule without Coupon %isolation%</field>
+            <field name="name" xsi:type="string">Cart Price Rule without Coupon %isolation%</field>
             <field name="description" xsi:type="string">Description for Cart Price Rule</field>
             <field name="is_active" xsi:type="string">Active</field>
             <field name="website_ids" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Fixtures/_files/small.xml b/dev/tests/integration/testsuite/Magento/Setup/Fixtures/_files/small.xml
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js
diff --git a/setup/performance-toolkit/profiles/ce/extra_large.xml b/setup/performance-toolkit/profiles/ce/extra_large.xml
diff --git a/setup/performance-toolkit/profiles/ce/large.xml b/setup/performance-toolkit/profiles/ce/large.xml
diff --git a/setup/performance-toolkit/profiles/ce/medium.xml b/setup/performance-toolkit/profiles/ce/medium.xml
diff --git a/setup/performance-toolkit/profiles/ce/small.xml b/setup/performance-toolkit/profiles/ce/small.xml
diff --git a/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php b/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected function _prepareLayout()`
`27`	`27`	`'addButton',`
`28`	`28`	`'Magento\Backend\Block\Widget\Button',`
`29`	`29`	`[`
`30`		`- 'label' => __('Add New Set'),`
	`30`	`+ 'label' => __('Add Product Template'),`
`31`	`31`	`'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/add') . '\')',`
`32`	`32`	`'class' => 'add primary add-set'`
`33`	`33`	`]`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function execute()`
`37`	`37`	`/** @var \Magento\Backend\Model\View\Result\Page $resultPage */`
`38`	`38`	`$resultPage = $this->resultPageFactory->create();`
`39`	`39`	`$resultPage->setActiveMenu('Magento_Catalog::catalog_products');`
`40`		`- $resultPage->getConfig()->getTitle()->set((__('Products')));`
	`40`	`+ $resultPage->getConfig()->getTitle()->prepend(__('Catalog'));`
`41`	`41`	`return $resultPage;`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,8 @@ protected function _prepareForm()`
`129`	`129`	`'text',`
`130`	`130`	`[`
`131`	`131`	`'name' => 'frontend_label[0]',`
`132`		`- 'label' => __('Attribute Label'),`
`133`		`- 'title' => __('Attribute Label'),`
	`132`	`+ 'label' => __('Default label'),`
	`133`	`+ 'title' => __('Default label'),`
`134`	`134`	`'required' => true,`
`135`	`135`	`'value' => is_array($labels) ? $labels[0] : $labels`
`136`	`136`	`]`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function _prepareColumns()`
`53`	`53`	`$this->addColumn(`
`54`	`54`	`'frontend_label',`
`55`	`55`	`[`
`56`		`- 'header' => __('Attribute Label'),`
	`56`	`+ 'header' => __('Default label'),`
`57`	`57`	`'sortable' => true,`
`58`	`58`	`'index' => 'frontend_label',`
`59`	`59`	`'header_css_class' => 'col-label',`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ protected function _prepareForm()`
`66`	`66`	`[`
`67`	`67`	`'name' => 'price_rule_type',`
`68`	`68`	`'options' => [__('Any'), __('Specified')],`
`69`		`- 'label' => __('Shopping Cart Price Rule')`
	`69`	`+ 'label' => __('Cart Price Rule')`
`70`	`70`	`]`
`71`	`71`	`);`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Quote extends \Magento\Backend\Block\Widget\Grid\Container`
`20`	`20`	`protected function _construct()`
`21`	`21`	`{`
`22`	`22`	`$this->_controller = 'promo_quote';`
`23`		`- $this->_headerText = __('Shopping Cart Price Rules');`
	`23`	`+ $this->_headerText = __('Cart Price Rules');`
`24`	`24`	`$this->_addButtonLabel = __('Add New Rule');`
`25`	`25`	`parent::_construct();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@`
`20`	`20`	`use Magento\Store\Model\System\Store;`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * Shopping Cart Price Rule General Information Tab`
	`23`	`+ * Cart Price Rule General Information Tab`
	`24`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`24`	`25`	`*`
`25`	`26`	`* @author Magento Core Team <core@magentocommerce.com>`
`26`	`27`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Main\Renderer;`
`7`	`7`
`8`	`8`	`/**`
`9`		`- * Renderer for specific checkbox that is used on Rule Information tab in Shopping cart price rules`
	`9`	`+ * Renderer for specific checkbox that is used on Rule Information tab in Cart Price Rules`
`10`	`10`	`*`
`11`	`11`	`* @author Magento Core Team <core@magentocommerce.com>`
`12`	`12`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ protected function _construct()`
`22`	`22`	`parent::_construct();`
`23`	`23`	`$this->setId('promo_catalog_edit_tabs');`
`24`	`24`	`$this->setDestElementId('edit_form');`
`25`		`- $this->setTitle(__('Shopping Cart Price Rule'));`
	`25`	`+ $this->setTitle(__('Cart Price Rule'));`
`26`	`26`	`}`
`27`	`27`	`}`