Merge remote-tracking branch 'remotes/api/MAGETWO-44459-Check-javascr…

…ipt-function-calls-and-labels-are-translatable' into API-Bug-PR # Conflicts: # app/code/Magento/Paypal/i18n/de_DE.csv # app/code/Magento/Paypal/i18n/en_US.csv # app/code/Magento/Paypal/i18n/es_ES.csv # app/code/Magento/Paypal/i18n/fr_FR.csv # app/code/Magento/Paypal/i18n/nl_NL.csv # app/code/Magento/Paypal/i18n/pt_BR.csv # app/code/Magento/Paypal/i18n/zh_Hans_CN.csv
magento · Nov 2, 2015 · b9ecb3b · b9ecb3b
2 parents a58bda7 + 9a9d01c
commit b9ecb3b
Show file tree

Hide file tree

Showing 214 changed files with 1,786 additions and 683 deletions.
diff --git a/app/code/Magento/Backend/i18n/de_DE.csv b/app/code/Magento/Backend/i18n/de_DE.csv
@@ -614,3 +614,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
@@ -620,3 +620,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backend/i18n/es_ES.csv b/app/code/Magento/Backend/i18n/es_ES.csv
@@ -614,3 +614,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backend/i18n/fr_FR.csv b/app/code/Magento/Backend/i18n/fr_FR.csv
@@ -614,3 +614,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backend/i18n/nl_NL.csv b/app/code/Magento/Backend/i18n/nl_NL.csv
@@ -614,3 +614,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backend/i18n/pt_BR.csv b/app/code/Magento/Backend/i18n/pt_BR.csv
@@ -614,3 +614,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backend/i18n/zh_Hans_CN.csv b/app/code/Magento/Backend/i18n/zh_Hans_CN.csv
@@ -614,3 +614,27 @@ Communications,Communications
 "Import History","Import History"
 Extensions,Extensions
 "Web Setup Wizard","Web Setup Wizard"
+"VAT number","VAT number"
+"Top destinations","Top destinations"
+"Store Hours of Operation","Store Hours of Operation"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/"
+"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/"
+"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
+"Use SID on Storefront","Use SID on Storefront"
+"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
+"For Windows server only.","For Windows server only."
+"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
+"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
+"Minify Html","Minify Html"
+"Enabled for Storefront","Enabled for Storefront"
+"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations."
+"Enable Javascript Bundling","Enable Javascript Bundling"
+"Minify CSS Files","Minify CSS Files"
+"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
+"Average Order","Average Order"
+"Last Orders","Last Orders"
+"Last Search Terms","Last Search Terms"
+"Top Search Terms","Top Search Terms"
+"Reload Data","Reload Data"
+"Welcome, please sign in","Welcome, please sign in"
+"Sign in","Sign in"
diff --git a/app/code/Magento/Backup/i18n/de_DE.csv b/app/code/Magento/Backup/i18n/de_DE.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?","Sind Sie sicher, dass Sie die ausgewählten Sicherungskopie(n) löschen wollen?"
 Size(bytes),Size(bytes)
 Rollback,Rollback
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Backup/i18n/en_US.csv b/app/code/Magento/Backup/i18n/en_US.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?","Are you sure you want to delete the selected backup(s)?"
 Size(bytes),Size(bytes)
 Rollback,Rollback
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Backup/i18n/es_ES.csv b/app/code/Magento/Backup/i18n/es_ES.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?","¿Seguro que desea eliminar las copias de seguridad seleccionadas?"
 Size(bytes),Size(bytes)
 Rollback,Revertir
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Backup/i18n/fr_FR.csv b/app/code/Magento/Backup/i18n/fr_FR.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?","êtes-vous sûrs de vouloir supprimer la/les copie(s) de sauvegarde sélectionnée(s) ?"
 Size(bytes),Size(bytes)
 Rollback,Réduction
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Backup/i18n/nl_NL.csv b/app/code/Magento/Backup/i18n/nl_NL.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?","Weet u zeker dat u de geselecteerde back-up(s) wilt verwijderen?"
 Size(bytes),Size(bytes)
 Rollback,Terugrollen
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Backup/i18n/pt_BR.csv b/app/code/Magento/Backup/i18n/pt_BR.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?","Você tem certeza que quer deletar o(s) backup(s) selecionado(s)?"
 Size(bytes),Size(bytes)
 Rollback,Reversão
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Backup/i18n/zh_Hans_CN.csv b/app/code/Magento/Backup/i18n/zh_Hans_CN.csv
@@ -79,3 +79,6 @@ Frequency,Frequency
 "Are you sure you want to delete the selected backup(s)?",你是否确定要删除所选备份？
 Size(bytes),Size(bytes)
 Rollback,回滚
+"Maintenance mode","Maintenance mode"
+"This may take a few moments.","This may take a few moments."
+"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."
diff --git a/app/code/Magento/Captcha/i18n/de_DE.csv b/app/code/Magento/Captcha/i18n/de_DE.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Captcha/i18n/es_ES.csv b/app/code/Magento/Captcha/i18n/es_ES.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Captcha/i18n/fr_FR.csv b/app/code/Magento/Captcha/i18n/fr_FR.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Captcha/i18n/nl_NL.csv b/app/code/Magento/Captcha/i18n/nl_NL.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Captcha/i18n/pt_BR.csv b/app/code/Magento/Captcha/i18n/pt_BR.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Captcha/i18n/zh_Hans_CN.csv b/app/code/Magento/Captcha/i18n/zh_Hans_CN.csv
@@ -25,3 +25,4 @@ Forms,Forms
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
+"Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -88,7 +88,7 @@ public function getAdditionalData(array $excludeAttr = [])
 
                 if (is_string($value) && strlen($value)) {
                     $data[$attribute->getAttributeCode()] = [
-                        'label' => $attribute->getStoreLabel(),
+                        'label' => __($attribute->getStoreLabel()),
                         'value' => $value,
                         'code' => $attribute->getAttributeCode(),
                     ];