From 90c35f662fc2589d25c460c35ed1af9f5361670d Mon Sep 17 00:00:00 2001 From: Cari Spruiell Date: Wed, 28 Oct 2015 22:49:09 -0500 Subject: [PATCH] MAGETWO-44275: Some layout xml files doesn't have translations - added translate tags to xml template - added missing checkout phrases to translation files --- app/code/Magento/Catalog/etc/adminhtml/di.xml | 8 ++++---- app/code/Magento/Catalog/etc/di.xml | 4 ++-- app/code/Magento/Catalog/etc/widget.xml | 4 ++-- app/code/Magento/Checkout/i18n/de_DE.csv | 5 +++++ app/code/Magento/Checkout/i18n/en_US.csv | 5 +++++ app/code/Magento/Checkout/i18n/es_ES.csv | 5 +++++ app/code/Magento/Checkout/i18n/fr_FR.csv | 5 +++++ app/code/Magento/Checkout/i18n/nl_NL.csv | 5 +++++ app/code/Magento/Checkout/i18n/pt_BR.csv | 5 +++++ app/code/Magento/Checkout/i18n/zh_CN.csv | 5 +++++ app/code/Magento/Cms/etc/widget.xml | 4 ++-- .../view/base/ui_component/customer_form.xml | 2 +- .../frontend/layout/checkout_index_index.xml | 2 +- .../frontend/layout/checkout_index_index.xml | 18 +++++++++--------- 14 files changed, 56 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml index 5cf13196cbd26..d26252deb0d5b 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/di.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml @@ -16,19 +16,19 @@ - Small + Small small_image - Main + Main image - Thumbnail + Thumbnail thumbnail - Custom image + Custom image custom_image diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index 40b644c226a2a..c200a717172f7 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -112,11 +112,11 @@ container1 - Product Info Column + Product Info Column container2 - Block after Info Column + Block after Info Column diff --git a/app/code/Magento/Catalog/etc/widget.xml b/app/code/Magento/Catalog/etc/widget.xml index 9317297c3e332..a57b789ade1c8 100644 --- a/app/code/Magento/Catalog/etc/widget.xml +++ b/app/code/Magento/Catalog/etc/widget.xml @@ -96,7 +96,7 @@ - Select Product... + Select Product... @@ -135,7 +135,7 @@ - Select Category... + Select Category... diff --git a/app/code/Magento/Checkout/i18n/de_DE.csv b/app/code/Magento/Checkout/i18n/de_DE.csv index f604546621d38..df04e14683f67 100644 --- a/app/code/Magento/Checkout/i18n/de_DE.csv +++ b/app/code/Magento/Checkout/i18n/de_DE.csv @@ -177,3 +177,8 @@ Register,Registrieren "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.","Ihre Bestellung wurde erhalten." +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv index 60b459d0ba9a7..c2c432be4cdc0 100644 --- a/app/code/Magento/Checkout/i18n/en_US.csv +++ b/app/code/Magento/Checkout/i18n/en_US.csv @@ -177,3 +177,8 @@ Register,Register "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.","Your order has been received." +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Checkout/i18n/es_ES.csv b/app/code/Magento/Checkout/i18n/es_ES.csv index 3c66daf827db3..85bfda0fce594 100644 --- a/app/code/Magento/Checkout/i18n/es_ES.csv +++ b/app/code/Magento/Checkout/i18n/es_ES.csv @@ -177,3 +177,8 @@ Register,Registrarse "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.","Se recibió su pedido." +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Checkout/i18n/fr_FR.csv b/app/code/Magento/Checkout/i18n/fr_FR.csv index 84f388d8db5a2..dbff2a6c3d591 100644 --- a/app/code/Magento/Checkout/i18n/fr_FR.csv +++ b/app/code/Magento/Checkout/i18n/fr_FR.csv @@ -177,3 +177,8 @@ Register,S'inscrire "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.","Votre commande a bien été reçue." +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Checkout/i18n/nl_NL.csv b/app/code/Magento/Checkout/i18n/nl_NL.csv index 99e59069beacd..d3303a00878b1 100644 --- a/app/code/Magento/Checkout/i18n/nl_NL.csv +++ b/app/code/Magento/Checkout/i18n/nl_NL.csv @@ -177,3 +177,8 @@ Register,Registreer "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.","Uw bestelling is ontvangen." +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Checkout/i18n/pt_BR.csv b/app/code/Magento/Checkout/i18n/pt_BR.csv index 3262a6a301b51..64e9e0b5fda16 100644 --- a/app/code/Magento/Checkout/i18n/pt_BR.csv +++ b/app/code/Magento/Checkout/i18n/pt_BR.csv @@ -177,3 +177,8 @@ Register,Registrar "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.","Seu pedido foi recebido." +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Checkout/i18n/zh_CN.csv b/app/code/Magento/Checkout/i18n/zh_CN.csv index e7d99aa2b4dfc..576dff70d207a 100644 --- a/app/code/Magento/Checkout/i18n/zh_CN.csv +++ b/app/code/Magento/Checkout/i18n/zh_CN.csv @@ -177,3 +177,8 @@ Register,注册 "Separate by "","".","Separate by "",""." "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method" "Your order has been received.",我们已经收到您的订单。 +"For delivery questions.","For delivery questions." +"You can create an account after checkout.","You can create an account after checkout." +"Not yet calculated","Not yet calculated" +"Order Summary","Order Summary" +"Estimated Total","Estimated Total" diff --git a/app/code/Magento/Cms/etc/widget.xml b/app/code/Magento/Cms/etc/widget.xml index b69e13fc5cb09..8af7dd548d7a1 100644 --- a/app/code/Magento/Cms/etc/widget.xml +++ b/app/code/Magento/Cms/etc/widget.xml @@ -17,7 +17,7 @@ - Select Page... + Select Page... @@ -52,7 +52,7 @@ - Select Block... + Select Block... diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml index a32b3dee3716b..786002b7ac7b7 100644 --- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml +++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml @@ -102,7 +102,7 @@ http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes - If your Magento site has multiple views, you can set the scope to apply to a specific view. + If your Magento site has multiple views, you can set the scope to apply to a specific view. diff --git a/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml index b5ddc47cf8bae..24ccbd70f2c80 100644 --- a/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml +++ b/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml @@ -42,7 +42,7 @@ Magento_SalesRule/js/view/summary/discount - Discount + Discount diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml index 62de4a52b6925..42a5ed4521690 100644 --- a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml +++ b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml @@ -40,16 +40,16 @@ Magento_Tax/js/view/checkout/summary/subtotal - Excl. Tax - Incl. Tax + Excl. Tax + Incl. Tax Magento_Tax/js/view/checkout/summary/shipping 20 - Excl. Tax - Incl. Tax + Excl. Tax + Incl. Tax @@ -62,16 +62,16 @@ Magento_Tax/js/view/checkout/summary/tax - Tax + Tax Magento_Tax/js/view/checkout/summary/grand-total - Order Total Excl. Tax - Order Total Incl. Tax - Your credit card will be charged for - Order Total + Order Total Excl. Tax + Order Total Incl. Tax + Your credit card will be charged for + Order Total