diff --git a/app/code/Magento/Backend/i18n/de_DE.csv b/app/code/Magento/Backend/i18n/de_DE.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/de_DE.csv +++ b/app/code/Magento/Backend/i18n/de_DE.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/en_US.csv +++ b/app/code/Magento/Backend/i18n/en_US.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Backend/i18n/es_ES.csv b/app/code/Magento/Backend/i18n/es_ES.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/es_ES.csv +++ b/app/code/Magento/Backend/i18n/es_ES.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Backend/i18n/fr_FR.csv b/app/code/Magento/Backend/i18n/fr_FR.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/fr_FR.csv +++ b/app/code/Magento/Backend/i18n/fr_FR.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Backend/i18n/nl_NL.csv b/app/code/Magento/Backend/i18n/nl_NL.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/nl_NL.csv +++ b/app/code/Magento/Backend/i18n/nl_NL.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Backend/i18n/pt_BR.csv b/app/code/Magento/Backend/i18n/pt_BR.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/pt_BR.csv +++ b/app/code/Magento/Backend/i18n/pt_BR.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Backend/i18n/zh_Hans_CN.csv b/app/code/Magento/Backend/i18n/zh_Hans_CN.csv index 8bd82b41c2050..7c6b4dab5992d 100644 --- a/app/code/Magento/Backend/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Backend/i18n/zh_Hans_CN.csv @@ -606,3 +606,11 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +Marketing,Marketing +Communications,Communications +"SEO & Search","SEO & Search" +"User Content","User Content" +"Data Transfer","Data Transfer" +"Import History","Import History" +Extensions,Extensions +"Web Setup Wizard","Web Setup Wizard" diff --git a/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml b/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml index e866c76a8b5a4..7c49fa2eecbd8 100644 --- a/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml +++ b/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml @@ -9,8 +9,8 @@ /** @var $block \Magento\Braintree\Block\Creditcard\Management */ echo $block->getLayout()->getMessagesBlock()->getGroupedHtml(); -$defaultExpMonth = $block->getTodayMonth(); -$defaultExpYear = $block->getTodayYear(); +$defaultExpMonth = ''; +$defaultExpYear = ''; $countrySpecificCardTypeConfig = $block->getCountrySpecificCardTypeConfig(); $applicableCardTypeConfig = $block->getCcApplicableTypes(); if ($block->isEditMode()) { diff --git a/app/code/Magento/Catalog/i18n/de_DE.csv b/app/code/Magento/Catalog/i18n/de_DE.csv index 835c5a2fa1b33..13f728de1c48b 100644 --- a/app/code/Magento/Catalog/i18n/de_DE.csv +++ b/app/code/Magento/Catalog/i18n/de_DE.csv @@ -161,6 +161,8 @@ Empty,Leer "Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen" "Add New Set","Neuen Satz hinzufügen" "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Fenster Schließen" "New Product","Neues Produkt" "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,Kategorien "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten." "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index e6583169c3b1a..87bcbd26408da 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -161,6 +161,8 @@ Empty,Empty "Add New Attribute Set","Add New Attribute Set" "Add New Set","Add New Set" "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Close Window" "New Product","New Product" "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,Categories "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.","An error occurred while saving the attribute set." "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/i18n/es_ES.csv b/app/code/Magento/Catalog/i18n/es_ES.csv index 2c45038e94f15..b80323c57f1d5 100644 --- a/app/code/Magento/Catalog/i18n/es_ES.csv +++ b/app/code/Magento/Catalog/i18n/es_ES.csv @@ -161,6 +161,8 @@ Empty,Vacío(a) "Add New Attribute Set","Agregar nuevo conjunto de atributos" "Add New Set","Agregar nuevo conjunto" "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Cerrar Ventana" "New Product","Nuevo producto" "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,Categorías "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.","Se produjo un error mientras se guardaba el conjunto de atributos." "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/i18n/fr_FR.csv b/app/code/Magento/Catalog/i18n/fr_FR.csv index 37740e1e7db80..1ea1cd2d717d2 100644 --- a/app/code/Magento/Catalog/i18n/fr_FR.csv +++ b/app/code/Magento/Catalog/i18n/fr_FR.csv @@ -161,6 +161,8 @@ Empty,Vide "Add New Attribute Set","Ajouter un nouveau jeu d'attributs" "Add New Set","Ajouter une nouvelle série" "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Fermer la fenêtre" "New Product","Nouveau produit" "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,catégories "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.","Une erreur est survenue pendant la sauvegarde de la série d'attributs." "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/i18n/nl_NL.csv b/app/code/Magento/Catalog/i18n/nl_NL.csv index 650ef84638334..5b99980e6ecae 100644 --- a/app/code/Magento/Catalog/i18n/nl_NL.csv +++ b/app/code/Magento/Catalog/i18n/nl_NL.csv @@ -161,6 +161,8 @@ Empty,Leeg "Add New Attribute Set","Voeg Nieuwe Attribuut Set toe" "Add New Set","Voeg Nieuwe Reeks Toe" "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Venster Sluiten" "New Product","Nieuw Product" "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,Categoriën "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.","Er is een fout opgetreden tijdens het opslaan van de attribuut set." "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/i18n/pt_BR.csv b/app/code/Magento/Catalog/i18n/pt_BR.csv index d2c337913df3a..f539953fb7554 100644 --- a/app/code/Magento/Catalog/i18n/pt_BR.csv +++ b/app/code/Magento/Catalog/i18n/pt_BR.csv @@ -161,6 +161,8 @@ Empty,Vazio "Add New Attribute Set","Adicionar Novo Conjunto de Atributos" "Add New Set","Adicionar Novo Conjunto" "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Fechar Janela" "New Product","Novo Produto" "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,Categorias "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.","Ocorreu um erro ao salvar o conjunto de atributos." "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv b/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv index ed8938feb0f02..5180add5db942 100644 --- a/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv @@ -161,6 +161,8 @@ Empty,空 "Add New Attribute Set",添加新属性集 "Add New Set",添加新集 "Attribute Sets","Attribute Sets" +"Product Templates","Product Templates" +"Product Template","Product Template" "Close Window",关闭窗口 "New Product",新产品 "Save & Edit","Save & Edit" @@ -281,6 +283,7 @@ Categories,分类 "You saved the attribute set.","You saved the attribute set." "An error occurred while saving the attribute set.",保存属性集时发生错误。 "New Attribute Set","New Attribute Set" +"New Product Template","New Product Template" "The attribute set has been removed.","The attribute set has been removed." "An error occurred while deleting this set.","An error occurred while deleting this set." "Search Terms","Search Terms" diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml index 15e6732c51b00..25aaaea0ffe2b 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml @@ -10,9 +10,7 @@
- - - + - - -