Skip to content

Commit b9ecb3b

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'remotes/api/MAGETWO-44459-Check-javascript-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
2 parents a58bda7 + 9a9d01c commit b9ecb3b

File tree

214 files changed

+1786
-683
lines changed

Some content is hidden

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

214 files changed

+1786
-683
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,27 @@ Communications,Communications
614614
"Import History","Import History"
615615
Extensions,Extensions
616616
"Web Setup Wizard","Web Setup Wizard"
617+
"VAT number","VAT number"
618+
"Top destinations","Top destinations"
619+
"Store Hours of Operation","Store Hours of Operation"
620+
"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/"
621+
"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/"
622+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
623+
"Use SID on Storefront","Use SID on Storefront"
624+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
625+
"For Windows server only.","For Windows server only."
626+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
627+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
628+
"Minify Html","Minify Html"
629+
"Enabled for Storefront","Enabled for Storefront"
630+
"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."
631+
"Enable Javascript Bundling","Enable Javascript Bundling"
632+
"Minify CSS Files","Minify CSS Files"
633+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
634+
"Average Order","Average Order"
635+
"Last Orders","Last Orders"
636+
"Last Search Terms","Last Search Terms"
637+
"Top Search Terms","Top Search Terms"
638+
"Reload Data","Reload Data"
639+
"Welcome, please sign in","Welcome, please sign in"
640+
"Sign in","Sign in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,3 +620,27 @@ Communications,Communications
620620
"Import History","Import History"
621621
Extensions,Extensions
622622
"Web Setup Wizard","Web Setup Wizard"
623+
"VAT number","VAT number"
624+
"Top destinations","Top destinations"
625+
"Store Hours of Operation","Store Hours of Operation"
626+
"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/"
627+
"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/"
628+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
629+
"Use SID on Storefront","Use SID on Storefront"
630+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
631+
"For Windows server only.","For Windows server only."
632+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
633+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
634+
"Minify Html","Minify Html"
635+
"Enabled for Storefront","Enabled for Storefront"
636+
"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."
637+
"Enable Javascript Bundling","Enable Javascript Bundling"
638+
"Minify CSS Files","Minify CSS Files"
639+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
640+
"Average Order","Average Order"
641+
"Last Orders","Last Orders"
642+
"Last Search Terms","Last Search Terms"
643+
"Top Search Terms","Top Search Terms"
644+
"Reload Data","Reload Data"
645+
"Welcome, please sign in","Welcome, please sign in"
646+
"Sign in","Sign in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,27 @@ Communications,Communications
614614
"Import History","Import History"
615615
Extensions,Extensions
616616
"Web Setup Wizard","Web Setup Wizard"
617+
"VAT number","VAT number"
618+
"Top destinations","Top destinations"
619+
"Store Hours of Operation","Store Hours of Operation"
620+
"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/"
621+
"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/"
622+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
623+
"Use SID on Storefront","Use SID on Storefront"
624+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
625+
"For Windows server only.","For Windows server only."
626+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
627+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
628+
"Minify Html","Minify Html"
629+
"Enabled for Storefront","Enabled for Storefront"
630+
"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."
631+
"Enable Javascript Bundling","Enable Javascript Bundling"
632+
"Minify CSS Files","Minify CSS Files"
633+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
634+
"Average Order","Average Order"
635+
"Last Orders","Last Orders"
636+
"Last Search Terms","Last Search Terms"
637+
"Top Search Terms","Top Search Terms"
638+
"Reload Data","Reload Data"
639+
"Welcome, please sign in","Welcome, please sign in"
640+
"Sign in","Sign in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,27 @@ Communications,Communications
614614
"Import History","Import History"
615615
Extensions,Extensions
616616
"Web Setup Wizard","Web Setup Wizard"
617+
"VAT number","VAT number"
618+
"Top destinations","Top destinations"
619+
"Store Hours of Operation","Store Hours of Operation"
620+
"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/"
621+
"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/"
622+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
623+
"Use SID on Storefront","Use SID on Storefront"
624+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
625+
"For Windows server only.","For Windows server only."
626+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
627+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
628+
"Minify Html","Minify Html"
629+
"Enabled for Storefront","Enabled for Storefront"
630+
"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."
631+
"Enable Javascript Bundling","Enable Javascript Bundling"
632+
"Minify CSS Files","Minify CSS Files"
633+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
634+
"Average Order","Average Order"
635+
"Last Orders","Last Orders"
636+
"Last Search Terms","Last Search Terms"
637+
"Top Search Terms","Top Search Terms"
638+
"Reload Data","Reload Data"
639+
"Welcome, please sign in","Welcome, please sign in"
640+
"Sign in","Sign in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,27 @@ Communications,Communications
614614
"Import History","Import History"
615615
Extensions,Extensions
616616
"Web Setup Wizard","Web Setup Wizard"
617+
"VAT number","VAT number"
618+
"Top destinations","Top destinations"
619+
"Store Hours of Operation","Store Hours of Operation"
620+
"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/"
621+
"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/"
622+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
623+
"Use SID on Storefront","Use SID on Storefront"
624+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
625+
"For Windows server only.","For Windows server only."
626+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
627+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
628+
"Minify Html","Minify Html"
629+
"Enabled for Storefront","Enabled for Storefront"
630+
"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."
631+
"Enable Javascript Bundling","Enable Javascript Bundling"
632+
"Minify CSS Files","Minify CSS Files"
633+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
634+
"Average Order","Average Order"
635+
"Last Orders","Last Orders"
636+
"Last Search Terms","Last Search Terms"
637+
"Top Search Terms","Top Search Terms"
638+
"Reload Data","Reload Data"
639+
"Welcome, please sign in","Welcome, please sign in"
640+
"Sign in","Sign in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,27 @@ Communications,Communications
614614
"Import History","Import History"
615615
Extensions,Extensions
616616
"Web Setup Wizard","Web Setup Wizard"
617+
"VAT number","VAT number"
618+
"Top destinations","Top destinations"
619+
"Store Hours of Operation","Store Hours of Operation"
620+
"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/"
621+
"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/"
622+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
623+
"Use SID on Storefront","Use SID on Storefront"
624+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
625+
"For Windows server only.","For Windows server only."
626+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
627+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
628+
"Minify Html","Minify Html"
629+
"Enabled for Storefront","Enabled for Storefront"
630+
"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."
631+
"Enable Javascript Bundling","Enable Javascript Bundling"
632+
"Minify CSS Files","Minify CSS Files"
633+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
634+
"Average Order","Average Order"
635+
"Last Orders","Last Orders"
636+
"Last Search Terms","Last Search Terms"
637+
"Top Search Terms","Top Search Terms"
638+
"Reload Data","Reload Data"
639+
"Welcome, please sign in","Welcome, please sign in"
640+
"Sign in","Sign in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,27 @@ Communications,Communications
614614
"Import History","Import History"
615615
Extensions,Extensions
616616
"Web Setup Wizard","Web Setup Wizard"
617+
"VAT number","VAT number"
618+
"Top destinations","Top destinations"
619+
"Store Hours of Operation","Store Hours of Operation"
620+
"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/"
621+
"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/"
622+
"Use Secure URLs on Storefront","Use Secure URLs on Storefront"
623+
"Use SID on Storefront","Use SID on Storefront"
624+
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
625+
"For Windows server only.","For Windows server only."
626+
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
627+
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
628+
"Minify Html","Minify Html"
629+
"Enabled for Storefront","Enabled for Storefront"
630+
"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."
631+
"Enable Javascript Bundling","Enable Javascript Bundling"
632+
"Minify CSS Files","Minify CSS Files"
633+
"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache."
634+
"Average Order","Average Order"
635+
"Last Orders","Last Orders"
636+
"Last Search Terms","Last Search Terms"
637+
"Top Search Terms","Top Search Terms"
638+
"Reload Data","Reload Data"
639+
"Welcome, please sign in","Welcome, please sign in"
640+
"Sign in","Sign in"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ Frequency,Frequency
7979
"Are you sure you want to delete the selected backup(s)?","Sind Sie sicher, dass Sie die ausgewählten Sicherungskopie(n) löschen wollen?"
8080
Size(bytes),Size(bytes)
8181
Rollback,Rollback
82+
"Maintenance mode","Maintenance mode"
83+
"This may take a few moments.","This may take a few moments."
84+
"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ Frequency,Frequency
7979
"Are you sure you want to delete the selected backup(s)?","Are you sure you want to delete the selected backup(s)?"
8080
Size(bytes),Size(bytes)
8181
Rollback,Rollback
82+
"Maintenance mode","Maintenance mode"
83+
"This may take a few moments.","This may take a few moments."
84+
"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ Frequency,Frequency
7979
"Are you sure you want to delete the selected backup(s)?","¿Seguro que desea eliminar las copias de seguridad seleccionadas?"
8080
Size(bytes),Size(bytes)
8181
Rollback,Revertir
82+
"Maintenance mode","Maintenance mode"
83+
"This may take a few moments.","This may take a few moments."
84+
"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup."

0 commit comments

Comments
 (0)