From 3eab8b83d3fce45ae16edc04fed5100131f64ee7 Mon Sep 17 00:00:00 2001 From: Cari Spruiell Date: Thu, 15 Oct 2015 15:09:08 -0500 Subject: [PATCH 1/6] MAGETWO-39125: Some backend menu are not properly translated when setting admin interface locale to non en_us. - added missing entries to translation files --- app/code/Magento/Backend/i18n/de_DE.csv | 8 ++++++++ app/code/Magento/Backend/i18n/en_US.csv | 8 ++++++++ app/code/Magento/Backend/i18n/es_ES.csv | 8 ++++++++ app/code/Magento/Backend/i18n/fr_FR.csv | 8 ++++++++ app/code/Magento/Backend/i18n/nl_NL.csv | 8 ++++++++ app/code/Magento/Backend/i18n/pt_BR.csv | 8 ++++++++ app/code/Magento/Backend/i18n/zh_Hans_CN.csv | 8 ++++++++ app/code/Magento/Catalog/i18n/de_DE.csv | 1 + app/code/Magento/Catalog/i18n/en_US.csv | 1 + app/code/Magento/Catalog/i18n/es_ES.csv | 1 + app/code/Magento/Catalog/i18n/fr_FR.csv | 1 + app/code/Magento/Catalog/i18n/nl_NL.csv | 1 + app/code/Magento/Catalog/i18n/pt_BR.csv | 1 + app/code/Magento/Catalog/i18n/zh_Hans_CN.csv | 1 + app/code/Magento/Cms/i18n/de_DE.csv | 5 +++++ app/code/Magento/Cms/i18n/en_US.csv | 5 +++++ app/code/Magento/Cms/i18n/es_ES.csv | 5 +++++ app/code/Magento/Cms/i18n/fr_FR.csv | 5 +++++ app/code/Magento/Cms/i18n/nl_NL.csv | 5 +++++ app/code/Magento/Cms/i18n/pt_BR.csv | 5 +++++ app/code/Magento/Cms/i18n/zh_Hans_CN.csv | 5 +++++ app/code/Magento/Customer/i18n/de_DE.csv | 2 ++ app/code/Magento/Customer/i18n/en_US.csv | 2 ++ app/code/Magento/Customer/i18n/es_ES.csv | 2 ++ app/code/Magento/Customer/i18n/fr_FR.csv | 2 ++ app/code/Magento/Customer/i18n/nl_NL.csv | 2 ++ app/code/Magento/Customer/i18n/pt_BR.csv | 2 ++ app/code/Magento/Customer/i18n/zh_Hans_CN.csv | 2 ++ app/code/Magento/EncryptionKey/i18n/de_DE.csv | 1 + app/code/Magento/EncryptionKey/i18n/en_US.csv | 1 + app/code/Magento/EncryptionKey/i18n/es_ES.csv | 1 + app/code/Magento/EncryptionKey/i18n/fr_FR.csv | 1 + app/code/Magento/EncryptionKey/i18n/nl_NL.csv | 1 + app/code/Magento/EncryptionKey/i18n/pt_BR.csv | 1 + app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv | 1 + app/code/Magento/Marketplace/i18n/de_DE.csv | 1 + app/code/Magento/Marketplace/i18n/en_US.csv | 1 + app/code/Magento/Marketplace/i18n/es_ES.csv | 1 + app/code/Magento/Marketplace/i18n/fr_FR.csv | 1 + app/code/Magento/Marketplace/i18n/nl_NL.csv | 1 + app/code/Magento/Marketplace/i18n/pt_BR.csv | 1 + app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv | 1 + app/code/Magento/Newsletter/i18n/de_DE.csv | 1 + app/code/Magento/Newsletter/i18n/en_US.csv | 1 + app/code/Magento/Newsletter/i18n/es_ES.csv | 1 + app/code/Magento/Newsletter/i18n/fr_FR.csv | 1 + app/code/Magento/Newsletter/i18n/nl_NL.csv | 1 + app/code/Magento/Newsletter/i18n/pt_BR.csv | 1 + app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv | 1 + app/code/Magento/Reports/etc/acl.xml | 2 +- app/code/Magento/Reports/i18n/de_DE.csv | 7 +++++++ app/code/Magento/Reports/i18n/en_US.csv | 7 +++++++ app/code/Magento/Reports/i18n/es_ES.csv | 7 +++++++ app/code/Magento/Reports/i18n/fr_FR.csv | 7 +++++++ app/code/Magento/Reports/i18n/nl_NL.csv | 7 +++++++ app/code/Magento/Reports/i18n/pt_BR.csv | 7 +++++++ app/code/Magento/Reports/i18n/zh_Hans_CN.csv | 7 +++++++ app/code/Magento/Sales/i18n/de_DE.csv | 1 + app/code/Magento/Sales/i18n/en_US.csv | 1 + app/code/Magento/Sales/i18n/es_ES.csv | 1 + app/code/Magento/Sales/i18n/fr_FR.csv | 1 + app/code/Magento/Sales/i18n/nl_NL.csv | 1 + app/code/Magento/Sales/i18n/pt_BR.csv | 1 + app/code/Magento/Sales/i18n/zh_Hans_CN.csv | 1 + app/code/Magento/Store/i18n/de_DE.csv | 3 +++ app/code/Magento/Store/i18n/en_US.csv | 3 +++ app/code/Magento/Store/i18n/es_ES.csv | 3 +++ app/code/Magento/Store/i18n/fr_FR.csv | 3 +++ app/code/Magento/Store/i18n/nl_NL.csv | 3 +++ app/code/Magento/Store/i18n/pt_BR.csv | 3 +++ app/code/Magento/Store/i18n/zh_Hans_CN.csv | 3 +++ app/code/Magento/Tax/i18n/de_DE.csv | 2 ++ app/code/Magento/Tax/i18n/en_US.csv | 2 ++ app/code/Magento/Tax/i18n/es_ES.csv | 2 ++ app/code/Magento/Tax/i18n/fr_FR.csv | 2 ++ app/code/Magento/Tax/i18n/nl_NL.csv | 2 ++ app/code/Magento/Tax/i18n/pt_BR.csv | 2 ++ app/code/Magento/Tax/i18n/zh_Hans_CN.csv | 2 ++ app/code/Magento/User/i18n/de_DE.csv | 2 ++ app/code/Magento/User/i18n/en_US.csv | 2 ++ app/code/Magento/User/i18n/es_ES.csv | 2 ++ app/code/Magento/User/i18n/fr_FR.csv | 2 ++ app/code/Magento/User/i18n/nl_NL.csv | 2 ++ app/code/Magento/User/i18n/pt_BR.csv | 2 ++ app/code/Magento/User/i18n/zh_Hans_CN.csv | 2 ++ 85 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Marketplace/i18n/de_DE.csv create mode 100644 app/code/Magento/Marketplace/i18n/en_US.csv create mode 100644 app/code/Magento/Marketplace/i18n/es_ES.csv create mode 100644 app/code/Magento/Marketplace/i18n/fr_FR.csv create mode 100644 app/code/Magento/Marketplace/i18n/nl_NL.csv create mode 100644 app/code/Magento/Marketplace/i18n/pt_BR.csv create mode 100644 app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv 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/Catalog/i18n/de_DE.csv b/app/code/Magento/Catalog/i18n/de_DE.csv index ecbd2cb02116b..fc8b41620dac7 100644 --- a/app/code/Magento/Catalog/i18n/de_DE.csv +++ b/app/code/Magento/Catalog/i18n/de_DE.csv @@ -161,6 +161,7 @@ Empty,Leer "Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen" "Add New Set","Neuen Satz hinzufügen" "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Fenster Schließen" "New Product","Neues Produkt" "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index 2cfe7083932dd..9c436a2bc0008 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -161,6 +161,7 @@ Empty,Empty "Add New Attribute Set","Add New Attribute Set" "Add New Set","Add New Set" "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Close Window" "New Product","New Product" "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Catalog/i18n/es_ES.csv b/app/code/Magento/Catalog/i18n/es_ES.csv index 83b48a5ad10cb..f86f269a69c42 100644 --- a/app/code/Magento/Catalog/i18n/es_ES.csv +++ b/app/code/Magento/Catalog/i18n/es_ES.csv @@ -161,6 +161,7 @@ Empty,Vacío(a) "Add New Attribute Set","Agregar nuevo conjunto de atributos" "Add New Set","Agregar nuevo conjunto" "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Cerrar Ventana" "New Product","Nuevo producto" "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Catalog/i18n/fr_FR.csv b/app/code/Magento/Catalog/i18n/fr_FR.csv index 62cb82be60950..0f6bdab522332 100644 --- a/app/code/Magento/Catalog/i18n/fr_FR.csv +++ b/app/code/Magento/Catalog/i18n/fr_FR.csv @@ -161,6 +161,7 @@ Empty,Vide "Add New Attribute Set","Ajouter un nouveau jeu d'attributs" "Add New Set","Ajouter une nouvelle série" "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Fermer la fenêtre" "New Product","Nouveau produit" "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Catalog/i18n/nl_NL.csv b/app/code/Magento/Catalog/i18n/nl_NL.csv index ee1eb9baee9d9..9f1dbdbb83988 100644 --- a/app/code/Magento/Catalog/i18n/nl_NL.csv +++ b/app/code/Magento/Catalog/i18n/nl_NL.csv @@ -161,6 +161,7 @@ Empty,Leeg "Add New Attribute Set","Voeg Nieuwe Attribuut Set toe" "Add New Set","Voeg Nieuwe Reeks Toe" "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Venster Sluiten" "New Product","Nieuw Product" "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Catalog/i18n/pt_BR.csv b/app/code/Magento/Catalog/i18n/pt_BR.csv index 3e0887c87547d..fbce46b4d5679 100644 --- a/app/code/Magento/Catalog/i18n/pt_BR.csv +++ b/app/code/Magento/Catalog/i18n/pt_BR.csv @@ -161,6 +161,7 @@ Empty,Vazio "Add New Attribute Set","Adicionar Novo Conjunto de Atributos" "Add New Set","Adicionar Novo Conjunto" "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window","Fechar Janela" "New Product","Novo Produto" "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv b/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv index 4774b64706d9a..d600494d742a2 100644 --- a/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv @@ -161,6 +161,7 @@ Empty,空 "Add New Attribute Set",添加新属性集 "Add New Set",添加新集 "Product Templates","Product Templates" +"Product Template","Product Template" "Close Window",关闭窗口 "New Product",新产品 "Save & Edit","Save & Edit" diff --git a/app/code/Magento/Cms/i18n/de_DE.csv b/app/code/Magento/Cms/i18n/de_DE.csv index 09eb96234df10..e3dc8b9b189c6 100644 --- a/app/code/Magento/Cms/i18n/de_DE.csv +++ b/app/code/Magento/Cms/i18n/de_DE.csv @@ -119,3 +119,8 @@ Template,Vorlage "CMS Static Block","CMS statischer Block" "Contents of a Static Block","Inhalte eines statischen Blocks" "CMS Static Block Default Template","CMS statischer Block Standardvorlage" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv index 03a82317472dc..58485f3d9d2c5 100644 --- a/app/code/Magento/Cms/i18n/en_US.csv +++ b/app/code/Magento/Cms/i18n/en_US.csv @@ -119,3 +119,8 @@ Template,Template "CMS Static Block","CMS Static Block" "Contents of a Static Block","Contents of a Static Block" "CMS Static Block Default Template","CMS Static Block Default Template" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Cms/i18n/es_ES.csv b/app/code/Magento/Cms/i18n/es_ES.csv index 90bcb395cd057..62584b6799530 100644 --- a/app/code/Magento/Cms/i18n/es_ES.csv +++ b/app/code/Magento/Cms/i18n/es_ES.csv @@ -119,3 +119,8 @@ Template,Plantilla "CMS Static Block","Bloque estático CMS" "Contents of a Static Block","Cotenidos de un bloque estático" "CMS Static Block Default Template","Tema por defecto del bloque estático CMS" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Cms/i18n/fr_FR.csv b/app/code/Magento/Cms/i18n/fr_FR.csv index 3feb0add8c11d..92e0c3ab029d7 100644 --- a/app/code/Magento/Cms/i18n/fr_FR.csv +++ b/app/code/Magento/Cms/i18n/fr_FR.csv @@ -119,3 +119,8 @@ Template,"Modèle visuel" "CMS Static Block","Bloc statique du CMS" "Contents of a Static Block","Contenu des blocs statiques" "CMS Static Block Default Template","Modèle de bloc statique par défaut du CMS" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Cms/i18n/nl_NL.csv b/app/code/Magento/Cms/i18n/nl_NL.csv index 259123f1fe6e2..ef34949cc0eb9 100644 --- a/app/code/Magento/Cms/i18n/nl_NL.csv +++ b/app/code/Magento/Cms/i18n/nl_NL.csv @@ -119,3 +119,8 @@ Template,Thema "CMS Static Block","CMS statisch blok" "Contents of a Static Block","Inhoud van een statisch blok" "CMS Static Block Default Template","CMS statisch blok standaard thema" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Cms/i18n/pt_BR.csv b/app/code/Magento/Cms/i18n/pt_BR.csv index daf3cf4a6f53e..706c52533cad0 100644 --- a/app/code/Magento/Cms/i18n/pt_BR.csv +++ b/app/code/Magento/Cms/i18n/pt_BR.csv @@ -119,3 +119,8 @@ Template,Modelo "CMS Static Block","Bloco Estático do CMS" "Contents of a Static Block","Conteúdos de um Bloco Estático" "CMS Static Block Default Template","Template Padrão do Bloco Estático do CMS" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Cms/i18n/zh_Hans_CN.csv b/app/code/Magento/Cms/i18n/zh_Hans_CN.csv index e27e81aa3b8ef..338aa81bc8cfb 100644 --- a/app/code/Magento/Cms/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Cms/i18n/zh_Hans_CN.csv @@ -119,3 +119,8 @@ Template,模板 "CMS Static Block","CMS 静态区块" "Contents of a Static Block",静态区块的内容 "CMS Static Block Default Template","CMS 静态区块默认模板" +Elements,Elements +Blocks,Blocks +Widgets,Widgets +Themes,Themes +Schedule,Schedule diff --git a/app/code/Magento/Customer/i18n/de_DE.csv b/app/code/Magento/Customer/i18n/de_DE.csv index e138d63071cf9..ec5acd01becc9 100644 --- a/app/code/Magento/Customer/i18n/de_DE.csv +++ b/app/code/Magento/Customer/i18n/de_DE.csv @@ -415,3 +415,5 @@ n/a,"Keine Angabe" "Password forgotten","Passwort vergessen" "My Dashboard","Meine Startseite" "You are now logged out","Sie sind jetzt abgemeldet" +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv index f3ed0e19fb9e3..24d087d95d06c 100644 --- a/app/code/Magento/Customer/i18n/en_US.csv +++ b/app/code/Magento/Customer/i18n/en_US.csv @@ -414,3 +414,5 @@ n/a,n/a "Password forgotten","Password forgotten" "My Dashboard","My Dashboard" "You are now logged out","You are now logged out" +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/Customer/i18n/es_ES.csv b/app/code/Magento/Customer/i18n/es_ES.csv index 6ee5727639a0e..a2d8a49b8e6cd 100644 --- a/app/code/Magento/Customer/i18n/es_ES.csv +++ b/app/code/Magento/Customer/i18n/es_ES.csv @@ -414,3 +414,5 @@ n/a,n/d "Password forgotten","Olvido de contraseña" "My Dashboard","Mi panel de control" "You are now logged out","Ha cerrado sesión." +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/Customer/i18n/fr_FR.csv b/app/code/Magento/Customer/i18n/fr_FR.csv index e32c2759c36ce..ded34d3149b9d 100644 --- a/app/code/Magento/Customer/i18n/fr_FR.csv +++ b/app/code/Magento/Customer/i18n/fr_FR.csv @@ -414,3 +414,5 @@ n/a,n/a "Password forgotten","Mot de passe oublié" "My Dashboard","Mon espace de travail" "You are now logged out","Vous êtes maintenant déconnecté." +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/Customer/i18n/nl_NL.csv b/app/code/Magento/Customer/i18n/nl_NL.csv index bde6b074652d8..4953a8783567d 100644 --- a/app/code/Magento/Customer/i18n/nl_NL.csv +++ b/app/code/Magento/Customer/i18n/nl_NL.csv @@ -414,3 +414,5 @@ n/a,n.v.t. "Password forgotten","Wachtwoord vergeten" "My Dashboard","Mijn Dashboard" "You are now logged out","U bent nu uitgelogd" +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/Customer/i18n/pt_BR.csv b/app/code/Magento/Customer/i18n/pt_BR.csv index b02e6801702ba..e3f1d8e704a73 100644 --- a/app/code/Magento/Customer/i18n/pt_BR.csv +++ b/app/code/Magento/Customer/i18n/pt_BR.csv @@ -414,3 +414,5 @@ n/a,n/d "Password forgotten","Senha esquecida" "My Dashboard","Meu Painel" "You are now logged out","Agora você está desconectado" +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/Customer/i18n/zh_Hans_CN.csv b/app/code/Magento/Customer/i18n/zh_Hans_CN.csv index e344fa595c39e..927f8db240678 100644 --- a/app/code/Magento/Customer/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Customer/i18n/zh_Hans_CN.csv @@ -414,3 +414,5 @@ n/a,不可用 "Password forgotten",密码忘记 "My Dashboard",我的仪表板 "You are now logged out",您已注销 +"All Customers", "All Customers" +"Now Online", "Now Online" diff --git a/app/code/Magento/EncryptionKey/i18n/de_DE.csv b/app/code/Magento/EncryptionKey/i18n/de_DE.csv index 6f364baa1ff9f..705d98a99d298 100644 --- a/app/code/Magento/EncryptionKey/i18n/de_DE.csv +++ b/app/code/Magento/EncryptionKey/i18n/de_DE.csv @@ -17,3 +17,4 @@ Username,Benutzername "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change","Änderung des Verschlüsselungscodes" +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/EncryptionKey/i18n/en_US.csv b/app/code/Magento/EncryptionKey/i18n/en_US.csv index 792bc2f60f5a8..f111edc33abb1 100644 --- a/app/code/Magento/EncryptionKey/i18n/en_US.csv +++ b/app/code/Magento/EncryptionKey/i18n/en_US.csv @@ -17,3 +17,4 @@ Username,Username "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change","Encryption Key Change" +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/EncryptionKey/i18n/es_ES.csv b/app/code/Magento/EncryptionKey/i18n/es_ES.csv index 0840d0cb0b5b2..16fe7d35f56db 100644 --- a/app/code/Magento/EncryptionKey/i18n/es_ES.csv +++ b/app/code/Magento/EncryptionKey/i18n/es_ES.csv @@ -17,3 +17,4 @@ Username,"Nombre de Usuario" "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change","Cambio de clave de encriptación" +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/EncryptionKey/i18n/fr_FR.csv b/app/code/Magento/EncryptionKey/i18n/fr_FR.csv index 0604b96989aef..6311d1da4f3e3 100644 --- a/app/code/Magento/EncryptionKey/i18n/fr_FR.csv +++ b/app/code/Magento/EncryptionKey/i18n/fr_FR.csv @@ -17,3 +17,4 @@ Username,"Nom d'utilisateur" "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change","Modification Clé de Chiffrement" +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/EncryptionKey/i18n/nl_NL.csv b/app/code/Magento/EncryptionKey/i18n/nl_NL.csv index cffae21b4184b..11268b36d5d1b 100644 --- a/app/code/Magento/EncryptionKey/i18n/nl_NL.csv +++ b/app/code/Magento/EncryptionKey/i18n/nl_NL.csv @@ -17,3 +17,4 @@ Username,Gebruikersnaam "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change","Encryptie Code Veranderen" +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/EncryptionKey/i18n/pt_BR.csv b/app/code/Magento/EncryptionKey/i18n/pt_BR.csv index 495e0c38d96cf..2529b0b015a7d 100644 --- a/app/code/Magento/EncryptionKey/i18n/pt_BR.csv +++ b/app/code/Magento/EncryptionKey/i18n/pt_BR.csv @@ -17,3 +17,4 @@ Username,"Nome do usuário" "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change","Mudança na Chave de Criptografia" +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv b/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv index 3b5711dc0af9b..02b9c53f97bb4 100644 --- a/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv @@ -17,3 +17,4 @@ Username,用户名 "The encryption key format is invalid.","The encryption key format is invalid." "File %1 is not writeable.","File %1 is not writeable." "Encryption Key Change",加密密钥已更改 +"Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/Marketplace/i18n/de_DE.csv b/app/code/Magento/Marketplace/i18n/de_DE.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/de_DE.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Marketplace/i18n/en_US.csv b/app/code/Magento/Marketplace/i18n/en_US.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/en_US.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Marketplace/i18n/es_ES.csv b/app/code/Magento/Marketplace/i18n/es_ES.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/es_ES.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Marketplace/i18n/fr_FR.csv b/app/code/Magento/Marketplace/i18n/fr_FR.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/fr_FR.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Marketplace/i18n/nl_NL.csv b/app/code/Magento/Marketplace/i18n/nl_NL.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/nl_NL.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Marketplace/i18n/pt_BR.csv b/app/code/Magento/Marketplace/i18n/pt_BR.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/pt_BR.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv b/app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv new file mode 100644 index 0000000000000..e0a266e1291f3 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv @@ -0,0 +1 @@ +"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/Newsletter/i18n/de_DE.csv b/app/code/Magento/Newsletter/i18n/de_DE.csv index 2fc3bee3bc65b..98a16ae2e7702 100644 --- a/app/code/Magento/Newsletter/i18n/de_DE.csv +++ b/app/code/Magento/Newsletter/i18n/de_DE.csv @@ -138,3 +138,4 @@ Unsubscribe,"Abonnement kündigen" Subscribed,Abonniert Unsubscribed,"Abonnements gekündigt" Unconfirmed,Unbestätigt +"Newsletter Template","Newsletter Vorlage" diff --git a/app/code/Magento/Newsletter/i18n/en_US.csv b/app/code/Magento/Newsletter/i18n/en_US.csv index ac79fef143eec..a30b48f0c939a 100644 --- a/app/code/Magento/Newsletter/i18n/en_US.csv +++ b/app/code/Magento/Newsletter/i18n/en_US.csv @@ -138,3 +138,4 @@ Unsubscribe,Unsubscribe Subscribed,Subscribed Unsubscribed,Unsubscribed Unconfirmed,Unconfirmed +"Newsletter Template","Newsletter Template" diff --git a/app/code/Magento/Newsletter/i18n/es_ES.csv b/app/code/Magento/Newsletter/i18n/es_ES.csv index 3be9617100dd0..43c2e724ea769 100644 --- a/app/code/Magento/Newsletter/i18n/es_ES.csv +++ b/app/code/Magento/Newsletter/i18n/es_ES.csv @@ -138,3 +138,4 @@ Unsubscribe,"Cancelar suscripción" Subscribed,Suscrito Unsubscribed,"Suscripción cancelada" Unconfirmed,"Sin confirmar" +"Newsletter Template","Newsletter Template" diff --git a/app/code/Magento/Newsletter/i18n/fr_FR.csv b/app/code/Magento/Newsletter/i18n/fr_FR.csv index cec853133f462..65134aa5e433b 100644 --- a/app/code/Magento/Newsletter/i18n/fr_FR.csv +++ b/app/code/Magento/Newsletter/i18n/fr_FR.csv @@ -138,3 +138,4 @@ Unsubscribe,"Se désinscrire" Subscribed,Inscrit Unsubscribed,Désinscrit Unconfirmed,"Non confirmé" +"Newsletter Template","Newsletter Template" diff --git a/app/code/Magento/Newsletter/i18n/nl_NL.csv b/app/code/Magento/Newsletter/i18n/nl_NL.csv index 9280f66bdc00c..7999b25e12975 100644 --- a/app/code/Magento/Newsletter/i18n/nl_NL.csv +++ b/app/code/Magento/Newsletter/i18n/nl_NL.csv @@ -138,3 +138,4 @@ Unsubscribe,Uitschrijven Subscribed,Uitschrijven Unsubscribed,Uitgeschreven Unconfirmed,Onbevestigd +"Newsletter Template","Newsletter Template" diff --git a/app/code/Magento/Newsletter/i18n/pt_BR.csv b/app/code/Magento/Newsletter/i18n/pt_BR.csv index 4ec9dd0d67d0d..cb2fecc6a5900 100644 --- a/app/code/Magento/Newsletter/i18n/pt_BR.csv +++ b/app/code/Magento/Newsletter/i18n/pt_BR.csv @@ -138,3 +138,4 @@ Unsubscribe,Desinscrever Subscribed,Assinado Unsubscribed,Desinscrito Unconfirmed,"Não Confirmado" +"Newsletter Template","Newsletter Template" diff --git a/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv b/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv index 96d65bc535252..71be218444fbc 100644 --- a/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv @@ -138,3 +138,4 @@ Unsubscribe,退订 Subscribed,已订阅 Unsubscribed,已退订 Unconfirmed,未确认 +"Newsletter Template","Newsletter Template" diff --git a/app/code/Magento/Reports/etc/acl.xml b/app/code/Magento/Reports/etc/acl.xml index 834fcdc528545..6d6972fd73412 100644 --- a/app/code/Magento/Reports/etc/acl.xml +++ b/app/code/Magento/Reports/etc/acl.xml @@ -42,7 +42,7 @@ - + diff --git a/app/code/Magento/Reports/i18n/de_DE.csv b/app/code/Magento/Reports/i18n/de_DE.csv index b2bd8ea9e794c..c751048ec4fd2 100644 --- a/app/code/Magento/Reports/i18n/de_DE.csv +++ b/app/code/Magento/Reports/i18n/de_DE.csv @@ -218,3 +218,10 @@ Hits,Treffer "Refresh Statistics for the Last Day","Aktualisiere Statistik für den letzten Tag" "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,undefiniert +"Products in Cart","Artikel in den Warenkörbe" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Reports/i18n/en_US.csv b/app/code/Magento/Reports/i18n/en_US.csv index 03173d8b230fd..3ab4dda3fe68c 100644 --- a/app/code/Magento/Reports/i18n/en_US.csv +++ b/app/code/Magento/Reports/i18n/en_US.csv @@ -219,3 +219,10 @@ Hits,Hits "Refresh Statistics for the Last Day","Refresh Statistics for the Last Day" "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,undefined +"Products in Cart","Products in Cart" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Reports/i18n/es_ES.csv b/app/code/Magento/Reports/i18n/es_ES.csv index 26595380f01b5..b025859c92e51 100644 --- a/app/code/Magento/Reports/i18n/es_ES.csv +++ b/app/code/Magento/Reports/i18n/es_ES.csv @@ -218,3 +218,10 @@ Hits,Visitas. "Refresh Statistics for the Last Day","Actualiza estadísticas del último día" "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,Indefinido +"Products in Cart","Products in Cart" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Reports/i18n/fr_FR.csv b/app/code/Magento/Reports/i18n/fr_FR.csv index 488b76e42c438..de79ece2ef856 100644 --- a/app/code/Magento/Reports/i18n/fr_FR.csv +++ b/app/code/Magento/Reports/i18n/fr_FR.csv @@ -218,3 +218,10 @@ Hits,Clics "Refresh Statistics for the Last Day","Rafraîchir les statistiques de la veille" "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,indéfini +"Products in Cart","Products in Cart" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Reports/i18n/nl_NL.csv b/app/code/Magento/Reports/i18n/nl_NL.csv index d35cbaf6f8596..f8b5dc7e7c8ec 100644 --- a/app/code/Magento/Reports/i18n/nl_NL.csv +++ b/app/code/Magento/Reports/i18n/nl_NL.csv @@ -218,3 +218,10 @@ Hits,Bezoeken "Refresh Statistics for the Last Day","Statistiek voor de laatste dag verversen" "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,ongedefinieerd +"Products in Cart","Products in Cart" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Reports/i18n/pt_BR.csv b/app/code/Magento/Reports/i18n/pt_BR.csv index 03072fb8a8dc2..8ef822b53a296 100644 --- a/app/code/Magento/Reports/i18n/pt_BR.csv +++ b/app/code/Magento/Reports/i18n/pt_BR.csv @@ -218,3 +218,10 @@ Hits,Críticas "Refresh Statistics for the Last Day","Atualizar estatísticas para o Último dia" "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,indefinido +"Products in Cart","Products in Cart" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Reports/i18n/zh_Hans_CN.csv b/app/code/Magento/Reports/i18n/zh_Hans_CN.csv index 3b36163f6b0e3..bf85485daa4fd 100644 --- a/app/code/Magento/Reports/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Reports/i18n/zh_Hans_CN.csv @@ -218,3 +218,10 @@ Hits,提示 "Refresh Statistics for the Last Day",刷新昨天的状态 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?" undefined,未定义 +"Products in Cart","Products in Cart" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"PayPal Settlement","PayPal Settlement" +"Order Count","Order Count" +Bestseller,Bestseller diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv index 8cd4ff0cf4df0..736a5f91b8f7b 100644 --- a/app/code/Magento/Sales/i18n/de_DE.csv +++ b/app/code/Magento/Sales/i18n/de_DE.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips","PDF Packzettel" "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv index 56fadf4515509..5970b2ff82e61 100644 --- a/app/code/Magento/Sales/i18n/en_US.csv +++ b/app/code/Magento/Sales/i18n/en_US.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips","PDF Packing Slips" "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Sales/i18n/es_ES.csv b/app/code/Magento/Sales/i18n/es_ES.csv index b14dd0c68fcbf..d524aad0e94ba 100644 --- a/app/code/Magento/Sales/i18n/es_ES.csv +++ b/app/code/Magento/Sales/i18n/es_ES.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips","Albaranes en PDF" "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Sales/i18n/fr_FR.csv b/app/code/Magento/Sales/i18n/fr_FR.csv index d56acf87271da..e6ee0ec1c4a3f 100644 --- a/app/code/Magento/Sales/i18n/fr_FR.csv +++ b/app/code/Magento/Sales/i18n/fr_FR.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips","Bons de livraison PDF" "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Sales/i18n/nl_NL.csv b/app/code/Magento/Sales/i18n/nl_NL.csv index 8018624c475f5..1675d096d63af 100644 --- a/app/code/Magento/Sales/i18n/nl_NL.csv +++ b/app/code/Magento/Sales/i18n/nl_NL.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips","PDF Packing Slips" "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Sales/i18n/pt_BR.csv b/app/code/Magento/Sales/i18n/pt_BR.csv index ffba7bb166d6b..41380ea687d54 100644 --- a/app/code/Magento/Sales/i18n/pt_BR.csv +++ b/app/code/Magento/Sales/i18n/pt_BR.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips","Guias de remessas em PDF" "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Sales/i18n/zh_Hans_CN.csv b/app/code/Magento/Sales/i18n/zh_Hans_CN.csv index ecbf74067715d..72b4d5663d7eb 100644 --- a/app/code/Magento/Sales/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Sales/i18n/zh_Hans_CN.csv @@ -679,3 +679,4 @@ order-header,order-header "State Code and Title","State Code and Title" "PDF Packing Slips",PDF版包裹清单 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)." +Operations,Operations diff --git a/app/code/Magento/Store/i18n/de_DE.csv b/app/code/Magento/Store/i18n/de_DE.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/de_DE.csv +++ b/app/code/Magento/Store/i18n/de_DE.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Store/i18n/en_US.csv b/app/code/Magento/Store/i18n/en_US.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/en_US.csv +++ b/app/code/Magento/Store/i18n/en_US.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Store/i18n/es_ES.csv b/app/code/Magento/Store/i18n/es_ES.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/es_ES.csv +++ b/app/code/Magento/Store/i18n/es_ES.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Store/i18n/fr_FR.csv b/app/code/Magento/Store/i18n/fr_FR.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/fr_FR.csv +++ b/app/code/Magento/Store/i18n/fr_FR.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Store/i18n/nl_NL.csv b/app/code/Magento/Store/i18n/nl_NL.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/nl_NL.csv +++ b/app/code/Magento/Store/i18n/nl_NL.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Store/i18n/pt_BR.csv b/app/code/Magento/Store/i18n/pt_BR.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/pt_BR.csv +++ b/app/code/Magento/Store/i18n/pt_BR.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Store/i18n/zh_Hans_CN.csv b/app/code/Magento/Store/i18n/zh_Hans_CN.csv index e498731b13b2c..5cbbe3e5697db 100644 --- a/app/code/Magento/Store/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Store/i18n/zh_Hans_CN.csv @@ -21,3 +21,6 @@ Layouts,Layouts "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)." "Collections Data","Collections Data" "Collection data files.","Collection data files." +"All Stores","All Stores" +"Other Settings","Other Settings" +Attribute,Attribute diff --git a/app/code/Magento/Tax/i18n/de_DE.csv b/app/code/Magento/Tax/i18n/de_DE.csv index 2365399967075..4fc035fa2f4a3 100644 --- a/app/code/Magento/Tax/i18n/de_DE.csv +++ b/app/code/Magento/Tax/i18n/de_DE.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,Bundesstaat/Region "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv index 078cef5d97b22..af228accb3440 100644 --- a/app/code/Magento/Tax/i18n/en_US.csv +++ b/app/code/Magento/Tax/i18n/en_US.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,State/Region "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/Tax/i18n/es_ES.csv b/app/code/Magento/Tax/i18n/es_ES.csv index 999f3930c262c..b97d5fe9cb3ee 100644 --- a/app/code/Magento/Tax/i18n/es_ES.csv +++ b/app/code/Magento/Tax/i18n/es_ES.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,Estado/Región "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/Tax/i18n/fr_FR.csv b/app/code/Magento/Tax/i18n/fr_FR.csv index bf297e3d67360..2687af941e9b2 100644 --- a/app/code/Magento/Tax/i18n/fr_FR.csv +++ b/app/code/Magento/Tax/i18n/fr_FR.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,État/Région "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/Tax/i18n/nl_NL.csv b/app/code/Magento/Tax/i18n/nl_NL.csv index ac644e6510cc1..212f01a0c4761 100644 --- a/app/code/Magento/Tax/i18n/nl_NL.csv +++ b/app/code/Magento/Tax/i18n/nl_NL.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,Provincie "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/Tax/i18n/pt_BR.csv b/app/code/Magento/Tax/i18n/pt_BR.csv index 2c52eee8e592a..d22d24f7218e3 100644 --- a/app/code/Magento/Tax/i18n/pt_BR.csv +++ b/app/code/Magento/Tax/i18n/pt_BR.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,Estado/Região "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/Tax/i18n/zh_Hans_CN.csv b/app/code/Magento/Tax/i18n/zh_Hans_CN.csv index d47d26b939bd1..2a4d9e43e27e0 100644 --- a/app/code/Magento/Tax/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/Tax/i18n/zh_Hans_CN.csv @@ -157,3 +157,5 @@ Note:,Note: "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings" State/Region,州/地区 "Subtotal Only","Subtotal Only" +Taxes,Taxes +"Import/Export Tax Rates","Import/Export Tax Rates" diff --git a/app/code/Magento/User/i18n/de_DE.csv b/app/code/Magento/User/i18n/de_DE.csv index 63367a6ff3a32..eb4689a2501f9 100644 --- a/app/code/Magento/User/i18n/de_DE.csv +++ b/app/code/Magento/User/i18n/de_DE.csv @@ -118,3 +118,5 @@ Unlock,Entsperren "Last login","Letzter Login" Failures,Fehler Unlocked,"Gesperrt bis" +"All Users","All Users" +"User Roles","User Roles" diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv index 1f56f067006fc..7c85088044d42 100644 --- a/app/code/Magento/User/i18n/en_US.csv +++ b/app/code/Magento/User/i18n/en_US.csv @@ -118,3 +118,5 @@ Unlock,Unlock "Last login","Last login" Failures,Failures Unlocked,Unlocked +"All Users","All Users" +"User Roles","User Roles" diff --git a/app/code/Magento/User/i18n/es_ES.csv b/app/code/Magento/User/i18n/es_ES.csv index 4dd4f371b4af5..1e9397fee14ca 100644 --- a/app/code/Magento/User/i18n/es_ES.csv +++ b/app/code/Magento/User/i18n/es_ES.csv @@ -119,3 +119,5 @@ Unlock,Desbloquear "Last login","Ultimo acceso" Failures,Fallos Unlocked,"Bloqueado hasta" +"All Users","All Users" +"User Roles","User Roles" diff --git a/app/code/Magento/User/i18n/fr_FR.csv b/app/code/Magento/User/i18n/fr_FR.csv index bbe1e63a96cbd..42116af645b08 100644 --- a/app/code/Magento/User/i18n/fr_FR.csv +++ b/app/code/Magento/User/i18n/fr_FR.csv @@ -119,3 +119,5 @@ Unlock,Déverrouiller "Last login","Dernière connexion" Failures,Echecs Unlocked,"Verrouillé jusqu'" +"All Users","All Users" +"User Roles","User Roles" diff --git a/app/code/Magento/User/i18n/nl_NL.csv b/app/code/Magento/User/i18n/nl_NL.csv index 91813e3a13311..3745ad0430220 100644 --- a/app/code/Magento/User/i18n/nl_NL.csv +++ b/app/code/Magento/User/i18n/nl_NL.csv @@ -119,3 +119,5 @@ Unlock,Openen "Last login","Laatste login" Failures,Mislukkingen Unlocked,"Gesloten tot" +"All Users","All Users" +"User Roles","User Roles" diff --git a/app/code/Magento/User/i18n/pt_BR.csv b/app/code/Magento/User/i18n/pt_BR.csv index d8d16b8cd04f7..0edca55b30ea6 100644 --- a/app/code/Magento/User/i18n/pt_BR.csv +++ b/app/code/Magento/User/i18n/pt_BR.csv @@ -119,3 +119,5 @@ Unlock,Desbloquear "Last login","Último login" Failures,Falhas Unlocked,"Bloqueado até" +"All Users","All Users" +"User Roles","User Roles" diff --git a/app/code/Magento/User/i18n/zh_Hans_CN.csv b/app/code/Magento/User/i18n/zh_Hans_CN.csv index 1c10afb0b649b..1c0292bf2db04 100644 --- a/app/code/Magento/User/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/User/i18n/zh_Hans_CN.csv @@ -119,3 +119,5 @@ Unlock,解锁 "Last login",上一次登录 Failures,失败 Unlocked,锁定直到 +"All Users","All Users" +"User Roles","User Roles" From 1129ce29d52a7aeb11910676a0fb889b11e47679 Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Tue, 20 Oct 2015 11:40:39 -0500 Subject: [PATCH 2/6] MAGETWO-44239: Text change to Full Page Cache -> Built-in Application option - Changed text to add disclaimer. --- .../Model/System/Config/Source/Application.php | 13 ++++++++++--- app/code/Magento/PageCache/i18n/de_DE.csv | 2 +- app/code/Magento/PageCache/i18n/en_US.csv | 2 +- app/code/Magento/PageCache/i18n/es_ES.csv | 2 +- app/code/Magento/PageCache/i18n/fr_FR.csv | 2 +- app/code/Magento/PageCache/i18n/nl_NL.csv | 2 +- app/code/Magento/PageCache/i18n/pt_BR.csv | 2 +- app/code/Magento/PageCache/i18n/zh_Hans_CN.csv | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php index 45233bb59c70b..eb428f7c0300a 100644 --- a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php +++ b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php @@ -23,8 +23,14 @@ class Application implements \Magento\Framework\Option\ArrayInterface public function toOptionArray() { return [ - ['value' => \Magento\PageCache\Model\Config::BUILT_IN, 'label' => __('Built-in Application')], - ['value' => \Magento\PageCache\Model\Config::VARNISH, 'label' => __('Varnish Caching')] + [ + 'value' => \Magento\PageCache\Model\Config::BUILT_IN, + 'label' => __('Built-in Application (Not Recommended for Production Use)') + ], + [ + 'value' => \Magento\PageCache\Model\Config::VARNISH, + 'label' => __('Varnish Caching') + ] ]; } @@ -36,7 +42,8 @@ public function toOptionArray() public function toArray() { return [ - \Magento\PageCache\Model\Config::BUILT_IN => __('Built-in Application'), + \Magento\PageCache\Model\Config::BUILT_IN => + __('Built-in Application (Not Recommended for Production Use)'), \Magento\PageCache\Model\Config::VARNISH => __('Varnish Caching') ]; } diff --git a/app/code/Magento/PageCache/i18n/de_DE.csv b/app/code/Magento/PageCache/i18n/de_DE.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/de_DE.csv +++ b/app/code/Magento/PageCache/i18n/de_DE.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" diff --git a/app/code/Magento/PageCache/i18n/en_US.csv b/app/code/Magento/PageCache/i18n/en_US.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/en_US.csv +++ b/app/code/Magento/PageCache/i18n/en_US.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" diff --git a/app/code/Magento/PageCache/i18n/es_ES.csv b/app/code/Magento/PageCache/i18n/es_ES.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/es_ES.csv +++ b/app/code/Magento/PageCache/i18n/es_ES.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" diff --git a/app/code/Magento/PageCache/i18n/fr_FR.csv b/app/code/Magento/PageCache/i18n/fr_FR.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/fr_FR.csv +++ b/app/code/Magento/PageCache/i18n/fr_FR.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" diff --git a/app/code/Magento/PageCache/i18n/nl_NL.csv b/app/code/Magento/PageCache/i18n/nl_NL.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/nl_NL.csv +++ b/app/code/Magento/PageCache/i18n/nl_NL.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" diff --git a/app/code/Magento/PageCache/i18n/pt_BR.csv b/app/code/Magento/PageCache/i18n/pt_BR.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/pt_BR.csv +++ b/app/code/Magento/PageCache/i18n/pt_BR.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" diff --git a/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv b/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv index 0d57f18488d74..701e12300596b 100644 --- a/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv +++ b/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv @@ -1,6 +1,6 @@ "Export VCL","Export VCL" "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero." -"Built-in Application","Built-in Application" +"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)" "Varnish Caching","Varnish Caching" "Full Page Cache","Full Page Cache" "Caching Application","Caching Application" From 04de8c253f8e87f7d485dbb11896f427a89dc5a1 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Wed, 21 Oct 2015 13:30:07 +0300 Subject: [PATCH 3/6] MAGETWO-43683: Magento 2 translation tools does not allow to translate Magento - removed an exception if i18n tools use default locale - added per module, lib, theme translation --- .../I18n/Dictionary/_files/expected/with_context.csv | 6 ++++-- setup/src/Magento/Setup/Module/I18n/Locale.php | 4 +--- .../src/Magento/Setup/Module/I18n/Parser/Contextual.php | 2 +- .../Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php | 9 --------- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv index 0895edb09f36d..6c873fee5c89b 100644 --- a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv +++ b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv @@ -1,9 +1,11 @@ Helper,Helper,module,Magento_FirstModule -Model,Model,module,"Magento_FirstModule,Magento_SecondModule" +Model,Model,module,Magento_FirstModule "Module template","Module template",module,Magento_FirstModule +Model,Model,module,Magento_SecondModule "Theme template","Theme template",theme,adminhtml/default/backend "Module js","Module js",module,Magento_FirstModule -"Lib js","Lib js",lib,"lib/web/mage/file.js,lib/web/varien/file.js" +"Lib js","Lib js",lib,lib/web/mage/file.js +"Lib js","Lib js",lib,lib/web/varien/file.js "Module layout label","Module layout label",module,Magento_FirstModule "Module layout title","Module layout title",module,Magento_FirstModule "Theme layout label","Theme layout label",theme,adminhtml/default/backend diff --git a/setup/src/Magento/Setup/Module/I18n/Locale.php b/setup/src/Magento/Setup/Module/I18n/Locale.php index e3bb79e9adb2f..053ee398a2f71 100644 --- a/setup/src/Magento/Setup/Module/I18n/Locale.php +++ b/setup/src/Magento/Setup/Module/I18n/Locale.php @@ -30,9 +30,7 @@ class Locale */ public function __construct($locale) { - if ($locale == self::DEFAULT_SYSTEM_LOCALE) { - throw new \InvalidArgumentException('Target locale is system default locale.'); - } elseif (!preg_match('/[a-z]{2}_[A-Z]{2}/', $locale)) { + if (!preg_match('/[a-z]{2}_[A-Z]{2}/', $locale)) { throw new \InvalidArgumentException('Target locale must match the following format: "aa_AA".'); } $this->_locale = $locale; diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php b/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php index d759eb11b2be3..cbeca7d79d6d8 100644 --- a/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php +++ b/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php @@ -63,7 +63,7 @@ protected function _parseByTypeOptions($options) */ protected function _addPhrase($phraseData, $contextType, $contextValue) { - $phraseKey = $contextType . stripslashes($phraseData['phrase']); + $phraseKey = $contextType . $contextValue. stripslashes($phraseData['phrase']); if (isset($this->_phrases[$phraseKey])) { /** @var \Magento\Setup\Module\I18n\Dictionary\Phrase $phrase */ diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php index 09914f7863146..9eec9b6901456 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php @@ -9,15 +9,6 @@ class LocaleTest extends \PHPUnit_Framework_TestCase { - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Target locale is system default locale. - */ - public function testLocaleIsSystemDefaultLocaleException() - { - new Locale('en_US'); - } - /** * @expectedException \InvalidArgumentException * @expectedExceptionMessage Target locale must match the following format: "aa_AA". From 9d3c87a69571ddee4d52e5c8503b47310228d245 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Thu, 22 Oct 2015 16:11:16 +0300 Subject: [PATCH 4/6] MAGETWO-44049: [GITHUB] data-bind i18n expressions with JavaScript function calls are used in the core but untranslatable due to regular expression and architectural limitations #1905 - decomposed expressions in data-bind "i18n" - replaced data-bind "i18n" with "text" for variables, method invokes, expressions - removed $t() for variables and expressions --- .../web/template/cart/totals/grand-total.html | 2 +- .../web/template/cart/totals/shipping.html | 2 +- .../web/template/cart/totals/subtotal.html | 2 +- .../frontend/web/template/estimation.html | 2 +- .../view/frontend/web/template/payment.html | 2 +- .../frontend/web/template/progress-bar.html | 2 +- .../web/template/shipping-information.html | 2 +- .../view/frontend/web/template/shipping.html | 6 ++-- .../web/template/summary/grand-total.html | 4 +-- .../web/template/summary/item/details.html | 4 +-- .../web/template/summary/shipping.html | 8 ++--- .../web/template/summary/subtotal.html | 4 +-- .../frontend/templates/default/home.phtml | 1 + .../catalog/product/edit/super/matrix.phtml | 2 +- .../web/template/payment/checkmo.html | 4 +-- .../web/template/cart/totals/discount.html | 2 +- .../web/template/summary/discount.html | 2 +- .../checkout/cart/totals/grand-total.html | 12 +++---- .../checkout/cart/totals/shipping.html | 24 +++++++------- .../template/checkout/cart/totals/tax.html | 12 +++---- .../checkout/summary/grand-total.html | 16 +++++----- .../template/checkout/summary/shipping.html | 32 +++++++++---------- .../template/checkout/summary/subtotal.html | 20 ++++++------ .../web/template/checkout/summary/tax.html | 16 +++++----- .../web/template/checkout/summary/weee.html | 2 +- 25 files changed, 93 insertions(+), 92 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html index e4ac4affabb34..751e4eaaa5142 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html @@ -6,7 +6,7 @@ --> - + diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html index 17c41206ab4e6..7cf6d85f66884 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html @@ -6,7 +6,7 @@ --> - + diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html index b5b7e2ecf683a..be761940327f8 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html @@ -5,7 +5,7 @@ */ --> - + diff --git a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html index 36009ab7b4634..f8b396939cef7 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html @@ -7,7 +7,7 @@
- +
- +
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html index 7c981e83bc978..926c269ef0777 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html @@ -112,10 +112,10 @@ + data-bind="text: method.method_title, attr: {'id': 'label_method_' + method.method_code + '_' + method.carrier_code}"> + data-bind="text: method.carrier_title, attr: {'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code}"> @@ -143,7 +143,7 @@
- +
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html index 107907b157acf..009c7e0143501 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html @@ -6,9 +6,9 @@ --> - + - + diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html index 05b39a8f11e00..69f698a7a5a4a 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html @@ -12,7 +12,7 @@
- +
@@ -30,7 +30,7 @@
-
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html index f3a22cef746e5..a6dc09dc74656 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html @@ -7,17 +7,17 @@ - - + + + data-bind="text: getValue(), attr: {'data-th': title}"> + data-bind="text: getValue(), attr: {'data-th': title}"> diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html index e217668f605f1..47b1bbc221fe4 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html @@ -6,9 +6,9 @@ --> - + - + diff --git a/app/code/Magento/Cms/view/frontend/templates/default/home.phtml b/app/code/Magento/Cms/view/frontend/templates/default/home.phtml index 9c51cd0004f6c..3ef8d5a107700 100644 --- a/app/code/Magento/Cms/view/frontend/templates/default/home.phtml +++ b/app/code/Magento/Cms/view/frontend/templates/default/home.phtml @@ -5,3 +5,4 @@ */ ?> There was no Home CMS page configured or found. +git \ No newline at end of file diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml index e962963ccac6c..321b8de464774 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml @@ -213,7 +213,7 @@ $currencySymbol = $block->getCurrencySymbol();
    • diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html index e20e15111e5b6..64385884483dd 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html +++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html @@ -25,12 +25,12 @@
    -
    +
    -
    +
    diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html index 1797b8ff9c276..b8a057ff065dd 100644 --- a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html +++ b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html @@ -7,7 +7,7 @@ - + diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html index 60ac9c7982a5f..705541de3b4fc 100644 --- a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html +++ b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html @@ -11,7 +11,7 @@ - + diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html index f756837bb1e7a..31bf3448f2020 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html @@ -7,17 +7,17 @@ - + - + - + - + @@ -25,9 +25,9 @@ - + - + diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html index 13fe7f3e716a6..37a8e82688a83 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html @@ -8,46 +8,46 @@ - - + + + data-bind="text: getExcludingValue(), attr: {'data-th': excludingTaxMessage}"> - - + + + data-bind="text: getIncludingValue(), attr: {'data-th': title + ' ' + excludingTaxMessage}"> - - + + + data-bind="text: getIncludingValue(), attr: {'data-th': title}"> - - + + + data-bind="text: getValue(), attr: {'data-th': title}"> diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html index c6f4c7833e0c0..8d70052ddc228 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html @@ -7,9 +7,9 @@ - - - + + + @@ -17,10 +17,10 @@ - + - - + + diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html index 4451adbf528d6..9d2072b1bf998 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html @@ -7,17 +7,17 @@ - + - + - + - + @@ -25,18 +25,18 @@ - + - + - + - + diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html index 1608f78ad1c91..3bcd9bccd15ea 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html @@ -8,33 +8,33 @@ - - + + + data-bind="text: getExcludingValue(), attr: {'data-th': excludingTaxMessage}"> + data-bind="text: getExcludingValue(), attr: {'data-th': excludingTaxMessage}"> - - + + + data-bind="text: getIncludingValue(), attr: {'data-th': title + ' ' + excludingTaxMessage}"> + data-bind="text: getIncludingValue(), attr: {'data-th': title + ' ' + excludingTaxMessage}"> @@ -42,17 +42,17 @@ - - + + + data-bind="text: getIncludingValue(), attr: {'data-th': title}"> + data-bind="text: getIncludingValue(), attr: {'data-th': title}"> @@ -60,17 +60,17 @@ - - + + + data-bind="text: getValue(), attr: {'data-th': title}"> + data-bind="text: getValue(), attr: {'data-th': title}"> diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html index a51407475cbfc..618bb6fd3281f 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html @@ -7,36 +7,36 @@ - - + + - + - - + + - + - + - + - + - + diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html index 5aa8b53e7fd08..3305b6956b8c7 100644 --- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html +++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html @@ -6,15 +6,15 @@ --> - - + + + data-bind="text: getValue()"> + data-bind="text: getValue()"> @@ -22,15 +22,15 @@ - - + + + data-bind="text: getValue()"> + data-bind="text: getValue()"> diff --git a/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html b/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html index 886e2443918e6..c8d5d922f9567 100644 --- a/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html +++ b/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html @@ -7,7 +7,7 @@ - + From 3fa8b517848d5e45b7abf09b9c39b25189f96a4d Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Thu, 22 Oct 2015 17:43:38 -0500 Subject: [PATCH 5/6] MAGETWO-44053: [GITHUB] Bug: i18n phrases with apostrophes (') in Knockout templates are untranslatable (and my fix) #1951 - Added fix to account for phrases with apostrophes in ko templates. --- app/code/Magento/Translation/Model/Js/DataProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php index ee6d8b3f5df19..a12859fe254d1 100644 --- a/app/code/Magento/Translation/Model/Js/DataProvider.php +++ b/app/code/Magento/Translation/Model/Js/DataProvider.php @@ -129,7 +129,7 @@ protected function getPhrases($content) if ($result) { if (isset($matches[2])) { foreach ($matches[2] as $match) { - $phrases[] = $match; + $phrases[] = str_replace('\\\'', '\'', $match); } } } From 341a3e39b25accbc99e8a57771c0eebab6752a77 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Fri, 23 Oct 2015 11:25:36 +0300 Subject: [PATCH 6/6] MAGETWO-44049: [GITHUB] data-bind i18n expressions with JavaScript function calls are used in the core but untranslatable due to regular expression and architectural limitations #1905 - replaced data-bind "i18n" with "text" for variables, method invokes, expressions - removed $t() for variables and expressions --- .../Checkout/view/frontend/web/template/registration.html | 2 +- .../Magento/Checkout/view/frontend/web/template/shipping.html | 2 +- .../Magento/Cms/view/frontend/templates/default/home.phtml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html index 1cb610134a90c..53c1248a210ab 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/registration.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/registration.html @@ -13,6 +13,6 @@ -

    +

    diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html index 926c269ef0777..9196030466853 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html @@ -122,7 +122,7 @@
    -
    +
    diff --git a/app/code/Magento/Cms/view/frontend/templates/default/home.phtml b/app/code/Magento/Cms/view/frontend/templates/default/home.phtml index 3ef8d5a107700..4fae6ce09006f 100644 --- a/app/code/Magento/Cms/view/frontend/templates/default/home.phtml +++ b/app/code/Magento/Cms/view/frontend/templates/default/home.phtml @@ -4,5 +4,4 @@ * See COPYING.txt for license details. */ ?> -There was no Home CMS page configured or found. -git \ No newline at end of file +There was no Home CMS page configured or found. \ No newline at end of file