Skip to content

Commit 447e70c

Browse files
author
Yu Tang
committed
Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-44491-Rename-Dispatch-Execute
2 parents cc68d2d + 80c5e2b commit 447e70c

File tree

165 files changed

+8058
-3961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+8058
-3961
lines changed

‎app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/fr_FR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/nl_NL.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/pt_BR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/zh_Hans_CN.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/** @var $block \Magento\Braintree\Block\Creditcard\Management */
1010

1111
echo $block->getLayout()->getMessagesBlock()->getGroupedHtml();
12-
$defaultExpMonth = $block->getTodayMonth();
13-
$defaultExpYear = $block->getTodayYear();
12+
$defaultExpMonth = '';
13+
$defaultExpYear = '';
1414
$countrySpecificCardTypeConfig = $block->getCountrySpecificCardTypeConfig();
1515
$applicableCardTypeConfig = $block->getCcApplicableTypes();
1616
if ($block->isEditMode()) {

‎app/code/Magento/Catalog/i18n/de_DE.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Leer
161161
"Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen"
162162
"Add New Set","Neuen Satz hinzufügen"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Fenster Schließen"
165167
"New Product","Neues Produkt"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Kategorien
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/en_US.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Empty
161161
"Add New Attribute Set","Add New Attribute Set"
162162
"Add New Set","Add New Set"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Close Window"
165167
"New Product","New Product"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categories
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","An error occurred while saving the attribute set."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

0 commit comments

Comments
 (0)