From f19b4652a91a6e3f34396329909d22fdbe034194 Mon Sep 17 00:00:00 2001
From: mage2-team <mage2-team@magento.com>
Date: Fri, 11 Jul 2014 11:30:21 -0700
Subject: [PATCH] 2.0.0.0-dev86 * Service layer updates: * Created Category
service and methods * Renamed attribute option service * Implemented an
API method to remove for attribute options * Created TaxClass service and
methods * Created APIs for Tax service * Framework improvements: *
REST/SOAP calls uses default store if store code not provided * Added a
warning about using a not secure protocol for theidentity link URL * Fixed
exception masking and removed unnecessary exceptions from the Webapi
framework * WEEE features parity: * Fixed an issue with Tax calculations
when FPT is enabled * Fixed an issue where FPT was not included in the
subtotal number on invoice pages * Fixed an issue where FPT was not
included in the subtotal number on credit memo pages * Free shipping
calculated with FPT * Fixed an issue where discounts where applied to FPT
* Fixed an issue with rounding is the Tax detailed info * Fixed issues with
bundle product pricing with tier and special prices * Added an integrity test
to verify that dictionary and code are synced * i18n Improvements: *
Improved the wording of the i18n CLI Tools * Removed the helpers which
became unused after i18n Improvements * Fixed bugs: * Fixed an issue where
configurable attributes were not chosen according to the hash tag * Fixed
an issue where the Compare Products functionality did not work correctly *
Fixed an issue where product attribute values were duplicated after import
* Fixed an issue were the scope of an attribute was not considered in catalog
price rule conditions * Fixed an issue where shipping address was not saved
if it was added during checkout * Fixed an issue where there was no POST
request when saving a customer group * Fixed an issue where an attribute
template was not applied after changing it for the first time during product
creation * Fixed an issue where the Sale Report Grid with no results found
contained an unnecessary empty Total section * Fixed an issue where a
notice was added to system.log when a product was added to cart * Fixed
integration test coverage failure * Fixed an issue where a message about
inequality of password and confirmation was displayed in the wrong place *
Fixed an issue with an XSS warning in 'Used for Sorting in Product Listing'
property of Product Attribute * Fixed an issue where an order was not
displayed on frontend if its order status was deleted * Fixed an issue
where tier pricing was not displayed on a grouped product page * Verified
and fixed the content of errors returned from SOAP calls * Fixed an issue
where it was impossible to create a tax rule when using a complex
Customer/Product tax class * Fixed an issue where the Street Address line
count setting was not applied. * Fixed an issue where customers were not
assigned to the correct VAT customer groups during admin order creation *
The unused translateArray method of AbstractHelper was removed * Fixed an
issue where localization did not work for strings containing a single quote
(') * Fixed issues with the translate and the logging transformation tools
* Fixed an issue where it was impossible to create a URL rewrite for a CMS
Page with Temporary (302) or Permanent (301) redirect * GitHub requests: *
[#598] Add Sort Order to Rules * [#580] Set changed status on model to
prevent status overwriting when model gets saved * Unit Tests Coverage: *
Part of the Catalog module covered with the unit tests * Added the following
functional tests: * Applying Several Catalog Price Rules * Attribute Set
Creation * Category Deletion * Customer Group Deletion * Generating
Sitemap * Product Attribute Deletion * Update Admin User * Update Cms
Page * Update Customer Group * Update Downloadable Product * Update
Product Attribute * Update Sales Rule * Update Sitemap
---
CHANGELOG.md | 68 +-
.../Magento/AdminNotification/i18n/de_DE.csv | 75 +-
.../Magento/AdminNotification/i18n/en_US.csv | 71 +-
.../Magento/AdminNotification/i18n/es_ES.csv | 73 +-
.../Magento/AdminNotification/i18n/fr_FR.csv | 73 +-
.../Magento/AdminNotification/i18n/nl_NL.csv | 73 +-
.../Magento/AdminNotification/i18n/pt_BR.csv | 73 +-
.../Magento/AdminNotification/i18n/zh_CN.csv | 81 +-
app/code/Magento/Authorizenet/i18n/de_DE.csv | 187 +-
app/code/Magento/Authorizenet/i18n/en_US.csv | 159 +-
app/code/Magento/Authorizenet/i18n/es_ES.csv | 186 +-
app/code/Magento/Authorizenet/i18n/fr_FR.csv | 187 +-
app/code/Magento/Authorizenet/i18n/nl_NL.csv | 188 +-
app/code/Magento/Authorizenet/i18n/pt_BR.csv | 173 +-
app/code/Magento/Authorizenet/i18n/zh_CN.csv | 181 +-
.../frontend/templates/directpost/form.phtml | 2 +-
.../frontend/templates/directpost/info.phtml | 6 +-
.../view/frontend/templates/info/cc.phtml | 38 +-
.../Magento/Authz/Service/AuthorizationV1.php | 42 +-
.../Service/AuthorizationV1Interface.php | 18 +-
app/code/Magento/Authz/etc/module.xml | 1 -
app/code/Magento/Authz/i18n/de_DE.csv | 5 +
app/code/Magento/Authz/i18n/en_US.csv | 5 +
app/code/Magento/Authz/i18n/es_ES.csv | 5 +
app/code/Magento/Authz/i18n/fr_FR.csv | 5 +
app/code/Magento/Authz/i18n/nl_NL.csv | 5 +
app/code/Magento/Authz/i18n/pt_BR.csv | 5 +
app/code/Magento/Authz/i18n/zh_CN.csv | 5 +
.../Block/Urlrewrite/Cms/Page/Edit/Form.php | 30 +-
.../Backend/Block/Urlrewrite/Selector.php | 2 -
.../Backend/Block/Widget/Grid/ColumnSet.php | 4 +-
.../Controller/Adminhtml/Urlrewrite.php | 299 ++--
.../Magento/Backend/Model/Session/Quote.php | 12 +-
app/code/Magento/Backend/i18n/de_DE.csv | 606 +++++++
app/code/Magento/Backend/i18n/en_US.csv | 606 +++++++
app/code/Magento/Backend/i18n/es_ES.csv | 606 +++++++
app/code/Magento/Backend/i18n/fr_FR.csv | 606 +++++++
app/code/Magento/Backend/i18n/nl_NL.csv | 606 +++++++
app/code/Magento/Backend/i18n/pt_BR.csv | 606 +++++++
app/code/Magento/Backend/i18n/zh_CN.csv | 606 +++++++
.../adminhtml/layout/adminhtml_noroute.xml | 4 +-
.../Backup/Controller/Adminhtml/Index.php | 10 +-
app/code/Magento/Backup/i18n/de_DE.csv | 123 +-
app/code/Magento/Backup/i18n/en_US.csv | 124 +-
app/code/Magento/Backup/i18n/es_ES.csv | 123 +-
app/code/Magento/Backup/i18n/fr_FR.csv | 123 +-
app/code/Magento/Backup/i18n/nl_NL.csv | 123 +-
app/code/Magento/Backup/i18n/pt_BR.csv | 123 +-
app/code/Magento/Backup/i18n/zh_CN.csv | 129 +-
.../Catalog/Product/View/Type/Bundle.php | 21 +-
.../Product/View/Type/Bundle/Option.php | 4 +-
.../Magento/Bundle/Model/Product/Price.php | 21 +-
app/code/Magento/Bundle/i18n/de_DE.csv | 122 +-
app/code/Magento/Bundle/i18n/en_US.csv | 122 +-
app/code/Magento/Bundle/i18n/es_ES.csv | 122 +-
app/code/Magento/Bundle/i18n/fr_FR.csv | 122 +-
app/code/Magento/Bundle/i18n/nl_NL.csv | 122 +-
app/code/Magento/Bundle/i18n/pt_BR.csv | 122 +-
app/code/Magento/Bundle/i18n/zh_CN.csv | 134 +-
.../catalog_product_view_type_bundle.xml | 3 +-
.../catalog/product/view/customize.phtml | 2 +-
.../catalog/product/view/summary.phtml | 14 +-
.../product/view/type/bundle/options.phtml | 1 +
.../view/frontend/web/js/product-summary.js | 8 +-
app/code/Magento/Captcha/README.md | 1 +
app/code/Magento/Captcha/i18n/de_DE.csv | 44 +-
app/code/Magento/Captcha/i18n/en_US.csv | 37 +-
app/code/Magento/Captcha/i18n/es_ES.csv | 43 +-
app/code/Magento/Captcha/i18n/fr_FR.csv | 43 +-
app/code/Magento/Captcha/i18n/nl_NL.csv | 43 +-
app/code/Magento/Captcha/i18n/pt_BR.csv | 43 +-
app/code/Magento/Captcha/i18n/zh_CN.csv | 49 +-
app/code/Magento/Catalog/Helper/Product.php | 8 +-
.../Catalog/Model/Layer/Filter/Attribute.php | 16 +-
.../Model/Product/Type/AbstractType.php | 2 +-
.../V1/Category/Attribute/ReadService.php | 80 +
.../Attribute/ReadServiceInterface.php | 58 +
.../Service/V1/Category/CategoryLoader.php | 60 +
.../Service/V1/Category/MetadataService.php | 96 +
.../V1/Category/MetadataServiceInterface.php | 56 +
.../V1/Category/ProductLinks/ReadService.php | 99 ++
.../ProductLinks/ReadServiceInterface.php} | 10 +-
.../V1/Category/ProductLinks/WriteService.php | 150 ++
.../ProductLinks/WriteServiceInterface.php | 62 +
.../Service/V1/Category/ReadService.php | 96 +
.../V1/Category/ReadServiceInterface.php | 36 +
.../Service/V1/Category/Tree/ReadService.php | 79 +
.../V1/Category/Tree/ReadServiceInterface.php | 43 +
.../Service/V1/Category/WriteService.php | 199 +++
.../V1/Category/WriteServiceInterface.php | 69 +
.../Catalog/Service/V1/Data/Category.php | 149 ++
.../Service/V1/Data/Category/Mapper.php | 77 +
.../Catalog/Service/V1/Data/Category/Tree.php | 153 ++
.../Service/V1/Data/CategoryBuilder.php | 154 ++
.../Catalog/Service/V1/Data/Converter.php | 4 +-
.../Service/V1/Data/Eav/AttributeMetadata.php | 4 +
.../V1/Data/Eav/AttributeMetadataBuilder.php | 2 +-
.../Data/Eav/Category/AttributeMetadata.php | 305 ++++
.../Eav/Category/AttributeMetadataBuilder.php | 282 +++
.../V1/Data/Eav/Category/Info/Converter.php | 60 +
.../V1/Data/Eav/Category/Info/Metadata.php | 181 ++
.../Eav/Category/Info/MetadataBuilder.php | 203 +++
.../Service/V1/Data/Eav/Category/Product.php | 21 +-
.../V1/Data/Eav/Category/ProductBuilder.php | 41 +
.../V1/Data/Eav/Category/ProductConverter.php | 65 +
.../V1/Data/Eav/Category/ProductLink.php | 54 +
.../Data/Eav/Category/ProductLinkBuilder.php | 50 +
.../Service/V1/Data/Eav/Category/Tree.php | 105 ++
.../V1/Data/Eav/Category/TreeBuilder.php | 106 ++
.../Catalog/Service/V1/Data/Product.php | 10 -
.../Data/Product/Attribute/SearchResults.php | 2 +-
.../Service/V1/Data/ProductBuilder.php | 19 +-
.../Catalog/Service/V1/MetadataService.php | 269 +++
...rface.php => MetadataServiceInterface.php} | 50 +-
.../Product/Attribute/Option/ReadService.php | 54 +
.../Attribute/Option/ReadServiceInterface.php | 38 +
.../Attribute/Option/WriteService.php} | 85 +-
.../Option/WriteServiceInterface.php} | 26 +-
.../V1/Product/Attribute/ReadService.php | 141 +-
.../V1/Product/Attribute/WriteService.php | 4 +-
.../V1/Product/AttributeSet/WriteService.php | 6 +-
.../AttributeSet/WriteServiceInterface.php | 1 -
.../Service/V1/Product/MetadataService.php | 97 ++
.../V1/Product/MetadataServiceInterface.php | 54 +
.../Service/V1/ProductMetadataService.php | 184 --
.../Catalog/Service/V1/ProductService.php | 20 +-
app/code/Magento/Catalog/etc/di.xml | 25 +-
app/code/Magento/Catalog/etc/webapi.xml | 112 +-
app/code/Magento/Catalog/etc/widget.xml | 4 +-
app/code/Magento/Catalog/i18n/de_DE.csv | 1386 +++++++--------
app/code/Magento/Catalog/i18n/en_US.csv | 1376 +++++++--------
app/code/Magento/Catalog/i18n/es_ES.csv | 1382 +++++++--------
app/code/Magento/Catalog/i18n/fr_FR.csv | 1380 +++++++--------
app/code/Magento/Catalog/i18n/nl_NL.csv | 1382 +++++++--------
app/code/Magento/Catalog/i18n/pt_BR.csv | 1382 +++++++--------
app/code/Magento/Catalog/i18n/zh_CN.csv | 1436 +++++++--------
.../templates/catalog/product/edit.phtml | 4 +-
.../templates/product/price/tier_prices.phtml | 2 +-
.../frontend/layout/catalog_category_view.xml | 13 +-
.../catalog_category_view_type_default.xml | 2 +-
.../frontend/layout/catalog_product_view.xml | 4 +-
.../Catalog/view/frontend/layout/default.xml | 2 +-
.../frontend/templates/category/cms.phtml | 36 +
.../templates/category/description.phtml | 36 +
.../frontend/templates/category/image.phtml | 41 +
.../templates/category/products.phtml} | 24 +-
.../view/frontend/templates/msrp/popup.phtml | 26 +-
.../templates/product/compare/list.phtml | 4 +-
.../templates/product/compare/sidebar.phtml | 2 +-
.../product/image_with_borders.phtml | 27 +-
.../frontend/templates/product/list.phtml | 28 +-
.../templates/product/list/items.phtml | 35 +-
.../templates/product/list/toolbar.phtml | 74 +-
.../product/list/toolbar/amount.phtml | 46 +
.../product/list/toolbar/limiter.phtml | 44 +
.../product/list/toolbar/sorter.phtml | 55 +
.../product/list/toolbar/viewmode.phtml | 57 +
.../frontend/templates/product/listing.phtml | 4 +-
.../templates/product/view/addto.phtml | 2 +-
.../templates/product/view/addtocart.phtml | 56 +-
.../templates/product/view/form.phtml | 2 +-
.../templates/product/view/mailto.phtml | 6 +-
.../product/view/options/wrapper.phtml | 2 +-
.../product/view/options/wrapper/bottom.phtml | 2 +-
.../product/widget/new/content/new_grid.phtml | 2 +-
.../product/widget/new/content/new_list.phtml | 2 +-
.../Model/Import/Product.php | 2 +-
.../CatalogImportExport/i18n/de_DE.csv | 16 +
.../CatalogImportExport/i18n/en_US.csv | 16 +
.../CatalogImportExport/i18n/es_ES.csv | 16 +
.../CatalogImportExport/i18n/fr_FR.csv | 16 +
.../CatalogImportExport/i18n/nl_NL.csv | 16 +
.../CatalogImportExport/i18n/pt_BR.csv | 16 +
.../CatalogImportExport/i18n/zh_CN.csv | 16 +
.../Magento/CatalogInventory/i18n/de_DE.csv | 104 +-
.../Magento/CatalogInventory/i18n/en_US.csv | 100 +-
.../Magento/CatalogInventory/i18n/es_ES.csv | 102 +-
.../Magento/CatalogInventory/i18n/fr_FR.csv | 102 +-
.../Magento/CatalogInventory/i18n/nl_NL.csv | 104 +-
.../Magento/CatalogInventory/i18n/pt_BR.csv | 104 +-
.../Magento/CatalogInventory/i18n/zh_CN.csv | 110 +-
.../CatalogRule/Model/Resource/Rule.php | 5 +-
app/code/Magento/CatalogRule/Model/Rule.php | 24 +-
.../Model/Rule/Condition/Product.php | 101 ++
app/code/Magento/CatalogRule/i18n/de_DE.csv | 122 +-
app/code/Magento/CatalogRule/i18n/en_US.csv | 120 +-
app/code/Magento/CatalogRule/i18n/es_ES.csv | 120 +-
app/code/Magento/CatalogRule/i18n/fr_FR.csv | 121 +-
app/code/Magento/CatalogRule/i18n/nl_NL.csv | 120 +-
app/code/Magento/CatalogRule/i18n/pt_BR.csv | 120 +-
app/code/Magento/CatalogRule/i18n/zh_CN.csv | 134 +-
app/code/Magento/CatalogSearch/i18n/de_DE.csv | 91 +-
app/code/Magento/CatalogSearch/i18n/en_US.csv | 90 +-
app/code/Magento/CatalogSearch/i18n/es_ES.csv | 89 +-
app/code/Magento/CatalogSearch/i18n/fr_FR.csv | 89 +-
app/code/Magento/CatalogSearch/i18n/nl_NL.csv | 89 +-
app/code/Magento/CatalogSearch/i18n/pt_BR.csv | 89 +-
app/code/Magento/CatalogSearch/i18n/zh_CN.csv | 101 +-
.../layout/catalogsearch_advanced_result.xml | 5 +
.../layout/catalogsearch_result_index.xml | 5 +
.../frontend/templates/advanced/form.phtml | 4 +-
.../view/frontend/templates/term.phtml | 2 +-
app/code/Magento/Centinel/i18n/de_DE.csv | 49 +-
app/code/Magento/Centinel/i18n/en_US.csv | 49 +-
app/code/Magento/Centinel/i18n/es_ES.csv | 49 +-
app/code/Magento/Centinel/i18n/fr_FR.csv | 49 +-
app/code/Magento/Centinel/i18n/nl_NL.csv | 49 +-
app/code/Magento/Centinel/i18n/pt_BR.csv | 49 +-
app/code/Magento/Centinel/i18n/zh_CN.csv | 65 +-
.../Magento/Checkout/Model/Type/Onepage.php | 47 +-
app/code/Magento/Checkout/i18n/de_DE.csv | 480 ++---
app/code/Magento/Checkout/i18n/en_US.csv | 478 ++---
app/code/Magento/Checkout/i18n/es_ES.csv | 478 ++---
app/code/Magento/Checkout/i18n/fr_FR.csv | 478 ++---
app/code/Magento/Checkout/i18n/nl_NL.csv | 478 ++---
app/code/Magento/Checkout/i18n/pt_BR.csv | 478 ++---
app/code/Magento/Checkout/i18n/zh_CN.csv | 510 ++----
.../frontend/layout/checkout_cart_index.xml | 8 +-
.../layout/checkout_onepage_index.xml | 10 +-
.../layout/checkout_onepage_success.xml | 3 +-
.../view/frontend/templates/button.phtml | 30 +
.../view/frontend/templates/cart/coupon.phtml | 2 +-
.../view/frontend/templates/cart/form.phtml | 4 +-
.../cart/item/configure/updatecart.phtml | 36 +-
.../templates/cart/item/default.phtml | 22 +-
.../frontend/templates/cart/minicart.phtml | 4 +-
.../frontend/templates/cart/shipping.phtml | 8 +-
.../view/frontend/templates/cart/totals.phtml | 2 +-
.../view/frontend/templates/onepage.phtml | 6 +-
.../frontend/templates/onepage/billing.phtml | 2 +-
.../frontend/templates/onepage/login.phtml | 6 +-
.../frontend/templates/onepage/payment.phtml | 2 +-
.../templates/onepage/payment/methods.phtml | 8 +-
.../frontend/templates/onepage/progress.phtml | 42 +-
.../templates/onepage/review/info.phtml | 4 +-
.../templates/onepage/review/item.phtml | 26 +-
.../templates/onepage/shipping_method.phtml | 4 +-
.../onepage/shipping_method/available.phtml | 6 +-
.../view/frontend/templates/success.phtml | 19 +-
.../Magento/CheckoutAgreements/i18n/de_DE.csv | 32 +
.../Magento/CheckoutAgreements/i18n/en_US.csv | 32 +
.../Magento/CheckoutAgreements/i18n/es_ES.csv | 32 +
.../Magento/CheckoutAgreements/i18n/fr_FR.csv | 32 +
.../Magento/CheckoutAgreements/i18n/nl_NL.csv | 32 +
.../Magento/CheckoutAgreements/i18n/pt_BR.csv | 32 +
.../Magento/CheckoutAgreements/i18n/zh_CN.csv | 32 +
.../Magento/Cms/Controller/Adminhtml/Page.php | 42 +-
app/code/Magento/Cms/Model/Page.php | 7 +-
app/code/Magento/Cms/Model/Wysiwyg/Config.php | 38 +-
app/code/Magento/Cms/README.md | 1 +
.../data/cms_setup/data-install-1.6.0.0.php | 37 -
app/code/Magento/Cms/i18n/de_DE.csv | 224 ++-
app/code/Magento/Cms/i18n/en_US.csv | 214 ++-
app/code/Magento/Cms/i18n/es_ES.csv | 218 ++-
app/code/Magento/Cms/i18n/fr_FR.csv | 218 ++-
app/code/Magento/Cms/i18n/nl_NL.csv | 218 ++-
app/code/Magento/Cms/i18n/pt_BR.csv | 218 ++-
app/code/Magento/Cms/i18n/zh_CN.csv | 236 ++-
.../Block/Product/View/Type/Configurable.php | 3 +-
.../ConfigurableProduct/Helper/Data.php | 1 +
.../ConfigurableProduct/i18n/de_DE.csv | 65 +-
.../ConfigurableProduct/i18n/en_US.csv | 66 +-
.../ConfigurableProduct/i18n/es_ES.csv | 64 +-
.../ConfigurableProduct/i18n/fr_FR.csv | 65 +-
.../ConfigurableProduct/i18n/nl_NL.csv | 65 +-
.../ConfigurableProduct/i18n/pt_BR.csv | 65 +-
.../ConfigurableProduct/i18n/zh_CN.csv | 71 +-
.../view/frontend/web/js/configurable.js | 22 +-
app/code/Magento/Connect/i18n/de_DE.csv | 106 +-
app/code/Magento/Connect/i18n/en_US.csv | 106 +-
app/code/Magento/Connect/i18n/es_ES.csv | 106 +-
app/code/Magento/Connect/i18n/fr_FR.csv | 106 +-
app/code/Magento/Connect/i18n/nl_NL.csv | 108 +-
app/code/Magento/Connect/i18n/pt_BR.csv | 106 +-
app/code/Magento/Connect/i18n/zh_CN.csv | 116 +-
app/code/Magento/Contact/i18n/de_DE.csv | 33 +-
app/code/Magento/Contact/i18n/en_US.csv | 25 +-
app/code/Magento/Contact/i18n/es_ES.csv | 31 +-
app/code/Magento/Contact/i18n/fr_FR.csv | 29 +-
app/code/Magento/Contact/i18n/nl_NL.csv | 31 +-
app/code/Magento/Contact/i18n/pt_BR.csv | 31 +-
app/code/Magento/Contact/i18n/zh_CN.csv | 35 +-
.../view/frontend/templates/form.phtml | 2 +-
app/code/Magento/Core/Helper/Data.php | 7 -
app/code/Magento/Core/i18n/de_DE.csv | 408 +----
app/code/Magento/Core/i18n/en_US.csv | 407 +----
app/code/Magento/Core/i18n/es_ES.csv | 406 +----
app/code/Magento/Core/i18n/fr_FR.csv | 406 +----
app/code/Magento/Core/i18n/nl_NL.csv | 408 +----
app/code/Magento/Core/i18n/pt_BR.csv | 408 +----
app/code/Magento/Core/i18n/zh_CN.csv | 416 +----
app/code/Magento/Cron/Model/Observer.php | 6 +-
app/code/Magento/Cron/Model/Schedule.php | 8 +-
app/code/Magento/Cron/i18n/de_DE.csv | 39 +-
app/code/Magento/Cron/i18n/en_US.csv | 29 +-
app/code/Magento/Cron/i18n/es_ES.csv | 39 +-
app/code/Magento/Cron/i18n/fr_FR.csv | 39 +-
app/code/Magento/Cron/i18n/nl_NL.csv | 39 +-
app/code/Magento/Cron/i18n/pt_BR.csv | 39 +-
app/code/Magento/Cron/i18n/zh_CN.csv | 39 +-
.../Magento/CurrencySymbol/i18n/de_DE.csv | 24 +-
.../Magento/CurrencySymbol/i18n/en_US.csv | 24 +-
.../Magento/CurrencySymbol/i18n/es_ES.csv | 24 +-
.../Magento/CurrencySymbol/i18n/fr_FR.csv | 24 +-
.../Magento/CurrencySymbol/i18n/nl_NL.csv | 24 +-
.../Magento/CurrencySymbol/i18n/pt_BR.csv | 24 +-
.../Magento/CurrencySymbol/i18n/zh_CN.csv | 30 +-
.../Customer/Block/Account/RegisterLink.php | 4 +-
.../Block/Adminhtml/Group/Edit/Form.php | 1 +
.../Magento/Customer/Controller/Account.php | 14 +-
app/code/Magento/Customer/Helper/Address.php | 2 +-
.../Customer/Model/Address/Converter.php | 12 +-
.../Service/V1/CustomerAccountService.php | 4 +-
app/code/Magento/Customer/i18n/de_DE.csv | 857 +++++----
app/code/Magento/Customer/i18n/en_US.csv | 843 +++++----
app/code/Magento/Customer/i18n/es_ES.csv | 847 +++++----
app/code/Magento/Customer/i18n/fr_FR.csv | 847 +++++----
app/code/Magento/Customer/i18n/nl_NL.csv | 851 +++++----
app/code/Magento/Customer/i18n/pt_BR.csv | 847 +++++----
app/code/Magento/Customer/i18n/zh_CN.csv | 891 +++++-----
.../view/frontend/layout/customer_account.xml | 3 +-
.../account/link/authorization.phtml | 2 +-
.../templates/account/link/back.phtml | 2 +-
.../frontend/templates/address/book.phtml | 2 +-
.../frontend/templates/address/edit.phtml | 2 +-
.../templates/form/confirmation.phtml | 2 +-
.../view/frontend/templates/form/edit.phtml | 2 +-
.../templates/form/forgotpassword.phtml | 2 +-
.../view/frontend/templates/form/login.phtml | 2 +-
.../frontend/templates/form/newsletter.phtml | 2 +-
.../frontend/templates/form/register.phtml | 2 +-
.../form/resetforgottenpassword.phtml | 2 +-
.../view/frontend/templates/newcustomer.phtml | 2 +-
.../CustomerImportExport/i18n/de_DE.csv | 17 +
.../CustomerImportExport/i18n/en_US.csv | 17 +
.../CustomerImportExport/i18n/es_ES.csv | 17 +
.../CustomerImportExport/i18n/fr_FR.csv | 17 +
.../CustomerImportExport/i18n/nl_NL.csv | 17 +
.../CustomerImportExport/i18n/pt_BR.csv | 17 +
.../CustomerImportExport/i18n/zh_CN.csv | 17 +
app/code/Magento/DesignEditor/README.md | 1 +
app/code/Magento/DesignEditor/etc/di.xml | 6 +
app/code/Magento/DesignEditor/i18n/de_DE.csv | 148 ++
app/code/Magento/DesignEditor/i18n/en_US.csv | 149 ++
app/code/Magento/DesignEditor/i18n/es_ES.csv | 148 ++
app/code/Magento/DesignEditor/i18n/fr_FR.csv | 148 ++
app/code/Magento/DesignEditor/i18n/nl_NL.csv | 148 ++
app/code/Magento/DesignEditor/i18n/pt_BR.csv | 148 ++
app/code/Magento/DesignEditor/i18n/zh_CN.csv | 148 ++
app/code/Magento/Dhl/i18n/de_DE.csv | 79 +
app/code/Magento/Dhl/i18n/en_US.csv | 79 +
app/code/Magento/Dhl/i18n/es_ES.csv | 79 +
app/code/Magento/Dhl/i18n/fr_FR.csv | 79 +
app/code/Magento/Dhl/i18n/nl_NL.csv | 79 +
app/code/Magento/Dhl/i18n/pt_BR.csv | 79 +
app/code/Magento/Dhl/i18n/zh_CN.csv | 79 +
app/code/Magento/Directory/i18n/de_DE.csv | 90 +-
app/code/Magento/Directory/i18n/en_US.csv | 75 +-
app/code/Magento/Directory/i18n/es_ES.csv | 86 +-
app/code/Magento/Directory/i18n/fr_FR.csv | 86 +-
app/code/Magento/Directory/i18n/nl_NL.csv | 86 +-
app/code/Magento/Directory/i18n/pt_BR.csv | 86 +-
app/code/Magento/Directory/i18n/zh_CN.csv | 88 +-
app/code/Magento/Downloadable/i18n/de_DE.csv | 161 +-
app/code/Magento/Downloadable/i18n/en_US.csv | 161 +-
app/code/Magento/Downloadable/i18n/es_ES.csv | 161 +-
app/code/Magento/Downloadable/i18n/fr_FR.csv | 161 +-
app/code/Magento/Downloadable/i18n/nl_NL.csv | 161 +-
app/code/Magento/Downloadable/i18n/pt_BR.csv | 161 +-
app/code/Magento/Downloadable/i18n/zh_CN.csv | 177 +-
.../templates/catalog/product/type.phtml | 1 -
.../templates/customer/products/list.phtml | 2 +-
app/code/Magento/Eav/i18n/de_DE.csv | 220 ++-
app/code/Magento/Eav/i18n/en_US.csv | 218 ++-
app/code/Magento/Eav/i18n/es_ES.csv | 218 ++-
app/code/Magento/Eav/i18n/fr_FR.csv | 218 ++-
app/code/Magento/Eav/i18n/nl_NL.csv | 220 ++-
app/code/Magento/Eav/i18n/pt_BR.csv | 218 ++-
app/code/Magento/Eav/i18n/zh_CN.csv | 232 ++-
app/code/Magento/Email/i18n/de_DE.csv | 74 +
app/code/Magento/Email/i18n/en_US.csv | 74 +
app/code/Magento/Email/i18n/es_ES.csv | 74 +
app/code/Magento/Email/i18n/fr_FR.csv | 74 +
app/code/Magento/Email/i18n/nl_NL.csv | 74 +
app/code/Magento/Email/i18n/pt_BR.csv | 74 +
app/code/Magento/Email/i18n/zh_CN.csv | 74 +
app/code/Magento/Fedex/i18n/de_DE.csv | 72 +
app/code/Magento/Fedex/i18n/en_US.csv | 72 +
app/code/Magento/Fedex/i18n/es_ES.csv | 72 +
app/code/Magento/Fedex/i18n/fr_FR.csv | 72 +
app/code/Magento/Fedex/i18n/nl_NL.csv | 72 +
app/code/Magento/Fedex/i18n/pt_BR.csv | 72 +
app/code/Magento/Fedex/i18n/zh_CN.csv | 72 +
app/code/Magento/GiftMessage/i18n/de_DE.csv | 50 +-
app/code/Magento/GiftMessage/i18n/en_US.csv | 50 +-
app/code/Magento/GiftMessage/i18n/es_ES.csv | 50 +-
app/code/Magento/GiftMessage/i18n/fr_FR.csv | 50 +-
app/code/Magento/GiftMessage/i18n/nl_NL.csv | 50 +-
app/code/Magento/GiftMessage/i18n/pt_BR.csv | 50 +-
app/code/Magento/GiftMessage/i18n/zh_CN.csv | 60 +-
.../view/frontend/templates/inline.phtml | 46 +-
app/code/Magento/GoogleAdwords/i18n/de_DE.csv | 13 +
app/code/Magento/GoogleAdwords/i18n/en_US.csv | 13 +
app/code/Magento/GoogleAdwords/i18n/es_ES.csv | 13 +
app/code/Magento/GoogleAdwords/i18n/fr_FR.csv | 13 +
app/code/Magento/GoogleAdwords/i18n/nl_NL.csv | 13 +
app/code/Magento/GoogleAdwords/i18n/pt_BR.csv | 13 +
app/code/Magento/GoogleAdwords/i18n/zh_CN.csv | 13 +
.../Magento/GoogleAnalytics/i18n/de_DE.csv | 6 +-
.../Magento/GoogleAnalytics/i18n/en_US.csv | 2 +-
.../Magento/GoogleAnalytics/i18n/es_ES.csv | 2 +-
.../Magento/GoogleAnalytics/i18n/fr_FR.csv | 2 +-
.../Magento/GoogleAnalytics/i18n/nl_NL.csv | 2 +-
.../Magento/GoogleAnalytics/i18n/pt_BR.csv | 2 +-
.../Magento/GoogleAnalytics/i18n/zh_CN.csv | 4 +-
.../Magento/GoogleOptimizer/i18n/de_DE.csv | 38 +-
.../Magento/GoogleOptimizer/i18n/en_US.csv | 38 +-
.../Magento/GoogleOptimizer/i18n/es_ES.csv | 38 +-
.../Magento/GoogleOptimizer/i18n/fr_FR.csv | 38 +-
.../Magento/GoogleOptimizer/i18n/nl_NL.csv | 38 +-
.../Magento/GoogleOptimizer/i18n/pt_BR.csv | 38 +-
.../Magento/GoogleOptimizer/i18n/zh_CN.csv | 40 +-
.../Magento/GoogleShopping/Helper/Data.php | 2 +-
.../GoogleShopping/Model/Attribute/Link.php | 8 +-
.../Magento/GoogleShopping/i18n/de_DE.csv | 157 ++
.../Magento/GoogleShopping/i18n/en_US.csv | 269 +--
.../Magento/GoogleShopping/i18n/es_ES.csv | 157 ++
.../Magento/GoogleShopping/i18n/fr_FR.csv | 157 ++
.../Magento/GoogleShopping/i18n/nl_NL.csv | 157 ++
.../Magento/GoogleShopping/i18n/pt_BR.csv | 157 ++
.../Magento/GoogleShopping/i18n/zh_CN.csv | 157 ++
.../Magento/GroupedProduct/i18n/de_DE.csv | 29 +-
.../Magento/GroupedProduct/i18n/en_US.csv | 27 +-
.../Magento/GroupedProduct/i18n/es_ES.csv | 28 +-
.../Magento/GroupedProduct/i18n/fr_FR.csv | 29 +-
.../Magento/GroupedProduct/i18n/nl_NL.csv | 28 +-
.../Magento/GroupedProduct/i18n/pt_BR.csv | 28 +-
.../Magento/GroupedProduct/i18n/zh_CN.csv | 29 +-
.../templates/product/price/final_price.phtml | 2 +-
.../catalog_product_view_type_grouped.xml | 3 +
.../templates/product/view/type/default.phtml | 40 +
.../templates/product/view/type/grouped.phtml | 50 +-
app/code/Magento/ImportExport/i18n/de_DE.csv | 133 +-
app/code/Magento/ImportExport/i18n/en_US.csv | 131 +-
app/code/Magento/ImportExport/i18n/es_ES.csv | 131 +-
app/code/Magento/ImportExport/i18n/fr_FR.csv | 131 +-
app/code/Magento/ImportExport/i18n/nl_NL.csv | 131 +-
app/code/Magento/ImportExport/i18n/pt_BR.csv | 131 +-
app/code/Magento/ImportExport/i18n/zh_CN.csv | 147 +-
app/code/Magento/Index/i18n/de_DE.csv | 75 +-
app/code/Magento/Index/i18n/en_US.csv | 75 +-
app/code/Magento/Index/i18n/es_ES.csv | 75 +-
app/code/Magento/Index/i18n/fr_FR.csv | 75 +-
app/code/Magento/Index/i18n/nl_NL.csv | 75 +-
app/code/Magento/Index/i18n/pt_BR.csv | 75 +-
app/code/Magento/Index/i18n/zh_CN.csv | 87 +-
app/code/Magento/Indexer/i18n/de_DE.csv | 19 +
app/code/Magento/Indexer/i18n/en_US.csv | 19 +
app/code/Magento/Indexer/i18n/es_ES.csv | 19 +
app/code/Magento/Indexer/i18n/fr_FR.csv | 19 +
app/code/Magento/Indexer/i18n/nl_NL.csv | 19 +
app/code/Magento/Indexer/i18n/pt_BR.csv | 19 +
app/code/Magento/Indexer/i18n/zh_CN.csv | 19 +
app/code/Magento/Install/i18n/de_DE.csv | 213 ++-
app/code/Magento/Install/i18n/en_US.csv | 208 ++-
app/code/Magento/Install/i18n/es_ES.csv | 207 ++-
app/code/Magento/Install/i18n/fr_FR.csv | 207 ++-
app/code/Magento/Install/i18n/nl_NL.csv | 207 ++-
app/code/Magento/Install/i18n/pt_BR.csv | 207 ++-
app/code/Magento/Install/i18n/zh_CN.csv | 239 ++-
.../Widget/Grid/Column/Renderer/Name.php | 14 +-
.../Controller/Adminhtml/Integration.php | 4 +-
.../Model/Resource/Integration/Collection.php | 9 +-
app/code/Magento/Integration/i18n/de_DE.csv | 72 +
app/code/Magento/Integration/i18n/en_US.csv | 72 +
app/code/Magento/Integration/i18n/es_ES.csv | 72 +
app/code/Magento/Integration/i18n/fr_FR.csv | 72 +
app/code/Magento/Integration/i18n/nl_NL.csv | 72 +
app/code/Magento/Integration/i18n/pt_BR.csv | 72 +
app/code/Magento/Integration/i18n/zh_CN.csv | 72 +
.../Magento/LayeredNavigation/i18n/de_DE.csv | 24 +
.../Magento/LayeredNavigation/i18n/en_US.csv | 24 +
.../Magento/LayeredNavigation/i18n/es_ES.csv | 24 +
.../Magento/LayeredNavigation/i18n/fr_FR.csv | 24 +
.../Magento/LayeredNavigation/i18n/nl_NL.csv | 24 +
.../Magento/LayeredNavigation/i18n/pt_BR.csv | 24 +
.../Magento/LayeredNavigation/i18n/zh_CN.csv | 28 +-
.../catalog_category_view_type_layered.xml | 2 +-
.../layout/catalogsearch_result_index.xml | 2 +-
.../view/frontend/layout/page_empty.xml | 28 +
.../view/frontend/layout/page_one_column.xml | 28 +
.../frontend/layout/page_three_columns.xml | 28 +
.../frontend/layout/page_two_columns_left.xml | 28 +
.../layout/page_two_columns_right.xml | 28 +
.../view/frontend/templates/layer/state.phtml | 8 +-
.../view/frontend/templates/layer/view.phtml | 17 +-
app/code/Magento/Log/i18n/de_DE.csv | 7 +-
app/code/Magento/Log/i18n/en_US.csv | 7 +-
app/code/Magento/Log/i18n/es_ES.csv | 7 +-
app/code/Magento/Log/i18n/fr_FR.csv | 7 +-
app/code/Magento/Log/i18n/nl_NL.csv | 7 +-
app/code/Magento/Log/i18n/pt_BR.csv | 7 +-
app/code/Magento/Log/i18n/zh_CN.csv | 17 +-
app/code/Magento/Multishipping/i18n/de_DE.csv | 79 +
app/code/Magento/Multishipping/i18n/en_US.csv | 79 +
app/code/Magento/Multishipping/i18n/es_ES.csv | 79 +
app/code/Magento/Multishipping/i18n/fr_FR.csv | 79 +
app/code/Magento/Multishipping/i18n/nl_NL.csv | 79 +
app/code/Magento/Multishipping/i18n/pt_BR.csv | 79 +
app/code/Magento/Multishipping/i18n/zh_CN.csv | 79 +
.../layout/multishipping_checkout.xml | 2 +-
.../templates/checkout/address/select.phtml | 2 +-
.../templates/checkout/addresses.phtml | 2 +-
.../frontend/templates/checkout/billing.phtml | 2 +-
.../templates/checkout/overview.phtml | 2 +-
.../templates/checkout/shipping.phtml | 2 +-
.../frontend/templates/checkout/success.phtml | 10 +-
app/code/Magento/Newsletter/i18n/de_DE.csv | 252 +--
app/code/Magento/Newsletter/i18n/en_US.csv | 247 +--
app/code/Magento/Newsletter/i18n/es_ES.csv | 252 +--
app/code/Magento/Newsletter/i18n/fr_FR.csv | 252 +--
app/code/Magento/Newsletter/i18n/nl_NL.csv | 252 +--
app/code/Magento/Newsletter/i18n/pt_BR.csv | 252 +--
app/code/Magento/Newsletter/i18n/zh_CN.csv | 274 +--
.../Magento/OfflinePayments/i18n/de_DE.csv | 24 +
.../Magento/OfflinePayments/i18n/en_US.csv | 24 +
.../Magento/OfflinePayments/i18n/es_ES.csv | 24 +
.../Magento/OfflinePayments/i18n/fr_FR.csv | 24 +
.../Magento/OfflinePayments/i18n/nl_NL.csv | 24 +
.../Magento/OfflinePayments/i18n/pt_BR.csv | 24 +
.../Magento/OfflinePayments/i18n/zh_CN.csv | 24 +
.../Magento/OfflineShipping/i18n/de_DE.csv | 49 +
.../Magento/OfflineShipping/i18n/en_US.csv | 49 +
.../Magento/OfflineShipping/i18n/es_ES.csv | 49 +
.../Magento/OfflineShipping/i18n/fr_FR.csv | 49 +
.../Magento/OfflineShipping/i18n/nl_NL.csv | 49 +
.../Magento/OfflineShipping/i18n/pt_BR.csv | 49 +
.../Magento/OfflineShipping/i18n/zh_CN.csv | 49 +
app/code/Magento/Ogone/Helper/Data.php | 32 -
app/code/Magento/Ogone/i18n/de_DE.csv | 172 +-
app/code/Magento/Ogone/i18n/en_US.csv | 166 +-
app/code/Magento/Ogone/i18n/es_ES.csv | 172 +-
app/code/Magento/Ogone/i18n/fr_FR.csv | 172 +-
app/code/Magento/Ogone/i18n/nl_NL.csv | 172 +-
app/code/Magento/Ogone/i18n/pt_BR.csv | 172 +-
app/code/Magento/Ogone/i18n/zh_CN.csv | 182 +-
.../Ogone/view/frontend/templates/form.phtml | 6 +-
app/code/Magento/PageCache/i18n/de_DE.csv | 30 +-
app/code/Magento/PageCache/i18n/en_US.csv | 30 +-
app/code/Magento/PageCache/i18n/es_ES.csv | 30 +-
app/code/Magento/PageCache/i18n/fr_FR.csv | 30 +-
app/code/Magento/PageCache/i18n/nl_NL.csv | 30 +-
app/code/Magento/PageCache/i18n/pt_BR.csv | 30 +-
app/code/Magento/PageCache/i18n/zh_CN.csv | 30 +-
.../PayPalRecurringPayment/i18n/de_DE.csv | 7 +
.../PayPalRecurringPayment/i18n/en_US.csv | 7 +
.../PayPalRecurringPayment/i18n/es_ES.csv | 7 +
.../PayPalRecurringPayment/i18n/fr_FR.csv | 7 +
.../PayPalRecurringPayment/i18n/nl_NL.csv | 7 +
.../PayPalRecurringPayment/i18n/pt_BR.csv | 7 +
.../PayPalRecurringPayment/i18n/zh_CN.csv | 7 +
app/code/Magento/Payment/i18n/de_DE.csv | 163 +-
app/code/Magento/Payment/i18n/en_US.csv | 168 +-
app/code/Magento/Payment/i18n/es_ES.csv | 161 +-
app/code/Magento/Payment/i18n/fr_FR.csv | 161 +-
app/code/Magento/Payment/i18n/nl_NL.csv | 163 +-
app/code/Magento/Payment/i18n/pt_BR.csv | 161 +-
app/code/Magento/Payment/i18n/zh_CN.csv | 169 +-
.../view/frontend/templates/form/cc.phtml | 2 +-
app/code/Magento/Paypal/i18n/de_DE.csv | 1149 +++++++-----
app/code/Magento/Paypal/i18n/en_US.csv | 1138 +++++++-----
app/code/Magento/Paypal/i18n/es_ES.csv | 1149 +++++++-----
app/code/Magento/Paypal/i18n/fr_FR.csv | 1149 +++++++-----
app/code/Magento/Paypal/i18n/nl_NL.csv | 1146 +++++++-----
app/code/Magento/Paypal/i18n/pt_BR.csv | 1148 +++++++-----
app/code/Magento/Paypal/i18n/zh_CN.csv | 1178 +++++++------
.../frontend/layout/catalog_category_view.xml | 2 +-
.../view/frontend/layout/cms_index_index.xml | 2 +-
.../templates/billing/agreement/view.phtml | 2 +-
.../templates/billing/agreements.phtml | 4 +-
.../frontend/templates/express/review.phtml | 2 +-
app/code/Magento/Persistent/i18n/de_DE.csv | 78 +-
app/code/Magento/Persistent/i18n/en_US.csv | 74 +-
app/code/Magento/Persistent/i18n/es_ES.csv | 78 +-
app/code/Magento/Persistent/i18n/fr_FR.csv | 78 +-
app/code/Magento/Persistent/i18n/nl_NL.csv | 78 +-
app/code/Magento/Persistent/i18n/pt_BR.csv | 78 +-
app/code/Magento/Persistent/i18n/zh_CN.csv | 80 +-
app/code/Magento/ProductAlert/i18n/de_DE.csv | 58 +-
app/code/Magento/ProductAlert/i18n/en_US.csv | 52 +-
app/code/Magento/ProductAlert/i18n/es_ES.csv | 58 +-
app/code/Magento/ProductAlert/i18n/fr_FR.csv | 58 +-
app/code/Magento/ProductAlert/i18n/nl_NL.csv | 58 +-
app/code/Magento/ProductAlert/i18n/pt_BR.csv | 58 +-
app/code/Magento/ProductAlert/i18n/zh_CN.csv | 66 +-
.../Magento/RecurringPayment/i18n/de_DE.csv | 142 ++
.../Magento/RecurringPayment/i18n/en_US.csv | 142 ++
.../Magento/RecurringPayment/i18n/es_ES.csv | 142 ++
.../Magento/RecurringPayment/i18n/fr_FR.csv | 142 ++
.../Magento/RecurringPayment/i18n/nl_NL.csv | 142 ++
.../Magento/RecurringPayment/i18n/pt_BR.csv | 142 ++
.../Magento/RecurringPayment/i18n/zh_CN.csv | 142 ++
.../templates/recurring/payments.phtml | 2 +-
.../Block/Adminhtml/Grid/AbstractGrid.php | 1 +
app/code/Magento/Reports/etc/widget.xml | 8 +-
app/code/Magento/Reports/i18n/de_DE.csv | 368 ++--
app/code/Magento/Reports/i18n/en_US.csv | 365 ++--
app/code/Magento/Reports/i18n/es_ES.csv | 366 ++--
app/code/Magento/Reports/i18n/fr_FR.csv | 366 ++--
app/code/Magento/Reports/i18n/nl_NL.csv | 366 ++--
app/code/Magento/Reports/i18n/pt_BR.csv | 366 ++--
app/code/Magento/Reports/i18n/zh_CN.csv | 390 +++--
...ory_view_type_default_without_children.xml | 4 -
...ory_view_type_layered_without_children.xml | 4 -
.../Reports/view/frontend/layout/default.xml | 6 +-
.../product/widget/viewed/item.phtml | 2 +-
.../compared/content/compared_grid.phtml | 2 +-
.../compared/content/compared_list.phtml | 2 +-
.../widget/viewed/content/viewed_grid.phtml | 2 +-
.../widget/viewed/content/viewed_list.phtml | 2 +-
app/code/Magento/Review/i18n/de_DE.csv | 242 ++-
app/code/Magento/Review/i18n/en_US.csv | 239 ++-
app/code/Magento/Review/i18n/es_ES.csv | 238 ++-
app/code/Magento/Review/i18n/fr_FR.csv | 238 ++-
app/code/Magento/Review/i18n/nl_NL.csv | 240 ++-
app/code/Magento/Review/i18n/pt_BR.csv | 238 ++-
app/code/Magento/Review/i18n/zh_CN.csv | 262 ++-
.../frontend/templates/customer/list.phtml | 2 +-
.../frontend/templates/customer/view.phtml | 2 +-
.../Review/view/frontend/templates/form.phtml | 2 +-
.../frontend/templates/helper/summary.phtml | 2 +-
.../templates/helper/summary_short.phtml | 2 +-
app/code/Magento/Rss/i18n/de_DE.csv | 104 +-
app/code/Magento/Rss/i18n/en_US.csv | 100 +-
app/code/Magento/Rss/i18n/es_ES.csv | 104 +-
app/code/Magento/Rss/i18n/fr_FR.csv | 104 +-
app/code/Magento/Rss/i18n/nl_NL.csv | 104 +-
app/code/Magento/Rss/i18n/pt_BR.csv | 104 +-
app/code/Magento/Rss/i18n/zh_CN.csv | 110 +-
app/code/Magento/Rule/Helper/Data.php | 32 -
app/code/Magento/Rule/i18n/de_DE.csv | 62 +-
app/code/Magento/Rule/i18n/en_US.csv | 60 +-
app/code/Magento/Rule/i18n/es_ES.csv | 60 +-
app/code/Magento/Rule/i18n/fr_FR.csv | 60 +-
app/code/Magento/Rule/i18n/nl_NL.csv | 60 +-
app/code/Magento/Rule/i18n/pt_BR.csv | 60 +-
app/code/Magento/Rule/i18n/zh_CN.csv | 72 +-
.../Adminhtml/Order/View/Tab/History.php | 7 +-
.../Magento/Sales/Model/AdminOrder/Create.php | 3 +-
.../Model/Order/Creditmemo/Total/Tax.php | 11 +-
.../Sales/Model/Order/Pdf/Total/Factory.php | 6 +-
app/code/Magento/Sales/Model/Order/Status.php | 44 +-
.../Sales/Model/Resource/Order/Status.php | 194 ++-
app/code/Magento/Sales/etc/widget.xml | 4 +-
app/code/Magento/Sales/i18n/de_DE.csv | 1510 ++++++++--------
app/code/Magento/Sales/i18n/en_US.csv | 1491 +++++++---------
app/code/Magento/Sales/i18n/es_ES.csv | 1497 ++++++++--------
app/code/Magento/Sales/i18n/fr_FR.csv | 1496 ++++++++--------
app/code/Magento/Sales/i18n/nl_NL.csv | 1502 ++++++++--------
app/code/Magento/Sales/i18n/pt_BR.csv | 1496 ++++++++--------
app/code/Magento/Sales/i18n/zh_CN.csv | 1552 ++++++++---------
.../templates/order/create/items/grid.phtml | 35 +-
.../order/view/items/renderer/default.phtml | 23 +-
.../view/frontend/layout/customer_account.xml | 1 -
.../Sales/view/frontend/layout/default.xml | 2 +-
.../view/frontend/templates/guest/form.phtml | 2 +-
.../frontend/templates/order/creditmemo.phtml | 2 +-
.../frontend/templates/order/invoice.phtml | 2 +-
.../order/items/renderer/default.phtml | 25 +-
.../view/frontend/templates/order/print.phtml | 2 +-
.../templates/order/print/creditmemo.phtml | 2 +-
.../templates/order/print/invoice.phtml | 2 +-
.../templates/order/print/shipment.phtml | 2 +-
.../view/frontend/templates/order/view.phtml | 2 +-
.../frontend/templates/reorder/sidebar.phtml | 2 +-
.../templates/widget/guest/form.phtml | 2 +-
app/code/Magento/SalesRule/i18n/de_DE.csv | 245 +--
app/code/Magento/SalesRule/i18n/en_US.csv | 241 +--
app/code/Magento/SalesRule/i18n/es_ES.csv | 241 +--
app/code/Magento/SalesRule/i18n/fr_FR.csv | 241 +--
app/code/Magento/SalesRule/i18n/nl_NL.csv | 243 +--
app/code/Magento/SalesRule/i18n/pt_BR.csv | 241 +--
app/code/Magento/SalesRule/i18n/zh_CN.csv | 271 +--
app/code/Magento/Sendfriend/i18n/de_DE.csv | 63 +-
app/code/Magento/Sendfriend/i18n/en_US.csv | 61 +-
app/code/Magento/Sendfriend/i18n/es_ES.csv | 63 +-
app/code/Magento/Sendfriend/i18n/fr_FR.csv | 63 +-
app/code/Magento/Sendfriend/i18n/nl_NL.csv | 63 +-
app/code/Magento/Sendfriend/i18n/pt_BR.csv | 63 +-
app/code/Magento/Sendfriend/i18n/zh_CN.csv | 73 +-
.../view/frontend/templates/send.phtml | 24 +-
app/code/Magento/Shipping/i18n/de_DE.csv | 239 ++-
app/code/Magento/Shipping/i18n/en_US.csv | 235 ++-
app/code/Magento/Shipping/i18n/es_ES.csv | 237 ++-
app/code/Magento/Shipping/i18n/fr_FR.csv | 235 ++-
app/code/Magento/Shipping/i18n/nl_NL.csv | 235 ++-
app/code/Magento/Shipping/i18n/pt_BR.csv | 235 ++-
app/code/Magento/Shipping/i18n/zh_CN.csv | 253 ++-
.../frontend/templates/order/shipment.phtml | 2 +-
.../frontend/templates/tracking/popup.phtml | 2 +-
app/code/Magento/Sitemap/README.md | 2 +
app/code/Magento/Sitemap/i18n/de_DE.csv | 102 +-
app/code/Magento/Sitemap/i18n/en_US.csv | 96 +-
app/code/Magento/Sitemap/i18n/es_ES.csv | 102 +-
app/code/Magento/Sitemap/i18n/fr_FR.csv | 102 +-
app/code/Magento/Sitemap/i18n/nl_NL.csv | 102 +-
app/code/Magento/Sitemap/i18n/pt_BR.csv | 102 +-
app/code/Magento/Sitemap/i18n/zh_CN.csv | 108 +-
app/code/Magento/Store/i18n/de_DE.csv | 12 +
app/code/Magento/Store/i18n/en_US.csv | 12 +
app/code/Magento/Store/i18n/es_ES.csv | 12 +
app/code/Magento/Store/i18n/fr_FR.csv | 12 +
app/code/Magento/Store/i18n/nl_NL.csv | 12 +
app/code/Magento/Store/i18n/pt_BR.csv | 12 +
app/code/Magento/Store/i18n/zh_CN.csv | 12 +
.../Magento/Tax/Controller/Adminhtml/Tax.php | 1 -
.../Magento/Tax/Model/Calculation/Rate.php | 5 +-
.../Model/Calculation/TaxRuleConverter.php | 21 +-
app/code/Magento/Tax/Model/ClassModel.php | 20 +-
app/code/Magento/Tax/Model/Config.php | 26 -
app/code/Magento/Tax/Model/Converter.php | 90 +
.../Magento/Tax/Model/Resource/TaxClass.php | 7 +-
.../Tax/Model/Sales/Total/Quote/Tax.php | 51 +-
.../Model/System/Message/Notifications.php | 55 +-
.../Tax/Service/V1/Data/SearchResults.php | 61 +
.../Service/V1/Data/SearchResultsBuilder.php | 68 +
.../Magento/Tax/Service/V1/Data/TaxClass.php | 76 +
.../Tax/Service/V1/Data/TaxClassBuilder.php | 66 +
.../Magento/Tax/Service/V1/Data/TaxRate.php | 2 +-
.../Magento/Tax/Service/V1/Data/TaxRule.php | 4 +-
.../Service/V1/Data/TaxRuleSearchResults.php | 4 +-
.../Tax/Service/V1/TaxClassService.php | 268 +++
.../Service/V1/TaxClassServiceInterface.php | 79 +
.../Magento/Tax/Service/V1/TaxRateService.php | 19 +-
.../Magento/Tax/Service/V1/TaxRuleService.php | 59 +-
app/code/Magento/Tax/etc/di.xml | 1 +
app/code/Magento/Tax/etc/webapi.xml | 112 ++
app/code/Magento/Tax/i18n/de_DE.csv | 284 +--
app/code/Magento/Tax/i18n/en_US.csv | 280 +--
app/code/Magento/Tax/i18n/es_ES.csv | 282 +--
app/code/Magento/Tax/i18n/fr_FR.csv | 282 +--
app/code/Magento/Tax/i18n/nl_NL.csv | 286 +--
app/code/Magento/Tax/i18n/pt_BR.csv | 282 +--
app/code/Magento/Tax/i18n/zh_CN.csv | 312 ++--
.../System/Design/Theme/Edit/Tab/Css.php | 12 +-
app/code/Magento/Theme/Block/Html/Header.php | 2 +
app/code/Magento/Theme/Helper/Data.php | 32 -
app/code/Magento/Theme/README.md | 1 +
app/code/Magento/Theme/i18n/de_DE.csv | 198 ++-
app/code/Magento/Theme/i18n/en_US.csv | 200 ++-
app/code/Magento/Theme/i18n/es_ES.csv | 198 ++-
app/code/Magento/Theme/i18n/fr_FR.csv | 198 ++-
app/code/Magento/Theme/i18n/nl_NL.csv | 198 ++-
app/code/Magento/Theme/i18n/pt_BR.csv | 198 ++-
app/code/Magento/Theme/i18n/zh_CN.csv | 204 ++-
.../Theme/view/frontend/layout/default.xml | 8 +-
.../view/frontend/templates/1column.phtml | 2 +-
.../frontend/templates/2columns-left.phtml | 9 +-
.../frontend/templates/2columns-right.phtml | 9 +-
.../view/frontend/templates/3columns.phtml | 10 +-
.../Theme/view/frontend/templates/empty.phtml | 2 +-
.../view/frontend/templates/html/title.phtml | 2 +-
.../Theme/view/frontend/templates/popup.phtml | 2 +-
app/code/Magento/Translation/i18n/de_DE.csv | 143 ++
app/code/Magento/Translation/i18n/en_US.csv | 143 ++
app/code/Magento/Translation/i18n/es_ES.csv | 143 ++
app/code/Magento/Translation/i18n/fr_FR.csv | 143 ++
app/code/Magento/Translation/i18n/nl_NL.csv | 143 ++
app/code/Magento/Translation/i18n/pt_BR.csv | 143 ++
app/code/Magento/Translation/i18n/zh_CN.csv | 143 ++
app/code/Magento/Ups/i18n/de_DE.csv | 111 ++
app/code/Magento/Ups/i18n/en_US.csv | 111 ++
app/code/Magento/Ups/i18n/es_ES.csv | 111 ++
app/code/Magento/Ups/i18n/fr_FR.csv | 111 ++
app/code/Magento/Ups/i18n/nl_NL.csv | 111 ++
app/code/Magento/Ups/i18n/pt_BR.csv | 111 ++
app/code/Magento/Ups/i18n/zh_CN.csv | 111 ++
.../Magento/UrlRewrite/Model/UrlRewrite.php | 61 +-
app/code/Magento/UrlRewrite/i18n/de_DE.csv | 11 +-
app/code/Magento/UrlRewrite/i18n/en_US.csv | 11 +-
app/code/Magento/UrlRewrite/i18n/es_ES.csv | 11 +-
app/code/Magento/UrlRewrite/i18n/fr_FR.csv | 11 +-
app/code/Magento/UrlRewrite/i18n/nl_NL.csv | 11 +-
app/code/Magento/UrlRewrite/i18n/pt_BR.csv | 11 +-
app/code/Magento/UrlRewrite/i18n/zh_CN.csv | 11 +-
app/code/Magento/User/i18n/de_DE.csv | 97 ++
app/code/Magento/User/i18n/en_US.csv | 97 ++
app/code/Magento/User/i18n/es_ES.csv | 97 ++
app/code/Magento/User/i18n/fr_FR.csv | 97 ++
app/code/Magento/User/i18n/nl_NL.csv | 97 ++
app/code/Magento/User/i18n/pt_BR.csv | 97 ++
app/code/Magento/User/i18n/zh_CN.csv | 97 ++
app/code/Magento/Usps/i18n/de_DE.csv | 132 ++
app/code/Magento/Usps/i18n/en_US.csv | 132 ++
app/code/Magento/Usps/i18n/es_ES.csv | 132 ++
app/code/Magento/Usps/i18n/fr_FR.csv | 132 ++
app/code/Magento/Usps/i18n/nl_NL.csv | 132 ++
app/code/Magento/Usps/i18n/pt_BR.csv | 132 ++
app/code/Magento/Usps/i18n/zh_CN.csv | 132 ++
.../Webapi/Controller/ErrorProcessor.php | 19 +-
app/code/Magento/Webapi/Controller/Rest.php | 4 -
.../Controller/ServiceArgsSerializer.php | 37 +-
app/code/Magento/Webapi/Controller/Soap.php | 8 +-
.../Controller/Soap/Request/Handler.php | 19 +-
.../DeserializationException.php} | 9 +-
.../Magento/Webapi/Model/PathProcessor.php | 6 +-
app/code/Magento/Webapi/Model/Soap/Fault.php | 34 +-
.../Webapi/ServiceAuthorizationException.php | 59 -
.../ServiceResourceNotFoundException.php | 57 -
app/code/Magento/Webapi/i18n/de_DE.csv | 34 +
app/code/Magento/Webapi/i18n/en_US.csv | 34 +
app/code/Magento/Webapi/i18n/es_ES.csv | 34 +
app/code/Magento/Webapi/i18n/fr_FR.csv | 34 +
app/code/Magento/Webapi/i18n/nl_NL.csv | 34 +
app/code/Magento/Webapi/i18n/pt_BR.csv | 34 +
app/code/Magento/Webapi/i18n/zh_CN.csv | 34 +
app/code/Magento/Weee/Helper/Data.php | 226 ++-
app/code/Magento/Weee/Model/Config.php | 192 ++
app/code/Magento/Weee/Model/Tax.php | 59 +-
.../Weee/Model/Total/Creditmemo/Weee.php | 21 +-
.../Magento/Weee/Model/Total/Invoice/Weee.php | 13 +
.../Magento/Weee/Model/Total/Quote/Weee.php | 367 ++--
.../Magento/Weee/etc/adminhtml/system.xml | 4 -
app/code/Magento/Weee/etc/sales.xml | 2 +-
app/code/Magento/Weee/i18n/de_DE.csv | 34 +-
app/code/Magento/Weee/i18n/en_US.csv | 30 +-
app/code/Magento/Weee/i18n/es_ES.csv | 34 +-
app/code/Magento/Weee/i18n/fr_FR.csv | 34 +-
app/code/Magento/Weee/i18n/nl_NL.csv | 34 +-
app/code/Magento/Weee/i18n/pt_BR.csv | 34 +-
app/code/Magento/Weee/i18n/zh_CN.csv | 38 +-
app/code/Magento/Widget/README.md | 1 +
app/code/Magento/Widget/i18n/de_DE.csv | 120 +-
app/code/Magento/Widget/i18n/en_US.csv | 116 +-
app/code/Magento/Widget/i18n/es_ES.csv | 116 +-
app/code/Magento/Widget/i18n/fr_FR.csv | 116 +-
app/code/Magento/Widget/i18n/nl_NL.csv | 116 +-
app/code/Magento/Widget/i18n/pt_BR.csv | 116 +-
app/code/Magento/Widget/i18n/zh_CN.csv | 130 +-
app/code/Magento/Wishlist/i18n/de_DE.csv | 183 +-
app/code/Magento/Wishlist/i18n/en_US.csv | 180 +-
app/code/Magento/Wishlist/i18n/es_ES.csv | 183 +-
app/code/Magento/Wishlist/i18n/fr_FR.csv | 183 +-
app/code/Magento/Wishlist/i18n/nl_NL.csv | 183 +-
app/code/Magento/Wishlist/i18n/pt_BR.csv | 186 +-
app/code/Magento/Wishlist/i18n/zh_CN.csv | 201 +--
.../Wishlist/view/frontend/layout/default.xml | 2 +-
.../wishlist_index_configure_type_bundle.xml | 2 +-
.../frontend/templates/item/column/cart.phtml | 4 +-
.../templates/item/configure/addto.phtml | 2 +-
.../view/frontend/templates/shared.phtml | 2 +-
.../view/frontend/templates/sharing.phtml | 2 +-
.../view/frontend/templates/sidebar.phtml | 4 +-
.../view/frontend/templates/view.phtml | 2 +-
.../web/css/source/module.less | 11 +
.../Magento_Theme/web/css/source/module.less | 11 +-
.../adminhtml/Magento/backend/i18n/en_US.csv | 201 ---
.../Magento_Bundle/web/css/source/module.less | 51 +-
.../web/css/source/module.less | 221 +--
.../web/css/source/module.less | 72 +-
.../layout/checkout_cart_index.xml | 10 +-
.../Magento_Checkout/web/css/source/cart.less | 376 ++++
.../web/css/source/minicart.less | 224 +++
.../web/css/source/module.less | 809 ++-------
.../web/css/source/module.less | 24 +-
.../web/css/source/module.less | 119 ++
.../web/css/source/module.less | 84 +
.../web/css/source/module.less | 25 +-
.../web/css/source/module.less | 3 +
.../Magento_Paypal/web/css/source/module.less | 2 +-
.../Magento_Review/web/css/source/module.less | 2 +
.../Magento_Sales/web/css/source/module.less | 5 +-
.../layout/default_head_blocks.xml | 5 +
.../Magento_Theme/web/css/source/module.less | 110 +-
.../web/css/source/module.less | 54 +-
.../frontend/Magento/blank/etc/view.xml | 4 +-
.../frontend/Magento/blank/i18n/de_DE.csv | 1 +
.../frontend/Magento/blank/i18n/en_US.csv | 1 +
.../frontend/Magento/blank/i18n/es_ES.csv | 1 +
.../frontend/Magento/blank/i18n/fr_FR.csv | 1 +
.../frontend/Magento/blank/i18n/nl_NL.csv | 1 +
.../frontend/Magento/blank/i18n/pt_BR.csv | 1 +
.../frontend/Magento/blank/i18n/zh_CN.csv | 1 +
.../frontend/Magento/blank/web/css/print.less | 2 +-
.../blank/web/css/source/abstract.less | 70 +-
.../blank/web/css/source/actions-toolbar.less | 9 +-
.../Magento/blank/web/css/source/forms.less | 34 +-
.../Magento/blank/web/css/source/layout.less | 78 +-
.../Magento/blank/web/css/source/loaders.less | 20 +-
.../blank/web/css/source/navigation.less | 247 +--
.../Magento/blank/web/css/source/pages.less | 9 +
.../Magento/blank/web/css/source/popups.less | 30 +
.../Magento/blank/web/css/source/price.less | 2 +
.../blank/web/css/source/sections.less | 2 +-
.../Magento/blank/web/css/source/tables.less | 3 +
.../blank/web/css/source/typography.less | 4 +
.../Magento/blank/web/css/styles.less | 2 +-
.../Magento/blank/web/js/navigation-menu.js | 86 +-
.../Magento/blank/web/js/responsive.js | 14 +-
.../Element/MultiselectgrouplistElement.php | 21 +-
.../Selenium/Element/SuggestElement.php | 95 +
.../app/Magento/Backend/Test/Block/Menu.php | 76 +
.../Backend/Test/Handler/Conditions.php | 22 +-
.../Backend/Test/Page/AdminAuthLogin.php | 2 +-
.../Magento/Backend/Test/Page/Dashboard.php | 19 +
.../Magento/Bundle/Test/Fixture/Bundle.php | 4 +-
.../Bundle/Test/Fixture/Bundle/Selections.php | 8 +-
.../Bundle/Test/Fixture/BundleDynamic.php | 4 +-
.../Bundle/Test/Fixture/BundleFixed.php | 4 +-
.../Test/TestCase/BundleDynamicTest.php | 6 +-
.../Bundle/Test/TestCase/BundleFixedTest.php | 6 +-
.../Bundle/Test/TestCase/EditBundleTest.php | 6 +-
.../Test/Block/Adminhtml/Category/Tree.php | 81 +-
.../Product/AffectedAttributeSetForm.php | 22 +-
.../Product/Attribute/Edit/AttributeForm.xml | 12 -
.../Product/Attribute/Edit/Tab/Options.php | 2 +-
.../Attribute/Edit/Tab/Options/Option.xml | 4 +-
.../Adminhtml/Product/Attribute/Grid.php | 27 +
.../Product/Attribute/Set/FormPageActions.php | 41 +
.../Adminhtml/Product/Attribute/Set/Grid.php | 53 +
.../Product/Attribute/Set/GridPageActions.php | 41 +
.../Adminhtml/Product/Attribute/Set/Main.php | 97 ++
.../Attribute/Set/Main/AttributeSetForm.php | 12 +-
.../Attribute/Set/Main/AttributeSetForm.xml | 33 +
.../Edit/CustomOptionsTab/OptionField.php | 3 +-
.../Product/Edit/Tab/Attributes/Search.php | 96 +
.../Edit/Tab/ProductDetails/AttributeSet.php | 56 +-
.../Block/Adminhtml/Product/ProductForm.php | 66 +-
.../Block/Adminhtml/Product/ProductForm.xml | 12 +-
.../ProductPagination.php} | 36 +-
.../Test/Block/Product/ListProduct.php | 2 +-
.../Catalog/Test/Block/Product/Price.php | 8 +-
.../Block/Product/ProductList/Crosssell.php | 9 +-
.../Catalog/Test/Block/Product/View.php | 6 +-
.../Test/Block/Product/View/CustomOptions.php | 4 +-
...sertAddedProductAttributeOnProductForm.php | 124 ++
.../AssertCategoryAbsenceOnBackend.php | 69 +
.../AssertCategoryAbsenceOnFrontend.php | 77 +
.../Test/Constraint/AssertCategoryPage.php | 2 +-
.../AssertCategorySuccessDeleteMessage.php | 75 +
.../AssertProductAttributeAbsenceInGrid.php | 75 +
...tAttributeAbsenceInSearchOnProductForm.php | 77 +
.../AssertProductAttributeSaveMessage.php | 4 +-
...rtProductAttributeSuccessDeleteMessage.php | 71 +
.../Test/Constraint/AssertProductForm.php | 4 +
.../Constraint/AssertProductTemplateForm.php | 94 +
.../AssertProductTemplateInGrid.php | 73 +
.../AssertProductTemplateOnProductForm.php | 115 ++
...ssertProductTemplateSuccessSaveMessage.php | 75 +
.../Test/Constraint/AssertProductView.php | 123 ++
.../AssertTierPriceOnProductPage.php | 6 +-
.../Catalog/Test/Fixture/AssignProducts.php | 8 +-
.../Test/Fixture/CatalogAttributeSet.php | 115 ++
.../Test/Fixture/CatalogAttributeSet.xml | 67 +
.../CatalogAttributeSet/SkeletonSet.php | 114 ++
.../Catalog/Test/Fixture/CatalogCategory.php | 1 +
.../Catalog/Test/Fixture/CatalogCategory.xml | 1 +
.../Test/Fixture/CatalogCategory/ParentId.php | 113 ++
.../Test/Fixture/CatalogProductAttribute.php | 6 +-
.../CatalogProductAttribute/Options.php | 6 +-
.../Test/Fixture/CatalogProductSimple.php | 4 +-
.../Test/Fixture/CatalogProductSimple.xml | 1 +
.../CatalogProductSimple/AttributeSetId.php | 115 ++
.../Test/Fixture/CrosssellProducts.php | 2 +-
.../Catalog/Test/Fixture/GroupedProduct.php | 12 +-
.../Magento/Catalog/Test/Fixture/Product.php | 4 +-
.../Catalog/Test/Fixture/SimpleProduct.php | 6 +
.../CatalogAttributeSetInterface.php | 11 +-
.../Test/Handler/CatalogAttributeSet/Curl.php | 77 +
.../CatalogProductAttributeInterface.php | 35 +
.../Handler/CatalogProductAttribute/Curl.php | 107 ++
.../Handler/CatalogProductSimple/Curl.php | 170 +-
.../CatalogProductAttributeIndex.php | 5 +-
.../Adminhtml/CatalogProductAttributeNew.php | 1 +
.../Page/Adminhtml/CatalogProductIndex.php | 16 +-
.../Page/Adminhtml/CatalogProductIndex.xml | 6 -
.../Page/Adminhtml/CatalogProductSetAdd.php | 67 +
.../Page/Adminhtml/CatalogProductSetAdd.xml | 39 +
.../Page/Adminhtml/CatalogProductSetEdit.php | 67 +
.../Page/Adminhtml/CatalogProductSetEdit.xml | 39 +
.../Page/Adminhtml/CatalogProductSetIndex.php | 81 +
.../Page/Adminhtml/CatalogProductSetIndex.xml | 45 +
.../Page/Category/CatalogCategoryView.php | 4 +-
.../Page/Category/CatalogCategoryView.xml | 2 +-
.../Test/Repository/CatalogAttributeSet.php | 55 +
.../Test/Repository/CatalogCategory.php | 29 +-
.../Repository/CatalogProductAttribute.php | 76 +
.../Test/Repository/CatalogProductSimple.php | 27 +-
.../Catalog/Test/Repository/Product.php | 14 +-
.../TestCase/Category/AssignProductTest.php | 18 +-
.../Test/TestCase/Category/CreateTest.php | 3 +-
.../Category/DeleteCategoryEntityTest.php | 91 +
.../DeleteCategoryEntityTest/test.csv | 3 +
.../Category/UpdateCategoryEntityTest.php | 6 +-
.../{testUpdateCategory.csv => test.csv} | 0
.../Configurable/CreateWithAttributeTest.php | 6 +-
.../Product/CreateConfigurableTest.php | 6 +-
.../TestCase/Product/CreateGroupedTest.php | 6 +-
.../TestCase/Product/CreateProductTest.php | 6 +-
.../Product/CreateSimpleWithCategoryTest.php | 6 +-
...SimpleWithCustomOptionsAndCategoryTest.php | 6 +-
.../Test/TestCase/Product/CreateTest.php | 6 +-
.../TestCase/Product/CreateVirtualTest.php | 6 +-
.../Product/EditSimpleProductTest.php | 4 +-
.../TestCase/Product/UnassignCategoryTest.php | 2 +-
.../CreateAttributeSetEntityTest.php | 111 ++
.../testCreateAttributeSet.csv | 2 +
.../CreateProductAttributeEntityTest.php | 8 +-
.../testCreateProductAttribute.csv | 18 +-
.../DeleteProductAttributeEntityTest.php | 75 +
.../testDeleteProductAttribute.csv | 3 +
.../UpdateProductAttributeEntityTest.php | 86 +
.../testUpdateProductAttribute.csv | 3 +
.../app/Magento/Catalog/Test/etc/curl/di.xml | 2 +
.../Catalog/Test/etc/global/constraint.xml | 69 +-
.../Catalog/Test/etc/global/fixture.xml | 5 +
.../Magento/Catalog/Test/etc/global/page.xml | 20 +
.../Test/TestCase/AdvancedSearchTest.php | 2 +-
.../app/Magento/Checkout/Test/Block/Cart.php | 7 +-
.../Checkout/Test/Page/CheckoutCart.php | 2 +-
.../Checkout/Test/Page/CheckoutCart.xml | 2 +-
.../Magento/Cms/Test/Handler/CmsPage/Curl.php | 46 +-
.../app/Magento/Cms/Test/Page/CmsIndex.php | 4 +-
.../app/Magento/Cms/Test/Page/CmsIndex.xml | 4 +-
.../AssertProductAttributeIsConfigurable.php | 10 +-
.../Repository/CatalogProductConfigurable.php | 2 +-
.../ConfigurableProduct/Test/etc/curl/di.xml | 28 +
.../app/Magento/Core/Test/Block/Messages.php | 11 +-
.../Adminhtml/Group/CustomerGroupGrid.php | 9 +-
.../AssertCustomerGroupAlreadyExists.php | 6 +-
.../Constraint/AssertCustomerGroupForm.php | 120 ++
...ssertCustomerGroupSuccessDeleteMessage.php | 70 +
...AssertCustomerGroupSuccessSaveMessage.php} | 6 +-
.../Fixture/CustomerGroup/TaxClassIds.php | 31 +-
.../Test/Fixture/CustomerGroupInjectable.php | 19 +-
.../Test/Fixture/CustomerGroupInjectable.xml | 4 +
.../Handler/CustomerGroupInjectable/Curl.php | 90 +
.../CustomerGroupInjectableInterface.php | 35 +
.../Test/Page/CustomerAccountIndex.php | 2 +-
.../Test/Page/CustomerAccountIndex.xml | 2 +-
.../testCreateCustomerGroup.csv | 4 +-
.../DeleteCustomerGroupEntityTest.php | 97 ++
.../DeleteCustomerGroupEntityTest/test.csv | 2 +
.../UpdateCustomerGroupEntityTest.php | 101 ++
.../UpdateCustomerGroupEntityTest/test.csv | 5 +
.../app/Magento/Customer/Test/etc/curl/di.xml | 1 +
.../Customer/Test/etc/global/constraint.xml | 13 +-
.../Customer/Test/etc/global/fixture.xml | 4 +-
.../Product/Edit/Tab/Downloadable/Links.php | 4 +-
...ks.php => AssertDownloadableLinksData.php} | 4 +-
.../AssertDownloadableProductForm.php | 22 +-
.../Fixture/CatalogProductDownloadable.php | 51 +-
.../CatalogProductDownloadableInterface.php | 34 +
.../CatalogProductDownloadable/Curl.php | 76 +
.../Test/Page/Product/CatalogProductView.php | 2 +-
.../Test/Page/Product/CatalogProductView.xml | 2 +-
.../Repository/CatalogProductDownloadable.php | 79 +
.../Create/LinksPurchasedSeparatelyTest.php | 6 +-
.../testCreateDownloadableProduct.csv | 12 +-
.../UpdateDownloadableProductEntityTest.php | 128 ++
.../testUpdateDownloadableProduct.csv | 8 +
.../Magento/Downloadable/Test/etc/curl/di.xml | 28 +
.../Test/etc/global/constraint.xml | 4 +-
.../Test/Block/Adminhtml/Export/Edit/Form.php | 12 +-
.../Test/Block/Adminhtml/Export/Edit/Form.xml | 35 +
.../Test/Block/Adminhtml/Export/Filter.php | 50 +
...AssertProductAttributeAbsenceForExport.php | 81 +
.../Test/Fixture/ImportExport.php | 91 +
.../Test/Fixture/ImportExport.xml | 60 +
.../Test/Page/Adminhtml/AdminExportIndex.php | 67 +
.../Test/Page/Adminhtml/AdminExportIndex.xml | 39 +
.../Test/etc/global/constraint.xml | 30 +
.../ImportExport/Test/etc/global/fixture.xml | 32 +
.../ImportExport/Test/etc/global/page.xml | 32 +
.../Review/Test/TestCase/ReviewTest.php | 2 +-
.../Test/Block/Adminhtml/SitemapGrid.php | 38 +-
.../Block/Adminhtml/SitemapPageActions.php} | 23 +-
.../Test/Constraint/AssertSitemapContent.php | 113 ++
.../AssertSitemapFailFolderSaveMessage.php | 1 -
.../AssertSitemapFailPathSaveMessage.php | 1 -
.../Test/Constraint/AssertSitemapInGrid.php | 13 +-
.../Constraint/AssertSitemapNotInGrid.php | 1 -
.../AssertSitemapSuccessDeleteMessage.php | 1 -
.../AssertSitemapSuccessGenerateMessage.php | 75 +
...tSitemapSuccessSaveAndGenerateMessages.php | 76 +
.../AssertSitemapSuccessSaveMessage.php | 1 -
.../Sitemap/Test/Handler/Sitemap/Curl.php | 26 +-
.../Test/Page/Adminhtml/SitemapIndex.php | 1 -
.../Test/Page/Adminhtml/SitemapNew.php | 13 +-
.../Test/Page/Adminhtml/SitemapNew.xml | 4 +-
.../Test/TestCase/CreateSitemapEntityTest.php | 2 +-
.../TestCase/GenerateSitemapEntityTest.php | 111 ++
.../testGenerateSitemap.csv | 2 +
.../Test/TestCase/UpdateSitemapEntityTest.php | 102 ++
.../testUpdateSitemap.csv | 2 +
.../app/Magento/Sitemap/Test/etc/curl/di.xml | 4 +-
.../Sitemap/Test/etc/global/constraint.xml | 9 +
.../Test/Fixture/UrlRewrite/IdPath.php | 2 +-
.../Test/Block/Adminhtml/Role/RoleForm.xml | 4 +-
.../User/Test/Block/Adminhtml/RoleGrid.php | 6 +-
.../Test/Block/Adminhtml/User/Tab/Role.php | 61 +
.../Block/Adminhtml/User/Tab/Role/Grid.php | 53 +
.../Test/Block/Adminhtml/User/UserForm.php | 55 +
.../Test/Block/Adminhtml/User/UserForm.xml | 48 +
.../User/Test/Constraint/AssertRoleInGrid.php | 2 +-
.../Test/Constraint/AssertRoleNotInGrid.php | 2 +-
.../AssertRoleSuccessDeleteMessage.php | 6 +-
.../User/Test/Constraint/AssertUserInGrid.php | 7 +-
.../AssertUserRoleSalesRestrictedAccess.php | 76 +
.../Constraint/AssertUserSuccessLogOut.php | 71 +
.../Constraint/AssertUserSuccessLogin.php | 81 +
.../AssertUserSuccessSaveMessage.php | 71 +
... => AssertUserWrongCredentialsMessage.php} | 27 +-
.../User/Test/Constraint/LoginSuccess.php | 6 +-
.../User/Test/Fixture/AdminUserInjectable.php | 27 +
.../User/Test/Fixture/AdminUserInjectable.xml | 4 +
.../User/Test/Fixture/AdminUserRole.php | 6 +-
.../User/Test/Fixture/AdminUserRole.xml | 6 +-
.../Magento/User/Test/Fixture/User/Role.php | 120 ++
.../User/Test/Handler/AdminUser/Curl.php | 7 +-
.../User/Test/Handler/AdminUserRole/Curl.php | 13 +-
.../User/Test/Page/Adminhtml/UserEdit.php | 18 +-
.../User/Test/Page/Adminhtml/UserEdit.xml | 8 +-
.../User/Test/Page/Adminhtml/UserIndex.php | 14 +
.../User/Test/Page/Adminhtml/UserIndex.xml | 6 +
.../Test/Repository/AdminUserInjectable.php | 13 +-
.../User/Test/Repository/AdminUserRole.php | 29 +-
.../testCreateUserRole.csv | 2 +-
.../TestCase/DeleteAdminUserEntityTest.php | 22 +-
.../TestCase/DeleteUserRoleEntityTest.php | 10 +-
.../User/Test/TestCase/LoginUserTest.php | 6 +-
.../User/Test/TestCase/LoginUserTest/test.csv | 4 +-
.../TestCase/UpdateAdminUserEntityTest.php | 168 ++
.../testUpdateAdminUser.csv | 4 +
.../User/Test/etc/global/constraint.xml | 69 +-
.../functional/utils/generate/factory.php | 1 +
.../Magento/TestFramework/Db/Mysql.php | 2 +-
.../TestFramework/Indexer/TestCase.php | 1 +
.../Authz/Service/AuthorizationV1Test.php | 2 +-
.../Controller/Adminhtml/UrlrewriteTest.php | 58 +
.../Magento/Backend/Helper/DataTest.php | 1 -
.../Indexer/Product/Flat/Action/RowsTest.php | 1 +
.../_files/select_attribute_rollback.php | 14 +-
.../testsuite/Magento/Catalog/WidgetTest.php | 4 +-
.../Magento/Catalog/_files/category.php | 46 +
.../Catalog/_files/category_product.php | 78 +
.../_files/category_product_rollback.php | 42 +
.../Catalog/_files/category_rollback.php | 38 +
.../Magento/Catalog/_files/category_tree.php | 76 +
.../Catalog/_files/category_tree_rollback.php | 38 +
.../Catalog/_files/multiselect_attribute.php | 74 +
.../Catalog/_files/products_in_category.php | 98 ++
.../_files/products_in_category_rollback.php | 50 +
.../products_with_multiselect_attribute.php | 88 +
.../Model/Import/ProductTest.php | 33 +-
...oducts_with_invalid_multiselect_values.csv | 5 +
.../Magento/Cms/Controller/PageTest.php | 4 +-
.../testsuite/Magento/Cms/_files/pages.php | 43 +-
.../Product/View/Type/ConfigurableTest.php | 1 +
.../Block/Adminhtml/Group/Edit/FormTest.php | 2 +
.../App/Helper/AbstractHelperTest.php | 71 -
.../Magento/Newsletter/_files/problems.php | 2 +-
.../Magento/Payment/Model/ConfigTest.php | 8 +
.../Block/Adminhtml/Sales/Sales/GridTest.php | 40 +
.../Magento/Reports/Block/WidgetTest.php | 8 +-
.../Magento/Reports/_files/orders.php | 32 +
.../Sales/Model/Resource/Order/StatusTest.php | 66 +
.../Sales/_files/assign_status_to_state.php | 34 +
.../testsuite/Magento/Tax/Model/ClassTest.php | 10 +-
.../Tax/Service/V1/TaxClassServiceTest.php | 258 +++
.../Tax/Service/V1/TaxRateServiceTest.php | 2 +-
.../Tax/Service/V1/TaxRuleFixtureFactory.php | 2 +-
.../Tax/Service/V1/TaxRuleServiceTest.php | 2 +-
.../I18n/Code/Dictionary/GeneratorTest.php | 60 +-
.../_files/expected/with_context.csv | 6 +-
.../_files/expected/without_context.csv | 3 +
.../{unused => not_magento_dir}/Model.php | 0
.../{unused => not_magento_dir}/file.js | 0
.../template.phtml | 0
.../Webapi/Model/PathProcessorTest.php | 13 +-
.../testsuite/Magento/Weee/Model/TaxTest.php | 7 +-
.../Widget/Model/Widget/InstanceTest.php | 4 +-
.../Test/Integrity/App/Language/Package.php | 45 +
.../Integrity/App/Language/PackageTest.php | 61 +-
.../App/Language/TranslationFiles.php | 111 ++
.../App/Language/TranslationFilesTest.php | 182 ++
.../Integrity/_files/blacklist/namespace.txt | 2 +-
.../Test/Legacy/_files/obsolete_classes.php | 16 +-
.../Test/Legacy/_files/obsolete_methods.php | 1 +
.../Php/_files/phpcpd/blacklist/common.txt | 4 +-
.../Php/_files/phpcs/blacklist/common.txt | 2 -
.../Authz/Service/AuthorizationV1Test.php | 3 +-
.../Magento/Catalog/Model/ConfigTest.php | 339 ++++
.../V1/Category/CategoryLoaderTest.php | 84 +
.../Category/ProductLinks/ReadServiceTest.php | 134 ++
.../ProductLinks/WriteServiceTest.php | 269 +++
.../Service/V1/Category/ReadServiceTest.php | 147 ++
.../V1/Category/Tree/ReadServiceTest.php | 142 ++
.../Service/V1/Category/WriteServiceTest.php | 316 ++++
.../Service/V1/Data/Category/MapperTest.php | 64 +
.../Service/V1/Data/Category/TreeTest.php | 205 +++
.../Catalog/Service/V1/Data/ConverterTest.php | 4 +-
.../Service/V1/Data/ProductBuilderTest.php | 5 +-
...erviceTest.php => MetadataServiceTest.php} | 10 +-
.../Attribute/Option/ReadServiceTest.php | 77 +
.../Attribute/Option/WriteServiceTest.php | 235 +++
.../V1/Product/Attribute/ReadServiceTest.php | 166 +-
.../V1/Product/Attribute/WriteServiceTest.php | 7 +-
.../Product/AttributeSet/WriteServiceTest.php | 2 +-
.../V1/ProductAttributeServiceTest.php | 176 --
.../Catalog/Service/V1/ProductServiceTest.php | 5 +-
.../Model/Rule/Condition/ProductTest.php | 199 +++
.../Magento/CatalogRule/Model/RuleTest.php | 160 ++
.../ConfigurableProduct/Helper/DataTest.php | 12 +-
.../Magento/Cron/Model/ObserverTest.php | 15 +-
.../Magento/Cron/Model/ScheduleTest.php | 90 +-
.../Block/Account/RegisterLinkTest.php | 41 +-
.../Customer/Controller/AccountTest.php | 140 +-
.../Magento/Customer/Helper/AddressTest.php | 7 +-
.../App/Helper/AbstractHelperTest.php | 116 ++
.../Framework/Data/Form/Element/DateTest.php | 131 ++
.../Exception/AuthorizationExceptionTest.php | 2 +-
.../Controller/Adminhtml/IntegrationTest.php | 4 +-
.../Magento/Sales/Model/Order/StatusTest.php | 166 +-
.../Sales/Model/Resource/Order/StatusTest.php | 8 +-
.../Tax/Service/V1/TaxClassServiceTest.php | 634 +++++++
.../Test/Tools/I18n/Code/ContextTest.php | 14 +-
.../I18n/Code/Dictionary/GeneratorTest.php | 167 +-
.../Options/ResolverFactoryTest.php | 59 +
.../Code/Dictionary/Options/ResolverTest.php | 128 ++
.../Options/_files/source/app/code/.gitignore | 1 +
.../_files/source/app/design/.gitignore | 1 +
.../_files/source/lib/web/mage/.gitignore | 1 +
.../_files/source/lib/web/varien/.gitignore | 1 +
.../Tools/I18n/Code/Dictionary/PhraseTest.php | 10 +-
.../Test/Tools/I18n/Code/FactoryTest.php | 41 +-
.../Tools/I18n/Code/Pack/GeneratorTest.php | 122 +-
.../Tools/I18n/Code/Parser/ParserTest.php | 205 +++
.../System/Design/Theme/Tab/CssTest.php | 65 +-
.../Webapi/Controller/ErrorProcessorTest.php | 2 +-
.../Magento/Webapi/Controller/RestTest.php | 2 +-
.../Magento/Weee/Helper/DataTest.php | 84 +-
.../Weee/Model/Total/Quote/WeeeTest.php | 903 ++++++----
dev/tools/Magento/Tools/I18n/Code/Context.php | 2 +-
.../Tools/I18n/Code/Dictionary/Generator.php | 70 +-
.../Dictionary/Loader/File/AbstractFile.php | 6 +-
.../I18n/Code/Dictionary/Options/Resolver.php | 119 ++
.../Dictionary/Options/ResolverFactory.php | 63 +
.../Dictionary/Options/ResolverInterface.php | 35 +
.../Tools/I18n/Code/Dictionary/Phrase.php | 12 +-
.../Tools/I18n/Code/Dictionary/Writer/Csv.php | 6 +-
dev/tools/Magento/Tools/I18n/Code/Factory.php | 3 +-
.../Tools/I18n/Code/Pack/Generator.php | 31 +-
.../Code/Pack/Writer/File/AbstractFile.php | 12 +-
.../Tools/I18n/Code/Parser/AbstractParser.php | 1 -
.../Code/Parser/Adapter/AbstractAdapter.php | 50 +-
.../Tools/I18n/Code/Parser/Adapter/Xml.php | 4 +-
.../Magento/Tools/I18n/Code/Parser/Parser.php | 8 +-
.../Tools/I18n/Code/ServiceLocator.php | 7 +-
dev/tools/Magento/Tools/I18n/bootstrap.php | 2 +-
dev/tools/Magento/Tools/I18n/generator.php | 63 +-
dev/tools/Magento/Tools/I18n/pack.php | 31 +-
dev/tools/xml/translate.php | 42 -
dev/tools/xml/translate.xslt | 55 -
.../Framework/App/Helper/AbstractHelper.php | 19 -
.../Magento/Framework/AppInterface.php | 2 +-
lib/internal/Magento/Framework/Css/README.md | 1 +
.../Framework/Data/Form/Element/Date.php | 2 +-
.../Exception/AuthorizationException.php | 2 +-
.../Exception/CouldNotDeleteException.php | 6 +-
lib/internal/Magento/Framework/Less/README.md | 2 +
.../Magento/Framework/Model/Exception.php | 2 +
.../Model/Resource/Db/AbstractDb.php | 15 +-
.../Framework/View/Element/Template.php | 5 +-
lib/internal/Magento/Framework/View/README.md | 1 +
lib/web/css/docs/source/forms.less | 2 +-
lib/web/css/docs/source/layout.less | 8 +-
lib/web/css/docs/source/variables.less | 2 +-
lib/web/css/source/extend.less | 15 +-
lib/web/css/source/lib/abstract.less | 3 +
lib/web/css/source/lib/breadcrumbs.less | 58 +-
lib/web/css/source/lib/buttons.less | 33 +-
lib/web/css/source/lib/forms.less | 474 ++---
lib/web/css/source/lib/icons.less | 4 +-
lib/web/css/source/lib/layout.less | 22 +-
lib/web/css/source/lib/loaders.less | 1 +
lib/web/css/source/lib/popups.less | 176 +-
lib/web/css/source/lib/responsive.less | 7 +
lib/web/css/source/lib/sections.less | 70 +-
lib/web/css/source/lib/utilities.less | 60 +-
lib/web/css/source/lib/variables.less | 139 +-
.../Blank-Theme-Icons/Blank-Theme-Icons.eot | Bin 6268 -> 6728 bytes
.../Blank-Theme-Icons/Blank-Theme-Icons.svg | 1 +
.../Blank-Theme-Icons/Blank-Theme-Icons.ttf | Bin 6064 -> 6524 bytes
.../Blank-Theme-Icons/Blank-Theme-Icons.woff | Bin 4720 -> 4976 bytes
.../fonts/Blank-Theme-Icons/selection.json | 875 ++++++++++
lib/web/i18n/de_DE.csv | 20 +
lib/web/i18n/en_US.csv | 22 +
lib/web/i18n/es_ES.csv | 20 +
lib/web/i18n/fr_FR.csv | 20 +
lib/web/i18n/nl_NL.csv | 20 +
lib/web/i18n/pt_BR.csv | 20 +
lib/web/i18n/zh_CN.csv | 20 +
lib/web/mage/accordion.js | 7 +
lib/web/mage/collapsible.js | 17 +
lib/web/mage/gallery.less | 5 +-
lib/web/mage/menu.js | 4 +-
1307 files changed, 77794 insertions(+), 47100 deletions(-)
create mode 100644 app/code/Magento/Authz/i18n/de_DE.csv
create mode 100644 app/code/Magento/Authz/i18n/en_US.csv
create mode 100644 app/code/Magento/Authz/i18n/es_ES.csv
create mode 100644 app/code/Magento/Authz/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Authz/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Authz/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Authz/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Backend/i18n/de_DE.csv
create mode 100644 app/code/Magento/Backend/i18n/en_US.csv
create mode 100644 app/code/Magento/Backend/i18n/es_ES.csv
create mode 100644 app/code/Magento/Backend/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Backend/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Backend/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Backend/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Captcha/README.md
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadServiceInterface.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/CategoryLoader.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/MetadataService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/MetadataServiceInterface.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadService.php
rename app/code/Magento/{Email/Helper/Data.php => Catalog/Service/V1/Category/ProductLinks/ReadServiceInterface.php} (73%)
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceInterface.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/ReadService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/ReadServiceInterface.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/Tree/ReadService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/Tree/ReadServiceInterface.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/WriteService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Category/WriteServiceInterface.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Category.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Category/Mapper.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Category/Tree.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/CategoryBuilder.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadata.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadataBuilder.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Converter.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Metadata.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/MetadataBuilder.php
rename lib/internal/Magento/Framework/Exception/Exception.php => app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Product.php (73%)
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductBuilder.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductConverter.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLink.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLinkBuilder.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Tree.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Data/Eav/Category/TreeBuilder.php
create mode 100644 app/code/Magento/Catalog/Service/V1/MetadataService.php
rename app/code/Magento/Catalog/Service/V1/{ProductMetadataServiceInterface.php => MetadataServiceInterface.php} (57%)
create mode 100644 app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceInterface.php
rename app/code/Magento/Catalog/Service/V1/{ProductAttributeService.php => Product/Attribute/Option/WriteService.php} (50%)
rename app/code/Magento/Catalog/Service/V1/{ProductAttributeServiceInterface.php => Product/Attribute/Option/WriteServiceInterface.php} (77%)
create mode 100644 app/code/Magento/Catalog/Service/V1/Product/MetadataService.php
create mode 100644 app/code/Magento/Catalog/Service/V1/Product/MetadataServiceInterface.php
delete mode 100644 app/code/Magento/Catalog/Service/V1/ProductMetadataService.php
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
rename app/code/Magento/{Widget/Helper/Data.php => Catalog/view/frontend/templates/category/products.phtml} (57%)
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
create mode 100644 app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
create mode 100644 app/code/Magento/CatalogImportExport/i18n/de_DE.csv
create mode 100644 app/code/Magento/CatalogImportExport/i18n/en_US.csv
create mode 100644 app/code/Magento/CatalogImportExport/i18n/es_ES.csv
create mode 100644 app/code/Magento/CatalogImportExport/i18n/fr_FR.csv
create mode 100644 app/code/Magento/CatalogImportExport/i18n/nl_NL.csv
create mode 100644 app/code/Magento/CatalogImportExport/i18n/pt_BR.csv
create mode 100644 app/code/Magento/CatalogImportExport/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Checkout/view/frontend/templates/button.phtml
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/de_DE.csv
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/en_US.csv
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/es_ES.csv
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/fr_FR.csv
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/nl_NL.csv
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/pt_BR.csv
create mode 100644 app/code/Magento/CheckoutAgreements/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Cms/README.md
create mode 100644 app/code/Magento/CustomerImportExport/i18n/de_DE.csv
create mode 100644 app/code/Magento/CustomerImportExport/i18n/en_US.csv
create mode 100644 app/code/Magento/CustomerImportExport/i18n/es_ES.csv
create mode 100644 app/code/Magento/CustomerImportExport/i18n/fr_FR.csv
create mode 100644 app/code/Magento/CustomerImportExport/i18n/nl_NL.csv
create mode 100644 app/code/Magento/CustomerImportExport/i18n/pt_BR.csv
create mode 100644 app/code/Magento/CustomerImportExport/i18n/zh_CN.csv
create mode 100644 app/code/Magento/DesignEditor/README.md
create mode 100644 app/code/Magento/DesignEditor/i18n/de_DE.csv
create mode 100644 app/code/Magento/DesignEditor/i18n/en_US.csv
create mode 100644 app/code/Magento/DesignEditor/i18n/es_ES.csv
create mode 100644 app/code/Magento/DesignEditor/i18n/fr_FR.csv
create mode 100644 app/code/Magento/DesignEditor/i18n/nl_NL.csv
create mode 100644 app/code/Magento/DesignEditor/i18n/pt_BR.csv
create mode 100644 app/code/Magento/DesignEditor/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Dhl/i18n/de_DE.csv
create mode 100644 app/code/Magento/Dhl/i18n/en_US.csv
create mode 100644 app/code/Magento/Dhl/i18n/es_ES.csv
create mode 100644 app/code/Magento/Dhl/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Dhl/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Dhl/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Dhl/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Email/i18n/de_DE.csv
create mode 100644 app/code/Magento/Email/i18n/en_US.csv
create mode 100644 app/code/Magento/Email/i18n/es_ES.csv
create mode 100644 app/code/Magento/Email/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Email/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Email/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Email/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Fedex/i18n/de_DE.csv
create mode 100644 app/code/Magento/Fedex/i18n/en_US.csv
create mode 100644 app/code/Magento/Fedex/i18n/es_ES.csv
create mode 100644 app/code/Magento/Fedex/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Fedex/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Fedex/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Fedex/i18n/zh_CN.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/de_DE.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/en_US.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/es_ES.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/fr_FR.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/nl_NL.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/pt_BR.csv
create mode 100644 app/code/Magento/GoogleAdwords/i18n/zh_CN.csv
create mode 100644 app/code/Magento/GoogleShopping/i18n/de_DE.csv
create mode 100644 app/code/Magento/GoogleShopping/i18n/es_ES.csv
create mode 100644 app/code/Magento/GoogleShopping/i18n/fr_FR.csv
create mode 100644 app/code/Magento/GoogleShopping/i18n/nl_NL.csv
create mode 100644 app/code/Magento/GoogleShopping/i18n/pt_BR.csv
create mode 100644 app/code/Magento/GoogleShopping/i18n/zh_CN.csv
create mode 100644 app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
create mode 100644 app/code/Magento/Indexer/i18n/de_DE.csv
create mode 100644 app/code/Magento/Indexer/i18n/en_US.csv
create mode 100644 app/code/Magento/Indexer/i18n/es_ES.csv
create mode 100644 app/code/Magento/Indexer/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Indexer/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Indexer/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Indexer/i18n/zh_CN.csv
create mode 100644 app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml
create mode 100644 app/code/Magento/LayeredNavigation/view/frontend/layout/page_one_column.xml
create mode 100644 app/code/Magento/LayeredNavigation/view/frontend/layout/page_three_columns.xml
create mode 100644 app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_left.xml
create mode 100644 app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_right.xml
create mode 100644 app/code/Magento/Multishipping/i18n/de_DE.csv
create mode 100644 app/code/Magento/Multishipping/i18n/en_US.csv
create mode 100644 app/code/Magento/Multishipping/i18n/es_ES.csv
create mode 100644 app/code/Magento/Multishipping/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Multishipping/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Multishipping/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Multishipping/i18n/zh_CN.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/de_DE.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/en_US.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/es_ES.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/fr_FR.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/nl_NL.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/pt_BR.csv
create mode 100644 app/code/Magento/OfflinePayments/i18n/zh_CN.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/de_DE.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/en_US.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/es_ES.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/fr_FR.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/nl_NL.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/pt_BR.csv
create mode 100644 app/code/Magento/OfflineShipping/i18n/zh_CN.csv
delete mode 100644 app/code/Magento/Ogone/Helper/Data.php
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/de_DE.csv
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/en_US.csv
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/es_ES.csv
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/fr_FR.csv
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/nl_NL.csv
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/pt_BR.csv
create mode 100644 app/code/Magento/PayPalRecurringPayment/i18n/zh_CN.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/de_DE.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/en_US.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/es_ES.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/fr_FR.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/nl_NL.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/pt_BR.csv
create mode 100644 app/code/Magento/RecurringPayment/i18n/zh_CN.csv
delete mode 100644 app/code/Magento/Rule/Helper/Data.php
create mode 100644 app/code/Magento/Sitemap/README.md
create mode 100644 app/code/Magento/Store/i18n/de_DE.csv
create mode 100644 app/code/Magento/Store/i18n/en_US.csv
create mode 100644 app/code/Magento/Store/i18n/es_ES.csv
create mode 100644 app/code/Magento/Store/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Store/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Store/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Store/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Tax/Model/Converter.php
create mode 100644 app/code/Magento/Tax/Service/V1/Data/SearchResults.php
create mode 100644 app/code/Magento/Tax/Service/V1/Data/SearchResultsBuilder.php
create mode 100644 app/code/Magento/Tax/Service/V1/Data/TaxClass.php
create mode 100644 app/code/Magento/Tax/Service/V1/Data/TaxClassBuilder.php
create mode 100644 app/code/Magento/Tax/Service/V1/TaxClassService.php
create mode 100644 app/code/Magento/Tax/Service/V1/TaxClassServiceInterface.php
create mode 100644 app/code/Magento/Tax/etc/webapi.xml
delete mode 100644 app/code/Magento/Theme/Helper/Data.php
create mode 100644 app/code/Magento/Theme/README.md
create mode 100644 app/code/Magento/Translation/i18n/de_DE.csv
create mode 100644 app/code/Magento/Translation/i18n/en_US.csv
create mode 100644 app/code/Magento/Translation/i18n/es_ES.csv
create mode 100644 app/code/Magento/Translation/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Translation/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Translation/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Translation/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Ups/i18n/de_DE.csv
create mode 100644 app/code/Magento/Ups/i18n/en_US.csv
create mode 100644 app/code/Magento/Ups/i18n/es_ES.csv
create mode 100644 app/code/Magento/Ups/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Ups/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Ups/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Ups/i18n/zh_CN.csv
create mode 100644 app/code/Magento/User/i18n/de_DE.csv
create mode 100644 app/code/Magento/User/i18n/en_US.csv
create mode 100644 app/code/Magento/User/i18n/es_ES.csv
create mode 100644 app/code/Magento/User/i18n/fr_FR.csv
create mode 100644 app/code/Magento/User/i18n/nl_NL.csv
create mode 100644 app/code/Magento/User/i18n/pt_BR.csv
create mode 100644 app/code/Magento/User/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Usps/i18n/de_DE.csv
create mode 100644 app/code/Magento/Usps/i18n/en_US.csv
create mode 100644 app/code/Magento/Usps/i18n/es_ES.csv
create mode 100644 app/code/Magento/Usps/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Usps/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Usps/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Usps/i18n/zh_CN.csv
rename app/code/Magento/{Cron/Helper/Data.php => Webapi/DeserializationException.php} (82%)
delete mode 100644 app/code/Magento/Webapi/ServiceAuthorizationException.php
delete mode 100644 app/code/Magento/Webapi/ServiceResourceNotFoundException.php
create mode 100644 app/code/Magento/Webapi/i18n/de_DE.csv
create mode 100644 app/code/Magento/Webapi/i18n/en_US.csv
create mode 100644 app/code/Magento/Webapi/i18n/es_ES.csv
create mode 100644 app/code/Magento/Webapi/i18n/fr_FR.csv
create mode 100644 app/code/Magento/Webapi/i18n/nl_NL.csv
create mode 100644 app/code/Magento/Webapi/i18n/pt_BR.csv
create mode 100644 app/code/Magento/Webapi/i18n/zh_CN.csv
create mode 100644 app/code/Magento/Weee/Model/Config.php
create mode 100644 app/code/Magento/Widget/README.md
delete mode 100644 app/design/adminhtml/Magento/backend/i18n/en_US.csv
create mode 100644 app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less
create mode 100644 app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less
create mode 100644 app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less
create mode 100644 app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/module.less
create mode 100644 app/design/frontend/Magento/blank/i18n/de_DE.csv
create mode 100644 app/design/frontend/Magento/blank/i18n/en_US.csv
create mode 100644 app/design/frontend/Magento/blank/i18n/es_ES.csv
create mode 100644 app/design/frontend/Magento/blank/i18n/fr_FR.csv
create mode 100644 app/design/frontend/Magento/blank/i18n/nl_NL.csv
create mode 100644 app/design/frontend/Magento/blank/i18n/pt_BR.csv
create mode 100644 app/design/frontend/Magento/blank/i18n/zh_CN.csv
create mode 100644 dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/FormPageActions.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Grid.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/GridPageActions.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
rename app/code/Magento/GiftMessage/Helper/Data.php => dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php (82%)
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
rename app/code/Magento/Webapi/ServiceException.php => dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php (54%)
rename dev/tests/functional/tests/app/Magento/Catalog/Test/Block/{Backend/AddNewSplitButton.php => Category/ProductPagination.php} (61%)
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory/ParentId.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
rename app/code/Magento/Log/Helper/Data.php => dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php (81%)
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest/test.csv
rename dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/{testUpdateCategory.csv => test.csv} (100%)
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest/testCreateAttributeSet.csv
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest/testDeleteProductAttribute.csv
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv
create mode 100644 dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/curl/di.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
rename dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/{AssertCustomerGroupSuccessCreateMessage.php => AssertCustomerGroupSuccessSaveMessage.php} (92%)
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest/test.csv
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv
rename dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/{AssertDownloadableLinks.php => AssertDownloadableLinksData.php} (97%)
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/CatalogProductDownloadableInterface.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/Curl.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/CatalogProductDownloadable.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/curl/di.xml
rename app/code/Magento/Install/Helper/Data.php => dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php (84%)
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.xml
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Filter.php
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.php
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/constraint.xml
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/fixture.xml
create mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/page.xml
rename dev/tests/functional/tests/app/Magento/{User/Test/Block/Backend/UserEditPageActions.php => Sitemap/Test/Block/Adminhtml/SitemapPageActions.php} (71%)
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest/testGenerateSitemap.csv
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest/testUpdateSitemap.csv
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role/Grid.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.xml
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
rename dev/tests/functional/tests/app/Magento/User/Test/Constraint/{InvalidCredentials.php => AssertUserWrongCredentialsMessage.php} (67%)
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/Role.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest/testUpdateAdminUser.csv
create mode 100644 dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlrewriteTest.php
rename app/code/Magento/Cms/Helper/Data.php => dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/_files/select_attribute_rollback.php (74%)
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_rollback.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree_rollback.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category_rollback.php
create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_invalid_multiselect_values.csv
delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php
create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/orders.php
create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/assign_status_to_state.php
create mode 100644 dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php
rename dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/{unused => not_magento_dir}/Model.php (100%)
rename dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/{unused => not_magento_dir}/file.js (100%)
rename dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/{unused => not_magento_dir}/template.phtml (100%)
create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/Package.php
create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFiles.php
create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFilesTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/CategoryLoaderTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ReadServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/Tree/ReadServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/WriteServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/MapperTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/TreeTest.php
rename dev/tests/unit/testsuite/Magento/Catalog/Service/V1/{ProductMetadataServiceTest.php => MetadataServiceTest.php} (93%)
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceTest.php
delete mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductAttributeServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Model/Rule/Condition/ProductTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverFactoryTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/code/.gitignore
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/design/.gitignore
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/mage/.gitignore
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/varien/.gitignore
create mode 100644 dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Parser/ParserTest.php
create mode 100644 dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/Resolver.php
create mode 100644 dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverFactory.php
create mode 100644 dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverInterface.php
delete mode 100644 dev/tools/xml/translate.php
delete mode 100644 dev/tools/xml/translate.xslt
create mode 100644 lib/internal/Magento/Framework/Css/README.md
rename app/code/Magento/Index/Helper/Data.php => lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php (90%)
create mode 100644 lib/internal/Magento/Framework/Less/README.md
create mode 100644 lib/internal/Magento/Framework/View/README.md
create mode 100644 lib/web/fonts/Blank-Theme-Icons/selection.json
create mode 100644 lib/web/i18n/de_DE.csv
create mode 100644 lib/web/i18n/en_US.csv
create mode 100644 lib/web/i18n/es_ES.csv
create mode 100644 lib/web/i18n/fr_FR.csv
create mode 100644 lib/web/i18n/nl_NL.csv
create mode 100644 lib/web/i18n/pt_BR.csv
create mode 100644 lib/web/i18n/zh_CN.csv
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ec149d4a95..16ed020f1e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,70 @@
+2.0.0.0-dev86
+=============
+* Service layer updates:
+ * Created Category service and methods
+ * Renamed attribute option service
+ * Implemented an API method to remove for attribute options
+ * Created TaxClass service and methods
+ * Created APIs for Tax service
+* Framework improvements:
+ * REST/SOAP calls uses default store if store code not provided
+ * Added a warning about using a not secure protocol for theidentity link URL
+ * Fixed exception masking and removed unnecessary exceptions from the Webapi framework
+* WEEE features parity:
+ * Fixed an issue with Tax calculations when FPT is enabled
+ * Fixed an issue where FPT was not included in the subtotal number on invoice pages
+ * Fixed an issue where FPT was not included in the subtotal number on credit memo pages
+ * Free shipping calculated with FPT
+ * Fixed an issue where discounts where applied to FPT
+ * Fixed an issue with rounding is the Tax detailed info
+ * Fixed issues with bundle product pricing with tier and special prices
+* Added an integrity test to verify that dictionary and code are synced
+* i18n Improvements:
+ * Improved the wording of the i18n CLI Tools
+ * Removed the helpers which became unused after i18n Improvements
+* Fixed bugs:
+ * Fixed an issue where configurable attributes were not chosen according to the hash tag
+ * Fixed an issue where the Compare Products functionality did not work correctly
+ * Fixed an issue where product attribute values were duplicated after import
+ * Fixed an issue were the scope of an attribute was not considered in catalog price rule conditions
+ * Fixed an issue where shipping address was not saved if it was added during checkout
+ * Fixed an issue where there was no POST request when saving a customer group
+ * Fixed an issue where an attribute template was not applied after changing it for the first time during product creation
+ * Fixed an issue where the Sale Report Grid with no results found contained an unnecessary empty Total section
+ * Fixed an issue where a notice was added to system.log when a product was added to cart
+ * Fixed integration test coverage failure
+ * Fixed an issue where a message about inequality of password and confirmation was displayed in the wrong place
+ * Fixed an issue with an XSS warning in 'Used for Sorting in Product Listing' property of Product Attribute
+ * Fixed an issue where an order was not displayed on frontend if its order status was deleted
+ * Fixed an issue where tier pricing was not displayed on a grouped product page
+ * Verified and fixed the content of errors returned from SOAP calls
+ * Fixed an issue where it was impossible to create a tax rule when using a complex Customer/Product tax class
+ * Fixed an issue where the Street Address line count setting was not applied.
+ * Fixed an issue where customers were not assigned to the correct VAT customer groups during admin order creation
+ * The unused translateArray method of AbstractHelper was removed
+ * Fixed an issue where localization did not work for strings containing a single quote (')
+ * Fixed issues with the translate and the logging transformation tools
+ * Fixed an issue where it was impossible to create a URL rewrite for a CMS Page with Temporary (302) or Permanent (301) redirect
+* GitHub requests:
+ * [#598] Add Sort Order to Rules
+ * [#580] Set changed status on model to prevent status overwriting when model gets saved
+* Unit Tests Coverage:
+ * Part of the Catalog module covered with the unit tests
+* Added the following functional tests:
+ * Applying Several Catalog Price Rules
+ * Attribute Set Creation
+ * Category Deletion
+ * Customer Group Deletion
+ * Generating Sitemap
+ * Product Attribute Deletion
+ * Update Admin User
+ * Update Cms Page
+ * Update Customer Group
+ * Update Downloadable Product
+ * Update Product Attribute
+ * Update Sales Rule
+ * Update Sitemap
+
2.0.0.0-dev85
=============
* Service layer updates:
@@ -9,7 +76,6 @@
* Fixed an issue where Google Content was not sending the correct 'description' attribute
* Fixed an issue where custom attributes were not displayed in layered navigation after a product import
* Fixed an issue where the Category URL keys did not work correctly after saving
- * Fixed an issue where an admin could not create a Target rule with a certain Products to Display condition
* Fixed a jQuery error on a product page in the Admin panel, which appeared when switching between product tabs
* Framework Improvements:
* Created ProductsCustomOptions Service API for Catalog module
diff --git a/app/code/Magento/AdminNotification/i18n/de_DE.csv b/app/code/Magento/AdminNotification/i18n/de_DE.csv
index 7ce78b3948a..6a4ce03485e 100644
--- a/app/code/Magento/AdminNotification/i18n/de_DE.csv
+++ b/app/code/Magento/AdminNotification/i18n/de_DE.csv
@@ -1,30 +1,51 @@
-"Actions","Aktionen"
-"An error occurred while marking notification as read.","Fehler beim Markieren des Hinweises als 'gelesen'."
-"An error occurred while marking the messages as read.","Fehler beim Markieren der Nachrichten als 'gelesen'."
-"An error occurred while removing messages.","Fehler beim Entfernen der Nachrichten."
-"An error occurred while removing the message.","Fehler beim Entfernen der Nachricht."
-"Are you sure?","Sind Sie sicher?"
-"Date Added","Hinzugefügt am"
-"Last Update","Letzte Aktualisierung"
+"Read Details","Details anzeigen"
"Mark as Read","Als 'gelesen' markieren"
-"Mark as read","Als gelesen markieren"
-"Message","Nachricht"
-"Messages Inbox","Posteingang"
-"Notifications","Hinweise"
+"Are you sure?","Sind Sie sicher?"
+Remove,Entfernen
+"Messages Inbox",Posteingang
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,Hinweise
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
"Please select messages.","Bitte Nachrichten auswählen."
-"Read Details","Details anzeigen"
-"Remove","Entfernen"
-"Severity","Wichtigkeit"
-"Show List","Liste anzeigen"
-"Show Toolbar","Werkzeugleiste anzeigen"
-"The message has been marked as read.","Die Nachricht wurde als 'gelesen' markiert."
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
"The message has been removed.","Die Nachricht wurde entfernt."
-"Total of %d record(s) have been marked as read.","Insgesamt %d Einträge wurden als 'gelesen' markiert."
-"Total of %d record(s) have been removed.","Insgesamt %d Einträge wurden gelöscht."
-"Unable to proceed. Please, try again.","Vorgang konnte nicht ausgeführt werden. Bitte versuchen Sie es später noch einmal."
-"Update Frequency","Aktualisierungshäufigkeit"
-"Use HTTPS to Get Feed","Benutzen Sie HTTPS um Nachrichten abzurufen"
-"critical","kritisch"
-"major","wichtig"
-"minor","unwichtig"
-"notice","Hinweis"
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,kritisch
+major,wichtig
+minor,unwichtig
+notice,Hinweis
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,Aktionen
+Message,Nachricht
+"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,Wichtigkeit
+"Date Added","Hinzugefügt am"
diff --git a/app/code/Magento/AdminNotification/i18n/en_US.csv b/app/code/Magento/AdminNotification/i18n/en_US.csv
index b1a36d13a31..2c170470241 100644
--- a/app/code/Magento/AdminNotification/i18n/en_US.csv
+++ b/app/code/Magento/AdminNotification/i18n/en_US.csv
@@ -1,30 +1,51 @@
-"Actions","Actions"
-"An error occurred while marking notification as read.","An error occurred while marking notification as read."
-"An error occurred while marking the messages as read.","An error occurred while marking the messages as read."
-"An error occurred while removing messages.","An error occurred while removing messages."
-"An error occurred while removing the message.","An error occurred while removing the message."
-"Are you sure?","Are you sure?"
-"Date Added","Date Added"
-"Last Update","Last Update"
+"Read Details","Read Details"
"Mark as Read","Mark as Read"
-"Mark as read","Mark as read"
-"Message","Message"
+"Are you sure?","Are you sure?"
+Remove,Remove
"Messages Inbox","Messages Inbox"
-"Notifications","Notifications"
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,Notifications
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
"Please select messages.","Please select messages."
-"Read Details","Read Details"
-"Remove","Remove"
-"Severity","Severity"
-"Show List","Show List"
-"Show Toolbar","Show Toolbar"
-"The message has been marked as read.","The message has been marked as read."
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
"The message has been removed.","The message has been removed."
-"Total of %d record(s) have been marked as read.","Total of %d record(s) have been marked as read."
-"Total of %d record(s) have been removed.","Total of %d record(s) have been removed."
-"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
-"Update Frequency","Update Frequency"
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,critical
+major,major
+minor,minor
+notice,notice
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,Actions
+Message,Message
"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
-"critical","critical"
-"major","major"
-"minor","minor"
-"notice","notice"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,Severity
+"Date Added","Date Added"
diff --git a/app/code/Magento/AdminNotification/i18n/es_ES.csv b/app/code/Magento/AdminNotification/i18n/es_ES.csv
index baf79a70959..be75b360b52 100644
--- a/app/code/Magento/AdminNotification/i18n/es_ES.csv
+++ b/app/code/Magento/AdminNotification/i18n/es_ES.csv
@@ -1,30 +1,51 @@
-"Actions","Acciones"
-"An error occurred while marking notification as read.","Se ha producido un error al marcar la notificación como leÃda."
-"An error occurred while marking the messages as read.","Se ha producido un error al marcar los mensajes como leÃdos."
-"An error occurred while removing messages.","Se ha producido un error al eliminar los mensajes."
-"An error occurred while removing the message.","Se ha producido un error al eliminar el mensaje."
-"Are you sure?","¿Está seguro?"
-"Date Added","Añadido el dÃa"
-"Last Update","Última actualización"
+"Read Details","Leer detalles"
"Mark as Read","Marcar como leÃdo"
-"Mark as read","Marcar como leÃdo"
-"Message","Mensaje"
+"Are you sure?","¿Está seguro?"
+Remove,Eliminar
"Messages Inbox","Bandeja de entrada"
-"Notifications","Notificaciones"
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,Notificaciones
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
"Please select messages.","Por favor, selecciona al menos un mensaje."
-"Read Details","Leer detalles"
-"Remove","Eliminar"
-"Severity","Gravedad"
-"Show List","Mostrar lista"
-"Show Toolbar","Mostrar barra de herramientas"
-"The message has been marked as read.","El mensaje ha sido marcado como leÃdo."
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
"The message has been removed.","El mensaje ha sido eliminado."
-"Total of %d record(s) have been marked as read.","%d informe(s) ha(n) sido marcado(s) como leÃdo(s)."
-"Total of %d record(s) have been removed.","%d informe(s) ha(n) sido eliminado(s)."
-"Unable to proceed. Please, try again.","Imposible realizar la operación. Inténtalo de nuevo."
-"Update Frequency","Frecuencia de actualización"
-"Use HTTPS to Get Feed","Utiliza HTTPS para obtener información"
-"critical","crÃtico"
-"major","mayor"
-"minor","menor"
-"notice","aviso"
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,crÃtico
+major,mayor
+minor,menor
+notice,aviso
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,Acciones
+Message,Mensaje
+"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,Gravedad
+"Date Added","Añadido el dÃa"
diff --git a/app/code/Magento/AdminNotification/i18n/fr_FR.csv b/app/code/Magento/AdminNotification/i18n/fr_FR.csv
index 7348b9bbd9b..ece76aabcce 100644
--- a/app/code/Magento/AdminNotification/i18n/fr_FR.csv
+++ b/app/code/Magento/AdminNotification/i18n/fr_FR.csv
@@ -1,30 +1,51 @@
-"Actions","Action"
-"An error occurred while marking notification as read.","Une erreur est survenue lors du marquage de la notification comme lue."
-"An error occurred while marking the messages as read.","Une erreur est survenue lors du marquage du message comme lu."
-"An error occurred while removing messages.","Une erreur est survenue lors de la suppression des messages."
-"An error occurred while removing the message.","Une erreur est survenue lors de la suppression du message."
-"Are you sure?","Etes-vous sûr ?"
-"Date Added","Date ajoutée"
-"Last Update","Dernière mise à jour"
+"Read Details","Lire les détails"
"Mark as Read","Marquer comme lu"
-"Mark as read","Marqué comme lu"
-"Message","Message"
+"Are you sure?","Etes-vous sûr ?"
+Remove,Supprimer
"Messages Inbox","Boite de réception"
-"Notifications","Notification"
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,Notification
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
"Please select messages.","Veuillez sélectionner les messages"
-"Read Details","Lire les détails"
-"Remove","Supprimer"
-"Severity","Gravité"
-"Show List","Afficher liste"
-"Show Toolbar","Afficher toolbar"
-"The message has been marked as read.","Le message a été marqué comme lu."
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
"The message has been removed.","Le message a été supprimé."
-"Total of %d record(s) have been marked as read.","Total de %d message(s) ont été marqués comme lus."
-"Total of %d record(s) have been removed.","Total de %d message(s) ont été supprimés."
-"Unable to proceed. Please, try again.","Impossible de continuer. S'il vous plait, essayez encore."
-"Update Frequency","Fréquence de mise à jour"
-"Use HTTPS to Get Feed","Utilisez HTTPS pour récupérer le feed"
-"critical","critique"
-"major","majeur"
-"minor","mineur"
-"notice","notice"
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,critique
+major,majeur
+minor,mineur
+notice,notice
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,Action
+Message,Message
+"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,Gravité
+"Date Added","Date ajoutée"
diff --git a/app/code/Magento/AdminNotification/i18n/nl_NL.csv b/app/code/Magento/AdminNotification/i18n/nl_NL.csv
index f794e370dc9..dbb2722d658 100644
--- a/app/code/Magento/AdminNotification/i18n/nl_NL.csv
+++ b/app/code/Magento/AdminNotification/i18n/nl_NL.csv
@@ -1,30 +1,51 @@
-"Actions","Acties"
-"An error occurred while marking notification as read.","Er is een fout opgetreden terwijl er een notitie als gelezen werd gemarkeerd."
-"An error occurred while marking the messages as read.","Er is een fout opgetreden terwijl de berichten als gelezen werden gemarkeerd"
-"An error occurred while removing messages.","Er is een fout opgetreden terwijl de berichten werden verwijderd"
-"An error occurred while removing the message.","Er is een fout opgetreden terwijl het bericht werd verwijderd."
-"Are you sure?","Weet u het zeker"
-"Date Added","Datum toegevoegd"
-"Last Update","Laatste update"
+"Read Details","Lees details"
"Mark as Read","Markeer als gelezen"
-"Mark as read","Markeer als gelezen"
-"Message","Bericht"
+"Are you sure?","Weet u het zeker"
+Remove,Verwijderen
"Messages Inbox","Berichten inbox"
-"Notifications","Notificaties"
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,Notificaties
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
"Please select messages.","Selecteer a.u.b. berichten"
-"Read Details","Lees details"
-"Remove","Verwijderen"
-"Severity","Zwaarheid"
-"Show List","Laat lijst zien"
-"Show Toolbar","Laat werkbalk zien"
-"The message has been marked as read.","Dit bericht is gemarkeerd als gelezen"
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
"The message has been removed.","Dit bericht is verwijderd"
-"Total of %d record(s) have been marked as read.","Een totaal van %d bestand(en) is gemarkeerd als gelezen"
-"Total of %d record(s) have been removed.","Een totaal van %d bestand(en) zijn verwijderd."
-"Unable to proceed. Please, try again.","Niet in staat om door te gaan, probeer a.u.b. opnieuw."
-"Update Frequency","Update frequentie"
-"Use HTTPS to Get Feed","Gebruik HTTPS om Feed te verkrijgen"
-"critical","Kritisch"
-"major","groot"
-"minor","klein"
-"notice","aankondiging"
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,Kritisch
+major,groot
+minor,klein
+notice,aankondiging
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,Acties
+Message,Bericht
+"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,Zwaarheid
+"Date Added","Datum toegevoegd"
diff --git a/app/code/Magento/AdminNotification/i18n/pt_BR.csv b/app/code/Magento/AdminNotification/i18n/pt_BR.csv
index 466a84bec0f..29cd9398712 100644
--- a/app/code/Magento/AdminNotification/i18n/pt_BR.csv
+++ b/app/code/Magento/AdminNotification/i18n/pt_BR.csv
@@ -1,30 +1,51 @@
-"Actions","Ações"
-"An error occurred while marking notification as read.","Ocorreu um erro ao marcar a notificação como lida."
-"An error occurred while marking the messages as read.","Ocorreu um erro ao marcar as mensagens como lidas."
-"An error occurred while removing messages.","Ocorreu um erro ao remover mensagens."
-"An error occurred while removing the message.","Ocorreu um erro ao remover a mensagem."
-"Are you sure?","Tem certeza?"
-"Date Added","Data de Adição"
-"Last Update","Última Atualização"
+"Read Details","Ler detalhes"
"Mark as Read","Marcar como Lida"
-"Mark as read","Marcar como lida"
-"Message","Mensagem"
+"Are you sure?","Tem certeza?"
+Remove,Remover
"Messages Inbox","Caixa de Entrada de Mensagens"
-"Notifications","Notificações"
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,Notificações
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
"Please select messages.","Selecione mensagens."
-"Read Details","Ler detalhes"
-"Remove","Remover"
-"Severity","Rigor"
-"Show List","Mostrar Lista"
-"Show Toolbar","Mostrar Barra de Ferramentas"
-"The message has been marked as read.","A mensagem foi marcada como lida."
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
"The message has been removed.","A mensagem foi removida."
-"Total of %d record(s) have been marked as read.","Foi(Foram) marcado(s) ao todo %d registro(s) como lido(s)."
-"Total of %d record(s) have been removed.","Foi(Foram) removido(s) ao todo %d registro(s)."
-"Unable to proceed. Please, try again.","ImpossÃvel prosseguir. Tente novamente."
-"Update Frequency","Atualizar Frequência"
-"Use HTTPS to Get Feed","Use HTTPS para Obter Comentários"
-"critical","crÃtico"
-"major","maior"
-"minor","menor"
-"notice","aviso"
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,crÃtico
+major,maior
+minor,menor
+notice,aviso
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,Ações
+Message,Mensagem
+"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,Rigor
+"Date Added","Data de Adição"
diff --git a/app/code/Magento/AdminNotification/i18n/zh_CN.csv b/app/code/Magento/AdminNotification/i18n/zh_CN.csv
index 5ef50833a96..614bd688a0a 100644
--- a/app/code/Magento/AdminNotification/i18n/zh_CN.csv
+++ b/app/code/Magento/AdminNotification/i18n/zh_CN.csv
@@ -1,30 +1,51 @@
-"Actions","æ“作"
-"An error occurred while marking notification as read.","æ ‡è®°é€šçŸ¥ä¸ºå·²è¯»æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"An error occurred while marking the messages as read.","æ ‡è®°ä¿¡æ¯ä¸ºå·²è¯»æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"An error occurred while removing messages.","åˆ é™¤ä¿¡æ¯æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"An error occurred while removing the message.","åˆ é™¤è¯¥ä¿¡æ¯æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Date Added","æ·»åŠ æ—¥æœŸ"
-"Last Update","最åŽæ›´æ–°"
-"Mark as Read","æ ‡è®°ä¸ºå·²è¯»"
-"Mark as read","æ ‡è®°ä¸ºå·²è¯»"
-"Message","ä¿¡æ¯"
-"Messages Inbox","收件箱"
-"Notifications","通知"
-"Please select messages.","请选择一æ¡ä¿¡æ¯ã€‚"
-"Read Details","阅读详情"
-"Remove","åˆ é™¤"
-"Severity","严é‡ç¨‹åº¦"
-"Show List","显示列表"
-"Show Toolbar","显示工具æ "
-"The message has been marked as read.","该信æ¯å·²æ ‡è®°ä¸ºå·²è¯»ã€‚"
-"The message has been removed.","该信æ¯å·²è¢«åˆ 除。"
-"Total of %d record(s) have been marked as read.","å…± %d æ¡ä¿¡æ¯æ ‡è®°ä¸ºå·²è¯»ã€‚"
-"Total of %d record(s) have been removed.","å…± %d æ¡ä¿¡æ¯è¢«åˆ 除。"
-"Unable to proceed. Please, try again.","æ— æ³•å¤„ç†ã€‚请é‡è¯•ã€‚"
-"Update Frequency","更新频率"
-"Use HTTPS to Get Feed","使用HTTPS获å–æº"
-"critical","é‡è¦"
-"major","主è¦"
-"minor","次è¦"
-"notice","注æ„"
+"Read Details",阅读详情
+"Mark as Read",æ ‡è®°ä¸ºå·²è¯»
+"Are you sure?",您是å¦ç¡®è®¤ï¼Ÿ
+Remove,åˆ é™¤
+"Messages Inbox",收件箱
+"You have %1 new system messages","You have %1 new system messages"
+"You have %1 new system message","You have %1 new system message"
+"Incoming Message","Incoming Message"
+close,close
+"Read details","Read details"
+Notifications,通知
+"The message has been marked as Read.","The message has been marked as Read."
+"We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
+"Please select messages.",请选择一æ¡ä¿¡æ¯ã€‚
+"A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
+"The message has been removed.",该信æ¯å·²è¢«åˆ 除。
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"1 Hour","1 Hour"
+"2 Hours","2 Hours"
+"6 Hours","6 Hours"
+"12 Hours","12 Hours"
+"24 Hours","24 Hours"
+critical,é‡è¦
+major,主è¦
+minor,次è¦
+notice,注æ„
+"Wrong message type","Wrong message type"
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href=""%1"">configuration</a>."
+"One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
+"Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
+"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
+"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
+"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Close popup","Close popup"
+Close,Close
+"Critical System Messages","Critical System Messages"
+"Major System Messages","Major System Messages"
+"System messages","System messages"
+Notification,Notification
+Cancel,Cancel
+Acknowledge,Acknowledge
+"See All (%1 unread)","See All (%1 unread)"
+Actions,æ“作
+Message,ä¿¡æ¯
+"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Update Frequency","Update Frequency"
+"Last Update","Last Update"
+Severity,严é‡ç¨‹åº¦
+"Date Added",æ·»åŠ æ—¥æœŸ
diff --git a/app/code/Magento/Authorizenet/i18n/de_DE.csv b/app/code/Magento/Authorizenet/i18n/de_DE.csv
index f38994b8eec..93426979dd3 100644
--- a/app/code/Magento/Authorizenet/i18n/de_DE.csv
+++ b/app/code/Magento/Authorizenet/i18n/de_DE.csv
@@ -1,100 +1,101 @@
-"--Please Select--","--Bitte wählen--"
-"3D Secure","3D Secure"
-"3D Secure Card Validation","3D Secure-Kartenbestätigung"
-"API Login ID","API Login ID"
-"API Login ID","API Login-ID"
-"Accepted Currency","Akzeptierte Währung"
-"Allow Partial Authorization","Teilweise Autorisierung erlauben"
+Cancel,Abbrechen
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Sind Sie sicher, dass Sie die Zahlung abbrechen möchten? Klicken Sie auf OK, um Ihre Zahlung abzubrechen und den Betrag wieder frei verfügbar zu machen. Klicken Sie auf Abbrechen, um eine andere Kreditkarte anzugeben und mit der Zahlung fortzufahren."
+"Processed Amount","Bearbeiteter Betrag"
+"Remaining Balance","Verbleibender Betrag"
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.","Es ist ein Fehler beim Abbruch der Transaktion aufgetreten. Bitte kontaktieren Sie uns oder probieren Sie es später noch einmal."
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,fehlgeschlagen
+successful,erfolgreich
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,Autorisieren
+"authorize and capture","Autorisieren und Erfassen"
+capture,Erfassen
+refund,Rückerstattung
+void,ungültig
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.","Fehler beim Zahlungsupdate."
"Authorize Only","Nur genehmigen"
"Authorize and Capture","Genehmigen und erfassen"
-"Authorize.Net Transaction ID %s","Authorize.Net Transaktions-ID %s"
-"Authorize.net","Genehmigen.net"
-"Authorize.net Direct Post","Authorize.net Direktpost"
-"Cancel","Abbrechen"
-"Card Verification Number","Kreditkartenprüfnummer"
-"Card Verification Number Visual Reference","Kartenprüfnummer Sichtmerkmale"
-"Centinel API URL","Centinel API-URL"
-"Close","Schließen"
-"Credit Card Information","Kreditkarteninformationen"
-"Credit Card Number","Kreditkartennummer"
-"Credit Card Type","Kreditkartentyp"
-"Credit Card Types","Kreditkartentypen"
-"Credit Card Types","Arten von Kreditkarten"
-"Credit Card Verification","Kreditkarten-Verifizierung"
-"Credit Card Verification","Überprüfung der Kreditkarte"
-"Credit Card: xxxx-%s","Kreditkarte: xxxx-%s"
-"Debug","Debug"
-"Debug","Fehlerbeseitigung"
-"Email Customer","Kunden-Email"
-"Email Customer","Kunden E-Mail"
-"Enabled","Aktiviert"
-"Error in payment gateway.","Fehler beim Payment Gateway."
-"Expiration Date","Ablaufdatum"
-"Gateway URL","Gateway URL"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway-Aktionen wurden gesperrt, weil der Gateway eine oder mehrere Transaktionen nicht verarbeiten konnte. Bitte loggen Sie sich in Ihren Authorize.Net-Account ein, um dieses Problem manuell zu beheben."
-"Gateway error: %s","Fehler des Gateway: %s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Es wird ein Standardwert verwendet, falls das Feld freigelassen wird. Eine benutzerdefinierte URL darf nach der CardinalCommerce-Vereinbarung angegeben werden."
-"Invalid amount for authorization.","Ungültiger Betrag um genehmigt zu werden."
"Invalid amount for capture.","Ungültiger Betrag für die Erfassung."
-"Invalid amount for partial authorization.","Ungültiger Betrag für die teilweise Autorisierung."
-"Invalid amount for refund.","Ungültiger Betrag für eine Rückerstattung."
-"Invalid split tenderId ID.","Ungültige gespaltene Angebotsidentität"
-"Maximum Order Total","Maximale Bestellung Total"
-"Maximum Order Total","Höchstsumme der Bestellung"
-"Merchant MD5","Händler MD5"
-"Merchant's Email","Händler-Email"
-"Merchant's Email","E-Mail des Händlers"
-"Minimum Order Total","Mindestsumme der Bestellung"
-"Minimum Order Total","Minimale Bestellung Total"
-"New Order Status","Stand der neuen Bestellung"
-"New Order Status","Neuer Bestellstatus"
-"Order saving error: %s","Fehler beim Speichern der Order:"
-"Payment Action","Zahlungsaktion"
-"Payment Action","Zahlungsvorgang"
-"Payment authorization error.","Fehler bei der Zahlungsermächtigung."
-"Payment authorization error. Transacion id is empty.","Fehler bei der Zahlungsbestätigung. Transaktions-ID ist leer."
-"Payment canceling error.","Fehler bei Zahlungsabbruch."
"Payment capturing error.","Fehler bei Zahlungserfassung."
-"Payment error. Order was not found.","Zahlungsfehler. Bestellung konnte nicht gefunden werden."
-"Payment error. Paid amount doesn't match the order amount.","Zahlungsfehler. Gezahlter Betrag entspricht nicht dem Rechnungsbetrag."
-"Payment from Applicable Countries","Bezahlung aus den entsprechenden Ländern"
-"Payment from Applicable Countries","Zahlung aus geeigneten Ländern"
-"Payment from Specific Countries","Zahlung aus spezifischen Ländern"
-"Payment from Specific Countries","Bezahlung aus bestimmten Ländern"
-"Payment partial authorization error.","Fehler bei teilweiser Autorisierung."
-"Payment refunding error.","Fehler bei der Rückerstattung."
-"Payment updating error.","Fehler beim Zahlungsupdate."
+"Invalid transaction ID.","Invalid transaction ID."
"Payment voiding error.","Fehler beim Stornieren der Zahlung."
-"Please, choose payment method","Bitte wählen Sie die Zahlungsmethode"
-"Processed Amount","Bearbeiteter Betrag"
-"Remaining Balance","Verbleibender Betrag"
-"Response hash validation failed. Transaction declined.","Überprüfung der Zahlungsfähigkeit fehlgeschlagen. Transaktion abgelehnt."
-"Severe 3D Secure Card Validation","Strenge Absicherung der 3D geschützten Karte"
-"Severe Validation Removes Chargeback Liability on Merchant","Die bestehende strenge Absicherung entzieht den Verkäufer der Verbindlichkeit Ausgleichsbuchungen nachkommen zu müssen"
-"Shopping cart contents and/or address has been changed.","Artikel im Einkaufswagen und/oder die Adresse wurden geändert."
-"Sort Order","Sortierreihenfolge"
-"Sort Order","Sortierfolge"
-"Test Mode","Testmodus"
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","Der Betrag auf Ihrer Kreditkarte reicht nicht aus, um den Kauf durchzuführen. Auf den verfügbaren Betrag kann nicht zugegriffen werden. Um den Kauf durchzuführen, klicken Sie bitte auf OK und geben Sie eine weitere Kreditkartennummer an. Um den Kauf abzubrechen und auf den Betrag wieder zugreifen zu können, klicken Sie bitte auf Abbrechen."
-"The order has been created.","Die Bestellung wurde aufgenommen."
-"There was an error canceling transactions. Please contact us or try again later.","Es ist ein Fehler beim Abbruch der Transaktion aufgetreten. Bitte kontaktieren Sie uns oder probieren Sie es später noch einmal."
-"There was an error processing your order. Please contact us or try again later.","Bei der Bearbeitung Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns oder versuchen Sie es später noch einmal."
-"Title","Titel"
-"Transaction Key","Transaktionsschlüssel"
-"Transaction Key","Transaction key"
+"Invalid amount for refund.","Ungültiger Betrag für eine Rückerstattung."
+"Payment refunding error.","Fehler bei der Rückerstattung."
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type",Kreditkartentyp
+"Credit Card Number",Kreditkartennummer
+"Expiration Date",Ablaufdatum
+"Card Verification Number",Kreditkartenprüfnummer
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
+"Credit Card Information",Kreditkarteninformationen
+"--Please Select--","--Bitte wählen--"
+"Card Verification Number Visual Reference","Kartenprüfnummer Sichtmerkmale"
"What is this?","Was ist das?"
-"You have reached the maximum number of credit card allowed to be used for the payment.","Sie haben die maximale Anzahl an Kreditkarten erreicht, die Sie für die Bezahlung verwenden dürfen."
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Sie haben die maximale Anzahl an Kreditkarten erreicht, die Sie für eine Bezahlung verwenden dürfen. Die verfügbaren Beträge auf allen verwendeten Karten reichten nicht aus, um die Bezahlung abschließen zu können. Der Zahlungsprozess wurde abgebrochen und die Beträge sind wieder frei verfügbar."
-"You will be required to enter your payment details before you place an order.","Bevor Sie eine Bestellung aufgeben können, müssen Sie Ihre Zahlungsdetails angeben."
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Ihre Kredtikarte wurde abgelehnt. Klicken Sie OK, um eine andere Kreditkarte anzugeben, damit Sie den Zahlungsvorgang abschließen können. Klicken Sie auf Abbrechen, um den verwendeten Betrag wieder verfügbar zu machen und eine andere Zahlungsmethode auszuwählen."
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Ihre Bestellung wurde nicht aufgegeben, weil Artikel in Ihrem Einkaufswagen und/oder die Adresse geändert wurden. Bereits autorisierte, ausstehende Beträge von Ihrer vorherigen Zahlung sind wieder frei verfügbar. Bitte führen Sie den Zahlungsvorgang noch einmal durch, um Ihre neu hinzugekommenen Artikel zu erfassen."
-"Your payment has been cancelled. All authorized amounts have been released.","Ihre Zahlung wurde abgebrochen. Alle autorisierten Beträge sind wieder frei verfügbar."
-"amount %s","Betrag %s"
-"authorize","Autorisieren"
-"authorize and capture","Autorisieren und Erfassen"
-"capture","Erfassen"
-"failed","fehlgeschlagen"
-"refund","Rückerstattung"
-"successful","erfolgreich"
-"void","ungültig"
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
+"Email Customer","Email Customer"
+"API Login ID","API Login ID"
+"Merchant's Email","Merchant's Email"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
+"Payment Action","Payment Action"
+"Accepted Currency","Accepted Currency"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
index 1a3d5e3762a..3b3f69fda44 100644
--- a/app/code/Magento/Authorizenet/i18n/en_US.csv
+++ b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -1,86 +1,101 @@
-"--Please Select--","--Please Select--"
-"3D Secure","3D Secure"
-"3D Secure Card Validation","3D Secure Card Validation"
-"API Login ID","API Login ID"
-"Accepted Currency","Accepted Currency"
-"Allow Partial Authorization","Allow Partial Authorization"
+Cancel,Cancel
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment."
+"Processed Amount","Processed Amount"
+"Remaining Balance","Remaining Balance"
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.","There was an error canceling transactions. Please contact us or try again later."
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,failed
+successful,successful
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,authorize
+"authorize and capture","authorize and capture"
+capture,capture
+refund,refund
+void,void
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.","Payment updating error."
"Authorize Only","Authorize Only"
"Authorize and Capture","Authorize and Capture"
-"Authorize.Net Transaction ID %s","Authorize.Net Transaction ID %s"
-"Authorize.net","Authorize.net"
-"Authorize.net Direct Post","Authorize.net Direct Post"
-"Cancel","Cancel"
+"Invalid amount for capture.","Invalid amount for capture."
+"Payment capturing error.","Payment capturing error."
+"Invalid transaction ID.","Invalid transaction ID."
+"Payment voiding error.","Payment voiding error."
+"Invalid amount for refund.","Invalid amount for refund."
+"Payment refunding error.","Payment refunding error."
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type","Credit Card Type"
+"Credit Card Number","Credit Card Number"
+"Expiration Date","Expiration Date"
"Card Verification Number","Card Verification Number"
-"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
-"Centinel API URL","Centinel API URL"
-"Close","Close"
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
"Credit Card Information","Credit Card Information"
-"Credit Card Number","Credit Card Number"
-"Credit Card Type","Credit Card Type"
+"--Please Select--","--Please Select--"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","What is this?"
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
"Credit Card Types","Credit Card Types"
"Credit Card Verification","Credit Card Verification"
-"Credit Card: xxxx-%s","Credit Card: xxxx-%s"
-"Debug","Debug"
"Email Customer","Email Customer"
-"Enabled","Enabled"
-"Error in payment gateway.","Error in payment gateway."
-"Expiration Date","Expiration Date"
-"Gateway URL","Gateway URL"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s)."
-"Gateway error: %s","Gateway error: %s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
-"Invalid amount for authorization.","Invalid amount for authorization."
-"Invalid amount for capture.","Invalid amount for capture."
-"Invalid amount for partial authorization.","Invalid amount for partial authorization."
-"Invalid amount for refund.","Invalid amount for refund."
-"Invalid split tenderId ID.","Invalid split tenderId ID."
-"Maximum Order Total","Maximum Order Total"
-"Merchant MD5","Merchant MD5"
+"API Login ID","API Login ID"
"Merchant's Email","Merchant's Email"
-"Minimum Order Total","Minimum Order Total"
-"New Order Status","New Order Status"
-"Order saving error: %s","Order saving error: %s"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
"Payment Action","Payment Action"
-"Payment authorization error.","Payment authorization error."
-"Payment authorization error. Transacion id is empty.","Payment authorization error. Transacion id is empty."
-"Payment canceling error.","Payment canceling error."
-"Payment capturing error.","Payment capturing error."
-"Payment error. Order was not found.","Payment error. Order was not found."
-"Payment error. Paid amount doesn't match the order amount.","Payment error. Paid amount doesn't match the order amount."
+"Accepted Currency","Accepted Currency"
"Payment from Applicable Countries","Payment from Applicable Countries"
"Payment from Specific Countries","Payment from Specific Countries"
-"Payment partial authorization error.","Payment partial authorization error."
-"Payment refunding error.","Payment refunding error."
-"Payment updating error.","Payment updating error."
-"Payment voiding error.","Payment voiding error."
-"Please, choose payment method","Please, choose payment method"
-"Processed Amount","Processed Amount"
-"Remaining Balance","Remaining Balance"
-"Response hash validation failed. Transaction declined.","Response hash validation failed. Transaction declined."
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
-"Shopping cart contents and/or address has been changed.","Shopping cart contents and/or address has been changed."
-"Sort Order","Sort Order"
-"Test Mode","Test Mode"
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel."
-"The order has been created.","The order has been created."
-"There was an error canceling transactions. Please contact us or try again later.","There was an error canceling transactions. Please contact us or try again later."
-"There was an error processing your order. Please contact us or try again later.","There was an error processing your order. Please contact us or try again later."
-"Title","Title"
-"Transaction Key","Transaction Key"
-"What is this?","What is this?"
-"You have reached the maximum number of credit card allowed to be used for the payment.","You have reached the maximum number of credit card allowed to be used for the payment."
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released."
-"You will be required to enter your payment details before you place an order.","You will be required to enter your payment details before you place an order."
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method."
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents."
-"Your payment has been cancelled. All authorized amounts have been released.","Your payment has been cancelled. All authorized amounts have been released."
-"amount %s","amount %s"
-"authorize","authorize"
-"authorize and capture","authorize and capture"
-"capture","capture"
-"failed","failed"
-"refund","refund"
-"successful","successful"
-"void","void"
+"Centinel API URL","Centinel API URL"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/i18n/es_ES.csv b/app/code/Magento/Authorizenet/i18n/es_ES.csv
index 9d3e547329d..6767161d421 100644
--- a/app/code/Magento/Authorizenet/i18n/es_ES.csv
+++ b/app/code/Magento/Authorizenet/i18n/es_ES.csv
@@ -1,99 +1,101 @@
-"--Please Select--","--Por favor, seleccione-"
-"3D Secure","3D Secure"
-"3D Secure Card Validation","Validación de Tarjeta 3D Secure"
-"API Login ID","ID de inicio de sesión en API"
-"API Login ID","Id. de inicio de sesión de API"
-"Accepted Currency","Moneda aceptada"
-"Accepted Currency","Moneda Aceptada"
-"Allow Partial Authorization","Permitir Autorización Parcial"
+Cancel,Cancelar
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","¿Está seguro de que desea cancelar su pago? Pinche en Aceptar para cancelar el pago y liberar la cantidad retenida. Pinche en ""Cancelar"" para introducir otra tarjeta de crédito y continuar con su pago."
+"Processed Amount","Cantidad Procesada"
+"Remaining Balance","Saldo Restante"
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.","Ha habido un error en la cancelación de las transacciones. Por favor, póngase en contacto con nosotros o inténtelo más tarde de nuevo."
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,error
+successful,exitoso
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,autorizar
+"authorize and capture","autorizar y capturar"
+capture,capturar
+refund,reembolso
+void,vacÃo
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.","Error de actualización del pago."
"Authorize Only","Sólo autorizar"
"Authorize and Capture","Autorizar y capturar"
-"Authorize.Net Transaction ID %s","Identificación de la Transacción %s Authorize.Net"
-"Authorize.net","Authorize.net"
-"Authorize.net Direct Post","Enlace directo a authorize.net"
-"Cancel","Cancelar"
-"Card Verification Number","Número de Verificación de Tarjeta"
-"Card Verification Number Visual Reference","Referencia visual del número de verificación de tarjeta"
-"Centinel API URL","Centinel API URL"
-"Close","Cerrar"
-"Credit Card Information","Información de la tarjeta de crédito"
-"Credit Card Number","Número de Tarjeta de Crédito"
-"Credit Card Type","Tipo de Tarjeta de Crédito"
-"Credit Card Types","Tipos de Tarjeta de Crédito"
-"Credit Card Types","Tipos de tarjeta de crédito"
-"Credit Card Verification","Verificación de Tarjeta de Crédito"
-"Credit Card Verification","Verificación de tarjeta de crédito"
-"Credit Card: xxxx-%s","Tarjeta de Crédito: xxxx-%s"
-"Debug","Depurar"
-"Email Customer","Cliente de correo"
-"Email Customer","Enviar mensaje de correo electrónico al cliente"
-"Enabled","Habilitado"
-"Error in payment gateway.","Error en el proceso de pago."
-"Expiration Date","Fecha de Caducidad"
-"Gateway URL","URL de la puerta de enlace"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Las acciones de Gateway se han bloqueadas ya que gateway no puede completar una o varias transacciones. Por favor, inicie sesión manualmente en su cuenta Authorize.Net para resolver el/los problema/s."
-"Gateway error: %s","Error de proceso: %s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Al dejarlo en blanco, se utilizará un valor por defecto. Se puede proporcionar un URL personalizado por el acuerdo CardinalCommerce."
-"Invalid amount for authorization.","Monto no válido para la autorización."
"Invalid amount for capture.","Cantidad para retención no válida."
-"Invalid amount for partial authorization.","Cantidad de autorización parcial no válida."
-"Invalid amount for refund.","Cantidad de reembolso no válida."
-"Invalid split tenderId ID.","La identificación tenderId no se puede separar."
-"Maximum Order Total","Total máximo de pedido"
-"Maximum Order Total","Total del pedido máximo"
-"Merchant MD5","MD5 del comerciante"
-"Merchant's Email","Email del comerciante"
-"Merchant's Email","Correo electrónico del vendedor"
-"Minimum Order Total","Total mÃnimo de pedido"
-"Minimum Order Total","Total del pedido mÃnimo"
-"New Order Status","Estado de los nuevos pedidos"
-"New Order Status","Nuevo estado de pedido"
-"Order saving error: %s","Error al guardar el pedido: %s"
-"Payment Action","Acción de pago"
-"Payment Action","Acción de Pago"
-"Payment authorization error.","Error de autorización de pago."
-"Payment authorization error.","Error en la autorización de pago."
-"Payment authorization error. Transacion id is empty.","Error de autorización del pago. El identificador de transacción está vacÃo."
-"Payment canceling error.","Error en el pago de cancelación."
"Payment capturing error.","Error en el pago de retención."
-"Payment error. Order was not found.","Error de pago. No se encontró el pedido."
-"Payment error. Paid amount doesn't match the order amount.","Error de pago. El importe pagado no coincide con el importe del pedido."
-"Payment from Applicable Countries","Pago desde paÃses aceptados"
-"Payment from Applicable Countries","Pago desde paÃses aplicables"
-"Payment from Specific Countries","Pago desde paÃses especÃficos"
-"Payment partial authorization error.","Error en el pago parcial de la autorización."
-"Payment refunding error.","Error en el pago de reembolso."
-"Payment updating error.","Error de actualización del pago."
+"Invalid transaction ID.","Invalid transaction ID."
"Payment voiding error.","Error en la anulación del pago."
-"Please, choose payment method","Seleccione un método de pago"
-"Processed Amount","Cantidad Procesada"
-"Remaining Balance","Saldo Restante"
-"Response hash validation failed. Transaction declined.","Fallo de validación del hash de respuesta. Se rechazó la transacción."
-"Severe 3D Secure Card Validation","Validación de Tarjeta Severe 3D Secure"
-"Severe Validation Removes Chargeback Liability on Merchant","La Validación Severe Suprime la Responsabilidad de Cancelación de Cargo del Comerciante"
-"Shopping cart contents and/or address has been changed.","El contenido de la cesta de compra y/o la dirección han cambiado."
-"Sort Order","Orden de selección"
-"Sort Order","Ordenar Pedido"
-"Test Mode","Modo de prueba"
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","No tiene suficiente dinero en su tarjeta de crédito para completar la compra. El dinero disponible ha sido retenido. Para completar la compra, pulse OK y especifique un número de tarjeta de crédito adicional. Para cancelar la compra y liberar el dinero retenido, pulse Cancelar."
-"The order has been created.","Se ha creado el pedido."
-"There was an error canceling transactions. Please contact us or try again later.","Ha habido un error en la cancelación de las transacciones. Por favor, póngase en contacto con nosotros o inténtelo más tarde de nuevo."
-"There was an error processing your order. Please contact us or try again later.","Se produjo un error en el proceso de su pedido. Contacte con nosotros o inténtelo más tarde."
-"Title","TÃtulo"
-"Transaction Key","Clave de transacción"
+"Invalid amount for refund.","Cantidad de reembolso no válida."
+"Payment refunding error.","Error en el pago de reembolso."
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type","Tipo de Tarjeta de Crédito"
+"Credit Card Number","Número de Tarjeta de Crédito"
+"Expiration Date","Fecha de Caducidad"
+"Card Verification Number","Número de Verificación de Tarjeta"
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
+"Credit Card Information","Información de la tarjeta de crédito"
+"--Please Select--","--Por favor, seleccione-"
+"Card Verification Number Visual Reference","Referencia visual del número de verificación de tarjeta"
"What is this?","¿Qué es esto?"
-"You have reached the maximum number of credit card allowed to be used for the payment.","Ha alcanzado el máximo permitido por su tarjeta de crédito para efectuar el pago."
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Ha alcanzado el número máximo de tarjetas de crédito que se pueden usar para un solo pago. El dinero disponible en todas las tarjetas usadas era insuficiente para completar el pago. El pago se ha cancelado y el dinero retenido se ha liberado."
-"You will be required to enter your payment details before you place an order.","Se le solicitará que introduzca los detalles de pago antes de realizar un pedido."
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Su tarjeta de crédito se ha rechazado. Pulse OK para especificar otra tarjeta de crédito para completar la compra. Pulse Cancelar para liberar el dinero retenido y seleccionar otra forma de pago."
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Su orden no ha sido cursada, porque el contenido de la cesta de la compra y/o la dirección se han cambiado. El dinero autorizado en su pago previo, como adelanto, ahora lo tiene disponible. Por favor, revise el proceso de pago para su pedido reciente."
-"Your payment has been cancelled. All authorized amounts have been released.","Su pago se ha cancelado. Dispone de todo el dinero que habÃa avanzado."
-"amount %s","dinero %s"
-"authorize","autorizar"
-"authorize and capture","autorizar y capturar"
-"capture","capturar"
-"failed","error"
-"refund","reembolso"
-"successful","exitoso"
-"void","vacÃo"
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
+"Email Customer","Email Customer"
+"API Login ID","API Login ID"
+"Merchant's Email","Merchant's Email"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
+"Payment Action","Payment Action"
+"Accepted Currency","Accepted Currency"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/i18n/fr_FR.csv b/app/code/Magento/Authorizenet/i18n/fr_FR.csv
index 27f8c38ee27..86c3b1feb6e 100644
--- a/app/code/Magento/Authorizenet/i18n/fr_FR.csv
+++ b/app/code/Magento/Authorizenet/i18n/fr_FR.csv
@@ -1,100 +1,101 @@
-"--Please Select--","--Veuillez choisir--"
-"3D Secure","Sécurité 3D"
-"3D Secure Card Validation","Validation de carte sécurité 3D"
-"API Login ID","Identifiant de l'API"
-"API Login ID","ID de connexion de l'API"
-"Accepted Currency","Monnaie acceptée"
-"Accepted Currency","Devise acceptée"
-"Allow Partial Authorization","Permettre autorisation partielle"
+Cancel,Annuler
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Etes-vous sûr de vouloir annuler votre paiement ? Cliquez sur OK pour annuler le paiement et débloquer le montant en attente. Cliquez sur Quitter pour entrer une autre carte bancaire et continuer le paiemetn."
+"Processed Amount","Montant réalisé"
+"Remaining Balance","Balance restante"
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.","Une erreur s'est produite lors de l'annulation de transactions. Veuillez nous contacter ou réessayer ultérieurement."
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,échoué
+successful,réussi
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,autoriser
+"authorize and capture","autoriser et saisir"
+capture,saisir
+refund,remboursement
+void,vide
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.","Erreur lors de la mise à jour du paiement."
"Authorize Only","Autoriser uniquement"
"Authorize and Capture","Autoriser et enregistrer"
-"Authorize.Net Transaction ID %s","Identifiant de transaction %s Authorize.Net"
-"Authorize.net","Authorize.net"
-"Authorize.net Direct Post","Enregistrement direct Authorize.net"
-"Cancel","Annuler"
-"Card Verification Number","Numéro de vérification de la carte"
-"Card Verification Number Visual Reference","Référence visuelle du numéro de vérification de la carte"
-"Centinel API URL","URP API Centinel"
-"Close","Fermer"
-"Credit Card Information","Renseignements sur la carte de crédit"
-"Credit Card Number","Numéro de carte de crédit"
-"Credit Card Type","Type de carte de crédit"
-"Credit Card Types","Types de cartes de crédit"
-"Credit Card Verification","Vérification de la carte de crédit"
-"Credit Card: xxxx-%s","Carte de crédit : xxxx-%s"
-"Debug","Déboguer"
-"Email Customer","Envoyer un email au client"
-"Email Customer","Envoyer un courriel au client"
-"Enabled","Activé"
-"Enabled","Actif"
-"Error in payment gateway.","Erreur dans le transfert du paiement."
-"Expiration Date","Date d'expiration"
-"Gateway URL","URL passerelle"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Les actions de passerelle sont verouillées car la passerelle ne peut pas compléter une ou plusieurs transactions. Veuillez vous connecter à Authorize.net pour résoudre manuellement le problème."
-"Gateway error: %s","Erreur de la passerelle : %s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Si vide, une valeur par défaut sera utilisée. Une URL personnalisée peut être fournie par CardinalCommerce."
-"Invalid amount for authorization.","Montant invalide pour autorisation."
"Invalid amount for capture.","Montant invalide"
-"Invalid amount for partial authorization.","Montant invalide pour l'autorisation partielle"
-"Invalid amount for refund.","Montant invalide pour un remboursement"
-"Invalid split tenderId ID.","Identifiant invalide"
-"Maximum Order Total","Total maximal de la commande"
-"Maximum Order Total","Montant total maximum"
-"Merchant MD5","MD5 du commerçant"
-"Merchant's Email","Email du marchand"
-"Merchant's Email","Courriel du commerçant"
-"Minimum Order Total","Total minimal de la commande"
-"Minimum Order Total","Montant total minimum"
-"New Order Status","Nouveau statut de la commande"
-"New Order Status","Nouveau statut commande"
-"Order saving error: %s","Erreur enregistrement commande : %s"
-"Payment Action","Action de paiement"
-"Payment Action","Paiement"
-"Payment authorization error.","Erreur autorisation de paiement."
-"Payment authorization error.","Erreur d'autorisation du paiement."
-"Payment authorization error. Transacion id is empty.","Erreur d'autorisation de paiement. L'id de transaction est vide."
-"Payment canceling error.","Erreur dans l'annulation du paiement."
"Payment capturing error.","Erreur lors de la saisie du paiement"
-"Payment error. Order was not found.","Erreur de paiement. La commande n'a pas été trouvée."
-"Payment error. Paid amount doesn't match the order amount.","Erreur de paiement. Le montant payé ne correspond pas au montant de la commande."
-"Payment from Applicable Countries","Paiement depuis les pays applicables"
-"Payment from Applicable Countries","Paiement depuis les pays disponibles."
-"Payment from Specific Countries","Paiement depuis les pays spécifiques"
-"Payment partial authorization error.","Erreur de l'autorisation partielle du paiement"
-"Payment refunding error.","Erreur de remboursement du paiement"
-"Payment updating error.","Erreur lors de la mise à jour du paiement."
+"Invalid transaction ID.","Invalid transaction ID."
"Payment voiding error.","Erreur annulant le paiement"
-"Please, choose payment method","Veuillez choisir une méthode de paiement"
-"Processed Amount","Montant réalisé"
-"Remaining Balance","Balance restante"
-"Response hash validation failed. Transaction declined.","Réponse la validation de hachage a échoué. Transaction refusée."
-"Severe 3D Secure Card Validation","Validation de carte sécurité 3D sévère"
-"Severe Validation Removes Chargeback Liability on Merchant","Validation sévère supprime le risque de remboursement pour le vendeur"
-"Shopping cart contents and/or address has been changed.","Le contenu du panier et/ou l'adresse ont été changés."
-"Sort Order","Trier les widgets"
-"Sort Order","Trier la commande"
-"Test Mode","Mode test"
-"Test Mode","Mode test."
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","Le montant disponible sur votre carte de crédit est insuffisant pour pouvoir finaliser votre commande. Le montant disponible a été mis en attente. Pour finaliser votre commande, cliquez sur OK et indiquez le numéro d'une autre carte de crédit. Pour annuler la commande et débloquer le montant mis en attente, cliquez sur Annuler."
-"The order has been created.","La commande a été créée."
-"There was an error canceling transactions. Please contact us or try again later.","Une erreur s'est produite lors de l'annulation de transactions. Veuillez nous contacter ou réessayer ultérieurement."
-"There was an error processing your order. Please contact us or try again later.","Il y a eu une erreur dans le traitement de votre commande. Veuillez nous contacter ou réessayez plus tard."
-"Title","Titre"
-"Transaction Key","Clé de la transaction"
-"Transaction Key","Clé de transaction"
+"Invalid amount for refund.","Montant invalide pour un remboursement"
+"Payment refunding error.","Erreur de remboursement du paiement"
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type","Type de carte de crédit"
+"Credit Card Number","Numéro de carte de crédit"
+"Expiration Date","Date d'expiration"
+"Card Verification Number","Numéro de vérification de la carte"
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
+"Credit Card Information","Renseignements sur la carte de crédit"
+"--Please Select--","--Veuillez choisir--"
+"Card Verification Number Visual Reference","Référence visuelle du numéro de vérification de la carte"
"What is this?","Qu'est-ce que c'est ?"
-"You have reached the maximum number of credit card allowed to be used for the payment.","Vous avez atteint le nombre maximum autorisé de cartes de crédit à utiliser pour le paiement."
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Vous avez atteint le nombre maximum autorisé de cartes de crédits à utiliser pour un paiement. Les montants disponibles sur l'ensemble des cartes de crédit étaient insuffisants pour finaliser le paiement. Le paiement a été annulé et les montants mis en attente débloqués."
-"You will be required to enter your payment details before you place an order.","Il vous sera demandé de renseigner vos détails de paiement avant de passer une commande."
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Votre carte de crédit a été refusée. Cliquez sur OK pour indiquer une autre carte de crédit pour finaliser votre paiement. Cliquez sur Annuler pour débloquer le montant mis attente et sélectionner un autre moyen de paiement."
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Votre commande n'a pas été enregistrée car les contenus du panier et/ou de l'adresse ont été modifiés. Les montants autorisés en attente de votre paiement précédent sont désormais débloqués. Veuillez procéder au paiement pour les contenus de votre dernier panier."
-"Your payment has been cancelled. All authorized amounts have been released.","Votre paiement a été annulé. Tous les montants autorisés ont été débloqués."
-"amount %s","Montant %s"
-"authorize","autoriser"
-"authorize and capture","autoriser et saisir"
-"capture","saisir"
-"failed","échoué"
-"refund","remboursement"
-"successful","réussi"
-"void","vide"
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
+"Email Customer","Email Customer"
+"API Login ID","API Login ID"
+"Merchant's Email","Merchant's Email"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
+"Payment Action","Payment Action"
+"Accepted Currency","Accepted Currency"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/i18n/nl_NL.csv b/app/code/Magento/Authorizenet/i18n/nl_NL.csv
index ab578fc138a..ccb0ae09a5e 100644
--- a/app/code/Magento/Authorizenet/i18n/nl_NL.csv
+++ b/app/code/Magento/Authorizenet/i18n/nl_NL.csv
@@ -1,101 +1,101 @@
-"--Please Select--","--selecteer a.u.b.--"
-"3D Secure","3D Secure"
-"3D Secure Card Validation","3D Secure Card Validation"
-"API Login ID","API Login ID"
-"API Login ID","API login ID"
-"Accepted Currency","Geaccepteerde munteenheid"
-"Accepted Currency","Geaccepteerde valuta"
-"Allow Partial Authorization","Gedeeltelijke autorisatie toestaan"
+Cancel,Annuleren
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Weet u zeker dat u uw betaling wilt annuleren? Klik op OK om uw betaling te annuleren en het geld vrij te geven. Klik op Cancel om een andere kredietkaart te gebruiken en verder te gaan met uw betaling."
+"Processed Amount","Verwerkte hoeveelheid"
+"Remaining Balance","Resterend balans"
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.","Er heeft zich een fout voorgedaan tijdens het annuleren van de transacties. Neem contact met ons op of probeer later."
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,mislukt
+successful,succesvol
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,autoriseer
+"authorize and capture","autoriseer en vang"
+capture,vang
+refund,teruggave
+void,ongeldig
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.","Fout bij het bijwerken van de betaling."
"Authorize Only","Alleen authoriseren"
"Authorize and Capture","Authoriseren en opnemen"
-"Authorize.Net Transaction ID %s","Authorize.Net Transactie ID %s"
-"Authorize.net","Authorize.net"
-"Authorize.net Direct Post","Authorize.net directe post"
-"Cancel","Annuleren"
-"Card Verification Number","Kaart verificatie nummer"
-"Card Verification Number Visual Reference","Kaart verificatie nummer visuele referentie"
-"Centinel API URL","Centinel API URL"
-"Close","sluiten"
-"Credit Card Information","Creditcard informatie"
-"Credit Card Number","Creditcardnummer"
-"Credit Card Type","Creditcardtype"
-"Credit Card Types","Creditcardtypes"
-"Credit Card Types","Types credit card"
-"Credit Card Verification","Creditcard verificatie"
-"Credit Card Verification","Credit Card Verificatie"
-"Credit Card: xxxx-%s","Kredietkaart: xxxx-%s"
-"Debug","Debug"
-"Email Customer","email klant"
-"Email Customer","E-mail Klant"
-"Enabled","Aan"
-"Enabled","Werkzaam gemaakt"
-"Error in payment gateway.","Fout in betaling gateway."
-"Expiration Date","vervaldatum"
-"Gateway URL","Gateway URL"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway acties zijn vergrendeld omdat de gateway een of meerdere transacties niet kan voltooien. Log alstublieft in op uw Authorize.Net account om zelf het problem/de problemen op te lossen."
-"Gateway error: %s","Gateway fout: %s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Indien leeg, een standaard waarde kan worden gebruikt. Een aangepaste URL kan worden geleverd volgens de CardinalCommerce overeenkomst"
-"Invalid amount for authorization.","Ongeldig bedrag voor autorisatie."
"Invalid amount for capture.","Ongeldige aantal voor vangst."
-"Invalid amount for partial authorization.","Ongeldig aantal voor gedeeltelijke autorisatie."
-"Invalid amount for refund.","Ongeldige aantal voor teruggave."
-"Invalid split tenderId ID.","Ongeldige split tenderld ID."
-"Maximum Order Total","Maximale bestellingstotalen"
-"Maximum Order Total","Maximale Bestelling"
-"Merchant MD5","Verkoper MD5"
-"Merchant's Email","Verkoper's email"
-"Merchant's Email","Verkopers e-mail"
-"Minimum Order Total","Minimale Bestelling"
-"Minimum Order Total","Minimale bestellingstotalen"
-"New Order Status","Nieuwe Status van de Bestelling"
-"New Order Status","Nieuwe bestellingsstatus"
-"Order saving error: %s","Bestelling opslaan fout: %s"
-"Payment Action","Betaling"
-"Payment Action","Betalingsactie"
-"Payment authorization error.","Fout bij autorisatie betaling."
-"Payment authorization error.","Betalingsautorisatie fout."
-"Payment authorization error. Transacion id is empty.","Betalings autorisatie fout. Transactie ID is leeg."
-"Payment canceling error.","Probleem met het annuleren van de betaling."
"Payment capturing error.","Fout in het ophalen van de betaling."
-"Payment error. Order was not found.","Betalingsfout. Bestelling is niet gevonden."
-"Payment error. Paid amount doesn't match the order amount.","Betalingsfout. Betaalde bedrag is niet hetzelfde als bedrag van bestelling."
-"Payment from Applicable Countries","Betaling vanuit toegestane landen"
-"Payment from Applicable Countries","Betaling van Geëigende Landen"
-"Payment from Specific Countries","Betaling van Specifieke Landen"
-"Payment from Specific Countries","Betaling vanuit specifieke landen"
-"Payment partial authorization error.","Fout in de gedeeltelijke autorisatie van de betaling."
-"Payment refunding error.","Fout in het terugbetalen van de betaling."
-"Payment updating error.","Fout bij het bijwerken van de betaling."
+"Invalid transaction ID.","Invalid transaction ID."
"Payment voiding error.","Fout in het vernietigen van de betaling."
-"Please, choose payment method","Kies a.u.b. de verzendmethode"
-"Processed Amount","Verwerkte hoeveelheid"
-"Remaining Balance","Resterend balans"
-"Response hash validation failed. Transaction declined.","Antwoord op hash validatie mislukt. Transactie geweigerd."
-"Severe 3D Secure Card Validation","Strenge 3D Secure Card Validation"
-"Severe Validation Removes Chargeback Liability on Merchant","Strenge validatie verwijdert terugboekingsaansprakelijkheid voor de handelaar"
-"Shopping cart contents and/or address has been changed.","Winkel wagen inhoud en/of adres is gewijzigd."
-"Sort Order","Sorteer Bestelling"
-"Test Mode","Test modus"
-"Test Mode","Testmode"
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","U heeft onvoldoende tegoed op uw creditcard om de aankoop te voltooien. Het bedrag is vastgezet. Om de aankoop te voltooien, klik op OK en geef een extra creditcardnummer op. Om de aankoop te annuleren en het geld terug te zetten, klik op Cancel."
-"The order has been created.","De bestelling is aangemaakt"
-"There was an error canceling transactions. Please contact us or try again later.","Er heeft zich een fout voorgedaan tijdens het annuleren van de transacties. Neem contact met ons op of probeer later."
-"There was an error processing your order. Please contact us or try again later.","Er is een fout opgetreden bij het verwerken van uw bestelling. Contacteer ons a.u.b. of probeert u het later nog eens."
-"Title","Titel"
-"Transaction Key","Transactiesleutel"
+"Invalid amount for refund.","Ongeldige aantal voor teruggave."
+"Payment refunding error.","Fout in het terugbetalen van de betaling."
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type",Creditcardtype
+"Credit Card Number",Creditcardnummer
+"Expiration Date",vervaldatum
+"Card Verification Number","Kaart verificatie nummer"
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
+"Credit Card Information","Creditcard informatie"
+"--Please Select--","--selecteer a.u.b.--"
+"Card Verification Number Visual Reference","Kaart verificatie nummer visuele referentie"
"What is this?","Wat is dit?"
-"You have reached the maximum number of credit card allowed to be used for the payment.","Het aantal toegestane creditcards voor deze betaling is bereikt."
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Het aantal toegestane creditcards voor één betaling is bereikt. Het saldo is nog steeds onvoldoende om de betaling te voltooien. De betaling is geannuleerd en de vastgezette bedragen zijn vrijgegeven."
-"You will be required to enter your payment details before you place an order.","U zult uw betalingsgegevens moeten invullen alvorens u een bestelling kunt plaatsen."
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Uw creditcard is geweigerd. Klik op OK om een andere creditcard te gebruiken voor uw betaling. Klik op Cancel om het bedrag vrij te geven en kies een andere betaalmethode."
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Uw order kan niet worden geplaatst, omdat de inhoud van uw winkelwagentje en/of adres gewijzigd zijn. Geautoriseerde bedragen van uw vorige betaling zijn vrijgegeven. Ga naar het betalingsproces voor de inhoud van uw huidige winkelwagen."
-"Your payment has been cancelled. All authorized amounts have been released.","Uw betaling is geannuleerd. Alle geautoriseerde bedragen zijn vrijgegeven."
-"amount %s","bedrag %s"
-"authorize","autoriseer"
-"authorize and capture","autoriseer en vang"
-"capture","vang"
-"failed","mislukt"
-"refund","teruggave"
-"successful","succesvol"
-"void","ongeldig"
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
+"Email Customer","Email Customer"
+"API Login ID","API Login ID"
+"Merchant's Email","Merchant's Email"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
+"Payment Action","Payment Action"
+"Accepted Currency","Accepted Currency"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/i18n/pt_BR.csv b/app/code/Magento/Authorizenet/i18n/pt_BR.csv
index 94cbdd747e3..3c465b2d154 100644
--- a/app/code/Magento/Authorizenet/i18n/pt_BR.csv
+++ b/app/code/Magento/Authorizenet/i18n/pt_BR.csv
@@ -1,86 +1,101 @@
-"--Please Select--","--Por Favor, Escolha--"
-"3D Secure","3D Secure"
-"3D Secure Card Validation","Validação de Cartão 3D Secure"
-"API Login ID","ID de Login API"
-"Accepted Currency","Moeda Aceita"
-"Allow Partial Authorization","Permitir Autorização Parcial"
+Cancel,Cancelar
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Tem certeza de que deseja cancelar o seu pagamento? Clique em OK para cancelar o seu pagamento e liberar o montante em espera. Clique em Cancelar para inserir outro cartão de crédito e continuar com o seu pagamento."
+"Processed Amount","Valor Processado"
+"Remaining Balance","Balanço Restante"
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.","Ocorreu um erro ao cancelar as transações. Por favor entre em contato conosco ou tente novamente mais tarde."
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,fracassado
+successful,"bem sucedido"
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,autorizar
+"authorize and capture","autorizar e capturar"
+capture,capturar
+refund,reembolso
+void,vazio
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.","Erro de atualização de pagamento."
"Authorize Only","Somente Autorizar"
"Authorize and Capture","Autorizar e Controlar"
-"Authorize.Net Transaction ID %s","ID Transação Authorize.Net %s"
-"Authorize.net","Authorize.net"
-"Authorize.net Direct Post","Postagem Direta da Authorize.net"
-"Cancel","Cancelar"
-"Card Verification Number","Número de Verificação do Cartão"
-"Card Verification Number Visual Reference","Referência Visual de Número de Verificação do Cartão"
-"Centinel API URL","URL Centinel API"
-"Close","Fechar"
-"Credit Card Information","Informações do Cartão de Crédito"
-"Credit Card Number","Número do Cartão de Crédito"
-"Credit Card Type","Tipo de Cartão de Crédito"
-"Credit Card Types","Tipos de Cartão de Crédito"
-"Credit Card Verification","Verificação de Cartão de Crédito"
-"Credit Card: xxxx-%s","Cartão de crédito: xxxx-%s"
-"Debug","Debug"
-"Email Customer","Enviar Email ao Cliente"
-"Enabled","Ativado"
-"Error in payment gateway.","Erro no portal de pagamento."
-"Expiration Date","Data de Validade"
-"Gateway URL","URL do Gateway"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Ações de portal são bloqueadas porque o portal não consegue completar uma ou mais das transações. Por favor entre na sua conta Authorize.Net manualmente para resolver o(s) problema(s)."
-"Gateway error: %s","Erro do portal: %s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Se vazio, um valor definido será usado. URL personalizado pode ser fornecido por acordo CardinalCommerce."
-"Invalid amount for authorization.","Valor inválido para autorização."
"Invalid amount for capture.","Valor inválido para captura."
-"Invalid amount for partial authorization.","Valor inválido para autorização parcial."
-"Invalid amount for refund.","Valor inválido para reembolso."
-"Invalid split tenderId ID.","ID tenderId de divisão inválida."
-"Maximum Order Total","Total Máximo do Pedido"
-"Merchant MD5","MD5 Vendedor"
-"Merchant's Email","Email do Vendedor"
-"Minimum Order Total","Total MÃnimo do Pedido"
-"New Order Status","Status do Novo Pedido"
-"Order saving error: %s","Erro na gravação do pedido: %s"
-"Payment Action","Ação de Pagamento"
-"Payment authorization error.","Erro na autorização de pagamento."
-"Payment authorization error. Transacion id is empty.","Erro de autorização de pagamento. ID de transação está vazio."
-"Payment canceling error.","Erro de cancelamento de pagamento."
"Payment capturing error.","Erro de captura de pagamento."
-"Payment error. Order was not found.","Erro de pagamento. Ordem não foi encontrada."
-"Payment error. Paid amount doesn't match the order amount.","Erro de pagamento. Valor pago não corresponde ao valor da ordem."
-"Payment from Applicable Countries","Pagamento de PaÃses Aplicáveis"
-"Payment from Specific Countries","Pagamento de PaÃses EspecÃficos"
-"Payment partial authorization error.","Erro de autorização de pagamento parcial."
-"Payment refunding error.","Erro de reembolso de pagamento."
-"Payment updating error.","Erro de atualização de pagamento."
+"Invalid transaction ID.","Invalid transaction ID."
"Payment voiding error.","Erro de anulamento de pagamento."
-"Please, choose payment method","Por favor, escolha o método de pagamento"
-"Processed Amount","Valor Processado"
-"Remaining Balance","Balanço Restante"
-"Response hash validation failed. Transaction declined.","Validação de resposta de mistura falhou. Transação recusada."
-"Severe 3D Secure Card Validation","Validação de Cartão Severe 3D Secure"
-"Severe Validation Removes Chargeback Liability on Merchant","Validação Severe Remove a Responsabilidade de Cobrança Retroativa no Comerciante"
-"Shopping cart contents and/or address has been changed.","Conteúdo do carrinho de compras e/ou endereço foi alterado."
-"Sort Order","Classificar pedido"
-"Test Mode","Modo de Teste"
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","O valor no seu cartão de crédito é insuficiente para concluir a compra. O montante disponÃvel foi colocado em espera. Para concluir a sua compra, clique em OK e especifique o número do cartão de crédito adicional. Para cancelar a compra e liberar o montante em espera, clique em Cancelar."
-"The order has been created.","A ordem foi criada."
-"There was an error canceling transactions. Please contact us or try again later.","Ocorreu um erro ao cancelar as transações. Por favor entre em contato conosco ou tente novamente mais tarde."
-"There was an error processing your order. Please contact us or try again later.","Ocorreu um erro ao processar sua ordem. Entre em contato conosco ou tente novamente mais tarde."
-"Title","TÃtulo"
-"Transaction Key","Chave de Transação"
+"Invalid amount for refund.","Valor inválido para reembolso."
+"Payment refunding error.","Erro de reembolso de pagamento."
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type","Tipo de Cartão de Crédito"
+"Credit Card Number","Número do Cartão de Crédito"
+"Expiration Date","Data de Validade"
+"Card Verification Number","Número de Verificação do Cartão"
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
+"Credit Card Information","Informações do Cartão de Crédito"
+"--Please Select--","--Por Favor, Escolha--"
+"Card Verification Number Visual Reference","Referência Visual de Número de Verificação do Cartão"
"What is this?","O que é isso?"
-"You have reached the maximum number of credit card allowed to be used for the payment.","Você atingiu o número máximo de cartão de crédito autorizado a ser utilizado para o pagamento."
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Você atingiu o número máximo de cartões de crédito que pode ser usado para um único pagamento. Os montantes disponÃveis em todos os cartões utilizados foram insuficientes para completar o pagamento. O pagamento foi cancelado e os valores em espera foram liberados."
-"You will be required to enter your payment details before you place an order.","Você será obrigado a inserir seus detalhes de pagamento antes de colocar uma ordem."
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Seu cartão de crédito foi recusado. Clique em OK para especificar outro cartão de crédito para concluir a compra. Clique em Cancelar para liberar a quantia em espera e selecione outro método de pagamento."
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Seu pedido não tenha sido colocado, porque o conteúdo do carrinho de compras e/ou endereço foi alterado. Montantes autorizados a partir do seu pagamento anterior que ficaram pendentes são agora liberados. Por favor siga através do processo de compra para o seu conteúdo recente do carrinho."
-"Your payment has been cancelled. All authorized amounts have been released.","O seu pagamento foi cancelado. Todos os valores autorizados foram liberados."
-"amount %s","valor %s"
-"authorize","autorizar"
-"authorize and capture","autorizar e capturar"
-"capture","capturar"
-"failed","fracassado"
-"refund","reembolso"
-"successful","bem sucedido"
-"void","vazio"
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
+"Email Customer","Email Customer"
+"API Login ID","API Login ID"
+"Merchant's Email","Merchant's Email"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
+"Payment Action","Payment Action"
+"Accepted Currency","Accepted Currency"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/i18n/zh_CN.csv b/app/code/Magento/Authorizenet/i18n/zh_CN.csv
index 5fb0d1927db..e7af229d6e8 100644
--- a/app/code/Magento/Authorizenet/i18n/zh_CN.csv
+++ b/app/code/Magento/Authorizenet/i18n/zh_CN.csv
@@ -1,86 +1,101 @@
+Cancel,å–消
+"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
+"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
+"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
+"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
+"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
+"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.",您是å¦ç¡®å®šè¦å–消支付？å•å‡»ç¡®å®šå¯å–消您的支付，并释放å 用的é¢åº¦ã€‚å•å‡»å–消å¯è¾“入其他信用å¡ï¼Œå¹¶ç»§ç»è¿›è¡Œæ”¯ä»˜ã€‚
+"Processed Amount",处ç†çš„é¢åº¦
+"Remaining Balance",剩下的余é¢
+"Order saving error: %1","Order saving error: %1"
+"Please choose a payment method.","Please choose a payment method."
+"You created the order.","You created the order."
+"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
+"There was an error canceling transactions. Please contact us or try again later.",å–消交易时é‡åˆ°äº†é”™è¯¯ã€‚请è”系我们或ç¨å€™é‡è¯•ã€‚
+"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"amount %1","amount %1"
+failed,失败
+successful,æˆåŠŸ
+"Credit Card: xxxx-%1","Credit Card: xxxx-%1"
+"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+authorize,授æƒ
+"authorize and capture",授æƒå’ŒèŽ·å–
+capture,获å–
+refund,退款
+void,é¿å…
+"This is an invalid amount for authorization.","This is an invalid amount for authorization."
+"This is an invalid amount for capture.","This is an invalid amount for capture."
+"This is an invalid amount for refund.","This is an invalid amount for refund."
+"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
+"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
+"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
+"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
+"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
+"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
+"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
+"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
+"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
+"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
+"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
+"Gateway error: %1","Gateway error: %1"
+"Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway actions are locked because the gateway cannot complete ' 'one or more of the transactions. ' 'Please log in to your Authorize.Net account to manually resolve the issue(s)."
+"Payment updating error.",支付更新错误。
+"Authorize Only",仅供授æƒ
+"Authorize and Capture",授æƒå’Œæ•èŽ·
+"Invalid amount for capture.",获å–çš„é¢åº¦æ— 效。
+"Payment capturing error.",支付æ•èŽ·å‡ºé”™ã€‚
+"Invalid transaction ID.","Invalid transaction ID."
+"Payment voiding error.",支付的作废出错。
+"Invalid amount for refund.",退款é¢åº¦æ— 效。
+"Payment refunding error.",支付的退款出错。
+"The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"There was a payment authorization error.","There was a payment authorization error."
+"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
+"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Credit Card Type",信用å¡ç±»åž‹
+"Credit Card Number",信用å¡å·ç
+"Expiration Date",过期日期
+"Card Verification Number",å¡ç‰‡éªŒè¯å·ç
+"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
+"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
+"Credit Card %1","Credit Card %1"
+"Credit Card Information",信用å¡ä¿¡æ¯
"--Please Select--","-- 请选择 --"
-"3D Secure","3D 安全"
-"3D Secure Card Validation","3D 安全信用å¡éªŒè¯"
-"API Login ID","API 登录 ID"
-"Accepted Currency","接å—的汇率"
-"Allow Partial Authorization","å…许部分身份验è¯"
-"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","您是å¦ç¡®å®šè¦å–消支付？å•å‡»ç¡®å®šå¯å–消您的支付，并释放å 用的é¢åº¦ã€‚å•å‡»å–消å¯è¾“入其他信用å¡ï¼Œå¹¶ç»§ç»è¿›è¡Œæ”¯ä»˜ã€‚"
-"Authorize Only","仅供授æƒ"
-"Authorize and Capture","授æƒå’Œæ•èŽ·"
-"Authorize.Net Transaction ID %s","Authorize.Net 交易 ID %s"
-"Authorize.net","Authorize.net"
-"Authorize.net Direct Post","Authorize.net 直接å‘表"
-"Cancel","å–消"
-"Card Verification Number","å¡ç‰‡éªŒè¯å·ç "
"Card Verification Number Visual Reference","信用å¡éªŒè¯å·ç 视觉å‚考"
+"What is this?",这是什么？
+"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
+"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
+Processing...,Processing...
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"3D Secure Card Validation","3D Secure Card Validation"
+"New Order Status","New Order Status"
+"No confirmation","No confirmation"
+Authorize.net,Authorize.net
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
+"Email Customer","Email Customer"
+"API Login ID","API Login ID"
+"Merchant's Email","Merchant's Email"
+"Test Mode","Test Mode"
+Debug,Debug
+"Transaction Key","Transaction Key"
+"Payment Action","Payment Action"
+"Accepted Currency","Accepted Currency"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Allow Partial Authorization","Allow Partial Authorization"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
"Centinel API URL","Centinel API URL"
-"Close","å…³é—"
-"Credit Card Information","信用å¡ä¿¡æ¯"
-"Credit Card Number","信用å¡å·ç "
-"Credit Card Type","信用å¡ç±»åž‹"
-"Credit Card Types","信用å¡ç±»åž‹"
-"Credit Card Verification","信用å¡éªŒè¯"
-"Credit Card: xxxx-%s","信用å¡ï¼šxxxx-%s"
-"Debug","调试"
-"Email Customer","å‘é€ç”µå邮件给客户"
-"Enabled","å·²å¯ç”¨"
-"Error in payment gateway.","支付网关出错。"
-"Expiration Date","过期日期"
-"Gateway URL","网关 URL"
-"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","网关æ“作被é”å®šï¼Œå› ä¸ºç½‘å…³æ— æ³•å®Œæˆä¸€ä¸ªæˆ–多个交易。请登录到您的 Authorize.Net å¸æˆ·å¹¶æ‰‹å·¥è§£å†³è¯¥é—®é¢˜ã€‚"
-"Gateway error: %s","网关错误：%s"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","如果为空，则会使用默认值。自定义URLå¯é€šè¿‡ CardinalCommerce åè®®æ供。"
-"Invalid amount for authorization.","授æƒçš„é¢åº¦æ— 效。"
-"Invalid amount for capture.","获å–çš„é¢åº¦æ— 效。"
-"Invalid amount for partial authorization.","部分身份验è¯æ— 效。"
-"Invalid amount for refund.","退款é¢åº¦æ— 效。"
-"Invalid split tenderId ID.","拆分的 tenderId ID æ— æ•ˆã€‚"
-"Maximum Order Total","最大订å•æ€»æ•°"
-"Merchant MD5","商家 MD5"
-"Merchant's Email","商家电å邮件"
-"Minimum Order Total","最å°è®¢å•æ€»æ•°"
-"New Order Status","新订å•çŠ¶æ€"
-"Order saving error: %s","订å•ä¿å˜é”™è¯¯ï¼š%s"
-"Payment Action","支付æ“作"
-"Payment authorization error.","支付授æƒé”™è¯¯ã€‚"
-"Payment authorization error. Transacion id is empty.","支付授æƒå‡ºé”™ã€‚交易编å·ä¸ºç©ºã€‚"
-"Payment canceling error.","å–消支付过程出错。"
-"Payment capturing error.","支付æ•èŽ·å‡ºé”™ã€‚"
-"Payment error. Order was not found.","支付出错，订å•æœªæ‰¾åˆ°ã€‚"
-"Payment error. Paid amount doesn't match the order amount.","支付错误。付款金é¢ä¸Žè®¢å•é‡‘é¢ä¸åŒ¹é…。"
-"Payment from Applicable Countries","从å¯æŽ¥å—的国家支付"
-"Payment from Specific Countries","从指定的国家支付"
-"Payment partial authorization error.","支付的部分身份验è¯å‡ºé”™ã€‚"
-"Payment refunding error.","支付的退款出错。"
-"Payment updating error.","支付更新错误。"
-"Payment voiding error.","支付的作废出错。"
-"Please, choose payment method","请选择支付方å¼"
-"Processed Amount","处ç†çš„é¢åº¦"
-"Remaining Balance","剩下的余é¢"
-"Response hash validation failed. Transaction declined.","å“应哈希验è¯å¤±è´¥ã€‚交易被拒ç»ã€‚"
-"Severe 3D Secure Card Validation","æä¾› 3D 安全信用å¡éªŒè¯"
-"Severe Validation Removes Chargeback Liability on Merchant","æ£å¼éªŒè¯å°†æ’¤é”€é“¶è¡Œçš„退款责任"
-"Shopping cart contents and/or address has been changed.","è´ç‰©è½¦å†…容和/或地å€å·²è¢«æ›´æ”¹ã€‚"
-"Sort Order","排åºé¡ºåº"
-"Test Mode","测试模å¼"
-"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","您信用å¡çš„ä½™é¢ä¸è¶³ä»¥å®Œæˆæœ¬æ¬¡è´ä¹°ã€‚å¯ç”¨ä½™é¢å·²ç»è¢«æš‚挂。为完æˆæ‚¨çš„è´ä¹°ï¼Œè¯·ç‚¹å‡»ç¡®å®šå¹¶æä¾›å¦ä¸€ä¸ªä¿¡ç”¨å¡å·ç 。è¦å–消è´ä¹°å¹¶é€€å›žæš‚挂的余é¢ï¼Œè¯·ç‚¹å‡»å–消。"
-"The order has been created.","订å•å·²åˆ›å»ºã€‚"
-"There was an error canceling transactions. Please contact us or try again later.","å–消交易时é‡åˆ°äº†é”™è¯¯ã€‚请è”系我们或ç¨å€™é‡è¯•ã€‚"
-"There was an error processing your order. Please contact us or try again later.","处ç†æ‚¨çš„订å•æ—¶é‡åˆ°äº†é”™è¯¯ã€‚请è”系我们，或ç¨åŽå†è¯•ã€‚"
-"Title","æ ‡é¢˜"
-"Transaction Key","交易密钥"
-"What is this?","这是什么？"
-"You have reached the maximum number of credit card allowed to be used for the payment.","您已ç»è¾¾åˆ°äº†å¯ç”¨äºŽäº¤æ˜“的信用å¡æ•°é‡æœ€å¤§å€¼ã€‚"
-"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","您已ç»è¾¾åˆ°äº†ä¸€æ¬¡æ”¯ä»˜å¯ä½¿ç”¨ä¿¡ç”¨å¡æ•°é‡çš„最大值。所有用过å¡ç‰‡çš„å¯ç”¨é¢åº¦éƒ½ä¸è¶³ä»¥å®Œæˆæ”¯ä»˜ã€‚付款已被å–消，暂挂的é¢åº¦å·²ç»è¢«è¿”还。"
-"You will be required to enter your payment details before you place an order.","您将需è¦è¾“入您的支付详情，éšåŽæ‰èƒ½ä¸‹å•ã€‚"
-"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","您的信用å¡è¢«æ‹’ç»ã€‚点击确定以指定å¦ä¸€å¼ å¯å®Œæˆæ¤æ¬¡äº¤æ˜“的信用å¡ã€‚点击å–消以返还被暂挂的é¢åº¦ï¼Œå¹¶é€‰æ‹©å…¶ä»–支付方å¼ã€‚"
-"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","您的订å•åˆ›å»ºä¸æˆåŠŸï¼Œå› 为è´ç‰©è½¦çš„内容和/或地å€å·²ç»æœ‰å˜åŠ¨ã€‚您的上次支付ä¸é€šè¿‡é¢„授æƒè¢«æš‚挂的é¢åº¦å·²ç»è¿”还。请为è´ç‰©è½¦ä¸çš„新内容é‡æ–°æ‰§è¡Œä»˜æ¬¾æµç¨‹ã€‚"
-"Your payment has been cancelled. All authorized amounts have been released.","您的付款已被å–消。所有授æƒçš„é¢åº¦å·²ç»è¢«è¿”还。"
-"amount %s","é¢åº¦ %s"
-"authorize","授æƒ"
-"authorize and capture","授æƒå’ŒèŽ·å–"
-"capture","获å–"
-"failed","失败"
-"refund","退款"
-"successful","æˆåŠŸ"
-"void","é¿å…"
+"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
+"Authorize.net Direct Post","Authorize.net Direct Post"
+"Merchant MD5","Merchant MD5"
+"Gateway URL","Gateway URL"
diff --git a/app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml b/app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml
index 59d1c1109d1..eaf45cebb7d 100644
--- a/app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml
+++ b/app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml
@@ -91,7 +91,7 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
<input type="number" title="<?php echo __('Card Verification Number') ?>" data-container="cc-cvv" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
<?php $_content = '<img src=\"'.$this->getViewFileUrl('Magento_Checkout::cvv.gif').'\" alt=\"'.__('Card Verification Number Visual Reference').'\" title=\"'.__('Card Verification Number Visual Reference').'\" />'; ?>
<div class="note">
- <a href="#" id="directpost-cvv-what-is-this" class="action cvv" title="" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
+ <a href="#" id="directpost-cvv-what-is-this" class="action cvv" title="<?php echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
</div>
</div>
diff --git a/app/code/Magento/Authorizenet/view/frontend/templates/directpost/info.phtml b/app/code/Magento/Authorizenet/view/frontend/templates/directpost/info.phtml
index b930f9ff1a6..c8e0cec02c9 100644
--- a/app/code/Magento/Authorizenet/view/frontend/templates/directpost/info.phtml
+++ b/app/code/Magento/Authorizenet/view/frontend/templates/directpost/info.phtml
@@ -26,8 +26,6 @@
* @see \Magento\Authorizenet\Block\Directpost\Form
*/
?>
-<fieldset id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="fieldset items">
- <div class="message notice">
- <div><?php echo __('You\'ll be asked for your payment details before placing an order.') ?></div>
- </div>
+<fieldset id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="fieldset items redirect">
+ <div><?php echo __('You\'ll be asked for your payment details before placing an order.') ?></div>
</fieldset>
diff --git a/app/code/Magento/Authorizenet/view/frontend/templates/info/cc.phtml b/app/code/Magento/Authorizenet/view/frontend/templates/info/cc.phtml
index ada7aeb7c99..39d60fbfb87 100644
--- a/app/code/Magento/Authorizenet/view/frontend/templates/info/cc.phtml
+++ b/app/code/Magento/Authorizenet/view/frontend/templates/info/cc.phtml
@@ -23,33 +23,31 @@
*/
?>
-<dl class="payment method">
+<dl class="payment-method">
<?php if (!$this->getHideTitle()): ?>
<dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
<?php endif; ?>
-
<?php
$cards = $this->getCards();
$showCount = count($cards) > 1;
?>
-
- <dl class="cards items">
-<?php foreach ($cards as $key => $card): ?>
-
- <?php if ($showCount): ?>
- <dt><?php echo __('Credit Card %1', $key + 1); ?></dt>
- <?php endif; ?>
<dd class="content">
- <table class="data table">
- <?php foreach ($card as $_label => $_value): ?>
- <tr>
- <th><?php echo $this->escapeHtml($_label) ?></th>
- <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n")) ?></td>
- </tr>
- <?php endforeach; ?>
- </table>
+ <dl class="items-cards">
+ <?php foreach ($cards as $key => $card): ?>
+ <?php if ($showCount): ?>
+ <dt class="title"><?php echo __('Credit Card %1', $key + 1); ?></dt>
+ <?php endif; ?>
+ <dd class="content">
+ <table class="data table">
+ <?php foreach ($card as $_label => $_value): ?>
+ <tr>
+ <th><?php echo $this->escapeHtml($_label) ?></th>
+ <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n")) ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </dd>
+ <?php endforeach; ?>
+ </dl>
</dd>
-
-<?php endforeach; ?>
- </dl>
</dl>
diff --git a/app/code/Magento/Authz/Service/AuthorizationV1.php b/app/code/Magento/Authz/Service/AuthorizationV1.php
index f8844e9bcf0..216c3c56c8a 100644
--- a/app/code/Magento/Authz/Service/AuthorizationV1.php
+++ b/app/code/Magento/Authz/Service/AuthorizationV1.php
@@ -27,14 +27,15 @@ use Magento\Authz\Model\UserIdentifier;
use Magento\Framework\Acl;
use Magento\Framework\Acl\Builder as AclBuilder;
use Magento\Framework\Acl\RootResource as RootAclResource;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Logger;
use Magento\User\Model\Resource\Role\CollectionFactory as RoleCollectionFactory;
use Magento\User\Model\Resource\Rules\CollectionFactory as RulesCollectionFactory;
use Magento\User\Model\Role;
use Magento\User\Model\RoleFactory;
use Magento\User\Model\RulesFactory;
-use Magento\Webapi\ServiceException as ServiceException;
-use Magento\Webapi\ServiceResourceNotFoundException;
/**
* Authorization service.
@@ -143,13 +144,9 @@ class AuthorizationV1 implements AuthorizationV1Interface
$role = $this->_createRole($userIdentifier);
}
$this->_associateResourcesWithRole($role, $resources);
- } catch (ServiceException $e) {
- throw $e;
} catch (\Exception $e) {
$this->_logger->logException($e);
- throw new ServiceException(
- __('Error happened while granting permissions. Check exception log for details.')
- );
+ throw new LocalizedException('Error happened while granting permissions. Check exception log for details.');
}
}
@@ -175,7 +172,7 @@ class AuthorizationV1 implements AuthorizationV1Interface
try {
$role = $this->_getUserRole($userIdentifier);
if (!$role) {
- throw new ServiceException(__('The role associated with the specified user cannot be found.'));
+ throw new AuthorizationException('The role associated with the specified user cannot be found.');
}
$rulesCollection = $this->_rulesCollectionFactory->create();
$rulesCollection->getByRoles($role->getId())->load();
@@ -187,12 +184,12 @@ class AuthorizationV1 implements AuthorizationV1Interface
$allowedResources[] = $resourceId;
}
}
- } catch (ServiceException $e) {
+ } catch (AuthorizationException $e) {
throw $e;
} catch (\Exception $e) {
$this->_logger->logException($e);
- throw new ServiceException(
- __('Error happened while getting a list of allowed resources. Check exception log for details.')
+ throw new LocalizedException(
+ 'Error happened while getting a list of allowed resources. Check exception log for details.'
);
}
return $allowedResources;
@@ -205,12 +202,12 @@ class AuthorizationV1 implements AuthorizationV1Interface
{
try {
$this->_deleteRole($userIdentifier);
- } catch (ServiceException $e) {
+ } catch (NoSuchEntityException $e) {
throw $e;
} catch (\Exception $e) {
$this->_logger->logException($e);
- throw new ServiceException(
- __('Error happened while deleting role and permissions. Check exception log for details.')
+ throw new LocalizedException(
+ 'Error happened while deleting role and permissions. Check exception log for details.'
);
}
}
@@ -220,6 +217,7 @@ class AuthorizationV1 implements AuthorizationV1Interface
*
* @param UserIdentifier $userIdentifier
* @return Role
+ * @throws NoSuchEntityException
* @throws \LogicException
*/
protected function _createRole($userIdentifier)
@@ -237,7 +235,7 @@ class AuthorizationV1 implements AuthorizationV1Interface
$userId = $userIdentifier->getUserId();
break;
default:
- throw new \LogicException("Unknown user type: '{$userType}'.");
+ throw NoSuchEntityException::singleField('userType', $userType);
}
$role = $this->_roleFactory->create();
$role->setRoleName($roleName)
@@ -254,6 +252,7 @@ class AuthorizationV1 implements AuthorizationV1Interface
*
* @param UserIdentifier $userIdentifier
* @return Role
+ * @throws NoSuchEntityException
* @throws \LogicException
*/
protected function _deleteRole($userIdentifier)
@@ -268,7 +267,7 @@ class AuthorizationV1 implements AuthorizationV1Interface
$roleName = $userType . $userId;
break;
default:
- throw new \LogicException("Unknown user type: '{$userType}'.");
+ throw NoSuchEntityException::singleField('userType', $userType);
}
$role = $this->_roleFactory->create()->load($roleName, 'role_name');
return $role->delete();
@@ -357,12 +356,11 @@ class AuthorizationV1 implements AuthorizationV1Interface
try {
$role = $this->_getUserRole($userIdentifier);
if (!$role) {
- throw new ServiceResourceNotFoundException(
- __(
- 'Role for user with ID "%1" and user type "%2" cannot be found.',
- $userIdentifier->getUserId(),
- $userIdentifier->getUserType()
- )
+ throw NoSuchEntityException::doubleField(
+ 'userId',
+ $userIdentifier->getUserId(),
+ 'userType',
+ $userIdentifier->getUserType()
);
}
foreach ($resources as $resource) {
diff --git a/app/code/Magento/Authz/Service/AuthorizationV1Interface.php b/app/code/Magento/Authz/Service/AuthorizationV1Interface.php
index 22769fa794d..9fbd2a5cc86 100644
--- a/app/code/Magento/Authz/Service/AuthorizationV1Interface.php
+++ b/app/code/Magento/Authz/Service/AuthorizationV1Interface.php
@@ -24,7 +24,9 @@
namespace Magento\Authz\Service;
use Magento\Authz\Model\UserIdentifier;
-use Magento\Webapi\ServiceException as ServiceException;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
/**
* Authorization service interface.
@@ -37,7 +39,8 @@ interface AuthorizationV1Interface
* @param UserIdentifier $userIdentifier
* @param string[] $resources List of resources which should be available to the specified user.
* @return void
- * @throws ServiceException
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
*/
public function grantPermissions(UserIdentifier $userIdentifier, array $resources);
@@ -46,7 +49,8 @@ interface AuthorizationV1Interface
*
* @param UserIdentifier $userIdentifier
* @return void
- * @throws ServiceException
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
*/
public function grantAllPermissions(UserIdentifier $userIdentifier);
@@ -58,7 +62,7 @@ interface AuthorizationV1Interface
* @param string|string[] $resources Single resource or a list of resources
* @param UserIdentifier|null $userIdentifier Context of current user is used by default
* @return bool
- * @throws ServiceException
+ * @throws NoSuchEntityException
*/
public function isAllowed($resources, UserIdentifier $userIdentifier = null);
@@ -67,7 +71,8 @@ interface AuthorizationV1Interface
*
* @param UserIdentifier $userIdentifier
* @return string[]
- * @throws ServiceException
+ * @throws AuthorizationException
+ * @throws LocalizedException
*/
public function getAllowedResources(UserIdentifier $userIdentifier);
@@ -76,7 +81,8 @@ interface AuthorizationV1Interface
*
* @param UserIdentifier $userIdentifier
* @return void
- * @throws ServiceException
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
*/
public function removePermissions(UserIdentifier $userIdentifier);
}
diff --git a/app/code/Magento/Authz/etc/module.xml b/app/code/Magento/Authz/etc/module.xml
index 4079bb85393..6d155cc6374 100644
--- a/app/code/Magento/Authz/etc/module.xml
+++ b/app/code/Magento/Authz/etc/module.xml
@@ -32,7 +32,6 @@
<!--TODO: Dependency on Magento_User is temporary and should be eliminated when ACL is made global-->
<module name="Magento_User"/>
<module name="Magento_Backend"/>
- <module name="Magento_Webapi"/>
</depends>
</module>
</config>
diff --git a/app/code/Magento/Authz/i18n/de_DE.csv b/app/code/Magento/Authz/i18n/de_DE.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/de_DE.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Authz/i18n/en_US.csv b/app/code/Magento/Authz/i18n/en_US.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/en_US.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Authz/i18n/es_ES.csv b/app/code/Magento/Authz/i18n/es_ES.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/es_ES.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Authz/i18n/fr_FR.csv b/app/code/Magento/Authz/i18n/fr_FR.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/fr_FR.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Authz/i18n/nl_NL.csv b/app/code/Magento/Authz/i18n/nl_NL.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/nl_NL.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Authz/i18n/pt_BR.csv b/app/code/Magento/Authz/i18n/pt_BR.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/pt_BR.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Authz/i18n/zh_CN.csv b/app/code/Magento/Authz/i18n/zh_CN.csv
new file mode 100644
index 00000000000..e3b44044195
--- /dev/null
+++ b/app/code/Magento/Authz/i18n/zh_CN.csv
@@ -0,0 +1,5 @@
+"Error happened while granting permissions. Check exception log for details.","Error happened while granting permissions. Check exception log for details."
+"The role associated with the specified user cannot be found.","The role associated with the specified user cannot be found."
+"Error happened while getting a list of allowed resources. Check exception log for details.","Error happened while getting a list of allowed resources. Check exception log for details."
+"Error happened while deleting role and permissions. Check exception log for details.","Error happened while deleting role and permissions. Check exception log for details."
+"Role for user with ID ""%1"" and user type ""%2"" cannot be found.","Role for user with ID ""%1"" and user type ""%2"" cannot be found."
diff --git a/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php b/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php
index 57f443b68e5..bf68ff4a064 100644
--- a/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php
+++ b/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php
@@ -21,19 +21,13 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Backend\Block\Urlrewrite\Cms\Page\Edit;
/**
* Edit form for CMS page URL rewrites
*
* @method \Magento\Cms\Model\Page getCmsPage()
* @method \Magento\Backend\Block\Urlrewrite\Cms\Page\Edit\Form setCmsPage(\Magento\Cms\Model\Page $model)
- *
- * @author Magento Core Team <core@magentocommerce.com>
- *
- */
-namespace Magento\Backend\Block\Urlrewrite\Cms\Page\Edit;
-
-/**
* @SuppressWarnings(PHPMD.DepthOfInheritance)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -100,7 +94,7 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
*/
protected function _formPostInit($form)
{
- $cmsPage = $this->_getCmsPage();
+ $cmsPage = $this->getCmsPageInstance();
$form->setAction(
$this->_adminhtmlData->getUrl(
'adminhtml/*/save',
@@ -117,20 +111,20 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
$targetPath = $this->getForm()->getElement('target_path');
$model = $this->_getModel();
- /** @var $cmsPageUrlrewrite \Magento\Cms\Model\Page\Urlrewrite */
- $cmsPageUrlrewrite = $this->_urlRewriteFactory->create();
+ /** @var $cmsPageUrlRewrite \Magento\Cms\Model\Page\Urlrewrite */
+ $cmsPageUrlRewrite = $this->_urlRewriteFactory->create();
if (!$model->getId()) {
- $idPath->setValue($cmsPageUrlrewrite->generateIdPath($cmsPage));
+ $idPath->setValue($cmsPageUrlRewrite->generateIdPath($cmsPage));
$sessionData = $this->_getSessionData();
if (!isset($sessionData['request_path'])) {
- $requestPath->setValue($cmsPageUrlrewrite->generateRequestPath($cmsPage));
+ $requestPath->setValue($cmsPageUrlRewrite->generateRequestPath($cmsPage));
}
- $targetPath->setValue($cmsPageUrlrewrite->generateTargetPath($cmsPage));
+ $targetPath->setValue($cmsPageUrlRewrite->generateTargetPath($cmsPage));
$disablePaths = true;
} else {
- $cmsPageUrlrewrite->load($this->_getModel()->getId(), 'url_rewrite_id');
- $disablePaths = $cmsPageUrlrewrite->getId() > 0;
+ $cmsPageUrlRewrite->load($this->_getModel()->getId(), 'url_rewrite_id');
+ $disablePaths = $cmsPageUrlRewrite->getId() > 0;
}
if ($disablePaths) {
$idPath->setData('disabled', true);
@@ -148,11 +142,11 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
*/
protected function _getEntityStores()
{
- $cmsPage = $this->_getCmsPage();
+ $cmsPage = $this->getCmsPageInstance();
$entityStores = array();
// showing websites that only associated to CMS page
- if ($this->_getCmsPage()->getId()) {
+ if ($this->getCmsPageInstance()->getId()) {
$entityStores = (array)$cmsPage->getResource()->lookupStoreIds($cmsPage->getId());
$this->_requireStoresFilter = !in_array(0, $entityStores);
@@ -171,7 +165,7 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
*
* @return \Magento\Cms\Model\Page
*/
- protected function _getCmsPage()
+ protected function getCmsPageInstance()
{
if (!$this->hasData('cms_page')) {
$this->setCmsPage($this->_pageFactory->create());
diff --git a/app/code/Magento/Backend/Block/Urlrewrite/Selector.php b/app/code/Magento/Backend/Block/Urlrewrite/Selector.php
index ef6403502ab..46ce62f5674 100644
--- a/app/code/Magento/Backend/Block/Urlrewrite/Selector.php
+++ b/app/code/Magento/Backend/Block/Urlrewrite/Selector.php
@@ -25,8 +25,6 @@ namespace Magento\Backend\Block\Urlrewrite;
/**
* Modes selector for URL rewrites modes
- *
- * @author Magento Core Team <core@magentocommerce.com>
*/
class Selector extends \Magento\Framework\View\Element\Template
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 87401e52d2c..8bd752db4a2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -145,10 +145,10 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
parent::__construct($context, $data);
- $this->setEmptyText(__(isset($data['empty_text']) ? $data['empty_text'] : 'We couldn\'t find any records.'));
+ $this->setEmptyText(isset($data['empty_text']) ? $data['empty_text'] : __('We couldn\'t find any records.'));
$this->setEmptyCellLabel(
- __(isset($data['empty_cell_label']) ? $data['empty_cell_label'] : 'We couldn\'t find any records.')
+ isset($data['empty_cell_label']) ? $data['empty_cell_label'] : __('We couldn\'t find any records.')
);
$this->setCountSubTotals(isset($data['count_subtotals']) ? (bool)$data['count_subtotals'] : false);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Urlrewrite.php b/app/code/Magento/Backend/Controller/Adminhtml/Urlrewrite.php
index 0020666a60f..95615ccb376 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Urlrewrite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Urlrewrite.php
@@ -30,38 +30,140 @@ use Magento\Framework\Model\Exception;
/**
* URL rewrite adminhtml controller
- *
- * @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Urlrewrite extends Action
{
+ /**
+ * Default id mode key
+ */
const ID_MODE = 'id';
+ /**
+ * Product mode key
+ */
const PRODUCT_MODE = 'product';
+ /**
+ * Category mode key
+ */
const CATEGORY_MODE = 'category';
+ /**
+ * CMS mode key
+ */
const CMS_PAGE_MODE = 'cms_page';
/**
* @var Product
*/
- private $_product;
+ protected $product;
/**
* @var Category
*/
- private $_category;
+ protected $category;
/**
* @var \Magento\Cms\Model\Page
*/
- private $_cmsPage;
+ protected $cmsPage;
/**
* @var \Magento\UrlRewrite\Model\UrlRewrite
*/
- private $_urlRewrite;
+ protected $urlRewrite;
+
+ /**
+ * @var \Magento\Catalog\Model\ProductFactory
+ */
+ protected $productFactory;
+
+ /**
+ * @var \Magento\Backend\Block\Urlrewrite\Selector
+ */
+ protected $rewriteSelector;
+
+ /**
+ * @var \Magento\Backend\Block\Urlrewrite\Catalog\Category\Tree
+ */
+ protected $categoryTree;
+
+ /**
+ * @var \Magento\UrlRewrite\Helper\UrlRewrite
+ */
+ protected $rewriteHelper;
+
+ /**
+ * @var \Magento\Cms\Model\Page\UrlrewriteFactory
+ */
+ protected $cmsRewriteFactory;
+
+ /**
+ * @var \Magento\Catalog\Model\CategoryFactory
+ */
+ protected $categoryFactory;
+
+ /**
+ * @var \Magento\UrlRewrite\Model\UrlRewriteFactory
+ */
+ protected $urlRewriteFactory;
+
+ /**
+ * @var \Magento\Cms\Model\PageFactory
+ */
+ protected $pageFactory;
+
+ /**
+ * @var \Magento\Catalog\Model\Url
+ */
+ protected $catalogUrl;
+
+ /**
+ * @var \Magento\Catalog\Model\Resource\UrlFactory
+ */
+ protected $catalogUrlFactory;
+
+ /**
+ * @param Action\Context $context
+ * @param \Magento\Catalog\Model\ProductFactory $productFactory
+ * @param \Magento\Backend\Block\Urlrewrite\Selector $rewriteSelector
+ * @param \Magento\Backend\Block\Urlrewrite\Catalog\Category\Tree $categoryTree
+ * @param \Magento\UrlRewrite\Helper\UrlRewrite $rewriteHelper
+ * @param \Magento\Cms\Model\Page\UrlrewriteFactory $cmsRewriteFactory
+ * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
+ * @param \Magento\UrlRewrite\Model\UrlRewriteFactory $urlRewriteFactory
+ * @param \Magento\Cms\Model\PageFactory $pageFactory
+ * @param \Magento\Catalog\Model\Url $catalogUrl
+ * @param \Magento\Catalog\Model\Resource\UrlFactory $catalogUrlFactory
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Catalog\Model\ProductFactory $productFactory,
+ \Magento\Backend\Block\Urlrewrite\Selector $rewriteSelector,
+ \Magento\Backend\Block\Urlrewrite\Catalog\Category\Tree $categoryTree,
+ \Magento\UrlRewrite\Helper\UrlRewrite $rewriteHelper,
+ \Magento\Cms\Model\Page\UrlrewriteFactory $cmsRewriteFactory,
+ \Magento\Catalog\Model\CategoryFactory $categoryFactory,
+ \Magento\UrlRewrite\Model\UrlRewriteFactory $urlRewriteFactory,
+ \Magento\Cms\Model\PageFactory $pageFactory,
+ \Magento\Catalog\Model\Url $catalogUrl,
+ \Magento\Catalog\Model\Resource\UrlFactory $catalogUrlFactory
+ ) {
+ $this->productFactory = $productFactory;
+ $this->rewriteSelector = $rewriteSelector;
+ $this->categoryTree = $categoryTree;
+ $this->rewriteHelper = $rewriteHelper;
+ $this->cmsRewriteFactory = $cmsRewriteFactory;
+ $this->categoryFactory = $categoryFactory;
+ $this->urlRewriteFactory = $urlRewriteFactory;
+ $this->pageFactory = $pageFactory;
+ $this->catalogUrl = $catalogUrl;
+ $this->catalogUrlFactory = $catalogUrlFactory;
+ parent::__construct($context);
+ }
+
/**
* Show URL rewrites index page
@@ -90,7 +192,7 @@ class Urlrewrite extends Action
$this->_view->loadLayout();
$this->_setActiveMenu('Magento_Catalog::catalog_urlrewrite');
- $mode = $this->_getMode();
+ $mode = $this->getMode();
switch ($mode) {
case self::PRODUCT_MODE:
@@ -99,10 +201,10 @@ class Urlrewrite extends Action
'',
array(
'data' => array(
- 'category' => $this->_getCategory(),
- 'product' => $this->_getProduct(),
+ 'category' => $this->getCategory(),
+ 'product' => $this->getProduct(),
'is_category_mode' => $this->getRequest()->has('category'),
- 'url_rewrite' => $this->_getUrlRewrite()
+ 'url_rewrite' => $this->getUrlRewrite()
)
)
);
@@ -112,7 +214,7 @@ class Urlrewrite extends Action
'Magento\Backend\Block\Urlrewrite\Catalog\Category\Edit',
'',
array(
- 'data' => array('category' => $this->_getCategory(), 'url_rewrite' => $this->_getUrlRewrite())
+ 'data' => array('category' => $this->getCategory(), 'url_rewrite' => $this->getUrlRewrite())
)
);
break;
@@ -121,7 +223,7 @@ class Urlrewrite extends Action
'Magento\Backend\Block\Urlrewrite\Cms\Page\Edit',
'',
array(
- 'data' => array('cms_page' => $this->_getCmsPage(), 'url_rewrite' => $this->_getUrlRewrite())
+ 'data' => array('cms_page' => $this->getCmsPage(), 'url_rewrite' => $this->getUrlRewrite())
)
);
break;
@@ -130,7 +232,7 @@ class Urlrewrite extends Action
$editBlock = $this->_view->getLayout()->createBlock(
'Magento\Backend\Block\Urlrewrite\Edit',
'',
- array('data' => array('url_rewrite' => $this->_getUrlRewrite()))
+ array('data' => array('url_rewrite' => $this->getUrlRewrite()))
);
break;
}
@@ -147,18 +249,18 @@ class Urlrewrite extends Action
*
* @return string
*/
- private function _getMode()
+ protected function getMode()
{
- if ($this->_getProduct()->getId() || $this->getRequest()->has('product')) {
+ if ($this->getProduct()->getId() || $this->getRequest()->has('product')) {
$mode = self::PRODUCT_MODE;
- } elseif ($this->_getCategory()->getId() || $this->getRequest()->has('category')) {
+ } elseif ($this->getCategory()->getId() || $this->getRequest()->has('category')) {
$mode = self::CATEGORY_MODE;
- } elseif ($this->_getCmsPage()->getId() || $this->getRequest()->has('cms_page')) {
+ } elseif ($this->getCmsPage()->getId() || $this->getRequest()->has('cms_page')) {
$mode = self::CMS_PAGE_MODE;
} elseif ($this->getRequest()->has('id')) {
$mode = self::ID_MODE;
} else {
- $mode = $this->_objectManager->get('Magento\Backend\Block\Urlrewrite\Selector')->getDefaultMode();
+ $mode = $this->rewriteSelector->getDefaultMode();
}
return $mode;
}
@@ -183,15 +285,7 @@ class Urlrewrite extends Action
public function categoriesJsonAction()
{
$categoryId = $this->getRequest()->getParam('id', null);
- $this->getResponse()->representJson(
- $this->_objectManager->get(
- 'Magento\Backend\Block\Urlrewrite\Catalog\Category\Tree'
- )->getTreeArray(
- $categoryId,
- true,
- 1
- )
- );
+ $this->getResponse()->setBody($this->categoryTree->getTreeArray($categoryId, true, 1));
}
/**
@@ -213,30 +307,23 @@ class Urlrewrite extends Action
*/
public function saveAction()
{
- if ($data = $this->getRequest()->getPost()) {
- /** @var $session \Magento\Backend\Model\Session */
- $session = $this->_objectManager->get('Magento\Backend\Model\Session');
+ $data = $this->getRequest()->getPost();
+ if ($data) {
try {
// set basic urlrewrite data
/** @var $model \Magento\UrlRewrite\Model\UrlRewrite */
- $model = $this->_getUrlRewrite();
+ $model = $this->getUrlRewrite();
// Validate request path
$requestPath = $this->getRequest()->getParam('request_path');
- $this->_objectManager->get('Magento\UrlRewrite\Helper\UrlRewrite')->validateRequestPath($requestPath);
+ $this->rewriteHelper->validateRequestPath($requestPath);
// Proceed and save request
- $model->setIdPath(
- $this->getRequest()->getParam('id_path')
- )->setTargetPath(
- $this->getRequest()->getParam('target_path')
- )->setOptions(
- $this->getRequest()->getParam('options')
- )->setDescription(
- $this->getRequest()->getParam('description')
- )->setRequestPath(
- $requestPath
- );
+ $model->setIdPath($this->getRequest()->getParam('id_path'))
+ ->setTargetPath($this->getRequest()->getParam('target_path'))
+ ->setOptions($this->getRequest()->getParam('options'))
+ ->setDescription($this->getRequest()->getParam('description'))
+ ->setRequestPath($requestPath);
if (!$model->getId()) {
$model->setIsSystem(0);
@@ -245,22 +332,22 @@ class Urlrewrite extends Action
$model->setStoreId($this->getRequest()->getParam('store_id', 0));
}
- $this->_onUrlRewriteSaveBefore($model);
+ $this->onUrlRewriteSaveBefore($model);
// save and redirect
$model->save();
- $this->_onUrlRewriteSaveAfter($model);
+ $this->onUrlRewriteSaveAfter($model);
$this->messageManager->addSuccess(__('The URL Rewrite has been saved.'));
$this->_redirect('adminhtml/*/');
return;
} catch (Exception $e) {
$this->messageManager->addError($e->getMessage());
- $session->setUrlrewriteData($data);
+ $this->_session->setUrlrewriteData($data);
} catch (\Exception $e) {
$this->messageManager->addException($e, __('An error occurred while saving URL Rewrite.'));
- $session->setUrlrewriteData($data);
+ $this->_session->setUrlrewriteData($data);
}
}
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
@@ -272,10 +359,10 @@ class Urlrewrite extends Action
* @param \Magento\UrlRewrite\Model\UrlRewrite $model
* @return void
*/
- protected function _onUrlRewriteSaveBefore($model)
+ protected function onUrlRewriteSaveBefore($model)
{
- $this->_handleCatalogUrlRewrite($model);
- $this->_handleCmsPageUrlRewrite($model);
+ $this->handleCatalogUrlRewrite($model);
+ $this->handleCmsPageUrlRewrite($model);
}
/**
@@ -284,9 +371,9 @@ class Urlrewrite extends Action
* @param \Magento\UrlRewrite\Model\UrlRewrite $model
* @return void
*/
- protected function _onUrlRewriteSaveAfter($model)
+ protected function onUrlRewriteSaveAfter($model)
{
- $this->_handleCmsPageUrlRewriteSave($model);
+ $this->handleCmsPageUrlRewriteSave($model);
}
/**
@@ -296,22 +383,20 @@ class Urlrewrite extends Action
* @return void
* @throws Exception
*/
- protected function _handleCatalogUrlRewrite($model)
+ protected function handleCatalogUrlRewrite($model)
{
- $product = $this->_getInitializedProduct($model);
- $category = $this->_getInitializedCategory($model);
+ $product = $this->getInitializedProduct($model);
+ $category = $this->getInitializedCategory($model);
if ($product || $category) {
- /** @var $catalogUrlModel \Magento\Catalog\Model\Url */
- $catalogUrlModel = $this->_objectManager->get('Magento\Catalog\Model\Url');
- $idPath = $catalogUrlModel->generatePath('id', $product, $category);
+ $idPath = $this->catalogUrl->generatePath('id', $product, $category);
$model->setIdPath($idPath);
// if redirect specified try to find friendly URL
$generateTarget = true;
- if ($this->_objectManager->get('Magento\UrlRewrite\Helper\UrlRewrite')->hasRedirectOptions($model)) {
+ if ($this->rewriteHelper->hasRedirectOptions($model)) {
/** @var $rewriteResource \Magento\Catalog\Model\Resource\Url */
- $rewriteResource = $this->_objectManager->create('Magento\Catalog\Model\Resource\Url');
+ $rewriteResource = $this->catalogUrlFactory->create();
/** @var $rewrite \Magento\UrlRewrite\Model\UrlRewrite */
$rewrite = $rewriteResource->getRewriteByIdPath($idPath, $model->getStoreId());
if (!$rewrite) {
@@ -328,7 +413,7 @@ class Urlrewrite extends Action
}
}
if ($generateTarget) {
- $model->setTargetPath($catalogUrlModel->generatePath('target', $product, $category));
+ $model->setTargetPath($this->catalogUrl->generatePath('target', $product, $category));
}
}
}
@@ -339,10 +424,10 @@ class Urlrewrite extends Action
* @param \Magento\UrlRewrite\Model\UrlRewrite $model
* @return Product|null
*/
- private function _getInitializedProduct($model)
+ protected function getInitializedProduct($model)
{
/** @var $product Product */
- $product = $this->_getProduct();
+ $product = $this->getProduct();
if ($product->getId()) {
$model->setProductId($product->getId());
} else {
@@ -358,10 +443,10 @@ class Urlrewrite extends Action
* @param \Magento\UrlRewrite\Model\UrlRewrite $model
* @return Category|null
*/
- private function _getInitializedCategory($model)
+ protected function getInitializedCategory($model)
{
/** @var $category Category */
- $category = $this->_getCategory();
+ $category = $this->getCategory();
if ($category->getId()) {
$model->setCategoryId($category->getId());
} else {
@@ -377,24 +462,24 @@ class Urlrewrite extends Action
* @return void
* @throws \Magento\Framework\Model\Exception
*/
- private function _handleCmsPageUrlRewrite($model)
+ protected function handleCmsPageUrlRewrite($model)
{
/** @var $cmsPage \Magento\Cms\Model\Page */
- $cmsPage = $this->_getCmsPage();
+ $cmsPage = $this->getCmsPage();
if (!$cmsPage->getId()) {
return;
}
/** @var $cmsPageUrlRewrite \Magento\Cms\Model\Page\Urlrewrite */
- $cmsPageUrlRewrite = $this->_objectManager->create('Magento\Cms\Model\Page\Urlrewrite');
+ $cmsPageUrlRewrite = $this->cmsRewriteFactory->create();
$idPath = $cmsPageUrlRewrite->generateIdPath($cmsPage);
$model->setIdPath($idPath);
// if redirect specified try to find friendly URL
$generateTarget = true;
- if ($this->_objectManager->get('Magento\UrlRewrite\Helper\UrlRewrite')->hasRedirectOptions($model)) {
+ if ($model->getId() && $this->rewriteHelper->hasRedirectOptions($model)) {
/** @var $rewriteResource \Magento\Catalog\Model\Resource\Url */
- $rewriteResource = $this->_objectManager->create('Magento\Catalog\Model\Resource\Url');
+ $rewriteResource = $this->catalogUrlFactory->create();
/** @var $rewrite \Magento\UrlRewrite\Model\UrlRewrite */
$rewrite = $rewriteResource->getRewriteByIdPath($idPath, $model->getStoreId());
if (!$rewrite) {
@@ -416,16 +501,16 @@ class Urlrewrite extends Action
* @param \Magento\UrlRewrite\Model\UrlRewrite $model
* @return void
*/
- private function _handleCmsPageUrlRewriteSave($model)
+ protected function handleCmsPageUrlRewriteSave($model)
{
/** @var $cmsPage \Magento\Cms\Model\Page */
- $cmsPage = $this->_getCmsPage();
+ $cmsPage = $this->getCmsPage();
if (!$cmsPage->getId()) {
return;
}
/** @var $cmsRewrite \Magento\Cms\Model\Page\Urlrewrite */
- $cmsRewrite = $this->_objectManager->create('Magento\Cms\Model\Page\Urlrewrite');
+ $cmsRewrite = $this->cmsRewriteFactory->create();
$cmsRewrite->load($model->getId(), 'url_rewrite_id');
if (!$cmsRewrite->getId()) {
$cmsRewrite->setUrlRewriteId($model->getId());
@@ -441,13 +526,13 @@ class Urlrewrite extends Action
*/
public function deleteAction()
{
- if ($this->_getUrlRewrite()->getId()) {
+ if ($this->getUrlRewrite()->getId()) {
try {
- $this->_getUrlRewrite()->delete();
+ $this->getUrlRewrite()->delete();
$this->messageManager->addSuccess(__('The URL Rewrite has been deleted.'));
} catch (\Exception $e) {
$this->messageManager->addException($e, __('An error occurred while deleting URL Rewrite.'));
- $this->_redirect('adminhtml/*/edit/', array('id' => $this->_getUrlRewrite()->getId()));
+ $this->_redirect('adminhtml/*/edit/', array('id' => $this->getUrlRewrite()->getId()));
return;
}
}
@@ -469,21 +554,21 @@ class Urlrewrite extends Action
*
* @return Category
*/
- private function _getCategory()
+ protected function getCategory()
{
- if (!$this->_category) {
- $this->_category = $this->_objectManager->create('Magento\Catalog\Model\Category');
- $categoryId = (int)$this->getRequest()->getParam('category', 0);
+ if (!$this->category) {
+ $this->category = $this->categoryFactory->create();
+ $categoryId = (int) $this->getRequest()->getParam('category', 0);
- if (!$categoryId && $this->_getUrlRewrite()->getId()) {
- $categoryId = $this->_getUrlRewrite()->getCategoryId();
+ if (!$categoryId && $this->getUrlRewrite()->getId()) {
+ $categoryId = $this->getUrlRewrite()->getCategoryId();
}
if ($categoryId) {
- $this->_category->load($categoryId);
+ $this->category->load($categoryId);
}
}
- return $this->_category;
+ return $this->category;
}
/**
@@ -491,21 +576,21 @@ class Urlrewrite extends Action
*
* @return Product
*/
- private function _getProduct()
+ protected function getProduct()
{
- if (!$this->_product) {
- $this->_product = $this->_objectManager->create('Magento\Catalog\Model\Product');
- $productId = (int)$this->getRequest()->getParam('product', 0);
+ if (!$this->product) {
+ $this->product = $this->productFactory->create();
+ $productId = (int) $this->getRequest()->getParam('product', 0);
- if (!$productId && $this->_getUrlRewrite()->getId()) {
- $productId = $this->_getUrlRewrite()->getProductId();
+ if (!$productId && $this->getUrlRewrite()->getId()) {
+ $productId = $this->getUrlRewrite()->getProductId();
}
if ($productId) {
- $this->_product->load($productId);
+ $this->product->load($productId);
}
}
- return $this->_product;
+ return $this->product;
}
/**
@@ -513,25 +598,25 @@ class Urlrewrite extends Action
*
* @return \Magento\Cms\Model\Page
*/
- private function _getCmsPage()
+ protected function getCmsPage()
{
- if (!$this->_cmsPage) {
- $this->_cmsPage = $this->_objectManager->create('Magento\Cms\Model\Page');
- $cmsPageId = (int)$this->getRequest()->getParam('cms_page', 0);
+ if (!$this->cmsPage) {
+ $this->cmsPage = $this->pageFactory->create();
+ $cmsPageId = (int) $this->getRequest()->getParam('cms_page', 0);
- if (!$cmsPageId && $this->_getUrlRewrite()->getId()) {
- $urlRewriteId = $this->_getUrlRewrite()->getId();
+ if (!$cmsPageId && $this->getUrlRewrite()->getId()) {
+ $urlRewriteId = $this->getUrlRewrite()->getId();
/** @var $cmsUrlRewrite \Magento\Cms\Model\Page\Urlrewrite */
- $cmsUrlRewrite = $this->_objectManager->create('Magento\Cms\Model\Page\Urlrewrite');
+ $cmsUrlRewrite = $this->cmsRewriteFactory->create();
$cmsUrlRewrite->load($urlRewriteId, 'url_rewrite_id');
$cmsPageId = $cmsUrlRewrite->getCmsPageId();
}
if ($cmsPageId) {
- $this->_cmsPage->load($cmsPageId);
+ $this->cmsPage->load($cmsPageId);
}
}
- return $this->_cmsPage;
+ return $this->cmsPage;
}
/**
@@ -539,16 +624,16 @@ class Urlrewrite extends Action
*
* @return \Magento\UrlRewrite\Model\UrlRewrite
*/
- private function _getUrlRewrite()
+ protected function getUrlRewrite()
{
- if (!$this->_urlRewrite) {
- $this->_urlRewrite = $this->_objectManager->create('Magento\UrlRewrite\Model\UrlRewrite');
+ if (!$this->urlRewrite) {
+ $this->urlRewrite = $this->urlRewriteFactory->create();
- $urlRewriteId = (int)$this->getRequest()->getParam('id', 0);
+ $urlRewriteId = (int) $this->getRequest()->getParam('id', 0);
if ($urlRewriteId) {
- $this->_urlRewrite->load((int)$this->getRequest()->getParam('id', 0));
+ $this->urlRewrite->load((int) $this->getRequest()->getParam('id', 0));
}
}
- return $this->_urlRewrite;
+ return $this->urlRewrite;
}
}
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 12607aa0f3c..d7acbf2752f 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -138,12 +138,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
if ($this->getStoreId() && $this->getQuoteId()) {
$this->_quote->setStoreId($this->getStoreId())->load($this->getQuoteId());
} elseif ($this->getStoreId() && $this->hasCustomerId()) {
- try {
- $customerData = $this->_customerService->getCustomer($this->getCustomerId());
- $this->_quote->assignCustomer($customerData);
- } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
- /** Customer does not exist */
- }
$customerGroupId = $this->_scopeConfig->getValue(
self::XML_PATH_DEFAULT_CREATEACCOUNT_GROUP,
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -154,6 +148,12 @@ class Quote extends \Magento\Framework\Session\SessionManager
->setIsActive(false)
->save();
$this->setQuoteId($this->_quote->getId());
+ try {
+ $customerData = $this->_customerService->getCustomer($this->getCustomerId());
+ $this->_quote->assignCustomer($customerData);
+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ /** Customer does not exist */
+ }
}
$this->_quote->setIgnoreOldQty(true);
$this->_quote->setIsSuperMode(true);
diff --git a/app/code/Magento/Backend/i18n/de_DE.csv b/app/code/Magento/Backend/i18n/de_DE.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/de_DE.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/i18n/es_ES.csv b/app/code/Magento/Backend/i18n/es_ES.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/es_ES.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/i18n/fr_FR.csv b/app/code/Magento/Backend/i18n/fr_FR.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/fr_FR.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/i18n/nl_NL.csv b/app/code/Magento/Backend/i18n/nl_NL.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/nl_NL.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/i18n/pt_BR.csv b/app/code/Magento/Backend/i18n/pt_BR.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/pt_BR.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/i18n/zh_CN.csv b/app/code/Magento/Backend/i18n/zh_CN.csv
new file mode 100644
index 00000000000..ba811a0ba34
--- /dev/null
+++ b/app/code/Magento/Backend/i18n/zh_CN.csv
@@ -0,0 +1,606 @@
+Custom,Custom
+"Are you sure?","Are you sure?"
+Close,Close
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Customers,Customers
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+Reset,Reset
+Edit,Edit
+"What is this?","What is this?"
+"Invalid Form Key. Please refresh the page.","Invalid Form Key. Please refresh the page."
+"You entered an invalid Secret Key. Please refresh the page.","You entered an invalid Secret Key. Please refresh the page."
+"Cache Storage Management","Cache Storage Management"
+"Flush Magento Cache","Flush Magento Cache"
+"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Flush Cache Storage","Flush Cache Storage"
+Invalidated,Invalidated
+Orders,Orders
+Amounts,Amounts
+Bestsellers,Bestsellers
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Customer,Customer
+Guest,Guest
+Items,Items
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"Average Orders","Average Orders"
+"Search Term","Search Term"
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
+"All Files","All Files"
+"Interface Language","Interface Language"
+"Reset to Default","Reset to Default"
+"All Store Views","All Store Views"
+"Save Account","Save Account"
+"My Account","My Account"
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+"Save Cache Settings","Save Cache Settings"
+"Catalog Rewrites","Catalog Rewrites"
+Refresh,Refresh
+"Images Cache","Images Cache"
+Clear,Clear
+"Search Index","Search Index"
+Rebuild,Rebuild
+"Inventory Stock Status","Inventory Stock Status"
+"Rebuild Catalog Index","Rebuild Catalog Index"
+"Rebuild Flat Catalog Category","Rebuild Flat Catalog Category"
+"Rebuild Flat Catalog Product","Rebuild Flat Catalog Product"
+"Cache Control","Cache Control"
+"All Cache","All Cache"
+"No change","No change"
+Disable,Disable
+Enable,Enable
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+"-- No Theme --","-- No Theme --"
+Synchronize,Synchronize
+Configuration,Configuration
+"Add Design Change","Add Design Change"
+Delete,Delete
+Save,Save
+"Edit Design Change","Edit Design Change"
+"New Store Design Change","New Store Design Change"
+"General Settings","General Settings"
+Store,Store
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
+"Date From","Date From"
+"Date To","Date To"
+"Design Change","Design Change"
+General,General
+"Delete %1 '%2'","Delete %1 '%2'"
+"Delete %1","Delete %1"
+"Block Information","Block Information"
+"Backup Options","Backup Options"
+"Create DB Backup","Create DB Backup"
+Yes,Yes
+"Delete Store","Delete Store"
+"Delete Web Site","Delete Web Site"
+"Save Web Site","Save Web Site"
+"Save Store","Save Store"
+"Save Store View","Save Store View"
+"Delete Store View","Delete Store View"
+"Edit Web Site","Edit Web Site"
+"New Web Site","New Web Site"
+"Edit Store","Edit Store"
+"New Store","New Store"
+"Edit Store View","Edit Store View"
+"New Store View","New Store View"
+"Store Information","Store Information"
+"Web Site","Web Site"
+Name,Name
+"Root Category","Root Category"
+"Default Store View","Default Store View"
+"Store View Information","Store View Information"
+Code,Code
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Sort Order","Sort Order"
+"Web Site Information","Web Site Information"
+"Default Store","Default Store"
+"Set as Default","Set as Default"
+Stores,Stores
+"Create Website","Create Website"
+"Create Store","Create Store"
+"Create Store View","Create Store View"
+"Custom Variables","Custom Variables"
+"Add New Variable","Add New Variable"
+"Save and Continue Edit","Save and Continue Edit"
+"Custom Variable ""%1""","Custom Variable ""%1"""
+"New Custom Variable","New Custom Variable"
+Variable,Variable
+"Variable Code","Variable Code"
+"Variable Name","Variable Name"
+"Use Default Variable Values","Use Default Variable Values"
+"Variable HTML Value","Variable HTML Value"
+"Variable Plain Value","Variable Plain Value"
+"URL Rewrite Management","URL Rewrite Management"
+"Add URL Rewrite","Add URL Rewrite"
+"Edit URL Rewrite for a Category","Edit URL Rewrite for a Category"
+"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
+Category:,Category:
+"We can't set up a URL rewrite because the product you chose is not associated with a website.","We can't set up a URL rewrite because the product you chose is not associated with a website."
+"We can't set up a URL rewrite because the category your chose is not associated with a website.","We can't set up a URL rewrite because the category your chose is not associated with a website."
+"Edit URL Rewrite for a Product","Edit URL Rewrite for a Product"
+"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
+Product:,Product:
+"Skip Category Selection","Skip Category Selection"
+"Edit URL Rewrite for CMS page","Edit URL Rewrite for CMS page"
+"Add URL Rewrite for CMS page","Add URL Rewrite for CMS page"
+"CMS page:","CMS page:"
+"Chosen cms page does not associated with any website.","Chosen cms page does not associated with any website."
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+"Edit URL Rewrite","Edit URL Rewrite"
+"Add New URL Rewrite","Add New URL Rewrite"
+"Are you sure you want to do this?","Are you sure you want to do this?"
+"URL Rewrite Information","URL Rewrite Information"
+Type,Type
+"ID Path","ID Path"
+"Request Path","Request Path"
+"Target Path","Target Path"
+Redirect,Redirect
+Description,Description
+"For category","For category"
+"For product","For product"
+"For CMS page","For CMS page"
+"Create URL Rewrite:","Create URL Rewrite:"
+"Global Attribute","Global Attribute"
+"This attribute shares the same value in all stores.","This attribute shares the same value in all stores."
+Home,Home
+"Add New Image","Add New Image"
+"Reset Filter","Reset Filter"
+Search,Search
+Any,Any
+"All Countries","All Countries"
+From,From
+To,To
+"Date selector","Date selector"
+"[ deleted ]","[ deleted ]"
+"Select All","Select All"
+" [deleted]"," [deleted]"
+"We couldn't find any records.","We couldn't find any records."
+"Add New","Add New"
+Export,Export
+"Please correct the column format and try again.","Please correct the column format and try again."
+"Please select items.","Please select items."
+Submit,Submit
+"Please correct the tab configuration and try again.","Please correct the tab configuration and try again."
+"You have logged out.","You have logged out."
+"Cache Management","Cache Management"
+"You flushed the cache storage.","You flushed the cache storage."
+"The Magento cache storage has been flushed.","The Magento cache storage has been flushed."
+"%1 cache type(s) enabled.","%1 cache type(s) enabled."
+"An error occurred while enabling cache.","An error occurred while enabling cache."
+"%1 cache type(s) disabled.","%1 cache type(s) disabled."
+"An error occurred while disabling cache.","An error occurred while disabling cache."
+"%1 cache type(s) refreshed.","%1 cache type(s) refreshed."
+"An error occurred while refreshing cache.","An error occurred while refreshing cache."
+"Specified cache type(s) don't exist: ","Specified cache type(s) don't exist: "
+"The JavaScript/CSS cache has been cleaned.","The JavaScript/CSS cache has been cleaned."
+"An error occurred while clearing the JavaScript/CSS cache.","An error occurred while clearing the JavaScript/CSS cache."
+"The image cache was cleaned.","The image cache was cleaned."
+"An error occurred while clearing the image cache.","An error occurred while clearing the image cache."
+Dashboard,Dashboard
+"invalid request","invalid request"
+"see error log for details","see error log for details"
+"Service unavailable: %1","Service unavailable: %1"
+Error,Error
+"Access Denied","Access Denied"
+"You need more permissions to do this.","You need more permissions to do this."
+"No search modules were registered","No search modules were registered"
+"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
+System,System
+"The account has been saved.","The account has been saved."
+"An error occurred while saving account.","An error occurred while saving account."
+"This section is not allowed.","This section is not allowed."
+"You saved the configuration.","You saved the configuration."
+"An error occurred while saving this configuration:","An error occurred while saving this configuration:"
+"Synchronizing %1 to %2","Synchronizing %1 to %2"
+Synchronizing...,Synchronizing...
+"The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
+"Store Design","Store Design"
+"Edit Store Design Change","Edit Store Design Change"
+"You saved the design change.","You saved the design change."
+"You deleted the design change.","You deleted the design change."
+"Cannot delete the design change.","Cannot delete the design change."
+"Manage Stores","Manage Stores"
+"The website does not exist.","The website does not exist."
+"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
+"The store does not exist","The store does not exist"
+"Store view doesn't exist","Store view doesn't exist"
+"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
+"New ","New "
+"The website has been saved.","The website has been saved."
+"The store has been saved.","The store has been saved."
+"The store view has been saved","The store view has been saved"
+"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
+"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
+"This website cannot be deleted.","This website cannot be deleted."
+"This store cannot be deleted.","This store cannot be deleted."
+"This store view cannot be deleted.","This store view cannot be deleted."
+"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
+"The website has been deleted.","The website has been deleted."
+"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
+"The store has been deleted.","The store has been deleted."
+"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
+"The store view has been deleted.","The store view has been deleted."
+"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
+"The database was backed up.","The database was backed up."
+"We couldn't create a backup right now. Please try again later.","We couldn't create a backup right now. Please try again later."
+"Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1.","Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.), but the %1 will not be able to be restored. It is suggested that you create a database backup before deleting the %1."
+"You saved the custom variable.","You saved the custom variable."
+"You deleted the customer.","You deleted the customer."
+"URL Redirects","URL Redirects"
+"[New/Edit] URL Redirect","[New/Edit] URL Redirect"
+"The URL Rewrite has been saved.","The URL Rewrite has been saved."
+"An error occurred while saving URL Rewrite.","An error occurred while saving URL Rewrite."
+"Chosen product does not associated with the chosen store or category.","Chosen product does not associated with the chosen store or category."
+"Chosen category does not associated with the chosen store.","Chosen category does not associated with the chosen store."
+"Chosen cms page does not associated with the chosen store.","Chosen cms page does not associated with the chosen store."
+"The URL Rewrite has been deleted.","The URL Rewrite has been deleted."
+"An error occurred while deleting URL Rewrite.","An error occurred while deleting URL Rewrite."
+"Last 24 Hours","Last 24 Hours"
+"Last 7 Days","Last 7 Days"
+"Current Month","Current Month"
+YTD,YTD
+2YTD,2YTD
+"Please correct the user name or password.","Please correct the user name or password."
+"Authentication error occurred.","Authentication error occurred."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected in not available in allowed currencies.","Sorry, the default display currency you selected in not available in allowed currencies."
+"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"Please correct the timezone.","Please correct the timezone."
+"IP Address","IP Address"
+"Cookie (unsafe)","Cookie (unsafe)"
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+Optional,Optional
+Required,Required
+Website,Website
+"File System","File System"
+Database,Database
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Order #%1 (%2)","Order #%1 (%2)"
+"Access denied","Access denied"
+"Please try to log out and sign in again.","Please try to log out and sign in again."
+"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Welcome,Welcome
+"User Name:","User Name:"
+"user name","user name"
+Password:,Password:
+password,password
+"Log in","Log in"
+"Please wait...","Please wait..."
+"Select Range:","Select Range:"
+"No Data Found","No Data Found"
+"Chart is disabled. To enable the chart, click <a href=""%1"">here</a>.","Chart is disabled. To enable the chart, click <a href=""%1"">here</a>."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
+"Top 5 Search Terms","Top 5 Search Terms"
+"There are no search keywords.","There are no search keywords."
+"View Statistics For:","View Statistics For:"
+"All Websites","All Websites"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+"Browse Files...","Browse Files..."
+"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Magento ver. %1","Magento ver. %1"
+"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Account Setting","Account Setting"
+"Customer View","Customer View"
+"Sign Out","Sign Out"
+"About the calendar","About the calendar"
+"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers (1-9) into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z) into this field.","Please enter only letters (a-z) into this field."
+"Please enter only numbers (0-9) or letters (a-z) into this field.","Please enter only numbers (0-9) or letters (a-z) into this field."
+"Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters.","Please enter only numbers or letters into this field. Do not use spaces, commas, or any other characters."
+"Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field.","Please enter only letters (a-z), numbers (0-9), spaces and the ""#"" character into this field."
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890)."
+"Please enter a valid date.","Please enter a valid date."
+"Please enter a valid email address(for example johndoe@domain.com.).","Please enter a valid email address(for example johndoe@domain.com.)."
+"Please enter 6 or more characters.","Please enter 6 or more characters."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","Please enter a valid URL (for example, the URL must begin with ""http://"")."
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","Please enter a valid URL (for examples, http://www.example.com or www.example.com)."
+"Please enter a valid social security number (for example, 123-45-6789).","Please enter a valid social security number (for example, 123-45-6789)."
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","Please enter a valid zip code (for example, 90602 or 90602-1234)."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006."
+"Please enter a valid dollar amount (for example, $100.00).","Please enter a valid dollar amount (for example, $100.00)."
+"Please select one of these options.","Please select one of these options."
+"Please select State/Province.","Please select State/Province."
+"Please enter a valid password.","Please enter a valid password."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
+"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
+"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Additional Cache Management","Additional Cache Management"
+"Flush Catalog Images Cache","Flush Catalog Images Cache"
+"Pregenerated product images files","Pregenerated product images files"
+"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Cache"
+"Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
+Catalog,Catalog
+JavaScript/CSS,JavaScript/CSS
+"JavaScript/CSS Cache","JavaScript/CSS Cache"
+"Add after","Add after"
+"Current Configuration Scope:","Current Configuration Scope:"
+"Personal Information","Personal Information"
+"No records found.","No records found."
+"Select Category","Select Category"
+Images,Images
+"Big Image","Big Image"
+Thumbnail,Thumbnail
+"Additional Settings","Additional Settings"
+"Total %1 records found","Total %1 records found"
+View,View
+"per page","per page"
+Page,Page
+"Previous page","Previous page"
+"of %1","of %1"
+"Next page","Next page"
+"Export to:","Export to:"
+Actions,Actions
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+Country,Country
+City,City
+"VAT Number","VAT Number"
+"Street Address","Street Address"
+Design,Design
+"Media Storage","Media Storage"
+Admin,Admin
+Advanced,Advanced
+"Transactional Emails","Transactional Emails"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Locale,Locale
+"Base URL","Base URL"
+"Enable Charts","Enable Charts"
+"Secure Base URL","Secure Base URL"
+Host,Host
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+Debug,Debug
+"System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml).","System(config.xml, local.xml) and modules configuration files(config.xml, menu.xml)."
+Services,Services
+"Disable Modules Output","Disable Modules Output"
+"Store Email Addresses","Store Email Addresses"
+"Custom Email 1","Custom Email 1"
+"Custom Email 2","Custom Email 2"
+"General Contact","General Contact"
+"Sales Representative","Sales Representative"
+"Customer Support","Customer Support"
+"User-Agent Exceptions","User-Agent Exceptions"
+"
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ ","
+ Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style=""font-family:monospace"">Firefox<br />/^mozilla/i</span>
+ "
+"Find a string in client user-agent header and switch to specific design theme for that browser.","Find a string in client user-agent header and switch to specific design theme for that browser."
+Pagination,Pagination
+"Pagination Frame","Pagination Frame"
+"How many links to display at once.","How many links to display at once."
+"Pagination Frame Skip","Pagination Frame Skip"
+"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
+"Anchor Text for Previous","Anchor Text for Previous"
+"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
+"Anchor Text for Next","Anchor Text for Next"
+"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+Developer,Developer
+"Developer Client Restrictions","Developer Client Restrictions"
+"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
+"Leave empty for access from any location.","Leave empty for access from any location."
+"Template Path Hints","Template Path Hints"
+"Add Block Names to Hints","Add Block Names to Hints"
+"Template Settings","Template Settings"
+"Allow Symlinks","Allow Symlinks"
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"Translate Inline","Translate Inline"
+"Enabled for Frontend","Enabled for Frontend"
+"Enabled for Admin","Enabled for Admin"
+"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
+"Log Settings","Log Settings"
+"System Log File Name","System Log File Name"
+"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
+"Exceptions Log File Name","Exceptions Log File Name"
+"JavaScript Settings","JavaScript Settings"
+"Merge JavaScript Files","Merge JavaScript Files"
+"Minify JavaScript Files","Minify JavaScript Files"
+"CSS Settings","CSS Settings"
+"Merge CSS Files","Merge CSS Files"
+"Image Processing Settings","Image Processing Settings"
+"Image Adapter","Image Adapter"
+"Static Files Settings","Static Files Settings"
+"Sign Static Files","Sign Static Files"
+"Country Options","Country Options"
+"Allow Countries","Allow Countries"
+"Default Country","Default Country"
+"European Union Countries","European Union Countries"
+"Locale Options","Locale Options"
+Timezone,Timezone
+"First Day of Week","First Day of Week"
+"Weekend Days","Weekend Days"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Single-Store Mode","Single-Store Mode"
+"Enable Single-Store Mode","Enable Single-Store Mode"
+"This setting will not be taken into account if system has more than one store view.","This setting will not be taken into account if system has more than one store view."
+"Mail Sending Settings","Mail Sending Settings"
+"Disable Email Communications","Disable Email Communications"
+"Port (25)","Port (25)"
+"Set Return-Path","Set Return-Path"
+"Return-Path Email","Return-Path Email"
+"Storage Configuration for Media","Storage Configuration for Media"
+"Select Media Database","Select Media Database"
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"Environment Update Time","Environment Update Time"
+"Admin User Emails","Admin User Emails"
+"Forgot Password Email Template","Forgot Password Email Template"
+"Forgot and Reset Email Sender","Forgot and Reset Email Sender"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Startup Page","Startup Page"
+"Admin Base URL","Admin Base URL"
+"Use Custom Admin URL","Use Custom Admin URL"
+"Custom Admin URL","Custom Admin URL"
+"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
+"Use Custom Admin Path","Use Custom Admin Path"
+"Custom Admin Path","Custom Admin Path"
+"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
+Security,Security
+"Add Secret Key to URLs","Add Secret Key to URLs"
+"Login is Case Sensitive","Login is Case Sensitive"
+"Admin Session Lifetime (seconds)","Admin Session Lifetime (seconds)"
+"Values less than 60 are ignored.","Values less than 60 are ignored."
+Web,Web
+"Url Options","Url Options"
+"Add Store Code to Urls","Add Store Code to Urls"
+"
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ ","
+ <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+ "
+"Auto-redirect to Base URL","Auto-redirect to Base URL"
+"Search Engine Optimization","Search Engine Optimization"
+"Use Web Server Rewrites","Use Web Server Rewrites"
+"Base URLs","Base URLs"
+"Specify URL or {{base_url}} placeholder.","Specify URL or {{base_url}} placeholder."
+"Base Link URL","Base Link URL"
+"Base URL for Static View Files","Base URL for Static View Files"
+"May be empty or start with {{unsecure_base_url}} placeholder.","May be empty or start with {{unsecure_base_url}} placeholder."
+"Base URL for User Media Files","Base URL for User Media Files"
+"Base URLs (Secure)","Base URLs (Secure)"
+"Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.","Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base Link URL","Secure Base Link URL"
+"Secure Base URL for Static View Files","Secure Base URL for Static View Files"
+"May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.","May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder."
+"Secure Base URL for User Media Files","Secure Base URL for User Media Files"
+"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
+"Use Secure URLs in Admin","Use Secure URLs in Admin"
+"Offloader header","Offloader header"
+"Default Pages","Default Pages"
+"Default Web URL","Default Web URL"
+"Default No-route URL","Default No-route URL"
+"Default Cookie Settings","Default Cookie Settings"
+"Cookie Lifetime","Cookie Lifetime"
+"Cookie Path","Cookie Path"
+"Cookie Domain","Cookie Domain"
+"Use HTTP Only","Use HTTP Only"
+"Cookie Restriction Mode","Cookie Restriction Mode"
+"Session Validation Settings","Session Validation Settings"
+"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
+"Validate HTTP_VIA","Validate HTTP_VIA"
+"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
+"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
+"Use SID on Frontend","Use SID on Frontend"
+"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
+"Cache Type","Cache Type"
+Tags,Tags
+"<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
+"Variable ID","Variable ID"
+Options,Options
+"Magento Admin","Magento Admin"
+"Community Edition","Community Edition"
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
index 082c3bd3cb8..5a7ddf6c47e 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
@@ -27,9 +27,7 @@
<referenceContainer name="content">
<block class="Magento\Framework\View\Element\Text" name="content.noRoute">
<action method="setText">
- <argument translate="true" name="text" xsi:type="string">
- <![CDATA[<h1 class="page-heading">404 Error</h1><p>Page not found.</p>]]>
- </argument>
+ <argument translate="true" name="text" xsi:type="string"><![CDATA[<h1 class="page-heading">404 Error</h1><p>Page not found.</p>]]></argument>
</action>
</block>
</referenceContainer>
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
index 30e2108db14..0b12997b80c 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -168,10 +168,7 @@ class Index extends \Magento\Backend\App\Action
)
);
$backupManager->setErrorMessage(
- __(
- "Something went wrong '
- . 'putting your store into maintenance mode."
- )
+ __('Something went wrong putting your store into maintenance mode.')
);
return $this->getResponse()->representJson($response->toJson());
}
@@ -322,10 +319,7 @@ class Index extends \Magento\Backend\App\Action
)
);
$backupManager->setErrorMessage(
- __(
- "Something went wrong '
- . 'putting your store into maintenance mode."
- )
+ __('Something went wrong putting your store into maintenance mode.')
);
return $this->getResponse()->representJson($response->toJson());
}
diff --git a/app/code/Magento/Backup/i18n/de_DE.csv b/app/code/Magento/Backup/i18n/de_DE.csv
index c36ba55a0e6..d06f30000fb 100644
--- a/app/code/Magento/Backup/i18n/de_DE.csv
+++ b/app/code/Magento/Backup/i18n/de_DE.csv
@@ -1,50 +1,81 @@
-"Action","Aktion"
-"An error occurred while creating the backup.","Beim Anlegen der Sicherungskopie ist ein Fehler aufgetreten."
-"An error occurred while writing to the backup file ""%s"".","Während des Speichervorgangs auf der Sicherungsdatei ""%s"". trat ein Fehler auf."
-"Are you sure you want to delete the selected backup(s)?","Sind Sie sicher, dass Sie die ausgewählten Sicherungskopie(n) löschen wollen?"
-"Backup Type","Typ der Sicherungskopie"
-"Backup file ""%s"" cannot be read from or written to.","Sicherungsdatei ""%s"" lässt sich weder beschreiben noch auslesen."
-"Backup file ""%s"" does not exist.","Sicherungsdatei ""%s"" existiert nicht."
-"Backup file does not exist.","Sicherungsdatei existiert nicht."
-"Backup file handler was unspecified.","Anwender der Sicherungsdatei nicht spezifiziert."
-"Backup file not found","Sicherungskopie nicht gefunden"
-"Backup file path was not specified.","Pfad der Sicherungsdatei nicht spezifiziert."
-"Backups","Sicherungsdateien"
-"Cannot read backup file.","Sicherungsdatei kann nicht gelesen werden."
-"Create Backup","Sicherungsdatei anlegen"
-"Database Backup","Sicherungskopie der Datenbank"
+Cancel,Cancel
+Action,Aktion
+failed,failed
+successful,successful
+Delete,Delete
+Name,Name
+Type,Typ
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,Zeit
+"System Backup",Systemsicherung
"Database and Media Backup","Sicherungskopie von Datenbank und Medien"
-"Database was successfuly backed up.","Datenbank erfolgreich gesichert."
-"Download","Download"
-"Enable Scheduled Backup","Planmäßige Datensicherung aktivieren"
-"Failed to connect to FTP","Verbindung mit FTP fehlgeschlagen"
-"Failed to delete one or several backups.","Löschen einer oder mehrerer Sicherungskopien fehlgeschlagen"
-"Failed to rollback","Rollback fehlgeschlagen"
+"Database Backup","Sicherungskopie der Datenbank"
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,Sicherungsdateien
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","FTP-Validierung fehlgeschlagen"
-"Frequency","Frequenz"
-"Invalid Password.","Ungültiges Passwort"
-"Maintenance Mode","Wartungsmodus"
-"Name","Name"
-"Not enough free space to create backup.","Nicht genug freier Speicher zum Anlegen der Sicherungskopie"
-"Not enough permissions to create backup.","Keine ausreichende Berechtigung zum Anlegen der Sicherungskopie"
-"Not enough permissions to perform rollback","Keine ausreichende Berechtigung zur Durchführung des Rollback"
-"Please deselect the sufficient check-box, if you want to continue backup's creation","Bitte deselektieren Sie ausreichend viele Check-Boxen, wenn Sie mit dem Anlegen der Sicherungskopie fortfahren wollen."
-"Please deselect the sufficient check-box, if you want to continue rollback processing","Bitte deselektieren Sie ausreichend viele Check-Boxen, wenn Sie mit der Durchführung des Rollback fortfahren wollen."
-"Put store on the maintenance mode while backup's creation","Setzen Sie den Shop während des Anlegens der Sicherungskopie in den Wartungsmodus."
-"Rollback","Rollback"
-"Scheduled Backup Settings","Einstellungen für die planmäßige Datensicherung"
-"Size (bytes)","Größe, Bytes"
-"Start Time","Startzeit"
-"System Backup","Systemsicherung"
-"System couldn't put store on the maintenance mode","Das System konnte den Shop nicht in den Wartungsmodus setzen."
-"The database and media backup has been created.","Die Sicherungskopie von Datenbank und Medien wurde angelegt."
-"The database backup has been created.","Die Sicherungskopie der Datenbank wurde angelegt."
-"The file was compressed with Zlib, but this extension is not installed on server.","Die Datei wurde mit Zlib komprimiert, diese Erweiterung ist jedoch auf dem Server nicht installiert."
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback","Rollback fehlgeschlagen"
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
"The selected backup(s) has been deleted.","Die ausgewählte(n) Datenkopie(n) wurde(n) gelöscht."
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
"The system backup has been created.","Die Sicherungskopie des Systems wurde angelegt."
-"Time","Zeit"
-"Type","Typ"
-"Unable to create backup. Please, try again later.","Sicherungskopie konnte nicht erstellt werden. Bitte versuchen Sie es später noch einmal."
-"Unable to save the cron expression.","Der Cron-Ausdruck kann nicht gespeichert werden."
-"Warning! System couldn't put store on the maintenance mode.","Warnung! System konnte Shop nicht in den Wartungsmodus setzen."
-"Wrong order of creation for new backup.","Falscher Befehl zum Erstellen einer neuen Sicherungskopie."
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.","Die Sicherungskopie von Datenbank und Medien wurde angelegt."
+"The database backup has been created.","Die Sicherungskopie der Datenbank wurde angelegt."
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup","Sicherungsdatei anlegen"
+Download,Download
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"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
diff --git a/app/code/Magento/Backup/i18n/en_US.csv b/app/code/Magento/Backup/i18n/en_US.csv
index b9730343075..7d05a45a649 100644
--- a/app/code/Magento/Backup/i18n/en_US.csv
+++ b/app/code/Magento/Backup/i18n/en_US.csv
@@ -1,51 +1,81 @@
-"Action","Action"
-"An error occurred while creating the backup.","An error occurred while creating the backup."
-"An error occurred while writing to the backup file ""%s"".","An error occurred while writing to the backup file ""%s""."
-"Are you sure you want to delete the selected backup(s)?","Are you sure you want to delete the selected backup(s)?"
-"Backup Type","Backup Type"
-"Backup file ""%s"" cannot be read from or written to.","Backup file ""%s"" cannot be read from or written to."
-"Backup file ""%s"" does not exist.","Backup file ""%s"" does not exist."
-"Backup file does not exist.","Backup file does not exist."
-"Backup file handler was unspecified.","Backup file handler was unspecified."
-"Backup file not found","Backup file not found"
-"Backup file path was not specified.","Backup file path was not specified."
-"Backups","Backups"
-"Cannot read backup file.","Cannot read backup file."
-"Create Backup","Create Backup"
-"Database Backup","Database Backup"
+Cancel,Cancel
+Action,Action
+failed,failed
+successful,successful
+Delete,Delete
+Name,Name
+Type,Type
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,Time
+"System Backup","System Backup"
"Database and Media Backup","Database and Media Backup"
-"Database was successfuly backed up.","Database was successfuly backed up."
-"Download","Download"
-"Enable Scheduled Backup","Enable Scheduled Backup"
-"Failed to connect to FTP","Failed to connect to FTP"
-"Failed to delete one or several backups.","Failed to delete one or several backups."
-"Failed to rollback","Failed to rollback"
+"Database Backup","Database Backup"
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,Backups
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","Failed to validate FTP"
-"Frequency","Frequency"
-"Invalid Password.","Invalid Password."
-"Maintenance Mode","Maintenance Mode"
-"Name","Name"
-"Not enough free space to create backup.","Not enough free space to create backup."
-"Not enough permissions to create backup.","Not enough permissions to create backup."
-"Not enough permissions to perform rollback","Not enough permissions to perform rollback"
-"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup."""
-"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback."""
-"Put store on the maintenance mode while backup's creation","Put store on the maintenance mode while backup's creation"
-"Rollback","Rollback"
-"Scheduled Backup Settings","Scheduled Backup Settings"
-"Size (bytes)","Size (bytes)"
-"Start Time","Start Time"
-"System Backup","System Backup"
-"System couldn't put store on the maintenance mode","System couldn't put store on the maintenance mode"
-"The database and media backup has been created.","The database and media backup has been created."
-"The database backup has been created.","The database backup has been created."
-"The file was compressed with Zlib, but this extension is not installed on server.","The file was compressed with Zlib, but this extension is not installed on server."
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback","Failed to rollback"
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
"The selected backup(s) has been deleted.","The selected backup(s) has been deleted."
-"The system (excluding Media) backup has been created.","The system (excluding Media) backup has been created."
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
"The system backup has been created.","The system backup has been created."
-"Time","Time"
-"Type","Type"
-"Unable to create backup. Please, try again later.","Unable to create backup. Please, try again later."
-"Unable to save the cron expression.","Unable to save the cron expression."
-"Wrong order of creation for new backup.","Wrong order of creation for new backup."
-"You do not have sufficient permissions to enable Maintenance Mode during this operation.","You do not have sufficient permissions to enable Maintenance Mode during this operation."
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.","The database and media backup has been created."
+"The database backup has been created.","The database backup has been created."
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup","Create Backup"
+Download,Download
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"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
diff --git a/app/code/Magento/Backup/i18n/es_ES.csv b/app/code/Magento/Backup/i18n/es_ES.csv
index b75014e4871..62086f4e014 100644
--- a/app/code/Magento/Backup/i18n/es_ES.csv
+++ b/app/code/Magento/Backup/i18n/es_ES.csv
@@ -1,50 +1,81 @@
-"Action","Acción"
-"An error occurred while creating the backup.","Error al crear la copia de seguridad."
-"An error occurred while writing to the backup file ""%s"".","Ocurrió un error al guardar el archivo de la copia de seguridad ""%s""."
-"Are you sure you want to delete the selected backup(s)?","¿Seguro que desea eliminar las copias de seguridad seleccionadas?"
-"Backup Type","Tipo de copia de seguridad"
-"Backup file ""%s"" cannot be read from or written to.","No se puede leer o escribir en el archivo de la copia de seguridad ""%s""."
-"Backup file ""%s"" does not exist.","El archivo de la copia de seguridad ""%s"" no existe."
-"Backup file does not exist.","El archivo de copia de seguridad no existe."
-"Backup file handler was unspecified.","No se ha especificado el procesador del archivo de copia de seguridad."
-"Backup file not found","Copia de seguridad no encontrada"
-"Backup file path was not specified.","No se ha especificado la ruta del archivo de copia de seguridad."
-"Backups","Copias de seguridad"
-"Cannot read backup file.","No se puede leer el archivo de copia de seguridad."
-"Create Backup","Crear Copia de seguridad"
-"Database Backup","Copia de seguridad de base de datos"
+Cancel,Cancel
+Action,Acción
+failed,failed
+successful,successful
+Delete,Delete
+Name,Nombre
+Type,Tipo
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,Tiempo
+"System Backup","Copia de seguridad del sistema"
"Database and Media Backup","Copia de seguridad de base de datos y medios"
-"Database was successfuly backed up.","Se ha creado con éxito una copia de seguridad de la base de datos."
-"Download","Descargar"
-"Enable Scheduled Backup","Activar copia de seguridad programada"
-"Failed to connect to FTP","No ha sido posible establecer conexión con el FTP"
-"Failed to delete one or several backups.","No ha sido posible eliminar una o varias copias de seguridad."
-"Failed to rollback","No ha sido posible revertir"
+"Database Backup","Copia de seguridad de base de datos"
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,"Copias de seguridad"
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","No ha sido posible validar el FTP"
-"Frequency","Frecuencia"
-"Invalid Password.","Contraseña no válida"
-"Maintenance Mode","Modo de Mantenimiento"
-"Name","Nombre"
-"Not enough free space to create backup.","No hay espacio libre suficiente para crear la copia de seguridad."
-"Not enough permissions to create backup.","No hay permisos suficientes para crear la copia de seguridad."
-"Not enough permissions to perform rollback","No hay permisos suficientes para realizar la reversión."
-"Please deselect the sufficient check-box, if you want to continue backup's creation","Anule la selección de la casilla de verificación Suficiente si desea continuar con la creación de la copia de seguridad"
-"Please deselect the sufficient check-box, if you want to continue rollback processing","Anule la selección de la casilla de verificación Suficiente si desea continuar con el procesamiento de la reversión"
-"Put store on the maintenance mode while backup's creation","Ponga la tienda en modo de mantenimiento durante la creación de la copia de seguridad"
-"Rollback","Revertir"
-"Scheduled Backup Settings","Configuración de copia de seguridad programada"
-"Size (bytes)","Tamaño, Bytes"
-"Start Time","Tiempo de Inicio"
-"System Backup","Copia de seguridad del sistema"
-"System couldn't put store on the maintenance mode","El sistema no ha podido poner la tienda en modo de mantenimiento"
-"The database and media backup has been created.","Se ha creado la copia de seguridad de la base de datos y de los medios."
-"The database backup has been created.","Se ha creado la copia de seguridad de la base de datos."
-"The file was compressed with Zlib, but this extension is not installed on server.","El archivo ha sido comprimido con Zlib, pero esta extensión no está instalada en el servidor."
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback","No ha sido posible revertir"
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
"The selected backup(s) has been deleted.","Se han eliminado las copias de seguridad seleccionadas."
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
"The system backup has been created.","Se ha creado la copia de seguridad del sistema."
-"Time","Tiempo"
-"Type","Tipo"
-"Unable to create backup. Please, try again later.","No se puede crear la copia de seguridad. Por favor, inténtelo de nuevo más tarde."
-"Unable to save the cron expression.","No ha sido posible guardar la expresión cron."
-"Warning! System couldn't put store on the maintenance mode.","Advertencia: el sistema no ha podido poner la tienda en modo de mantenimiento"
-"Wrong order of creation for new backup.","Orden incorrecta de creación de nueva copia de seguridad."
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.","Se ha creado la copia de seguridad de la base de datos y de los medios."
+"The database backup has been created.","Se ha creado la copia de seguridad de la base de datos."
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup","Crear Copia de seguridad"
+Download,Descargar
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"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
diff --git a/app/code/Magento/Backup/i18n/fr_FR.csv b/app/code/Magento/Backup/i18n/fr_FR.csv
index 397cd8c86fc..9a383f775e5 100644
--- a/app/code/Magento/Backup/i18n/fr_FR.csv
+++ b/app/code/Magento/Backup/i18n/fr_FR.csv
@@ -1,50 +1,81 @@
-"Action","Action"
-"An error occurred while creating the backup.","Une erreur est survenue lors de la création de la copie de sauvegarde"
-"An error occurred while writing to the backup file ""%s"".","Une erreur est survenue lors du message au fichier de sauvegarde ""%s""."
-"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) ?"
-"Backup Type","Type de sauvegarde"
-"Backup file ""%s"" cannot be read from or written to.","Le fichier de sauvegarde ""%s"" ne peut être lu et ne peut recevoir de message."
-"Backup file ""%s"" does not exist.","Le fichier de sauvegarde ""%s"" n'existe pas."
-"Backup file does not exist.","Le fichier de sauvegarde n'existe pas."
-"Backup file handler was unspecified.","Le propriétaire du fichier de sauvegarde n'a pas été spécifié."
-"Backup file not found","Fichier de sauvegarde non trouvé"
-"Backup file path was not specified.","Le répertoire du fichier de sauvegarde n'a pas été spécifié."
-"Backups","Sauvegardes"
-"Cannot read backup file.","Ne peut pas lire le fichier de sauvegarde."
-"Create Backup","Créer sauvegarde"
-"Database Backup","Sauvegarde de la base de données"
+Cancel,Cancel
+Action,Action
+failed,failed
+successful,successful
+Delete,Delete
+Name,Nom
+Type,Type
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,Temps
+"System Backup","Sauvegarde du système"
"Database and Media Backup","Sauvegarde de la base de données et des médias"
-"Database was successfuly backed up.","La base de données a été sauvegardée avec succès."
-"Download","Téléchargement"
-"Enable Scheduled Backup","Activer la sauvegarde programmée"
-"Failed to connect to FTP","Échec de la connexion au FTP"
-"Failed to delete one or several backups.","Échec de la suppression d'une ou plusieurs copies de sauvegarde."
-"Failed to rollback","Échec de la réduction"
+"Database Backup","Sauvegarde de la base de données"
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,Sauvegardes
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","Échec de la validation du FTP"
-"Frequency","Fréquence"
-"Invalid Password.","Mot de passe non valable."
-"Maintenance Mode","Mode maintenance"
-"Name","Nom"
-"Not enough free space to create backup.","Espace libre insuffisant pour la création d'une copie de sauvegarde."
-"Not enough permissions to create backup.","Autorisations insuffisantes pour la création d'une copie de sauvegarde."
-"Not enough permissions to perform rollback","Autorisations insuffisantes pour effectuer une réduction"
-"Please deselect the sufficient check-box, if you want to continue backup's creation","Veuillez dé-sélectionner suffisamment de cases si vous souhaitez continuer la création d'une copie de sauvegarde"
-"Please deselect the sufficient check-box, if you want to continue rollback processing","Veuillez dé-sélectionner suffisamment de cases si vous souhaitez continuer le processus de réduction"
-"Put store on the maintenance mode while backup's creation","Mettre une réserve sur le mode de maintenance lors de la création de la copie de sauvegarde"
-"Rollback","Réduction"
-"Scheduled Backup Settings","Paramètres de la sauvegarde programmée"
-"Size (bytes)","Taille, Bytes"
-"Start Time","Date de début"
-"System Backup","Sauvegarde du système"
-"System couldn't put store on the maintenance mode","Le système n'a pas pu mettre de réserves sur le mode maintenance"
-"The database and media backup has been created.","La copie de sauvegarde de la base de données et des médias a été créée."
-"The database backup has been created.","La copie de sauvegarde de la base de données a été créée."
-"The file was compressed with Zlib, but this extension is not installed on server.","Le fichier a été compressé avec Zlib, mais cette extension n'est pas installée sur le serveur."
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback","Échec de la réduction"
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
"The selected backup(s) has been deleted.","La copie de sauvegarde sélectionnée a été supprimée."
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
"The system backup has been created.","La copie de sauvegarde du système a été créée."
-"Time","Temps"
-"Type","Type"
-"Unable to create backup. Please, try again later.","Impossible de créer la sauvegarde. Veuillez réessayer plus tard."
-"Unable to save the cron expression.","Impossible de sauvegarder l'expression cron."
-"Warning! System couldn't put store on the maintenance mode.","Avertissement ! Le système n'a pas pu mettre de réserves sur le mode maintenance."
-"Wrong order of creation for new backup.","Mauvais ordre de création de la nouvelle sauvegarde."
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.","La copie de sauvegarde de la base de données et des médias a été créée."
+"The database backup has been created.","La copie de sauvegarde de la base de données a été créée."
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup","Créer sauvegarde"
+Download,Téléchargement
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"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
diff --git a/app/code/Magento/Backup/i18n/nl_NL.csv b/app/code/Magento/Backup/i18n/nl_NL.csv
index a8f178c8363..13950d82df1 100644
--- a/app/code/Magento/Backup/i18n/nl_NL.csv
+++ b/app/code/Magento/Backup/i18n/nl_NL.csv
@@ -1,50 +1,81 @@
-"Action","Actie"
-"An error occurred while creating the backup.","Er is een fout opgetreden tijdens het maken van de backup."
-"An error occurred while writing to the backup file ""%s"".","Er is een fout opgetreden terwijl het backup-bestand ""%s"" werd geschreven."
-"Are you sure you want to delete the selected backup(s)?","Weet u zeker dat u de geselecteerde back-up(s) wilt verwijderen?"
-"Backup Type","Back-up Type"
-"Backup file ""%s"" cannot be read from or written to.","Backup-bestand ""%s"" kan niet gelezen of beschreven worden."
-"Backup file ""%s"" does not exist.","Backup-bestand ""%s"" bestaat niet."
-"Backup file does not exist.","Backup-bestand bestaat niet"
-"Backup file handler was unspecified.","Backup bestand behandelaar is niet gespecificeerd."
-"Backup file not found","Back-up bestand niet gevonden"
-"Backup file path was not specified.","Backup-bestand pad is niet gespecificeerd."
-"Backups","Backups"
-"Cannot read backup file.","Kan backup-bestand niet lezen."
-"Create Backup","Creëer backup"
-"Database Backup","Database Back-up"
+Cancel,Cancel
+Action,Actie
+failed,failed
+successful,successful
+Delete,Delete
+Name,Naam
+Type,type
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,Tijd
+"System Backup","Systeem Back-up"
"Database and Media Backup","Database en Media Back-up"
-"Database was successfuly backed up.","Database backup is met succes uitgevoerd"
-"Download","Download"
-"Enable Scheduled Backup","Schakel Geplande Back-up in"
-"Failed to connect to FTP","Kan geen verbinding maken met FTP"
-"Failed to delete one or several backups.","Fout bij verwijderen van een of meerdere back-ups."
-"Failed to rollback","Terugdraaien mislukt"
+"Database Backup","Database Back-up"
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,Backups
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","Kan FTP niet valideren"
-"Frequency","Frequentie"
-"Invalid Password.","Ongeldig Wachtwoord."
-"Maintenance Mode","Onderhouds Modus"
-"Name","Naam"
-"Not enough free space to create backup.","Niet genoeg vrije ruimte om back-up te creëren."
-"Not enough permissions to create backup.","Niet genoeg rechten om back-up te creëren."
-"Not enough permissions to perform rollback","Niet genoeg rechten om terugdraaien uit te voeren"
-"Please deselect the sufficient check-box, if you want to continue backup's creation","Gelieve vinkje te verwijderen van het voldoende vakje, als u het maken van de back-up's wilt voortzetten"
-"Please deselect the sufficient check-box, if you want to continue rollback processing","Gelieve vinkje te verwijderen van het voldoende vakje, als u het terugdraaiproces wilt voortzetten"
-"Put store on the maintenance mode while backup's creation","Zet store op de onderhoudsmodus, tijdens het maken van back-up's"
-"Rollback","Terugrollen"
-"Scheduled Backup Settings","Geplande Back-up Instellingen"
-"Size (bytes)","Grootte, bytes"
-"Start Time","Begintijd"
-"System Backup","Systeem Back-up"
-"System couldn't put store on the maintenance mode","Systeem kon store niet in de onderhoudsmodus zetten"
-"The database and media backup has been created.","De database en media back-up zijn gemaakt."
-"The database backup has been created.","De database back-up is gemaakt."
-"The file was compressed with Zlib, but this extension is not installed on server.","Het bestand is gecomprimeerd met Zlib, maar deze extensie is niet geïnstalleerd op de server."
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback","Terugdraaien mislukt"
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
"The selected backup(s) has been deleted.","De geselecteerde back-up(s) is/zijn verwijderd."
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
"The system backup has been created.","Het systeem back-up is gemaakt."
-"Time","Tijd"
-"Type","type"
-"Unable to create backup. Please, try again later.","Niet in staat om backup te creëren. Probeer a.u.b. later opnieuw."
-"Unable to save the cron expression.","Kan de cron uitdrukking niet opslaan."
-"Warning! System couldn't put store on the maintenance mode.","Let op! Het systeem kon store niet in de onderhoudsmodus zetten."
-"Wrong order of creation for new backup.","Verkeerde volgorde van creëren van nieuwe backup."
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.","De database en media back-up zijn gemaakt."
+"The database backup has been created.","De database back-up is gemaakt."
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup","Creëer backup"
+Download,Download
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"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
diff --git a/app/code/Magento/Backup/i18n/pt_BR.csv b/app/code/Magento/Backup/i18n/pt_BR.csv
index f1414f79b03..48a61b65812 100644
--- a/app/code/Magento/Backup/i18n/pt_BR.csv
+++ b/app/code/Magento/Backup/i18n/pt_BR.csv
@@ -1,50 +1,81 @@
-"Action","Ação"
-"An error occurred while creating the backup.","Ocorreu um erro ao criar o backup."
-"An error occurred while writing to the backup file ""%s"".","Ocorreu um erro durante a gravação do arquivo de cópia de segurança ""%s""."
-"Are you sure you want to delete the selected backup(s)?","Você tem certeza que quer deletar o(s) backup(s) selecionado(s)?"
-"Backup Type","Tipo de backup"
-"Backup file ""%s"" cannot be read from or written to.","Cópia de segurança do arquivo ""%s"" não pode ser lido ou gravado."
-"Backup file ""%s"" does not exist.","Cópia de segurança do arquivo ""%s"" não existe."
-"Backup file does not exist.","Cópia de segurança do arquivo não existe."
-"Backup file handler was unspecified.","Processador de arquivo de cópia de segurança não foi especificado."
-"Backup file not found","Arquivo de backup não encontrado"
-"Backup file path was not specified.","Caminho do arquivo de cópia de segurança não foi especificado."
-"Backups","Cópias de segurança"
-"Cannot read backup file.","Não é possÃvel ler arquivo de cópia de segurança."
-"Create Backup","Criar Cópia de Segurança"
-"Database Backup","Backup de banco de dados"
+Cancel,Cancel
+Action,Ação
+failed,failed
+successful,successful
+Delete,Delete
+Name,Nome
+Type,Tipo
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,Tempo
+"System Backup","Backup do sistema"
"Database and Media Backup","Backup de banco de dados e mÃdia"
-"Database was successfuly backed up.","Foi feita com sucesso a cópia de segurança da base de dados."
-"Download","Baixar"
-"Enable Scheduled Backup","Ativar backup agendado"
-"Failed to connect to FTP","Falha ao se conectar a FTP"
-"Failed to delete one or several backups.","Falha ao deletar um ou mais backups."
-"Failed to rollback","Falha ao restaurar"
+"Database Backup","Backup de banco de dados"
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,"Cópias de segurança"
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","Falha ao validar FTP"
-"Frequency","Freqüência"
-"Invalid Password.","Senha inválida."
-"Maintenance Mode","Modo de manutenção"
-"Name","Nome"
-"Not enough free space to create backup.","Sem espaço livre suficiente para criar backup."
-"Not enough permissions to create backup.","Sem permissões suficientes para criar backup."
-"Not enough permissions to perform rollback","Sem permissões suficientes para executar restauração"
-"Please deselect the sufficient check-box, if you want to continue backup's creation","Por favor desmarque a caixa de seleção suficiente se deseja prosseguir com a criação do backup"
-"Please deselect the sufficient check-box, if you want to continue rollback processing","Por favor desmarque a caixa de seleção suficiente se deseja prosseguir com o processamento da restauração"
-"Put store on the maintenance mode while backup's creation","Colocar loja em modo de manutenção durante a criação de backup"
-"Rollback","Reversão"
-"Scheduled Backup Settings","Configurações de backup agendado"
-"Size (bytes)","Tamanho, Bytes"
-"Start Time","Tempo de InÃcio"
-"System Backup","Backup do sistema"
-"System couldn't put store on the maintenance mode","O sistema não conseguiu colocar a loja em modo de manutenção"
-"The database and media backup has been created.","O backup do banco de dados e de mÃdia foi criado."
-"The database backup has been created.","O backup do banco de dados foi criado."
-"The file was compressed with Zlib, but this extension is not installed on server.","O arquivo foi compactado com Zlib, mas essa extensão não está instalada no servidor."
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback","Falha ao restaurar"
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
"The selected backup(s) has been deleted.","Backup(s) selecionado(s) deletado(s)."
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
"The system backup has been created.","O backup do sistema foi criado."
-"Time","Tempo"
-"Type","Tipo"
-"Unable to create backup. Please, try again later.","Não é possÃvel criar cópia de segurança. Por favor, tente novamente mais tarde."
-"Unable to save the cron expression.","ImpossÃvel salvar a expressão cron."
-"Warning! System couldn't put store on the maintenance mode.","Atenção! O sistema não conseguiu colocar a loja em modo de manutenção."
-"Wrong order of creation for new backup.","Ordem errada de criação de nova cópia de segurança."
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.","O backup do banco de dados e de mÃdia foi criado."
+"The database backup has been created.","O backup do banco de dados foi criado."
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup","Criar Cópia de Segurança"
+Download,Baixar
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"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
diff --git a/app/code/Magento/Backup/i18n/zh_CN.csv b/app/code/Magento/Backup/i18n/zh_CN.csv
index 685ef82df48..62aeea0861a 100644
--- a/app/code/Magento/Backup/i18n/zh_CN.csv
+++ b/app/code/Magento/Backup/i18n/zh_CN.csv
@@ -1,50 +1,81 @@
-"Action","æ“作"
-"An error occurred while creating the backup.","创建备份时å‘生错误。"
-"An error occurred while writing to the backup file ""%s"".","写入备份文件 ""%s"" æ—¶é‡åˆ°äº†ä¸€ä¸ªé”™è¯¯ã€‚"
-"Are you sure you want to delete the selected backup(s)?","ä½ æ˜¯å¦ç¡®å®šè¦åˆ 除所选备份？"
-"Backup Type","备份类型"
-"Backup file ""%s"" cannot be read from or written to.","备份文件 ""%s"" ä¸èƒ½è¯»å–或写入。"
-"Backup file ""%s"" does not exist.","备份文件 ""%s"" ä¸å˜åœ¨ã€‚"
-"Backup file does not exist.","备份文件ä¸å˜åœ¨ã€‚"
-"Backup file handler was unspecified.","未指定备份文件的处ç†ç¨‹åºã€‚"
-"Backup file not found","备份文件未找到"
-"Backup file path was not specified.","备份文件路径未指定。"
-"Backups","备份"
-"Cannot read backup file.","æ— æ³•è¯»å–备份文件。"
-"Create Backup","创建备份"
-"Database Backup","æ•°æ®åº“备份"
-"Database and Media Backup","æ•°æ®åº“与媒体备份"
-"Database was successfuly backed up.","æ•°æ®åº“å·²æˆåŠŸå¤‡ä»½ã€‚"
-"Download","下载"
-"Enable Scheduled Backup","å¯ç”¨è®¡åˆ’备份"
-"Failed to connect to FTP","连接到 FTP 失败"
-"Failed to delete one or several backups.","åˆ é™¤ä¸€ä¸ªæˆ–å¤šä¸ªå¤‡ä»½å¤±è´¥ã€‚"
-"Failed to rollback","回滚失败"
+Cancel,Cancel
+Action,æ“作
+failed,failed
+successful,successful
+Delete,Delete
+Name,姓å
+Type,类型
+System,System
+"We can't save the Cron expression.","We can't save the Cron expression."
+Database,Database
+Time,时间
+"System Backup",系统备份
+"Database and Media Backup",æ•°æ®åº“与媒体备份
+"Database Backup",æ•°æ®åº“备份
+"The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems.","The archive can be uncompressed with <a href=""%1"">%2</a> on Windows systems."
+Backups,备份
+Tools,Tools
+Backup,Backup
+"You need more permissions to activate maintenance mode right now.","You need more permissions to activate maintenance mode right now."
+"To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the backup, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"Something went wrong putting your store into maintenance mode.","Something went wrong putting your store into maintenance mode."
+"You need more free space to create a backup.","You need more free space to create a backup."
+"You need more permissions to create a backup.","You need more permissions to create a backup."
+"Something went wrong creating the backup.","Something went wrong creating the backup."
+"Please correct the password.","Please correct the password."
+"To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions.","To continue with the rollback, you need to either deselect ' '""Put store on the maintenance mode"" or update your permissions."
+"The backup file was not found.","The backup file was not found."
+"We couldn't connect to the FTP.","We couldn't connect to the FTP."
"Failed to validate FTP","éªŒè¯ FTP 失败"
-"Frequency","频率"
-"Invalid Password.","æ— æ•ˆå¯†ç 。"
-"Maintenance Mode","维护模å¼"
-"Name","姓å"
-"Not enough free space to create backup.","没有创建备份所需的足够空间。"
-"Not enough permissions to create backup.","没有创建备份所需的æƒé™ã€‚"
-"Not enough permissions to perform rollback","没有执行回滚所需的æƒé™"
-"Please deselect the sufficient check-box, if you want to continue backup's creation","å¦‚æžœä½ æƒ³ç»§ç»åˆ›å»ºå¤‡ä»½ï¼Œè¯·å选一定的å¤é€‰æ¡†"
-"Please deselect the sufficient check-box, if you want to continue rollback processing","å¦‚æžœä½ æƒ³ç»§ç»å›žæ»šæ“作，请å选一定的å¤é€‰æ¡†"
-"Put store on the maintenance mode while backup's creation","在创建备份时将店铺置于维护模å¼"
-"Rollback","回滚"
-"Scheduled Backup Settings","计划备份设置"
-"Size (bytes)","大å°ï¼Œå—节"
-"Start Time","开始时间"
-"System Backup","系统备份"
-"System couldn't put store on the maintenance mode","系统没有将店铺置于维护模å¼"
-"The database and media backup has been created.","æ•°æ®åº“与媒体备份已创建。"
-"The database backup has been created.","æ•°æ®åº“备份已创建。"
-"The file was compressed with Zlib, but this extension is not installed on server.","该文件已使用Zlib压缩，但æœåŠ¡å™¨ä¸Šæ²¡æœ‰å®‰è£…该扩展。"
-"The selected backup(s) has been deleted.","æ‰€é€‰å¤‡ä»½å·²åˆ é™¤ã€‚"
-"The system backup has been created.","系统备份已创建。"
-"Time","时间"
-"Type","类型"
-"Unable to create backup. Please, try again later.","æ— æ³•åˆ›å»ºå¤‡ä»½ã€‚è¯·ç¨å€™é‡è¯•ã€‚"
-"Unable to save the cron expression.","æ— æ³•ä¿å˜Cron表达å¼ã€‚"
-"Warning! System couldn't put store on the maintenance mode.","è¦å‘Šï¼ç³»ç»Ÿæ— 法将店铺置于维护模å¼ã€‚"
-"Wrong order of creation for new backup.","创建新备份的顺åºæœ‰è¯¯ã€‚"
+"Not enough permissions to perform rollback.","Not enough permissions to perform rollback."
+"Failed to rollback",回滚失败
+"We couldn't delete one or more backups.","We couldn't delete one or more backups."
+"The selected backup(s) has been deleted.",æ‰€é€‰å¤‡ä»½å·²åˆ é™¤ã€‚
+"Database and Media","Database and Media"
+"System (excluding Media)","System (excluding Media)"
+"The system backup has been created.",系统备份已创建。
+"The system backup (excluding media) has been created.","The system backup (excluding media) has been created."
+"The database and media backup has been created.",æ•°æ®åº“与媒体备份已创建。
+"The database backup has been created.",æ•°æ®åº“备份已创建。
+"Please correct the order of creation for a new backup.","Please correct the order of creation for a new backup."
+"The backup file does not exist.","The backup file does not exist."
+"The backup file path was not specified.","The backup file path was not specified."
+"The backup file ""%1"" does not exist.","The backup file ""%1"" does not exist."
+"Sorry, but we cannot read from or write to backup file ""%1"".","Sorry, but we cannot read from or write to backup file ""%1""."
+"The backup file handler was unspecified.","The backup file handler was unspecified."
+"Something went wrong writing to the backup file ""%1"".","Something went wrong writing to the backup file ""%1""."
+Warning,Warning
+"Any data created since the backup was made will be lost including admin users, customers and orders.","Any data created since the backup was made will be lost including admin users, customers and orders."
+"Are you sure you want to proceed?","Are you sure you want to proceed?"
+OK,OK
+"It will take time to create a backup.","It will take time to create a backup."
+"Please wait until the action ends.","Please wait until the action ends."
+"Are you sure you want to continue?","Are you sure you want to continue?"
+"Backup options","Backup options"
+"Please specify backup creation option.","Please specify backup creation option."
+"Backup Name","Backup Name"
+"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field."
+"Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup."
+"Exclude media folder from backup","Exclude media folder from backup"
+"Please enter a password.","Please enter a password."
+"Please enter the password to confirm rollback.","Please enter the password to confirm rollback."
+"This action cannot be undone.","This action cannot be undone."
+"User Password","User Password"
+"Please put your store into maintenance mode during rollback processing.","Please put your store into maintenance mode during rollback processing."
+"Use FTP Connection","Use FTP Connection"
+"FTP credentials","FTP credentials"
+"FTP Host","FTP Host"
+"FTP Login","FTP Login"
+"FTP Password","FTP Password"
+"Magento root directory","Magento root directory"
+"Create Backup",创建备份
+Download,下载
+"Start Time","Start Time"
+Frequency,Frequency
+"Scheduled Backup Settings","Scheduled Backup Settings"
+"Enable Scheduled Backup","Enable Scheduled Backup"
+"Backup Type","Backup Type"
+"Maintenance Mode","Maintenance Mode"
+"Are you sure you want to delete the selected backup(s)?",ä½ æ˜¯å¦ç¡®å®šè¦åˆ 除所选备份？
+Size(bytes),Size(bytes)
+Rollback,回滚
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 02ecf79e0bc..5eb6faa3ba8 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -28,6 +28,8 @@ use Magento\Tax\Model\Calculation;
/**
* Catalog bundle product info block
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
{
@@ -165,6 +167,10 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
* Returns JSON encoded config to be used in JS scripts
*
* @return string
+ *
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getJsonConfig()
{
@@ -207,12 +213,21 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
->getTierPriceList();
foreach ($tierPrices as &$tierPriceInfo) {
+ /** @var \Magento\Framework\Pricing\Amount\Base $price */
$price = $tierPriceInfo['price'];
+
+ $priceBaseAmount = $price->getBaseAmount();
+ $priceValue = $price->getValue();
+
+ $bundleProductPrice = $this->_productPrice->create();
+ $priceBaseAmount = $bundleProductPrice->getLowestPrice($currentProduct, $priceBaseAmount);
+ $priceValue = $bundleProductPrice->getLowestPrice($currentProduct, $priceValue);
+
$tierPriceInfo['price'] = $this->priceCurrency->convert(
- $this->_taxData->displayPriceIncludingTax() ? $price->getValue() : $price->getBaseAmount()
+ $this->_taxData->displayPriceIncludingTax() ? $priceValue : $priceBaseAmount
);
- $tierPriceInfo['exclTaxPrice'] = $this->priceCurrency->convert($price->getBaseAmount());
- $tierPriceInfo['inclTaxPrice'] = $this->priceCurrency->convert($price->getValue());
+ $tierPriceInfo['exclTaxPrice'] = $this->priceCurrency->convert($priceBaseAmount);
+ $tierPriceInfo['inclTaxPrice'] = $this->priceCurrency->convert($priceValue);
}
// break the reference with the last element
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index a57898fd5cd..459d7e037df 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -229,7 +229,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
{
$this->setFormatProduct($selection);
- $priceTitle = $selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($selection->getName());
+ $priceTitle = '<span class="product-name">' . $selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($selection->getName()) . '</span>';
$priceTitle .= ' ' . ($includeContainer ? '<span class="price-notice">' : '') . '+' .
$this->renderPriceString($selection, $includeContainer) . ($includeContainer ? '</span>' : '');
@@ -269,7 +269,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
*/
public function getSelectionTitlePrice($selection, $includeContainer = true)
{
- $priceTitle = $this->escapeHtml($selection->getName());
+ $priceTitle = '<span class="product-name">' . $this->escapeHtml($selection->getName()) . '</span>';
$priceTitle .= ' ' . ($includeContainer ? '<span class="price-notice">' : '') . '+'
. $this->renderPriceString($selection, $includeContainer) . ($includeContainer ? '</span>' : '');
return $priceTitle;
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 2be8f3d2d21..0a06eec93cb 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -666,11 +666,30 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
) {
if (!is_null($specialPrice) && $specialPrice != false) {
if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
- $specialPrice = $this->_storeManager->getStore()->roundPrice($finalPrice * $specialPrice / 100);
+ $specialPrice = $finalPrice * ($specialPrice / 100);
$finalPrice = min($finalPrice, $specialPrice);
}
}
return $finalPrice;
}
+
+ /**
+ * Returns the lowest price after applying any applicable bundle discounts
+ *
+ * @param /Magento/Catalog/Model/Product $bundleProduct
+ * @param float|string $price
+ * @param int $bundleQty
+ * @return float
+ */
+ public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
+ {
+ $price = (float)$price;
+ return min(
+ $price,
+ $this->_applyGroupPrice($bundleProduct, $price),
+ $this->_applyTierPrice($bundleProduct, $bundleQty, $price),
+ $this->_applySpecialPrice($bundleProduct, $price)
+ );
+ }
}
diff --git a/app/code/Magento/Bundle/i18n/de_DE.csv b/app/code/Magento/Bundle/i18n/de_DE.csv
index 2a648d31834..1d933e69589 100644
--- a/app/code/Magento/Bundle/i18n/de_DE.csv
+++ b/app/code/Magento/Bundle/i18n/de_DE.csv
@@ -1,56 +1,80 @@
-"* Required Fields","* Pflichtfelder"
-"-- Select --","-- Auswählen --"
-"Add New Option","Neue Option hinzufügen"
-"Add Selection","Auswahl hinzufügen"
-"As Low as","So niedrig wie"
-"As low as","So niedrig wie"
-"Bundle Items","Bundleartikel"
-"Bundle Product","Bundleprodukt"
-"Buy %1$s with %2$s discount each","Kaufen Sie %1$s mit je %2$s Rabatt"
-"Catalog Product View (Bundle)","Katalog Produkt Ansicht (Bundle)"
-"Checkbox","Checkbox"
-"Choose a selection...","Wählen Sie eine Auswahl..."
-"Close","Schließen"
-"Default","Standard"
-"Default Quantity","Standardanzahl"
-"Default Title","Standardtitel"
-"Drop-down","Drop-down"
-"Dynamic","Dynamisch"
+None,Keine
+Close,Schließen
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
"Excl. Tax","Steuer weglassen"
-"Fixed","Fix"
-"From","Von"
-"From:","Von:"
-"Gift Message","Geschenkmitteilung"
+Total,Total
"Incl. Tax","Steuer inkludieren"
-"Input Type","Eingabetyp"
-"Is Required","Ist erforderlich"
-"Message:","Nachricht:"
-"Multiple Select","Mehrfache Auswahl"
-"N/A","Nicht verfügbar"
-"No options of this product are available.","Es sind keine Optionen dieses Produkts verfügbar."
-"None","Keine"
-"Percent","Prozent"
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,Von
+To,An
+Required,Required
+Position,Position
"Percent Discount","Prozent Rabatt"
-"Please Select Products to Add","Bitte wählen Sie hinzuzufügende Produkte"
+"-- Select --","-- Auswählen --"
+Dynamic,Dynamisch
+Fixed,Fix
+"Create New Option","Create New Option"
+"Bundle Items",Bundleartikel
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
"Please enter search conditions to view products.","Bitte geben Sie Suchbedingungen ein, um Produkte zu sehen."
-"Please select options for product.","Bitte wählen Sie Optionen für das Produkt."
+"Use Default Value","Standardwert verwenden"
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as","So niedrig wie"
+"Price Range",Preisklasse
"Please specify product option(s).","Bitte spezifizieren Sie Produktoption(en)."
-"Position","Position"
-"Price Range","Preisklasse"
-"Price Type","Preistyp"
-"Price as configured","Preis wie konfiguriert"
-"Quantity:","Anzahl:"
-"Radio Buttons","Radiobutton"
-"Required options are not selected.","Pflichtoptionen sind nicht ausgewählt."
-"Selected required options are not available.","Ausgewählte Pflichtoptionen sind nicht verfügbar."
-"Separately","Separat"
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,"Nicht verfügbar"
+Percent,Prozent
+Qty:,Qty:
+"Choose a selection...","Wählen Sie eine Auswahl..."
"Ship Bundle Items","Bundleartikel versenden"
-"Shipment","Versand"
+Separately,Separat
+Together,Zusammen
+"Option Title","Option Title"
"Store View Title","Shopansicht Titel"
-"There is no defined renderer for ""%s"" option type.","Es gibt keine bestimmten Angaben für den ""%s"" Option-Typ."
-"This product is also part of bundle(s)","Dieses Produkt ist Teil eines Bundles."
-"To","An"
-"To:","An:"
-"Together","Zusammen"
-"Use Default Value","Standardwert verwenden"
-"User Defined Quantity","Benutzerdefinierte Anzahl"
+"Input Type",Eingabetyp
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,Standard
+"Price Type",Preistyp
+"Default Quantity",Standardanzahl
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as","So niedrig wie"
+From:,Von:
+To:,An:
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields","* Pflichtfelder"
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.","Es sind keine Optionen dieses Produkts verfügbar."
+"Gift Message",Geschenkmitteilung
+Message:,Nachricht:
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/i18n/en_US.csv b/app/code/Magento/Bundle/i18n/en_US.csv
index c13892f21b2..3af5498737e 100644
--- a/app/code/Magento/Bundle/i18n/en_US.csv
+++ b/app/code/Magento/Bundle/i18n/en_US.csv
@@ -1,56 +1,80 @@
-"* Required Fields","* Required Fields"
-"-- Select --","-- Select --"
-"Add New Option","Add New Option"
-"Add Selection","Add Selection"
-"As Low as","As Low as"
-"As low as","As low as"
-"Bundle Items","Bundle Items"
-"Bundle Product","Bundle Product"
-"Buy %1$s with %2$s discount each","Buy %1$s with %2$s discount each"
-"Catalog Product View (Bundle)","Catalog Product View (Bundle)"
-"Checkbox","Checkbox"
-"Choose a selection...","Choose a selection..."
-"Close","Close"
-"Default","Default"
-"Default Quantity","Default Quantity"
-"Default Title","Default Title"
-"Drop-down","Drop-down"
-"Dynamic","Dynamic"
+None,None
+Close,Close
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
"Excl. Tax","Excl. Tax"
-"Fixed","Fixed"
-"From","From"
-"From:","From:"
-"Gift Message","Gift Message"
+Total,Total
"Incl. Tax","Incl. Tax"
-"Input Type","Input Type"
-"Is Required","Is Required"
-"Message:","Message:"
-"Multiple Select","Multiple Select"
-"N/A","N/A"
-"No options of this product are available.","No options of this product are available."
-"None","None"
-"Percent","Percent"
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,From
+To,To
+Required,Required
+Position,Position
"Percent Discount","Percent Discount"
-"Please Select Products to Add","Please Select Products to Add"
+"-- Select --","-- Select --"
+Dynamic,Dynamic
+Fixed,Fixed
+"Create New Option","Create New Option"
+"Bundle Items","Bundle Items"
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
"Please enter search conditions to view products.","Please enter search conditions to view products."
-"Please select options for product.","Please select options for product."
-"Please specify product option(s).","Please specify product option(s)."
-"Position","Position"
+"Use Default Value","Use Default Value"
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as","As Low as"
"Price Range","Price Range"
-"Price Type","Price Type"
-"Price as configured","Price as configured"
-"Quantity:","Quantity:"
-"Radio Buttons","Radio Buttons"
-"Required options are not selected.","Required options are not selected."
-"Selected required options are not available.","Selected required options are not available."
-"Separately","Separately"
+"Please specify product option(s).","Please specify product option(s)."
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Percent,Percent
+Qty:,Qty:
+"Choose a selection...","Choose a selection..."
"Ship Bundle Items","Ship Bundle Items"
-"Shipment","Shipment"
+Separately,Separately
+Together,Together
+"Option Title","Option Title"
"Store View Title","Store View Title"
-"There is no defined renderer for ""%s"" option type.","There is no defined renderer for ""%s"" option type."
-"This product is also part of bundle(s)","This product is also part of bundle(s)"
-"To","To"
-"To:","To:"
-"Together","Together"
-"Use Default Value","Use Default Value"
-"User Defined Quantity","User Defined Quantity"
+"Input Type","Input Type"
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,Default
+"Price Type","Price Type"
+"Default Quantity","Default Quantity"
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as","As low as"
+From:,From:
+To:,To:
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields","* Required Fields"
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.","No options of this product are available."
+"Gift Message","Gift Message"
+Message:,Message:
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/i18n/es_ES.csv b/app/code/Magento/Bundle/i18n/es_ES.csv
index 4fa5b76045c..f8aa7f81dec 100644
--- a/app/code/Magento/Bundle/i18n/es_ES.csv
+++ b/app/code/Magento/Bundle/i18n/es_ES.csv
@@ -1,56 +1,80 @@
-"* Required Fields","* Campos obligatorios"
-"-- Select --","-- Seleccionar --"
-"Add New Option","Añadir Nueva Opción"
-"Add Selection","Añadir Selección"
-"As Low as","Tan bajo como"
-"As low as","Tan bajo como"
-"Bundle Items","Grupo de ArtÃculos"
-"Bundle Product","Grupo de Productos"
-"Buy %1$s with %2$s discount each","Compra %1$s con %2$s de descuento cada uno"
-"Catalog Product View (Bundle)","Ver Producto Catálogo (Grupo)"
-"Checkbox","Casilla de verificación"
-"Choose a selection...","Elegir una selección..."
-"Close","Cerrar"
-"Default","Predeterminada"
-"Default Quantity","Cantidad por Defecto"
-"Default Title","TÃtulo por Defecto"
-"Drop-down","Desplegable"
-"Dynamic","Dinámico"
+None,Nada
+Close,Cerrar
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
"Excl. Tax","Impuestos no incluidos"
-"Fixed","Fijo"
-"From","De"
-"From:","Desde:"
-"Gift Message","Mensaje de Regalo"
+Total,Total
"Incl. Tax","Impuestos incluidos"
-"Input Type","Introducir tipo"
-"Is Required","Es Requerido"
-"Message:","Mensaje:"
-"Multiple Select","Elección múltiple"
-"N/A","N/A"
-"No options of this product are available.","No hay opciones disponibles de este producto"
-"None","Nada"
-"Percent","Porcentaje"
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,De
+To,Para
+Required,Required
+Position,Posición
"Percent Discount","Descuento porcentaje"
-"Please Select Products to Add","Por favor, Selecciona Productos a Añadir"
+"-- Select --","-- Seleccionar --"
+Dynamic,Dinámico
+Fixed,Fijo
+"Create New Option","Create New Option"
+"Bundle Items","Grupo de ArtÃculos"
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
"Please enter search conditions to view products.","Por favor, indica las condiciones de búsqueda para ver productos."
-"Please select options for product.","Por favor, selecciona opciones para el producto"
-"Please specify product option(s).","Por favor, especifica opción(es) del producto"
-"Position","Posición"
+"Use Default Value","Usar Valor por Defecto"
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as","Tan bajo como"
"Price Range","Rango de Precio"
-"Price Type","Tipo de Precio"
-"Price as configured","Precio según configuración"
-"Quantity:","Cantidad:"
-"Radio Buttons","Botón de Radio"
-"Required options are not selected.","No se han seleccionado las opciones requeridas."
-"Selected required options are not available.","Las opciones requeridas seleccionadas no están disponibles."
-"Separately","Separadamente"
+"Please specify product option(s).","Por favor, especifica opción(es) del producto"
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Percent,Porcentaje
+Qty:,Qty:
+"Choose a selection...","Elegir una selección..."
"Ship Bundle Items","Enviar ArtÃculos en Grupo"
-"Shipment","EnvÃo"
+Separately,Separadamente
+Together,Juntos
+"Option Title","Option Title"
"Store View Title","TÃtulo de Vista de Tienda"
-"There is no defined renderer for ""%s"" option type.","No hay un visualizador definido para el tipo de opción ""%s""."
-"This product is also part of bundle(s)","Este producto es también parte de un(os) paquete(s)"
-"To","Para"
-"To:","A:"
-"Together","Juntos"
-"Use Default Value","Usar Valor por Defecto"
-"User Defined Quantity","Cantidad Definida por el Usuario"
+"Input Type","Introducir tipo"
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,Predeterminada
+"Price Type","Tipo de Precio"
+"Default Quantity","Cantidad por Defecto"
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as","Tan bajo como"
+From:,Desde:
+To:,A:
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields","* Campos obligatorios"
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.","No hay opciones disponibles de este producto"
+"Gift Message","Mensaje de Regalo"
+Message:,Mensaje:
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/i18n/fr_FR.csv b/app/code/Magento/Bundle/i18n/fr_FR.csv
index e050a3b48f6..4fcdfd86c0b 100644
--- a/app/code/Magento/Bundle/i18n/fr_FR.csv
+++ b/app/code/Magento/Bundle/i18n/fr_FR.csv
@@ -1,56 +1,80 @@
-"* Required Fields","* Champs requis"
-"-- Select --","-- Sélectionner --"
-"Add New Option","Ajouter nouvelle option"
-"Add Selection","Ajouter la sélection"
-"As Low as","aussi petit que"
-"As low as","Aussi bas que"
-"Bundle Items","Grouper les objets"
-"Bundle Product","Grouper les produits"
-"Buy %1$s with %2$s discount each","Acheter %1$s pour %2$s chacun"
-"Catalog Product View (Bundle)","Vue groupée du catalogue de produits"
-"Checkbox","Case à cocher"
-"Choose a selection...","Choisir une sélection..."
-"Close","Fermer"
-"Default","Défaut"
-"Default Quantity","Qté par défaut"
-"Default Title","Titre par défaut"
-"Drop-down","Menu déroulant"
-"Dynamic","Dynamique"
+None,aucun
+Close,Fermer
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
"Excl. Tax","Taxe non comprise"
-"Fixed","Fixé"
-"From","De"
-"From:","De :"
-"Gift Message","Message cadeau"
+Total,Total
"Incl. Tax","Taxe comprise"
-"Input Type","Entrer le type"
-"Is Required","Est requis"
-"Message:","Message :"
-"Multiple Select","Choix multiple"
-"N/A","non applicable"
-"No options of this product are available.","Il n'y a pas d'options disponibles pour ce produit"
-"None","aucun"
-"Percent","pour cent"
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,De
+To,A
+Required,Required
+Position,Position
"Percent Discount","pourcentage de réduction"
-"Please Select Products to Add","Sélectionner les produits à acheter"
+"-- Select --","-- Sélectionner --"
+Dynamic,Dynamique
+Fixed,Fixé
+"Create New Option","Create New Option"
+"Bundle Items","Grouper les objets"
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
"Please enter search conditions to view products.","Entrez les conditions de recherche pour voir les produits"
-"Please select options for product.","Sélectionner des options pour le produit."
-"Please specify product option(s).","Spécifier les options de produit."
-"Position","Position"
+"Use Default Value","Utiliser la valeur par défaut"
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as","aussi petit que"
"Price Range","Intervalle de prix"
-"Price Type","Type de prix"
-"Price as configured","Prix configuré"
-"Quantity:","Qté:"
-"Radio Buttons","Boutons radios"
-"Required options are not selected.","Les options requises ne sont pas sélectionnées."
-"Selected required options are not available.","Les options requises sélectionnées ne sont pas disponibles."
-"Separately","Séparément"
+"Please specify product option(s).","Spécifier les options de produit."
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,"non applicable"
+Percent,"pour cent"
+Qty:,Qty:
+"Choose a selection...","Choisir une sélection..."
"Ship Bundle Items","Envoyer le groupe d'objets"
-"Shipment","Envoi"
+Separately,Séparément
+Together,ensemble
+"Option Title","Option Title"
"Store View Title","Titre de la vue du magasin"
-"There is no defined renderer for ""%s"" option type.","Il n'y a pas de moteur de rendu défini pour le type d'option ""%s""."
-"This product is also part of bundle(s)","Ce produit fait aussi partie d'un groupe."
-"To","A"
-"To:","A :"
-"Together","ensemble"
-"Use Default Value","Utiliser la valeur par défaut"
-"User Defined Quantity","Quantité définie par l'utilisateur"
+"Input Type","Entrer le type"
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,Défaut
+"Price Type","Type de prix"
+"Default Quantity","Qté par défaut"
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as","Aussi bas que"
+From:,"De :"
+To:,"A :"
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields","* Champs requis"
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.","Il n'y a pas d'options disponibles pour ce produit"
+"Gift Message","Message cadeau"
+Message:,"Message :"
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/i18n/nl_NL.csv b/app/code/Magento/Bundle/i18n/nl_NL.csv
index 84fcef9d933..be3eff53ea3 100644
--- a/app/code/Magento/Bundle/i18n/nl_NL.csv
+++ b/app/code/Magento/Bundle/i18n/nl_NL.csv
@@ -1,56 +1,80 @@
-"* Required Fields","* Vereiste velden"
-"-- Select --","--selecteer--"
-"Add New Option","Voeg nieuwe optie toe"
-"Add Selection","Voeg selectie toe"
-"As Low as","Zo laag als"
-"As low as","Zo laag als"
-"Bundle Items","Bundel producten"
-"Bundle Product","Bundel product"
-"Buy %1$s with %2$s discount each","Koop %1$s met %1$s korting per stuk"
-"Catalog Product View (Bundle)","Catalogus product weergave (bundel)"
-"Checkbox","checkbox"
-"Choose a selection...","Kies een selectie..."
-"Close","sluiten"
-"Default","standaard"
-"Default Quantity","Standaardhoeveelheid"
-"Default Title","Standaardtitel"
-"Drop-down","drop-down"
-"Dynamic","Dynamisch"
+None,Geen
+Close,sluiten
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
"Excl. Tax","Excl. belasting"
-"Fixed","Gefixeerd"
-"From","Vanuit"
-"From:","Vanuit:"
-"Gift Message","Cadeau bericht"
+Total,Total
"Incl. Tax","Incl. belasting"
-"Input Type","Invoertype"
-"Is Required","Is vereist"
-"Message:","Bericht:"
-"Multiple Select","Meerdere selecties"
-"N/A","N.V.T"
-"No options of this product are available.","Geen opties van dit product zijn beschikbaar"
-"None","Geen"
-"Percent","Procent"
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,Vanuit
+To,Aan
+Required,Required
+Position,Positie
"Percent Discount","Procent korting"
-"Please Select Products to Add","Selecteer Alstublieft Producten om Toe te Voegen"
+"-- Select --",--selecteer--
+Dynamic,Dynamisch
+Fixed,Gefixeerd
+"Create New Option","Create New Option"
+"Bundle Items","Bundel producten"
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
"Please enter search conditions to view products.","Voer a.u.b. zoekvoorwaarden in om producten te bekijken"
-"Please select options for product.","Selecteer a.u.b. opties voor product."
+"Use Default Value","Gebruik standaardwaarde"
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as","Zo laag als"
+"Price Range",Prijsbereik
"Please specify product option(s).","Specificeer a.u.b. product optie(s)."
-"Position","Positie"
-"Price Range","Prijsbereik"
-"Price Type","Prijs type"
-"Price as configured","Prijs zoals geconfigureerd"
-"Quantity:","Kwant:"
-"Radio Buttons","Radioknoppen"
-"Required options are not selected.","Vereiste opties zijn niet geselecteerd"
-"Selected required options are not available.","Geselecteerde, vereiste opties zijn niet beschikbaar."
-"Separately","Apart"
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N.V.T
+Percent,Procent
+Qty:,Qty:
+"Choose a selection...","Kies een selectie..."
"Ship Bundle Items","Verzend bundel producten"
-"Shipment","Verzending"
+Separately,Apart
+Together,Samen
+"Option Title","Option Title"
"Store View Title","Winkelweergave titel"
-"There is no defined renderer for ""%s"" option type.","Er is geen gedefinieerde maker voor ""%s"" optietype."
-"This product is also part of bundle(s)","Dit product is ook onderdeel van bundel(s)"
-"To","Aan"
-"To:","Aan:"
-"Together","Samen"
-"Use Default Value","Gebruik standaardwaarde"
-"User Defined Quantity","Aantal bepaald door gebruiker"
+"Input Type",Invoertype
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,standaard
+"Price Type","Prijs type"
+"Default Quantity",Standaardhoeveelheid
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as","Zo laag als"
+From:,Vanuit:
+To:,Aan:
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields","* Vereiste velden"
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.","Geen opties van dit product zijn beschikbaar"
+"Gift Message","Cadeau bericht"
+Message:,Bericht:
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/i18n/pt_BR.csv b/app/code/Magento/Bundle/i18n/pt_BR.csv
index 33238703388..3a3a13ec642 100644
--- a/app/code/Magento/Bundle/i18n/pt_BR.csv
+++ b/app/code/Magento/Bundle/i18n/pt_BR.csv
@@ -1,56 +1,80 @@
-"* Required Fields","* Campos obrigatórios"
-"-- Select --","-- Selecionar --"
-"Add New Option","Adicione Nova Opção"
-"Add Selection","Adicionar seleção"
-"As Low as","A partir de"
-"As low as","A partir de"
-"Bundle Items","Empacotar itens"
-"Bundle Product","Empacotar produto"
-"Buy %1$s with %2$s discount each","Comprar %1$s com %2$s de desconto cada"
-"Catalog Product View (Bundle)","Visualização de produto de catálogo (pacote)"
-"Checkbox","Caixa de Seleção"
-"Choose a selection...","Escolha uma seleção..."
-"Close","Fechar"
-"Default","Predefinido"
-"Default Quantity","Quantidade padrão"
-"Default Title","TÃtulo padrão"
-"Drop-down","Suspenso"
-"Dynamic","Dinâmico"
+None,Nenhum
+Close,Fechar
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
"Excl. Tax","Excluir taxas"
-"Fixed","Fixado"
-"From","De"
-"From:","De:"
-"Gift Message","Mensagem de presente"
+Total,Total
"Incl. Tax","Incluir taxas"
-"Input Type","Tipo de entrada"
-"Is Required","É obrigatório"
-"Message:","Mensagem:"
-"Multiple Select","Múltipla escolha"
-"N/A","IndisponÃvel"
-"No options of this product are available.","Nenhuma opção deste produto está disponÃvel."
-"None","Nenhum"
-"Percent","Percentagem"
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,De
+To,Para
+Required,Required
+Position,Posição
"Percent Discount","Percentual de desconto"
-"Please Select Products to Add","Escolha os produtos a serem adicionados"
+"-- Select --","-- Selecionar --"
+Dynamic,Dinâmico
+Fixed,Fixado
+"Create New Option","Create New Option"
+"Bundle Items","Empacotar itens"
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
"Please enter search conditions to view products.","Insira as condições de pesquisa para visualizar os produtos."
-"Please select options for product.","Escolha as opções do produto."
-"Please specify product option(s).","Especifique a(s) opção(ões) do produto."
-"Position","Posição"
+"Use Default Value","Utilizar valor padrão"
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as","A partir de"
"Price Range","Variação de preço"
-"Price Type","Tipo de preço"
-"Price as configured","Preço como configurado"
-"Quantity:","Quantidade:"
-"Radio Buttons","Botões de Opção"
-"Required options are not selected.","As opções exigidas não estão selecionadas."
-"Selected required options are not available.","As opções exigidas selecionadas não estão disponÃveis."
-"Separately","Separadamente"
+"Please specify product option(s).","Especifique a(s) opção(ões) do produto."
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,IndisponÃvel
+Percent,Percentagem
+Qty:,Qty:
+"Choose a selection...","Escolha uma seleção..."
"Ship Bundle Items","Enviar itens do pacote"
-"Shipment","Remessa"
+Separately,Separadamente
+Together,Junto
+"Option Title","Option Title"
"Store View Title","TÃtulo de visualização de loja"
-"There is no defined renderer for ""%s"" option type.","Não há renderização definida para o tipo de opção ""%s""."
-"This product is also part of bundle(s)","Esse produto também faz parte do(s) pacote(s)"
-"To","Para"
-"To:","Para:"
-"Together","Junto"
-"Use Default Value","Utilizar valor padrão"
-"User Defined Quantity","Quantidade definida pelo usuário"
+"Input Type","Tipo de entrada"
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,Predefinido
+"Price Type","Tipo de preço"
+"Default Quantity","Quantidade padrão"
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as","A partir de"
+From:,De:
+To:,Para:
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields","* Campos obrigatórios"
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.","Nenhuma opção deste produto está disponÃvel."
+"Gift Message","Mensagem de presente"
+Message:,Mensagem:
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/i18n/zh_CN.csv b/app/code/Magento/Bundle/i18n/zh_CN.csv
index 7def92f4270..390434f2699 100644
--- a/app/code/Magento/Bundle/i18n/zh_CN.csv
+++ b/app/code/Magento/Bundle/i18n/zh_CN.csv
@@ -1,56 +1,80 @@
-"* Required Fields","*å¿…è¦å—段"
+None,æ—
+Close,å…³é—
+Cancel,Cancel
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+"Excl. Tax",ä¸å«ç¨Ž
+Total,Total
+"Incl. Tax",å«ç¨Ž
+"Total incl. tax","Total incl. tax"
+Delete,Delete
+Name,Name
+From,æ¥è‡ª
+To,å‘é€è‡³
+Required,Required
+Position,ä½ç½®
+"Percent Discount",折扣百分率
"-- Select --","-- 选择 --"
-"Add New Option","æ·»åŠ æ–°é€‰é¡¹"
-"Add Selection","æ·»åŠ é€‰æ‹©"
-"As Low as","低至"
-"As low as","低至"
-"Bundle Items","æ†ç»‘项"
-"Bundle Product","æ†ç»‘产å“"
-"Buy %1$s with %2$s discount each","ä¹° %1$个，æ¯ä¸ªæŠ˜æ‰£ä¸º %2$s"
-"Catalog Product View (Bundle)","分类产å“视图（æ†ç»‘）"
-"Checkbox","å¤é€‰æ¡†"
-"Choose a selection...","选择一个选项..."
-"Close","å…³é—"
-"Default","默认"
-"Default Quantity","默认数é‡"
-"Default Title","é»˜è®¤æ ‡é¢˜"
-"Drop-down","下拉èœå•"
-"Dynamic","动æ€"
-"Excl. Tax","ä¸å«ç¨Ž"
-"Fixed","固定"
-"From","æ¥è‡ª"
-"From:","æ¥è‡ªï¼š"
-"Gift Message","礼å“消æ¯"
-"Incl. Tax","å«ç¨Ž"
-"Input Type","输入类型"
-"Is Required","为必须"
-"Message:","ä¿¡æ¯ï¼š"
-"Multiple Select","多选"
-"N/A","N/A"
-"No options of this product are available.","该产å“没有å¯ç”¨é€‰é¡¹ã€‚"
-"None","æ— "
-"Percent","百分之"
-"Percent Discount","折扣百分率"
-"Please Select Products to Add","请选择è¦æ·»åŠ 的产å“"
-"Please enter search conditions to view products.","请输入æœç´¢æ¡ä»¶ä»¥æŸ¥çœ‹äº§å“。"
-"Please select options for product.","请为该产å“选择选项。"
-"Please specify product option(s).","请指定产å“选项。"
-"Position","ä½ç½®"
-"Price Range","ä»·æ ¼èŒƒå›´"
-"Price Type","ä»·æ ¼ç±»åž‹"
-"Price as configured","预é…ç½®ä»·æ ¼"
-"Quantity:","æ•°é‡ï¼š"
-"Radio Buttons","å•é€‰æŒ‰é’®"
-"Required options are not selected.","å¿…è¦çš„选项未选择。"
-"Selected required options are not available.","所选必è¦é€‰é¡¹ä¸å¯ç”¨ã€‚"
-"Separately","分别"
-"Ship Bundle Items","è¿é€æ†ç»‘的项目"
-"Shipment","å‘è´§"
-"Store View Title","åº—é“ºè§†å›¾æ ‡é¢˜"
-"There is no defined renderer for ""%s"" option type.","针对 ""%s"" 选项类型没有预定义的渲染器。"
-"This product is also part of bundle(s)","该产å“也属于æ†ç»‘销售的一部分"
-"To","å‘é€è‡³"
-"To:","至："
-"Together","一起"
-"Use Default Value","使用默认值"
-"User Defined Quantity","用户定义的数é‡"
+Dynamic,动æ€
+Fixed,固定
+"Create New Option","Create New Option"
+"Bundle Items",æ†ç»‘项
+"Add Products to Option","Add Products to Option"
+"Delete Option","Delete Option"
+"Please enter search conditions to view products.",请输入æœç´¢æ¡ä»¶ä»¥æŸ¥çœ‹äº§å“。
+"Use Default Value",使用默认值
+"There is no defined renderer for ""%1"" option type.","There is no defined renderer for ""%1"" option type."
+"As Low as",低至
+"Price Range",ä»·æ ¼èŒƒå›´
+"Please specify product option(s).",请指定产å“选项。
+"Please select all required options.","Please select all required options."
+"The required options you selected are not available.","The required options you selected are not available."
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Percent,百分之
+Qty:,Qty:
+"Choose a selection...",选择一个选项...
+"Ship Bundle Items",è¿é€æ†ç»‘的项目
+Separately,分别
+Together,一起
+"Option Title","Option Title"
+"Store View Title",åº—é“ºè§†å›¾æ ‡é¢˜
+"Input Type",输入类型
+"There are no products in this option.","There are no products in this option."
+"New Option","New Option"
+Default,默认
+"Price Type",ä»·æ ¼ç±»åž‹
+"Default Quantity",默认数é‡
+"User Defined","User Defined"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+"As low as",低至
+From:,æ¥è‡ªï¼š
+To:,至：
+"Buy %1 with %2 discount each","Buy %1 with %2 discount each"
+"Go back to product details","Go back to product details"
+"Customize and Add to Cart","Customize and Add to Cart"
+"* Required Fields",*å¿…è¦å—段
+"Your Customization","Your Customization"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Summary,Summary
+"%1 x %2","%1 x %2"
+Availability:,Availability:
+"Customize %1","Customize %1"
+"No options of this product are available.",该产å“没有å¯ç”¨é€‰é¡¹ã€‚
+"Gift Message",礼å“消æ¯
+Message:,ä¿¡æ¯ï¼š
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Total Incl. Tax","Total Incl. Tax"
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
index a477b243567..1ac55f7c0a1 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -52,6 +52,7 @@
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/>
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
+ <container name="product.info.bundle.options.top" as="product_info_bundle_options_top" />
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
@@ -73,7 +74,7 @@
</action>
</referenceBlock>
<referenceContainer name="content">
- <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle options container" after="product.info.media"/>
+ <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/>
<move element="product.info" destination="bundle.options.container" before="-"/>
</referenceContainer>
<referenceContainer name="product.info.type">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
index d4acc99db91..315e57df1f6 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
@@ -25,7 +25,7 @@
<?php $_product = $this->getProduct() ?>
<?php if ($_product->isSaleable() && $this->hasOptions()):?>
- <div class="actions bundle">
+ <div class="bundle-actions">
<button id="bundle-slide"
class="action primary customize"
type="button">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
index 4767cd194dd..90d5ed9da3e 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
@@ -28,15 +28,15 @@
?>
<?php if ($_product->isSaleable() && $this->hasOptions()): ?>
<div id="bundleSummary"
- class="block bundle summary"
- data-mage-init='{"sticky":{"container": ".product.add.form"}}'>
+ class="block-bundle-summary"
+ data-mage-init='{"sticky":{"container": ".product-add-form"}}'>
<div class="title">
<strong><?php echo __('Your Customization'); ?></strong>
</div>
<div class="content">
- <div class="bundle info">
+ <div class="bundle-info">
<?php echo $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_product, 'bundled_product_customization_page')->toHtml() ?>
- <div class="product details">
+ <div class="product-details">
<strong class="product name"><?php echo $this->escapeHtml($_product->getName()) ?></strong>
<?php if($_product->getIsSalable()): ?>
<p class="available stock" title="<?php echo __('Availability') ?>">
@@ -50,7 +50,7 @@
<?php echo $this->getChildHtml('', true);?>
</div>
</div>
- <div class="bundle summary">
+ <div class="bundle-summary">
<strong class="subtitle"><?php echo __('Summary'); ?></strong>
<div id="bundle-summary" data-container="product-summary">
<ul data-mage-init='{"productSummary": []}' class="bundle items"></ul>
@@ -70,12 +70,12 @@
<script>
//<![CDATA[
(function ($) {
- $('.product.add.form').mage('slide', {
+ $('.product-add-form').mage('slide', {
'slideSpeed': 1500,
'slideSelector': '#bundle-slide',
'slideBackSelector': '.action.customization.back',
'bundleProductSelector': '#bundleProduct',
- 'bundleOptionsContainer': '.product.add.form',
+ 'bundleOptionsContainer': '.product-add-form',
<?php if ($this->isStartCustomization()): ?>
'autostart': true
<?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index 96bf9755008..dd8ca149692 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -45,6 +45,7 @@ $helper = $this->helper('Magento\Catalog\Helper\Output');
<legend id="customizeTitle" class="legend title">
<span><?php echo __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
</legend><br />
+ <?php echo $this->getChildHtml('product_info_bundle_options_top');?>
<?php foreach ($options as $option): ?>
<?php if (!$option->getSelections()): ?>
<?php continue; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
index cd6baa15e45..a6e760d6dad 100644
--- a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
+++ b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
@@ -36,7 +36,8 @@
optionBlock: '[data-template="bundle-option"]'
},
optionSelector: '[data-container="options"]',
- summaryContainer: '[data-container="product-summary"]'
+ summaryContainer: '[data-container="product-summary"]',
+ bundleSummaryContainer: '.bundle-summary'
},
cache: {},
/**
@@ -57,11 +58,15 @@
*/
_renderSummaryBox: function(event, data) {
this.cache.currentElement = data.config;
+ this.cache.currentElementCount = 0;
// Clear Summary box
this.element.html("");
$.each(this.cache.currentElement.selected, $.proxy(this._renderOption, this));
+ this.element
+ .parents(this.options.bundleSummaryContainer)
+ .toggleClass('empty', !this.cache.currentElementCount); // Zero elements equal '.empty' container
},
_renderOption: function(key, row) {
if (row !== undefined) {
@@ -74,6 +79,7 @@
.appendTo(this.element);
$.each(row, $.proxy(this._renderOptionRow, this));
+ this.cache.currentElementCount += row.length;
//Reset Cache
this.cache.currentKey = null;
diff --git a/app/code/Magento/Captcha/README.md b/app/code/Magento/Captcha/README.md
new file mode 100644
index 00000000000..35979fb2b48
--- /dev/null
+++ b/app/code/Magento/Captcha/README.md
@@ -0,0 +1 @@
+The Captcha module allows applying Turing test in the process of user authentication or similar tasks.
\ No newline at end of file
diff --git a/app/code/Magento/Captcha/i18n/de_DE.csv b/app/code/Magento/Captcha/i18n/de_DE.csv
index 443f9443672..5cac03fd376 100644
--- a/app/code/Magento/Captcha/i18n/de_DE.csv
+++ b/app/code/Magento/Captcha/i18n/de_DE.csv
@@ -1,23 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Achtung</strong>: Beim Captcha Groß- und Kleinschreibung beachten."
+Always,Immer
"After number of attempts to login","Nach Anzahl von Anmeldungsversuchen"
-"Always","Immer"
-"CAPTCHA","CAPTCHA"
-"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (Minuten)"
-"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","CAPTCHA für ""Benutzer erstellen"" und ""Passwort vergessen"" Formen ist immer aktiviert wenn ausgewählt"
-"Case Sensitive","Groß-und Kleinschreibung beachten"
-"Displaying Mode","Anzeige Modus"
-"Enable CAPTCHA in Admin","CAPTCHA in Admin aktivieren"
-"Enable CAPTCHA on Frontend","CAPTCHA im Frontend aktivieren"
-"Font","Schriftart"
-"Forms","Formen"
-"If 0 is specified, CAPTCHA on the Login form will be always available.","Wenn 0 angegeben ist, ist CAPTCHA auf dem Login-Formular immer verfügbar."
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
"Incorrect CAPTCHA.","Falsches CAPTCHA."
-"Number of Symbols","Symbolanzahl"
-"Number of Unsuccessful Attempts to Login","Anzahl der fehlgeschlagenen Anmeldungsversuche"
-"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Bitte geben Sie höchstens 8 Symbole an. Zulässiger Bereich (z.B. 3-5)"
-"Please type the letters below","Bitte geben Sie die untenstehenden Buchstaben ein"
-"Please type the letters from the image:","Bitte geben Sie die Buchstaben auf diesem Bild ein:"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) in diesem Feld. Keine Leerzeichen oder andere Zeichen sind erlaubt.
-<br />Ähnliche Zeichen (z.B. ""i"", ""I', ""1"") verringern die Chance der richtigen Erkennung durch den Kunden."
+"Please enter the letters from the image:","Please enter the letters from the image:"
"Reload captcha","Captcha neu laden"
-"Symbols Used in CAPTCHA","Symbole, die im CAPTCHA verwendet werden"
+"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Achtung</strong>: Beim Captcha Groß- und Kleinschreibung beachten."
+"Please type the letters below","Bitte geben Sie die untenstehenden Buchstaben ein"
+CAPTCHA,CAPTCHA
+"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
+"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
+"Number of Symbols","Number of Symbols"
+"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv
index e5a7814ab67..7526ae62228 100644
--- a/app/code/Magento/Captcha/i18n/en_US.csv
+++ b/app/code/Magento/Captcha/i18n/en_US.csv
@@ -1,22 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha is case sensitive."
+Always,Always
"After number of attempts to login","After number of attempts to login"
-"Always","Always"
-"CAPTCHA","CAPTCHA"
-"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
-"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"
-"Case Sensitive","Case Sensitive"
-"Displaying Mode","Displaying Mode"
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
+"Incorrect CAPTCHA.","Incorrect CAPTCHA."
+"Please enter the letters from the image:","Please enter the letters from the image:"
+"Reload captcha","Reload captcha"
+"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha is case sensitive."
+"Please type the letters below","Please type the letters below"
+CAPTCHA,CAPTCHA
"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
-"Enable CAPTCHA on Frontend","Enable CAPTCHA on Frontend"
-"Font","Font"
-"Forms","Forms"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
-"Incorrect CAPTCHA.","Incorrect CAPTCHA."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
"Number of Symbols","Number of Symbols"
-"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
-"Please type the letters below","Please type the letters below"
-"Please type the letters from the image:","Please type the letters from the image:"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer."
-"Reload captcha","Reload captcha"
"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Captcha/i18n/es_ES.csv b/app/code/Magento/Captcha/i18n/es_ES.csv
index 3c359bc8ba0..9e15aafa9c9 100644
--- a/app/code/Magento/Captcha/i18n/es_ES.csv
+++ b/app/code/Magento/Captcha/i18n/es_ES.csv
@@ -1,22 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Atención</strong>: Captcha es sensible al uso de mayúsculas y minúsculas."
+Always,Siempre
"After number of attempts to login","Tras varios intentos de iniciar sesión"
-"Always","Siempre"
-"CAPTCHA","CAPTCHA"
-"CAPTCHA Timeout (minutes)","Tiempo de expiración del CAPTCHA (en minutos)"
-"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","Si asà se elige, el CAPTCHA estará siempre en funcionamiento en los formularios de «Nuevo usuario» y «Olvido de contraseña»"
-"Case Sensitive","Distingue mayúsculas y minúsculas"
-"Displaying Mode","Modo de visualización"
-"Enable CAPTCHA in Admin","Habilitar el CAPTCHA en Administrador"
-"Enable CAPTCHA on Frontend","Habilitar el CAPTCHA en el interfaz de usuario"
-"Font","Fuente"
-"Forms","Formularios"
-"If 0 is specified, CAPTCHA on the Login form will be always available.","Si se especifica 0, el CAPTCHA siempre estará disponible en el formulario de inicio de sesión."
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
"Incorrect CAPTCHA.","CAPTCHA incorrecto."
-"Number of Symbols","Número de sÃmbolos"
-"Number of Unsuccessful Attempts to Login","Número de intentos fallidos de iniciar sesión"
-"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Especifique un máximo de 8 sÃmbolos. Se permiten intervalos (por ejemplo, 3-5)"
-"Please type the letters below","Teclee las letras más abajo"
-"Please type the letters from the image:","Por favor escribe las letras de la imagen:"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Utilice solo letras (a-z o A-Z) o números (0-9) en este campo. No se permiten espacios ni otros caracteres. <br />Los caracteres de apariencia semejante (por ejemplo, «i», «l», «1») dificultan su reconocimiento por parte del cliente."
+"Please enter the letters from the image:","Please enter the letters from the image:"
"Reload captcha","Volver a cargar captcha"
-"Symbols Used in CAPTCHA","SÃmbolos utilizados en el CAPTCHA"
+"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Atención</strong>: Captcha es sensible al uso de mayúsculas y minúsculas."
+"Please type the letters below","Teclee las letras más abajo"
+CAPTCHA,CAPTCHA
+"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
+"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
+"Number of Symbols","Number of Symbols"
+"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Captcha/i18n/fr_FR.csv b/app/code/Magento/Captcha/i18n/fr_FR.csv
index 839609c9fba..b8772c45a8a 100644
--- a/app/code/Magento/Captcha/i18n/fr_FR.csv
+++ b/app/code/Magento/Captcha/i18n/fr_FR.csv
@@ -1,22 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>:Captcha est sensible à la casse."
+Always,Toujours
"After number of attempts to login","Après un nombre de tentatives de connexion"
-"Always","Toujours"
-"CAPTCHA","CAPTCHA"
-"CAPTCHA Timeout (minutes)","Pause du CAPTCHA (minutes)"
-"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","Les formulaires « Créer un compte utilisateur » et « Mot de passe oublié » contiendront toujours un CAPTCHA si cette option est sélectionnée"
-"Case Sensitive","Sensible à la casse"
-"Displaying Mode","Mode d'affichage"
-"Enable CAPTCHA in Admin","Activer le CAPTCHA en Admin"
-"Enable CAPTCHA on Frontend","Activer le CAPTCHA sur l'interface utilisateur"
-"Font","Police de caractères"
-"Forms","Formulaires"
-"If 0 is specified, CAPTCHA on the Login form will be always available.","Si 0 est sélectionné, le CAPTCHA s'affichera toujours sur le formulaire de connexion."
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
"Incorrect CAPTCHA.","CAPTCHA incorrect."
-"Number of Symbols","Nombre de symboles"
-"Number of Unsuccessful Attempts to Login","Nombre de tentatives de connexion ratées"
-"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Veuillez indiquer 8 symboles maximum. Les séries sont autorisées (3-5 par exemple)"
-"Please type the letters below","Veuillez saisir les lettres ci-dessous"
-"Please type the letters from the image:","Veuillez taper les lettres de l'image:"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Veuillez saisir uniquement des lettres (a-z ou A-Z) ou des chiffres (0-9) dans ce champ. Les espaces et les autres caractères ne sont pas autorisés. <br />Les caractères d'apparence similaire (par exemple « i », « l » ou « 1 ») réduisent les chances d'être identifié correctement par le client."
+"Please enter the letters from the image:","Please enter the letters from the image:"
"Reload captcha","Téléarger à nouveau Captcha"
-"Symbols Used in CAPTCHA","Symboles utilisés dans le CAPTCHA"
+"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>:Captcha est sensible à la casse."
+"Please type the letters below","Veuillez saisir les lettres ci-dessous"
+CAPTCHA,CAPTCHA
+"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
+"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
+"Number of Symbols","Number of Symbols"
+"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Captcha/i18n/nl_NL.csv b/app/code/Magento/Captcha/i18n/nl_NL.csv
index 4d9f8e11bc2..53fa5d204b0 100644
--- a/app/code/Magento/Captcha/i18n/nl_NL.csv
+++ b/app/code/Magento/Captcha/i18n/nl_NL.csv
@@ -1,22 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha is hoofdletter gevoelig"
+Always,Altijd
"After number of attempts to login","Na aantal pogingen om in te loggen"
-"Always","Altijd"
-"CAPTCHA","CAPTCHA"
-"CAPTCHA Timeout (minutes)","CAPTCHA Pauze (minuten)"
-"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","CAPTCHA voor ""Gebruiker creëren"" en ""Wachtwoord vergeten"" formulieren is altijd ingeschakeld als gekozen"
-"Case Sensitive","Hoofdletter Gevoelig"
-"Displaying Mode","Display Modus"
-"Enable CAPTCHA in Admin","Schakel CAPTCHA in in Admin"
-"Enable CAPTCHA on Frontend","Schakel CAPTCHA in in Frontend"
-"Font","Lettertype"
-"Forms","Formulieren"
-"If 0 is specified, CAPTCHA on the Login form will be always available.","Als 0 is gespecificeerd, is CAPTCHA op het Login formulier altijd beschikbaar."
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
"Incorrect CAPTCHA.","Onjuiste CAPTCHA."
-"Number of Symbols","Aantal Symbolen"
-"Number of Unsuccessful Attempts to Login","Aantal Niet Succesvolle Pogingen om In te Loggen"
-"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Specificeer aub maximaal 8 symbolen. Toegestane bereik (bv. 3-5)"
-"Please type the letters below","Voer aub de letters hieronder in"
-"Please type the letters from the image:","Voer aub de letters van de afbeelding in:"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Gebruik aub alleen letters (a-z of A-Z) of nummers (0-9) in dit veld. Er zijn geen spaties of andere symbolen toegestaan.<br />Soortgelijkende symbolen (bv. ""i"", ""l"", ""1"") verlagen de kans op een correcte herkenning door de klant."
+"Please enter the letters from the image:","Please enter the letters from the image:"
"Reload captcha","Herlaad captcha"
-"Symbols Used in CAPTCHA","Symbolen Gebruikt in CAPTCHA"
+"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha is hoofdletter gevoelig"
+"Please type the letters below","Voer aub de letters hieronder in"
+CAPTCHA,CAPTCHA
+"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
+"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
+"Number of Symbols","Number of Symbols"
+"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Captcha/i18n/pt_BR.csv b/app/code/Magento/Captcha/i18n/pt_BR.csv
index 7f047d15b79..fe52642d1be 100644
--- a/app/code/Magento/Captcha/i18n/pt_BR.csv
+++ b/app/code/Magento/Captcha/i18n/pt_BR.csv
@@ -1,22 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha diferencia maiúsculas e minúsculas."
+Always,Sempre
"After number of attempts to login","Após de várias de tentativas de entrar"
-"Always","Sempre"
-"CAPTCHA","CAPTCHA"
-"CAPTCHA Timeout (minutes)","Tempo limite do CAPTCHA (minutos)"
-"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","CAPTCHA para os formulários ""Criar usuário"" e ""Esqueci a senha"" está sempre habilitado se escolhido"
-"Case Sensitive","SensÃvel a maiúsculas e minúsculas"
-"Displaying Mode","Modo de exibição"
-"Enable CAPTCHA in Admin","Habilitar CAPTCHA em Admin"
-"Enable CAPTCHA on Frontend","Habilitar CAPTCHA no Frontend"
-"Font","Fonte"
-"Forms","Formulários"
-"If 0 is specified, CAPTCHA on the Login form will be always available.","Se 0 estiver especificado, CAPTCHA no formulário de login estará sempre disponÃvel."
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
"Incorrect CAPTCHA.","CAPTCHA incorreto."
-"Number of Symbols","Número de SÃmbolos"
-"Number of Unsuccessful Attempts to Login","Número de Tentativas Ineficazes de Login"
-"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Por favor especifique 8 sÃmbolos no máximo. Faixa permitida (exemplo: 3-5)"
-"Please type the letters below","Por favor digite as letras abaixo"
-"Please type the letters from the image:","Por favor digite as letras da imagem:"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) neste campo. Não são permitidos espaços entre os caracteres. <br />Caracteres parecidos (como. ""i"", ""l"", ""1"") diminuem a chance de reconhecimento correto pelo cliente."
+"Please enter the letters from the image:","Please enter the letters from the image:"
"Reload captcha","Recarregar captcha"
-"Symbols Used in CAPTCHA","SÃmbolos Usados no CAPTCHA"
+"<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha diferencia maiúsculas e minúsculas."
+"Please type the letters below","Por favor digite as letras abaixo"
+CAPTCHA,CAPTCHA
+"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
+"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
+"Number of Symbols","Number of Symbols"
+"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Captcha/i18n/zh_CN.csv b/app/code/Magento/Captcha/i18n/zh_CN.csv
index dcac23cfdca..2f33c6db96d 100644
--- a/app/code/Magento/Captcha/i18n/zh_CN.csv
+++ b/app/code/Magento/Captcha/i18n/zh_CN.csv
@@ -1,22 +1,27 @@
-"<strong>Attention</strong>: Captcha is case sensitive.","<strong>注æ„</strong>：验è¯ç 为大å°å†™æ•æ„Ÿçš„。"
-"After number of attempts to login","登录失败的次数"
-"Always","总是"
-"CAPTCHA","验è¯ç "
-"CAPTCHA Timeout (minutes)","验è¯ç 超时（分钟）"
-"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","如果选ä¸ï¼Œâ€œåˆ›å»ºç”¨æˆ·â€å’Œâ€œå¿˜è®°å¯†ç â€è¡¨å•å°†æ€»æ˜¯å¯ç”¨éªŒè¯ç "
-"Case Sensitive","大å°å†™æ•æ„Ÿ"
-"Displaying Mode","显示模å¼"
-"Enable CAPTCHA in Admin","在管ç†ç•Œé¢ä¸å¯ç”¨éªŒè¯ç "
-"Enable CAPTCHA on Frontend","在å‰ç«¯å¯ç”¨éªŒè¯ç "
-"Font","å—体"
-"Forms","表å•"
-"If 0 is specified, CAPTCHA on the Login form will be always available.","如果设置为0，登录表å•ä¸Šçš„验è¯ç 将总是显示。"
-"Incorrect CAPTCHA.","验è¯ç 有误。"
-"Number of Symbols","符å·æ•°é‡"
-"Number of Unsuccessful Attempts to Login","ä¸æˆåŠŸçš„登录ä¼å›¾æ•°é‡"
-"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","请最多指定8个符å·ã€‚å¯ç”¨èŒƒå›´æŒ‡å®šï¼ˆä¾‹å¦‚3-5）"
-"Please type the letters below","请输入下列å—æ¯"
-"Please type the letters from the image:","请输入图åƒä¸çš„å—æ¯ï¼š"
-"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","该å—段ä¸è¯·åªä½¿ç”¨å—æ¯ (a-z 或 A-Z) æˆ–æ•°å— (0-9)。ä¸èƒ½ä½¿ç”¨ç©ºæ ¼æˆ–其他å—符。<br />看起æ¥ç±»ä¼¼çš„å—符 (例如 ""i"", ""l"", ""1"")会é™ä½Žé¡¾å®¢å‡†ç¡®è¾¨è¯†çš„æˆåŠŸçŽ‡ã€‚"
-"Reload captcha","刷新验è¯ç "
-"Symbols Used in CAPTCHA","验è¯ç ä¸ä½¿ç”¨çš„符å·"
+Always,总是
+"After number of attempts to login",登录失败的次数
+"Incorrect CAPTCHA","Incorrect CAPTCHA"
+"Incorrect CAPTCHA.",验è¯ç 有误。
+"Please enter the letters from the image:","Please enter the letters from the image:"
+"Reload captcha",刷新验è¯ç
+"<strong>Attention</strong>: Captcha is case sensitive.",<strong>注æ„</strong>：验è¯ç 为大å°å†™æ•æ„Ÿçš„。
+"Please type the letters below",请输入下列å—æ¯
+CAPTCHA,CAPTCHA
+"Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
+Font,Font
+Forms,Forms
+"Displaying Mode","Displaying Mode"
+"Number of Unsuccessful Attempts to Login","Number of Unsuccessful Attempts to Login"
+"If 0 is specified, CAPTCHA on the Login form will be always available.","If 0 is specified, CAPTCHA on the Login form will be always available."
+"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (minutes)"
+"Number of Symbols","Number of Symbols"
+"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ ","
+ Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
+ "
+"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."
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index efd153138e2..177b2639bbc 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -73,7 +73,7 @@ class Product extends \Magento\Core\Helper\Url
*
* @var \Magento\Framework\Registry
*/
- protected $_coreRegistry = null;
+ protected $_coreRegistry;
/**
* @var string
@@ -97,11 +97,6 @@ class Product extends \Magento\Core\Helper\Url
*/
protected $_coreConfig;
- /**
- * @var \Magento\Framework\Logger
- */
- protected $_logger;
-
/**
* Catalog session
*
@@ -167,7 +162,6 @@ class Product extends \Magento\Core\Helper\Url
$this->_scopeConfig = $scopeConfig;
$this->_assetRepo = $assetRepo;
$this->_coreConfig = $coreConfig;
- $this->_logger = $context->getLogger();
$this->_reindexPriceIndexerData = $reindexPriceIndexerData;
parent::__construct($context, $storeManager);
}
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
index a7ad29d9e11..09917a939d3 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
@@ -47,13 +47,17 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
protected $string;
/**
- * Constructor
- *
- * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
+ * @var \Magento\Framework\Filter\StripTags
+ */
+ protected $tagFilter;
+
+ /**
+ * @param ItemFactory $filterItemFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory
* @param \Magento\Framework\Stdlib\String $string
+ * @param \Magento\Framework\Filter\StripTags $tagFilter
* @param array $data
*/
public function __construct(
@@ -62,11 +66,13 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory,
\Magento\Framework\Stdlib\String $string,
+ \Magento\Framework\Filter\StripTags $tagFilter,
array $data = array()
) {
$this->_resource = $filterAttributeFactory->create();
$this->string = $string;
$this->_requestVar = 'attribute';
+ $this->tagFilter = $tagFilter;
parent::__construct($filterItemFactory, $storeManager, $layer, $data);
}
@@ -145,14 +151,14 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
if ($this->_getIsFilterableAttribute($attribute) == self::OPTIONS_ONLY_WITH_RESULTS) {
if (!empty($optionsCount[$option['value']])) {
$data[] = array(
- 'label' => $option['label'],
+ 'label' => $this->tagFilter->filter($option['label']),
'value' => $option['value'],
'count' => $optionsCount[$option['value']]
);
}
} else {
$data[] = array(
- 'label' => $option['label'],
+ 'label' => $this->tagFilter->filter($option['label']),
'value' => $option['value'],
'count' => isset($optionsCount[$option['value']]) ? $optionsCount[$option['value']] : 0
);
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index eaab2830dd4..91aba621f50 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -506,7 +506,7 @@ abstract class AbstractType
$rootDir->create($rootDir->getRelativePath($path));
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
throw new \Magento\Framework\Model\Exception(
- __("We can't create writeable directory \"%1\".", $path)
+ __('We can\'t create writeable directory "%1".', $path)
);
}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadService.php b/app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadService.php
new file mode 100644
index 00000000000..203b0929fa7
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadService.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\Attribute;
+
+use Magento\Catalog\Model\Product\Attribute\Source\InputtypeFactory;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface;
+
+/**
+ * Class ReadService
+ */
+class ReadService implements ReadServiceInterface
+{
+ /**
+ * @var \Magento\Catalog\Service\V1\MetadataServiceInterface
+ */
+ private $metadataService;
+
+ /**
+ * @param \Magento\Catalog\Service\V1\MetadataServiceInterface $metadataService
+ */
+ public function __construct(
+ \Magento\Catalog\Service\V1\MetadataServiceInterface $metadataService
+ ) {
+ $this->metadataService = $metadataService;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function options($id)
+ {
+ return $this->metadataService->getAttributeMetadata(
+ MetadataServiceInterface::ENTITY_TYPE,
+ $id
+ )->getOptions();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function info($id)
+ {
+ return $this->metadataService->getAttributeMetadata(
+ MetadataServiceInterface::ENTITY_TYPE,
+ $id
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function search(\Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria)
+ {
+ return $this->metadataService->getAllAttributeMetadata(
+ MetadataServiceInterface::ENTITY_TYPE,
+ $searchCriteria
+ );
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadServiceInterface.php
new file mode 100644
index 00000000000..a65081a204c
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/Attribute/ReadServiceInterface.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\Attribute;
+
+/**
+ * Class ReadServiceInterface
+ */
+interface ReadServiceInterface
+{
+ /**
+ * Retrieve list of attribute options
+ *
+ * @param string $id
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Option[]
+ *
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function options($id);
+
+ /**
+ * Get full information about a required attribute with the list of options
+ *
+ * @param string $id
+ * @return \Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata
+ *
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function info($id);
+
+ /**
+ * Retrieve the list of product attributes
+ *
+ * @param \Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria
+ * @return \Magento\Catalog\Service\V1\Data\Product\Attribute\SearchResults containing Data\Eav\Attribute objects
+ */
+ public function search(\Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/CategoryLoader.php b/app/code/Magento/Catalog/Service/V1/Category/CategoryLoader.php
new file mode 100644
index 00000000000..8f3ade4fd21
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/CategoryLoader.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class CategoryLoader
+{
+ /**
+ * @var \Magento\Catalog\Model\CategoryFactory
+ */
+ private $categoryFactory;
+
+ /**
+ * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
+ */
+ public function __construct(\Magento\Catalog\Model\CategoryFactory $categoryFactory)
+ {
+ $this->categoryFactory = $categoryFactory;
+ }
+
+ /**
+ * @param int $categoryId
+ * @return Category
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function load($categoryId)
+ {
+ /** @var Category $category */
+ $category = $this->categoryFactory->create();
+ $category->load($categoryId);
+
+ if (!$category->getId()) {
+ throw new NoSuchEntityException('There is no category with provided ID');
+ }
+ return $category;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/MetadataService.php b/app/code/Magento/Catalog/Service/V1/Category/MetadataService.php
new file mode 100644
index 00000000000..aa098a384e4
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/MetadataService.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
+
+/**
+ * Class AttributeMetadataService
+ */
+class MetadataService implements MetadataServiceInterface
+{
+ /** @var \Magento\Catalog\Service\V1\MetadataService */
+ protected $metadataService;
+
+ /**
+ * @var \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder
+ */
+ private $searchCriteriaBuilder;
+
+ /**
+ * @var \Magento\Framework\Service\V1\Data\FilterBuilder
+ */
+ private $filterBuilder;
+
+ /**
+ * @param \Magento\Catalog\Service\V1\MetadataService $metadataService
+ * @param \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder $searchCriteriaBuilder
+ * @param \Magento\Framework\Service\V1\Data\FilterBuilder $filterBuilder
+ */
+ public function __construct(
+ \Magento\Catalog\Service\V1\MetadataService $metadataService,
+ \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder $searchCriteriaBuilder,
+ \Magento\Framework\Service\V1\Data\FilterBuilder $filterBuilder
+ ) {
+ $this->metadataService = $metadataService;
+ $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+ $this->filterBuilder = $filterBuilder;
+ }
+
+ /**
+ * Retrieve custom EAV attribute metadata of category
+ *
+ * @param int $attributeSetId
+ * @return AttributeMetadata[]
+ */
+ public function getCustomAttributesMetadata($attributeSetId = MetadataServiceInterface::DEFAULT_ATTRIBUTE_SET_ID)
+ {
+ $customAttributes = [];
+ foreach ($this->getCategoryAttributesMetadata($attributeSetId) as $attributeMetadata) {
+ $customAttributes[] = $attributeMetadata;
+ }
+ return $customAttributes;
+ }
+
+ /**
+ * Retrieve EAV attribute metadata of category
+ *
+ * @param int $attributeSetId
+ * @return AttributeMetadata[]
+ */
+ public function getCategoryAttributesMetadata($attributeSetId = MetadataServiceInterface::DEFAULT_ATTRIBUTE_SET_ID)
+ {
+ $this->searchCriteriaBuilder->addFilter([
+ $this->filterBuilder
+ ->setField('attribute_set_id')
+ ->setValue($attributeSetId)
+ ->create()
+ ]);
+
+ return $this->metadataService->getAllAttributeMetadata(
+ MetadataServiceInterface::ENTITY_TYPE,
+ $this->searchCriteriaBuilder->create()
+ )->getItems();
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/MetadataServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Category/MetadataServiceInterface.php
new file mode 100644
index 00000000000..32a00ff0982
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/MetadataServiceInterface.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
+
+/**
+ * Class Category MetadataServiceInterface
+ */
+interface MetadataServiceInterface
+{
+ /**#@+
+ * Predefined constants
+ */
+ const ENTITY_TYPE = 'catalog_category';
+
+ const DEFAULT_ATTRIBUTE_SET_ID = 3;
+ /**#@-*/
+
+ /**
+ * Retrieve custom EAV attribute metadata of category
+ *
+ * @param int $attributeSetId
+ * @return AttributeMetadata[]
+ */
+ public function getCustomAttributesMetadata($attributeSetId = self::DEFAULT_ATTRIBUTE_SET_ID);
+
+ /**
+ * Retrieve EAV attribute metadata of category
+ *
+ * @param int $attributeSetId
+ * @return AttributeMetadata[]
+ */
+ public function getCategoryAttributesMetadata($attributeSetId = self::DEFAULT_ATTRIBUTE_SET_ID);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadService.php b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadService.php
new file mode 100644
index 00000000000..6b8b1d3fa5a
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadService.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\ProductLinks;
+
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Service\V1\Data\Category;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductConverterFactory;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductLinkBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class ReadService implements ReadServiceInterface
+{
+ /**
+ * @var CategoryFactory
+ */
+ private $categoryFactory;
+
+ /**
+ * @var ProductLinkBuilder
+ */
+ private $productLinkBuilder;
+
+ /**
+ * @param CategoryFactory $categoryFactory
+ * @param ProductLinkBuilder $productLinkBuilder
+ */
+ public function __construct(
+ CategoryFactory $categoryFactory,
+ ProductLinkBuilder $productLinkBuilder
+ ) {
+ $this->categoryFactory = $categoryFactory;
+ $this->productLinkBuilder = $productLinkBuilder;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function assignedProducts($categoryId)
+ {
+ $category = $this->getCategory($categoryId);
+
+ $productsPosition = $category->getProductsPosition();
+ /** @var \Magento\Framework\Data\Collection\Db $products */
+ $products = $category->getProductCollection();
+
+ /** @var \Magento\Catalog\Service\V1\Data\Eav\Category\Product[] $dtoProductList */
+ $dtoProductList = [];
+
+ /** @var \Magento\Catalog\Model\Product $product */
+ foreach ($products->getItems() as $productId => $product) {
+ $dtoProductList[] = $this->productLinkBuilder->populateWithArray(
+ [ProductLink::SKU => $product->getSku(), ProductLink::POSITION => $productsPosition[$productId]]
+ )->create();
+ }
+
+ return $dtoProductList;
+ }
+
+ /**
+ * @param int $id
+ * @return CategoryModel
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ private function getCategory($id)
+ {
+ /** @var CategoryModel $category */
+ $category = $this->categoryFactory->create();
+ $category->load($id);
+
+ if (!$category->getId()) {
+ throw NoSuchEntityException::singleField(Category::ID, $id);
+ }
+ return $category;
+ }
+}
diff --git a/app/code/Magento/Email/Helper/Data.php b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceInterface.php
similarity index 73%
rename from app/code/Magento/Email/Helper/Data.php
rename to app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceInterface.php
index df916c18271..597d5401938 100644
--- a/app/code/Magento/Email/Helper/Data.php
+++ b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceInterface.php
@@ -21,8 +21,14 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Email\Helper;
+namespace Magento\Catalog\Service\V1\Category\ProductLinks;
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+interface ReadServiceInterface
{
+ /**
+ * @param int $categoryId
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink[]
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function assignedProducts($categoryId);
}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteService.php b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteService.php
new file mode 100644
index 00000000000..b52114a39f1
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteService.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\ProductLinks;
+
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Service\V1\Category\CategoryLoaderFactory;
+use Magento\Catalog\Service\V1\Data\Category;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\StateException;
+
+class WriteService implements WriteServiceInterface
+{
+ /**
+ * @var CategoryLoaderFactory
+ */
+ private $categoryLoaderFactory;
+
+ /**
+ * @var ProductFactory
+ */
+ private $productFactory;
+
+ /**
+ * @param CategoryLoaderFactory $categoryLoaderFactory
+ * @param ProductFactory $productFactory
+ */
+ public function __construct(
+ CategoryLoaderFactory $categoryLoaderFactory,
+ ProductFactory $productFactory
+ ) {
+ $this->categoryLoaderFactory = $categoryLoaderFactory;
+ $this->productFactory = $productFactory;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function assignProduct($categoryId, ProductLink $productLink)
+ {
+ return $this->setProductToCategory($categoryId, $productLink, true, 'Product already exists in this category');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function updateProduct($categoryId, ProductLink $productLink)
+ {
+ return $this->setProductToCategory($categoryId, $productLink, false, 'Product not found in this category');
+ }
+
+ /**
+ * @param int $categoryId
+ * @param ProductLink $productLink
+ * @param bool $isInPositions
+ * @param string $stateExceptionMessage
+ * @return bool
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @throws \Magento\Framework\Exception\StateException
+ */
+ public function setProductToCategory($categoryId, ProductLink $productLink, $isInPositions, $stateExceptionMessage)
+ {
+ /** @var CategoryModel $category */
+ $category = $this->categoryLoaderFactory->create()->load($categoryId);
+
+ $productId = $this->productFactory->create()->getIdBySku($productLink->getSku());
+ $productPositions = $category->getProductsPosition();
+
+ if ($isInPositions === array_key_exists($productId, $productPositions)) {
+ throw new StateException($stateExceptionMessage);
+ }
+
+ $newProductPositions = [$productId => $productLink->getPosition()] + $productPositions;
+
+ $category->setPostedProducts($newProductPositions);
+ try {
+ $category->save();
+ } catch (\Exception $e) {
+ throw new CouldNotSaveException(
+ 'Could not save product "%1" with position %2 to category %3',
+ [
+ $productId,
+ $productLink->getPosition(),
+ $categoryId,
+ ],
+ $e
+ );
+ }
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function removeProduct($categoryId, $productSku)
+ {
+ /** @var CategoryModel $category */
+ $category = $this->categoryLoaderFactory->create()->load($categoryId);
+ $productId = $this->productFactory->create()->getIdBySku($productSku);
+
+ /**
+ * old category-product relationships
+ */
+ $productPositions = $category->getProductsPosition();
+ if (!array_key_exists($productId, $productPositions)) {
+ throw new StateException('Category does not contain specified product');
+ }
+ unset($productPositions[$productId]);
+ $category->setPostedProducts($productPositions);
+
+ try {
+ $category->save();
+ } catch (\Exception $e) {
+ throw new CouldNotSaveException(
+ 'Could not remove product "%1" from category with ID "%2"',
+ [
+ $productSku,
+ $categoryId,
+ ],
+ $e
+ );
+ }
+ return true;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceInterface.php
new file mode 100644
index 00000000000..cd0c22d8e44
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceInterface.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\ProductLinks;
+
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink;
+
+interface WriteServiceInterface
+{
+ /**
+ * Assign a product to the required category
+ *
+ * @param int $categoryId
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink $productLink
+ * @return bool Will returned True if assigned
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @throws \Magento\Framework\Exception\StateException
+ */
+ public function assignProduct($categoryId, ProductLink $productLink);
+
+ /**
+ * @param int $categoryId
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink $productLink
+ * @return bool Will returned True if updated
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @throws \Magento\Framework\Exception\StateException
+ */
+ public function updateProduct($categoryId, ProductLink $productLink);
+
+ /**
+ * Remove the product assignment from the category.
+ *
+ * @param int $categoryId
+ * @param string $productSku Product SKU
+ * @return bool Will returned True if products sucessfully deleted
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\StateException
+ */
+ public function removeProduct($categoryId, $productSku);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/ReadService.php b/app/code/Magento/Catalog/Service/V1/Category/ReadService.php
new file mode 100644
index 00000000000..0d68159143c
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/ReadService.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Service\V1\Data\Category;
+use Magento\Catalog\Service\V1\Data\CategoryBuilder;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Info\ConverterFactory;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Info\MetadataBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class ReadService implements ReadServiceInterface
+{
+ /**
+ * @var CategoryBuilder
+ */
+ private $builder;
+
+ /**
+ * @var CategoryFactory
+ */
+ private $categoryFactory;
+
+ /**
+ * @var ConverterFactory
+ */
+ private $converterFactory;
+
+ /**
+ * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Category\Info\MetadataBuilder $builder
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Category\Info\ConverterFactory $converterFactory
+ */
+ public function __construct(
+ CategoryFactory $categoryFactory,
+ MetadataBuilder $builder,
+ ConverterFactory $converterFactory
+ ) {
+ $this->builder = $builder;
+ $this->categoryFactory = $categoryFactory;
+ $this->converterFactory = $converterFactory;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function info($categoryId)
+ {
+ $category = $this->getCategory($categoryId);
+
+ $metadata = $this->converterFactory->create(['builder' => $this->builder])
+ ->createDataFromModel($category);
+
+ return $metadata;
+ }
+
+ /**
+ * @param int $id
+ * @return CategoryModel
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ private function getCategory($id)
+ {
+ /** @var CategoryModel $category */
+ $category = $this->categoryFactory->create();
+ $category->load($id);
+
+ if (!$category->getId()) {
+ throw NoSuchEntityException::singleField(Category::ID, $id);
+ }
+ return $category;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/ReadServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Category/ReadServiceInterface.php
new file mode 100644
index 00000000000..2cf1d9146b8
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/ReadServiceInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+interface ReadServiceInterface
+{
+ /**
+ * Get info about category by category id
+ *
+ * @param int $categoryId
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Category\Info\Metadata
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function info($categoryId);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/Tree/ReadService.php b/app/code/Magento/Catalog/Service/V1/Category/Tree/ReadService.php
new file mode 100644
index 00000000000..76f6fb52b32
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/Tree/ReadService.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\Tree;
+
+/**
+ * Class ReadService
+ *
+ * @package Magento\Catalog\Service\V1\Category
+ */
+class ReadService implements ReadServiceInterface
+{
+ /**
+ * @var \Magento\Catalog\Model\CategoryFactory
+ */
+ protected $categoryFactory;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ protected $storeManager;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Data\Category\Tree
+ */
+ protected $categoryTree;
+
+ /**
+ * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
+ * @param \Magento\Catalog\Service\V1\Data\Category\Tree $categoryTree
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ */
+ public function __construct(
+ \Magento\Catalog\Model\CategoryFactory $categoryFactory,
+ \Magento\Catalog\Service\V1\Data\Category\Tree $categoryTree,
+ \Magento\Store\Model\StoreManagerInterface $storeManager
+ ) {
+ $this->categoryFactory = $categoryFactory;
+ $this->categoryTree = $categoryTree;
+ $this->storeManager = $storeManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function tree($rootCategoryId = null, $depth = null)
+ {
+ $category = null;
+ if (!is_null($rootCategoryId)) {
+ /** @var \Magento\Catalog\Model\Category $category */
+ $category = $this->categoryFactory->create()->load($rootCategoryId);
+ if (!$category->getId()) {
+ throw new \Magento\Framework\Exception\NoSuchEntityException('Root Category does not exist');
+ }
+ }
+ $result = $this->categoryTree->getTree($this->categoryTree->getRootNode($category), $depth);
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/Tree/ReadServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Category/Tree/ReadServiceInterface.php
new file mode 100644
index 00000000000..95b7f24a128
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/Tree/ReadServiceInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\Tree;
+
+use Magento\Catalog\Service\V1\Data\Eav\Category\Tree;
+
+/**
+ * Class ReadServiceInterface
+ * @package Magento\Catalog\Service\V1\Category
+ */
+interface ReadServiceInterface
+{
+ /**
+ * Retrieve list of product attribute types
+ *
+ * @throws \Magento\Framework\Exception\NoSuchEntityException If ID is not found
+ * @param int $rootCategoryId
+ * @param int $depth
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Category\Tree containing Tree objects
+ */
+ public function tree($rootCategoryId = null, $depth = null);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/WriteService.php b/app/code/Magento/Catalog/Service/V1/Category/WriteService.php
new file mode 100644
index 00000000000..8936631404a
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/WriteService.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Service\V1\Data\Category as CategoryDataObject;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Service\V1\Data\Category\Mapper as CategoryMapper;
+use Magento\Store\Model\StoreManagerInterface;
+
+class WriteService implements WriteServiceInterface
+{
+ /**
+ * @var CategoryFactory
+ */
+ private $categoryFactory;
+
+ /**
+ * @var CategoryMapper
+ */
+ private $categoryMapper;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ protected $storeManager;
+
+ /**
+ * List of fields that can used config values in case when value does not defined directly
+ *
+ * @var array
+ */
+ private $useConfigFields = ['available_sort_by', 'default_sort_by', 'filter_price_range'];
+
+ /**
+ * @param CategoryFactory $categoryFactory
+ * @param CategoryMapper $categoryMapper
+ * @param StoreManagerInterface $storeManager
+ */
+ public function __construct(
+ CategoryFactory $categoryFactory,
+ CategoryMapper $categoryMapper,
+ StoreManagerInterface $storeManager
+ ) {
+ $this->categoryFactory = $categoryFactory;
+ $this->categoryMapper = $categoryMapper;
+ $this->storeManager = $storeManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function create(CategoryDataObject $category)
+ {
+ try {
+ $categoryModel = $this->categoryMapper->toModel($category);
+ $parentId = $category->getParentId() ?: $this->storeManager->getStore()->getRootCategoryId();
+ $parentCategory = $this->categoryFactory->create()->load($parentId);
+ $categoryModel->setPath($parentCategory->getPath());
+
+ $this->validateCategory($categoryModel);
+ $categoryModel->save();
+ } catch (\Exception $e) {
+ throw new CouldNotSaveException('Could not save category: %1', [$e->getMessage()], $e);
+ }
+ return $categoryModel->getId();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete($categoryId)
+ {
+ /** @var Category $category */
+ $category = $this->loadCategory($categoryId);
+
+ try {
+ $category->delete();
+ } catch (\Exception $e) {
+ throw new CouldNotSaveException('Cannot delete category with id %1', [$categoryId], $e);
+ }
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function update($categoryId, CategoryDataObject $category)
+ {
+ $model = $this->loadCategory($categoryId);
+ try {
+ $this->categoryMapper->toModel($category, $model);
+ $this->validateCategory($model);
+ $model->save();
+ } catch (\Exception $e) {
+ throw new CouldNotSaveException('Could not save category', [], $e);
+ }
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function move($categoryId, $parentId, $afterId = null)
+ {
+ $model = $this->loadCategory($categoryId);
+ $parentCategory = $this->loadCategory($parentId);
+
+ if (is_null($afterId) && $parentCategory->hasChildren()) {
+ $parentChildren = $parentCategory->getChildren();
+ $categoryIds = explode(',', $parentChildren);
+ $afterId = array_pop($categoryIds);
+ }
+
+ if (strpos($parentCategory->getPath(), $model->getPath()) === 0) {
+ throw new \Magento\Framework\Model\Exception(
+ "Operation do not allow to move a parent category to any of children category"
+ );
+ }
+ try {
+ $model->move($parentId, $afterId);
+ } catch (\Exception $e) {
+ throw new \Magento\Framework\Model\Exception('Could not move category');
+ }
+ return true;
+ }
+
+ /**
+ * Validate category process
+ *
+ * @param Category $category
+ * @return void
+ * @throws \Magento\Framework\Model\Exception
+ */
+ protected function validateCategory(Category $category)
+ {
+ $useConfigFields = [];
+ foreach ($this->useConfigFields as $field) {
+ if (!$category->getData($field)) {
+ $useConfigFields[] = $field;
+ }
+ }
+ $category->setData('use_post_data_config', $useConfigFields);
+ $validate = $category->validate();
+ if ($validate !== true) {
+ foreach ($validate as $code => $error) {
+ if ($error === true) {
+ $attribute = $category->getResource()->getAttribute($code)->getFrontend()->getLabel();
+ throw new \Magento\Framework\Model\Exception(__('Attribute "%1" is required.', $attribute));
+ } else {
+ throw new \Magento\Framework\Model\Exception($error);
+ }
+ }
+ }
+ $category->unsetData('use_post_data_config');
+ }
+
+ /**
+ * Load category
+ *
+ * @param int $id
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @return \Magento\Catalog\Model\Category
+ */
+ protected function loadCategory($id)
+ {
+ $model = $this->categoryFactory->create();
+ $model->load($id);
+ if (!$model->getId()) {
+ throw NoSuchEntityException::singleField(CategoryDataObject::ID, $id);
+ }
+ return $model;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Category/WriteServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Category/WriteServiceInterface.php
new file mode 100644
index 00000000000..29a6ec66464
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Category/WriteServiceInterface.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+interface WriteServiceInterface
+{
+ /**
+ * Create category service
+ *
+ * @param \Magento\Catalog\Service\V1\Data\Category $category
+ * @return int
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function create(\Magento\Catalog\Service\V1\Data\Category $category);
+
+ /**
+ * Delete category
+ *
+ * @param int $categoryId category which will deleted
+ * @return bool Will returned True if deleted
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function delete($categoryId);
+
+ /**
+ * Update category
+ *
+ * @param int $categoryId category to be updated
+ * @param \Magento\Catalog\Service\V1\Data\Category $category
+ * @return bool
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function update($categoryId, \Magento\Catalog\Service\V1\Data\Category $category);
+
+ /**
+ * Move category
+ *
+ * @param int $categoryId
+ * @param int $parentId
+ * @param int $afterId
+ * @return bool
+ * @throws \Magento\Framework\Model\Exception
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function move($categoryId, $parentId, $afterId = null);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Category.php b/app/code/Magento/Catalog/Service/V1/Data/Category.php
new file mode 100644
index 00000000000..ffc879eb60b
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Category.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data;
+
+use \Magento\Framework\Service\Data\Eav\AbstractObject;
+
+class Category extends AbstractObject
+{
+ const ID = 'id';
+
+ const PARENT_ID = 'parent_id';
+
+ const PATH = 'path';
+
+ const POSITION = 'position';
+
+ const LEVEL = 'level';
+
+ const CHILDREN_COUNT = 'children_count';
+
+ const CREATED_AT = 'created_at';
+
+ const UPDATED_AT = 'updated_at';
+
+ const NAME = 'name';
+
+ const ACTIVE = 'active';
+
+ /**
+ * Category id
+ *
+ * @return int|null
+ */
+ public function getId()
+ {
+ return $this->_get(self::ID);
+ }
+
+ /**
+ * Category parent id
+ *
+ * @return int|null
+ */
+ public function getParentId()
+ {
+ return $this->_get(self::PARENT_ID);
+ }
+
+ /**
+ * Path of the category
+ *
+ * @return string|null
+ */
+ public function getPath()
+ {
+ return $this->_get(self::PATH);
+ }
+
+ /**
+ * Position of the category
+ *
+ * @return int|null
+ */
+ public function getPosition()
+ {
+ return $this->_get(self::POSITION);
+ }
+
+ /**
+ * Category level
+ *
+ * @return int|null
+ */
+ public function getLevel()
+ {
+ return $this->_get(self::LEVEL);
+ }
+
+ /**
+ * Category children count
+ *
+ * @return int|null
+ */
+ public function getChildrenCount()
+ {
+ return $this->_get(self::CHILDREN_COUNT);
+ }
+
+ /**
+ * Category created date
+ *
+ * @return string|null
+ */
+ public function getCreatedAt()
+ {
+ return $this->_get(self::CREATED_AT);
+ }
+
+ /**
+ * Category updated date
+ *
+ * @return string|null
+ */
+ public function getUpdatedAt()
+ {
+ return $this->_get(self::UPDATED_AT);
+ }
+
+ /**
+ * Name of the created category
+ *
+ * @return string|null
+ */
+ public function getName()
+ {
+ return $this->_get(self::NAME);
+ }
+
+ /**
+ * Defines whether the category will be visible in the frontend
+ *
+ * @return bool|null
+ */
+ public function isActive()
+ {
+ return (bool)$this->_get(self::ACTIVE);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Category/Mapper.php b/app/code/Magento/Catalog/Service/V1/Data/Category/Mapper.php
new file mode 100644
index 00000000000..35a7934ad76
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Category/Mapper.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Category;
+
+use Magento\Framework\Service\EavDataObjectConverter;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\catalog\Service\V1\Data\Category as CategoryDataObject;
+
+class Mapper
+{
+ /** @var CategoryFactory */
+ protected $categoryFactory;
+
+ /**
+ * @param CategoryFactory $categoryFactory
+ */
+ public function __construct(
+ CategoryFactory $categoryFactory
+ ) {
+ $this->categoryFactory = $categoryFactory;
+ }
+
+ /**
+ * @param CategoryDataObject $category
+ * @param \Magento\Catalog\Model\Category $categoryModel
+ * @return \Magento\Catalog\Model\Category
+ * @throws \RuntimeException
+ */
+ public function toModel(
+ CategoryDataObject $category,
+ \Magento\Catalog\Model\Category $categoryModel = null
+ ) {
+ $categoryModel = $categoryModel ?: $this->categoryFactory->create();
+ $data = EavDataObjectConverter::toFlatArray($category);
+ /** @see /app/code/Magento/Catalog/Controller/Adminhtml/Category.php method "_filterCategoryPostData" */
+ if (isset($data['image']) && is_array($data['image'])) {
+ $data['image_additional_data'] = $data['image'];
+ unset($data['image']);
+ }
+ // this fields should not be changed
+ $data[CategoryDataObject::ID] = $categoryModel->getId();
+ $data[CategoryDataObject::PARENT_ID] = $categoryModel->getParentId();
+ $data[CategoryDataObject::PATH] = $categoryModel->getPath();
+
+ /** fill required fields */
+ $data['is_active'] = $category->isActive();
+ $data['include_in_menu'] = isset($data['include_in_menu']) ? (bool)$data['include_in_menu'] : false;
+
+ $categoryModel->addData($data);
+
+ if (!is_numeric($categoryModel->getAttributeSetId())) {
+ $categoryModel->setAttributeSetId($categoryModel->getDefaultAttributeSetId());
+ }
+ return $categoryModel;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Category/Tree.php b/app/code/Magento/Catalog/Service/V1/Data/Category/Tree.php
new file mode 100644
index 00000000000..33bf85cbaa6
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Category/Tree.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Category;
+
+use Magento\Framework\Data\Tree\Node;
+
+/**
+ * Retrieve category data represented in tree structure
+ */
+class Tree
+{
+ /**
+ * @var \Magento\Catalog\Model\Resource\Category\Tree
+ */
+ protected $categoryTree;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ protected $storeManager;
+
+ /**
+ * @var \Magento\Catalog\Model\Resource\Category\Collection
+ */
+ protected $categoryCollection;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Data\Eav\Category\TreeBuilderFactory
+ */
+ protected $treeBuilderFactory;
+
+ /**
+ * @param \Magento\Catalog\Model\Resource\Category\Tree $categoryTree
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Catalog\Model\Resource\Category\Collection $categoryCollection
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Category\TreeBuilderFactory $treeBuilderFactory
+ */
+ public function __construct(
+ \Magento\Catalog\Model\Resource\Category\Tree $categoryTree,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Catalog\Model\Resource\Category\Collection $categoryCollection,
+ \Magento\Catalog\Service\V1\Data\Eav\Category\TreeBuilderFactory $treeBuilderFactory
+ ) {
+ $this->categoryTree = $categoryTree;
+ $this->storeManager = $storeManager;
+ $this->categoryCollection = $categoryCollection;
+ $this->treeBuilderFactory = $treeBuilderFactory;
+ }
+
+ /**
+ * @param \Magento\Catalog\Model\Category|null $category
+ * @return Node|null
+ */
+ public function getRootNode($category = null)
+ {
+ if (!is_null($category) && $category->getId()) {
+ return $this->getNode($category);
+ }
+
+ $store = $this->storeManager->getStore();
+ $rootId = $store->getRootCategoryId();
+
+ $tree = $this->categoryTree->load(null);
+ $this->prepareCollection();
+ $tree->addCollectionData($this->categoryCollection);
+ $root = $tree->getNodeById($rootId);
+ return $root;
+ }
+
+ /**
+ * @param \Magento\Catalog\Model\Category $category
+ * @return Node
+ */
+ protected function getNode(\Magento\Catalog\Model\Category $category)
+ {
+ $nodeId = $category->getId();
+ $node = $this->categoryTree->loadNode($nodeId);
+ $node->loadChildren();
+ $this->prepareCollection();
+ $this->categoryTree->addCollectionData($this->categoryCollection);
+ return $node;
+ }
+
+ /**
+ * @return void
+ */
+ protected function prepareCollection()
+ {
+ $storeId = $this->storeManager->getStore()->getId();
+ $this->categoryCollection->addAttributeToSelect(
+ 'name'
+ )->addAttributeToSelect(
+ 'is_active'
+ )->setProductStoreId(
+ $storeId
+ )->setLoadProductCount(
+ true
+ )->setStoreId(
+ $storeId
+ );
+ }
+
+ /**
+ * @param \Magento\Framework\Data\Tree\Node $node
+ * @param int $depth
+ * @param int $currentLevel
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Category\Tree[]
+ */
+ public function getTree($node, $depth = null, $currentLevel = 0)
+ {
+ $builder = $this->treeBuilderFactory->create();
+ $builder->setId($node->getId())
+ ->setParentId($node->getParentId())
+ ->setName($node->getName())
+ ->setPosition($node->getPosition())
+ ->setLevel($node->getLevel())
+ ->setActive($node->getIsActive())
+ ->setChildren([]);
+
+ if ($node->hasChildren()) {
+ $children = array();
+ foreach ($node->getChildren() as $child) {
+ if (!is_null($depth) && $depth <= $currentLevel) {
+ break;
+ }
+ $children[] = $this->getTree($child, $depth, $currentLevel + 1);
+ }
+ $builder->setChildren($children);
+ }
+ return $builder->create();
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/CategoryBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/CategoryBuilder.php
new file mode 100644
index 00000000000..9d002c3a101
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/CategoryBuilder.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data;
+
+use Magento\Framework\Service\Data\Eav\AbstractObjectBuilder;
+use Magento\Framework\Service\Data\Eav\AttributeValueBuilder;
+use Magento\Catalog\Service\V1\Category\MetadataServiceInterface;
+
+class CategoryBuilder extends AbstractObjectBuilder
+{
+ /**
+ * @var MetadataServiceInterface
+ */
+ protected $metadataService;
+
+ /**
+ * Initialize dependencies
+ *
+ * @param \Magento\Framework\Service\Data\ObjectFactory $objectFactory
+ * @param AttributeValueBuilder $valueBuilder
+ * @param MetadataServiceInterface $metadataService
+ */
+ public function __construct(
+ \Magento\Framework\Service\Data\ObjectFactory $objectFactory,
+ AttributeValueBuilder $valueBuilder,
+ MetadataServiceInterface $metadataService
+ ) {
+ parent::__construct($objectFactory, $valueBuilder);
+ $this->metadataService = $metadataService;
+ }
+
+ /**
+ * Template method used to configure the attribute codes for the category attributes
+ *
+ * @return string[]
+ */
+ public function getCustomAttributesCodes()
+ {
+ $attributeCodes = array();
+ foreach ($this->metadataService->getCustomAttributesMetadata() as $attribute) {
+ $attributeCodes[] = $attribute->getAttributeCode();
+ }
+ return $attributeCodes;
+ }
+
+ /**
+ * Set category id
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setId($value)
+ {
+ return $this->_set(Category::ID, $value);
+ }
+
+ /**
+ * Set category parent id
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setParentId($value)
+ {
+ return $this->_set(Category::PARENT_ID, $value);
+ }
+
+ /**
+ * Set path of the category
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setPath($value)
+ {
+ return $this->_set(Category::PATH, $value);
+ }
+
+ /**
+ * Set position of the category
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setPosition($value)
+ {
+ return $this->_set(Category::POSITION, $value);
+ }
+
+ /**
+ * Set category level
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setLevel($value)
+ {
+ return $this->_set(Category::LEVEL, $value);
+ }
+
+ /**
+ * Set category children count
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setChildrenCount($value)
+ {
+ return $this->_set(Category::CHILDREN_COUNT, $value);
+ }
+
+ /**
+ * Name of the created category
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setName($value)
+ {
+ return $this->_set(Category::NAME, $value);
+ }
+
+ /**
+ * Set whether the category will be visible in the frontend
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function setActive($value)
+ {
+ return $this->_set(Category::ACTIVE, $value);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Converter.php b/app/code/Magento/Catalog/Service/V1/Data/Converter.php
index e7c82fd5a08..69e771ed885 100644
--- a/app/code/Magento/Catalog/Service/V1/Data/Converter.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/Converter.php
@@ -70,9 +70,7 @@ class Converter
$value = $productModel->getDataUsingMethod($attrCode);
$value = $value ? $value : $productModel->getData($attrCode);
if (null !== $value) {
- if ($attrCode == 'entity_id') {
- $attributes[ProductDataObject::ID] = $value;
- } else {
+ if ($attrCode != 'entity_id') {
$attributes[$attrCode] = $value;
}
}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadata.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadata.php
index 2adec8b2921..4ae46cb294a 100644
--- a/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadata.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadata.php
@@ -33,6 +33,10 @@ class AttributeMetadata extends AbstractObject
/**#@+
* Constants used as keys into $_data
*/
+
+ const ID = 'id';
+ const CODE = 'code';
+
const ATTRIBUTE_ID = 'attribute_id';
const ATTRIBUTE_CODE = 'attribute_code';
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadataBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadataBuilder.php
index 7da8259f70e..559362e58d1 100644
--- a/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadataBuilder.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/AttributeMetadataBuilder.php
@@ -229,7 +229,7 @@ class AttributeMetadataBuilder extends AbstractObjectBuilder
/**
* Set default value for the element
*
- * @param mixed $value
+ * @param string $value
* @return $this
*/
public function setDefaultValue($value)
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadata.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadata.php
new file mode 100644
index 00000000000..2f4b3ac823e
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadata.php
@@ -0,0 +1,305 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+use \Magento\Framework\Service\Data\Eav\AbstractObject;
+
+class AttributeMetadata extends AbstractObject
+{
+ const ATTRIBUTE_ID = 'attribute_id';
+
+ const ATTRIBUTE_CODE = 'attribute_code';
+
+ const NAME = 'name';
+
+ const ACTIVE = 'active';
+
+ const AVAILABLE_SORT_BY = 'available_sort_by';
+
+ const CUSTOM_DESIGN = 'custom_design';
+
+ const CUSTOM_APPLY_TO_PRODUCTS = 'custom_apply_to_products';
+
+ const CUSTOM_DESIGN_FROM = 'custom_design_from';
+
+ const CUSTOM_DESIGN_TO = 'custom_design_to';
+
+ const CUSTOM_LAYOUT_UPDATE = 'custom_layout_update';
+
+ const DEFAULT_SORT_BY = 'default_sort_by';
+
+ const DESCRIPTION = 'description';
+
+ const DISPLAY_MODE = 'display_mode';
+
+ const ANCHOR = 'anchor';
+
+ const LANDING_PAGE = 'landing_page';
+
+ const META_DESCRIPTION = 'meta_description';
+
+ const META_KEYWORDS = 'meta_keywords';
+
+ const META_TITLE = 'meta_title';
+
+ const PAGE_LAYOUT = 'page_layout';
+
+ const URL_KEY = 'url_key';
+
+ const INCLUDE_IN_MENU = 'include_in_menu';
+
+ const FILTER_PRICE_RANGE = 'filter_price_range';
+
+ const CUSTOM_USE_PARENT_SETTINGS = 'custom_use_parent_settings';
+
+ /**
+ * Retrieve id of the attribute.
+ *
+ * @return int|null
+ */
+ public function getAttributeId()
+ {
+ return $this->_get(self::ATTRIBUTE_ID);
+ }
+
+ /**
+ * Retrieve code of the attribute.
+ *
+ * @return string|null
+ */
+ public function getAttributeCode()
+ {
+ return $this->_get(self::ATTRIBUTE_CODE);
+ }
+
+ /**
+ * Name of the created category
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->_get(self::NAME);
+ }
+
+ /**
+ * Defines whether the category will be visible in the frontend
+ *
+ * @return bool|null
+ */
+ public function isActive()
+ {
+ return $this->_get(self::ACTIVE);
+ }
+
+ /**
+ * All available options by which products in the category can be sorted
+ *
+ * @return string[]|null
+ */
+ public function getAvailableSortBy()
+ {
+ return $this->_get(self::AVAILABLE_SORT_BY);
+ }
+
+ /**
+ * The custom design for the category (optional)
+ *
+ * @return string|null
+ */
+ public function getCustomDesign()
+ {
+ return $this->_get(self::CUSTOM_DESIGN);
+ }
+
+ /**
+ * Apply the custom design to all products assigned to the category
+ *
+ * @return int|null
+ */
+ public function getCustomApplyToProducts()
+ {
+ return $this->_get(self::CUSTOM_APPLY_TO_PRODUCTS);
+ }
+
+ /**
+ * Date starting from which the custom design will be applied to the category
+ *
+ * @return string|null
+ */
+ public function getCustomDesignFrom()
+ {
+ return $this->_get(self::CUSTOM_DESIGN_FROM);
+ }
+
+ /**
+ * Date till which the custom design will be applied to the category
+ *
+ * @return string|null
+ */
+ public function getCustomDesignTo()
+ {
+ return $this->_get(self::CUSTOM_DESIGN_TO);
+ }
+
+ /**
+ * Custom layout update
+ *
+ * @return string|null
+ */
+ public function getCustomLayoutUpdate()
+ {
+ return $this->_get(self::CUSTOM_LAYOUT_UPDATE);
+ }
+
+ /**
+ * The default option by which products in the category are sorted
+ *
+ * @return string|null
+ */
+ public function getDefaultSortBy()
+ {
+ return $this->_get(self::DEFAULT_SORT_BY);
+ }
+
+ /**
+ * Category description
+ *
+ * @return string|null
+ */
+ public function getDescription()
+ {
+ return $this->_get(self::DESCRIPTION);
+ }
+
+ /**
+ * Content that will be displayed on the category view page
+ *
+ * @return string|null
+ */
+ public function getDisplayMode()
+ {
+ return $this->_get(self::DISPLAY_MODE);
+ }
+
+ /**
+ * Defines whether the category will be anchored
+ *
+ * @return bool|null
+ */
+ public function isAnchor()
+ {
+ return $this->_get(self::ANCHOR);
+ }
+
+ /**
+ * Landing page
+ *
+ * @return int|null
+ */
+ public function getLandingPage()
+ {
+ return $this->_get(self::LANDING_PAGE);
+ }
+
+ /**
+ * Category meta description
+ *
+ * @return string|null
+ */
+ public function getMetaDescription()
+ {
+ return $this->_get(self::META_DESCRIPTION);
+ }
+
+ /**
+ * Category meta keywords
+ *
+ * @return string|null
+ */
+ public function getMetaKeywords()
+ {
+ return $this->_get(self::META_KEYWORDS);
+ }
+
+ /**
+ * Category meta title
+ *
+ * @return string|null
+ */
+ public function getMetaTitle()
+ {
+ return $this->_get(self::META_TITLE);
+ }
+
+ /**
+ * Type of page layout that the category should use
+ *
+ * @return string|null
+ */
+ public function getPageLayout()
+ {
+ return $this->_get(self::PAGE_LAYOUT);
+ }
+
+ /**
+ * A relative URL path which can be entered in place of the standard target path
+ *
+ * @return string|null
+ */
+ public function getUrlKey()
+ {
+ return $this->_get(self::URL_KEY);
+ }
+
+ /**
+ * Defines whether the category is visible on the top menu bar
+ *
+ * @return bool|null
+ */
+ public function getIncludeInMenu()
+ {
+ return $this->_get(self::INCLUDE_IN_MENU);
+ }
+
+ /**
+ * Price range of each price level displayed in the layered navigation block
+ *
+ * @return string|null
+ */
+ public function getFilterPriceRange()
+ {
+ return $this->_get(self::FILTER_PRICE_RANGE);
+ }
+
+ /**
+ * Price range of each price level displayed in the layered navigation block
+ *
+ * @return bool|null
+ */
+ public function getCustomUseParentSettings()
+ {
+ return $this->_get(self::CUSTOM_USE_PARENT_SETTINGS);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadataBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadataBuilder.php
new file mode 100644
index 00000000000..8b5fa303f83
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/AttributeMetadataBuilder.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+use Magento\Framework\Service\Data\AbstractObjectBuilder;
+
+class AttributeMetadataBuilder extends AbstractObjectBuilder
+{
+ /**
+ * Set attribute id
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setAttributeId($value)
+ {
+ return $this->_set(AttributeMetadata::ATTRIBUTE_ID, $value);
+ }
+
+ /**
+ * Set attribute code
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setAttributeCode($value)
+ {
+ return $this->_set(AttributeMetadata::ATTRIBUTE_CODE, $value);
+ }
+
+ /**
+ * Name of the created category
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setName($value)
+ {
+ return $this->_set(AttributeMetadata::NAME, $value);
+ }
+
+ /**
+ * Set whether the category will be visible in the frontend
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function setActive($value)
+ {
+ return $this->_set(AttributeMetadata::ACTIVE, $value);
+ }
+
+ /**
+ * Set available options by which products in the category can be sorted
+ *
+ * @param string[] $value
+ * @return $this
+ */
+ public function setAvailableSortBy($value)
+ {
+ return $this->_set(AttributeMetadata::AVAILABLE_SORT_BY, $value);
+ }
+
+ /**
+ * Set custom design for the category
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setCustomDesign($value)
+ {
+ return $this->_set(AttributeMetadata::CUSTOM_DESIGN, $value);
+ }
+
+ /**
+ * Apply the custom design to all products assigned to the category
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setCustomApplyToProducts($value)
+ {
+ return $this->_set(AttributeMetadata::CUSTOM_APPLY_TO_PRODUCTS, $value);
+ }
+
+ /**
+ * Set date starting from which the custom design will be applied to the category
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setCustomDesignFrom($value)
+ {
+ return $this->_set(AttributeMetadata::CUSTOM_DESIGN_FROM, $value);
+ }
+
+ /**
+ * Set date till which the custom design will be applied to the category
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setCustomDesignTo($value)
+ {
+ return $this->_set(AttributeMetadata::CUSTOM_DESIGN_TO, $value);
+ }
+
+ /**
+ * Custom layout update
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setCustomLayoutUpdate($value)
+ {
+ return $this->_set(AttributeMetadata::CUSTOM_LAYOUT_UPDATE, $value);
+ }
+
+ /**
+ * Set the default option by which products in the category are sorted
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setDefaultSortBy($value)
+ {
+ return $this->_set(AttributeMetadata::DEFAULT_SORT_BY, $value);
+ }
+
+ /**
+ * Category description
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setDescription($value)
+ {
+ return $this->_set(AttributeMetadata::DESCRIPTION, $value);
+ }
+
+ /**
+ * Set content that will be displayed on the category view page
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setDisplayMode($value)
+ {
+ return $this->_set(AttributeMetadata::DISPLAY_MODE, $value);
+ }
+
+ /**
+ * Set whether the category will be anchored
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function setAnchor($value)
+ {
+ return $this->_set(AttributeMetadata::ANCHOR, $value);
+ }
+
+ /**
+ * Landing page
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setLandingPage($value)
+ {
+ return $this->_set(AttributeMetadata::LANDING_PAGE, $value);
+ }
+
+ /**
+ * Set category meta description
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setMetaDescription($value)
+ {
+ return $this->_set(AttributeMetadata::META_DESCRIPTION, $value);
+ }
+
+ /**
+ * Set category meta keywords
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setMetaKeywords($value)
+ {
+ return $this->_set(AttributeMetadata::META_KEYWORDS, $value);
+ }
+
+ /**
+ * Set category meta title
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setMetaTitle($value)
+ {
+ return $this->_set(AttributeMetadata::META_TITLE, $value);
+ }
+
+ /**
+ * Set type of page layout that the category should use
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setPageLayout($value)
+ {
+ return $this->_set(AttributeMetadata::PAGE_LAYOUT, $value);
+ }
+
+ /**
+ * Set a relative URL path which can be entered in place of the standard target path
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setUrlKey($value)
+ {
+ return $this->_set(AttributeMetadata::URL_KEY, $value);
+ }
+
+ /**
+ * Set whether the category is visible on the top menu bar
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function setIncludeInMenu($value)
+ {
+ return $this->_set(AttributeMetadata::INCLUDE_IN_MENU, $value);
+ }
+
+ /**
+ * Set price range of each price level displayed in the layered navigation block
+ *
+ * @param string $value
+ * @return $this
+ */
+ public function setFilterPriceRange($value)
+ {
+ return $this->_set(AttributeMetadata::FILTER_PRICE_RANGE, $value);
+ }
+
+ /**
+ * Set price range of each price level displayed in the layered navigation block
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setCustomUseParentSettings($value)
+ {
+ return $this->_set(AttributeMetadata::CUSTOM_USE_PARENT_SETTINGS, $value);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Converter.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Converter.php
new file mode 100644
index 00000000000..e122894ccf3
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Converter.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category\Info;
+
+use Magento\Catalog\Model\Category;
+
+/**
+ * Class Converter
+ * @codeCoverageIgnore
+ */
+class Converter
+{
+ /**
+ * @var MetadataBuilder
+ */
+ private $builder;
+
+ /**
+ * @param MetadataBuilder $builder
+ */
+ public function __construct(MetadataBuilder $builder)
+ {
+ $this->builder = $builder;
+ }
+
+ /**
+ * @param Category $category
+ * @return Metadata
+ */
+ public function createDataFromModel(Category $category)
+ {
+ $builder = $this->builder->populateWithArray($category->getData())
+ ->setCategoryId($category->getId())
+ ->setActive($category->getIsActive())
+ ->setChildren($category->getAllChildren(true));
+
+ return $builder->create();
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Metadata.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Metadata.php
new file mode 100644
index 00000000000..9273c8d5083
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/Metadata.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category\Info;
+
+use Magento\Framework\Service\Data\Eav\AbstractObject;
+
+/**
+ * Class Metadata
+ * @codeCoverageIgnore
+ */
+class Metadata extends AbstractObject
+{
+ const ID = 'category_id';
+
+ const POSITION = 'position';
+
+ const LEVEL = 'level';
+
+ const PARENT_ID = 'parent_id';
+
+ const CHILDREN = 'children';
+
+ const CREATED_AT = 'created_at';
+
+ const UPDATED_AT = 'updated_at';
+
+ const NAME = 'name';
+
+ const URL_KEY = 'url_key';
+
+ const PATH = 'path';
+
+ const DISPLAY_MODE = 'display_mode';
+
+ const AVAILABLE_SORT_BY = 'available_sort_by';
+
+ const INCLUDE_IN_MENU = 'include_in_menu';
+
+ const ACTIVE = 'active';
+
+ /**
+ * @return \Magento\Framework\Service\Data\Eav\AttributeValue[]|null
+ */
+ public function getCustomAttributes()
+ {
+ $this->_get(self::CUSTOM_ATTRIBUTES_KEY);
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getCategoryId()
+ {
+ return $this->_get(self::ID);
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getPosition()
+ {
+ return $this->_get(self::POSITION);
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getLevel()
+ {
+ return $this->_get(self::LEVEL);
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getParentId()
+ {
+ return $this->_get(self::PARENT_ID);
+ }
+
+ /**
+ * @return int[]|null
+ */
+ public function getChildren()
+ {
+ return $this->_get(self::CHILDREN);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getCreatedAt()
+ {
+ return $this->_get(self::CREATED_AT);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getUpdatedAt()
+ {
+ return $this->_get(self::UPDATED_AT);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getName()
+ {
+ return $this->_get(self::NAME);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getUrlKey()
+ {
+ return $this->_get(self::URL_KEY);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getPath()
+ {
+ return $this->_get(self::PATH);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getDisplayMode()
+ {
+ return $this->_get(self::DISPLAY_MODE);
+ }
+
+ /**
+ * @return string[]|null
+ */
+ public function getAvailableSortBy()
+ {
+ return $this->_get(self::AVAILABLE_SORT_BY);
+ }
+
+ /**
+ * @return bool|null
+ */
+ public function isIncludeInMenu()
+ {
+ return (bool)$this->_get(self::INCLUDE_IN_MENU);
+ }
+
+ /**
+ * @return bool|null
+ */
+ public function isActive()
+ {
+ return (bool)$this->_get(self::ACTIVE);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/MetadataBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/MetadataBuilder.php
new file mode 100644
index 00000000000..485e5feeb8f
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Info/MetadataBuilder.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category\Info;
+
+use Magento\Catalog\Service\V1\Category\MetadataServiceInterface;
+use Magento\Framework\Service\Data\Eav\AbstractObjectBuilder;
+use Magento\Framework\Service\Data\Eav\AttributeValueBuilder;
+use Magento\Framework\Service\Data\ObjectFactory;
+
+/**
+ * Class MetadataBuilder
+ * @codeCoverageIgnore
+ */
+class MetadataBuilder extends AbstractObjectBuilder
+{
+ /**
+ * @param ObjectFactory $objectFactory
+ * @param AttributeValueBuilder $valueBuilder
+ * @param MetadataServiceInterface $metadataService
+ */
+ public function __construct(
+ ObjectFactory $objectFactory,
+ AttributeValueBuilder $valueBuilder,
+ MetadataServiceInterface $metadataService
+ ) {
+ parent::__construct($objectFactory, $valueBuilder);
+ $this->metadataService = $metadataService;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getCustomAttributesCodes()
+ {
+ $attributeCodes = array();
+ foreach ($this->metadataService->getCustomAttributesMetadata() as $attribute) {
+ /** @var \Magento\Catalog\Service\V1\Data\Eav\Category\AttributeMetadata @attribute */
+ $attributeCodes[] = $attribute->getAttributeCode();
+ }
+ return $attributeCodes;
+ }
+
+ /**
+ * @param int $value
+ * @return $this
+ */
+ public function setCategoryId($value)
+ {
+ $this->_set(Metadata::ID, $value);
+ return $this;
+ }
+
+ /**
+ * @param int $value
+ * @return $this
+ */
+ public function setPosition($value)
+ {
+ $this->_set(Metadata::POSITION, $value);
+ return $this;
+ }
+
+ /**
+ * @param int $value
+ * @return $this
+ */
+ public function setLevel($value)
+ {
+ $this->_set(Metadata::LEVEL, $value);
+ return $this;
+ }
+
+ /**
+ * @param int $value
+ * @return $this
+ */
+ public function setParentId($value)
+ {
+ $this->_set(Metadata::PARENT_ID, $value);
+ return $this;
+ }
+
+ /**
+ * @param int[] $value
+ * @return $this
+ */
+ public function setChildren($value)
+ {
+ $this->_set(Metadata::CHILDREN, $value);
+ return $this;
+ }
+
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setCreatedAt($value)
+ {
+ $this->_set(Metadata::CREATED_AT, $value);
+ return $this;
+ }
+
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setUpdatedAt($value)
+ {
+ $this->_set(Metadata::UPDATED_AT, $value);
+ return $this;
+ }
+
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setName($value)
+ {
+ $this->_set(Metadata::NAME, $value);
+ return $this;
+ }
+
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setUrlKey($value)
+ {
+ $this->_set(Metadata::URL_KEY, $value);
+ return $this;
+ }
+
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setPath($value)
+ {
+ $this->_set(Metadata::PATH, $value);
+ return $this;
+ }
+
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setDisplayMode($value)
+ {
+ $this->_set(Metadata::DISPLAY_MODE, $value);
+ return $this;
+ }
+
+ /**
+ * @param string[] $value
+ * @return $this
+ */
+ public function setAvailableSortBy($value)
+ {
+ $this->_set(Metadata::AVAILABLE_SORT_BY, $value);
+ return $this;
+ }
+
+ /**
+ * @param bool $value
+ * @return $this
+ */
+ public function setIncludeInMenu($value)
+ {
+ $this->_set(Metadata::INCLUDE_IN_MENU, $value);
+ return $this;
+ }
+
+ /**
+ * @param bool $value
+ * @return $this
+ */
+ public function setActive($value)
+ {
+ $this->_set(Metadata::ACTIVE, $value);
+ return $this;
+ }
+}
diff --git a/lib/internal/Magento/Framework/Exception/Exception.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Product.php
similarity index 73%
rename from lib/internal/Magento/Framework/Exception/Exception.php
rename to app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Product.php
index 3b1881718e5..88bd19757ad 100644
--- a/lib/internal/Magento/Framework/Exception/Exception.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Product.php
@@ -1,7 +1,5 @@
<?php
/**
- * Base service exception
- *
* Magento
*
* NOTICE OF LICENSE
@@ -23,22 +21,25 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Framework\Exception;
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
-abstract class Exception extends \Magento\Webapi\ServiceException
+/**
+ * @codeCoverageIgnore
+ */
+class Product extends \Magento\Catalog\Service\V1\Data\Product
{
/**
- * @var array
+ * Constants used as keys into $_data
*/
- protected $_params = array();
+ const POSITION = 'position';
/**
- * Returns the parameters detailing specifics of this Exception
+ * Get product position
*
- * @return array
+ * @return int|null
*/
- public function getParams()
+ public function getPosition()
{
- return $this->_params;
+ return $this->_get(Product::POSITION);
}
}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductBuilder.php
new file mode 100644
index 00000000000..cd3bc275862
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductBuilder.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+/**
+ * @codeCoverageIgnore
+ */
+class ProductBuilder extends \Magento\Catalog\Service\V1\Data\ProductBuilder
+{
+ /**
+ * Set product position list in category
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function setPosition($value)
+ {
+ return $this->_set(Product::POSITION, $value);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductConverter.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductConverter.php
new file mode 100644
index 00000000000..26803df6fb0
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductConverter.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+
+use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Product as CategoryProduct;
+use Magento\Catalog\Service\V1\Data\Converter;
+
+/**
+ * @codeCoverageIgnore
+ */
+class ProductConverter extends Converter
+{
+ /**
+ * @var int|null
+ */
+ private $position;
+
+ /**
+ * Convert a product model to a product data entity
+ *
+ * @param ProductModel $productModel
+ * @return CategoryProduct
+ */
+ public function createProductDataFromModel(ProductModel $productModel)
+ {
+ $this->_populateBuilderWithAttributes($productModel);
+ $this->productBuilder->setPosition($this->position);
+ $productDto = $this->productBuilder->create();
+ $this->setPosition(null);
+ return $productDto;
+ }
+
+ /**
+ * @param int|null $position
+ * @return void
+ */
+ public function setPosition($position)
+ {
+ $this->position = $position;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLink.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLink.php
new file mode 100644
index 00000000000..fe5a6a1976b
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLink.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+/**
+ * @codeCoverageIgnore
+ */
+class ProductLink extends \Magento\Framework\Service\Data\AbstractObject
+{
+ /**#@+
+ * Constants defined for keys of array
+ */
+ const SKU = 'sku';
+
+ const POSITION = 'position';
+ /**#@-*/
+
+ /**
+ * @return string|null
+ */
+ public function getSku()
+ {
+ return $this->_get(self::SKU);
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getPosition()
+ {
+ return $this->_get(self::POSITION);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLinkBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLinkBuilder.php
new file mode 100644
index 00000000000..7b0a76b7e10
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/ProductLinkBuilder.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+/**
+ * @codeCoverageIgnore
+ */
+class ProductLinkBuilder extends \Magento\Framework\Service\Data\AbstractObjectBuilder
+{
+ /**
+ * @param string $value
+ * @return $this
+ */
+ public function setSku($value)
+ {
+ $this->_set(ProductLink::SKU, $value);
+ return $this;
+ }
+
+ /**
+ * @param int $value
+ * @return $this
+ */
+ public function setPosition($value)
+ {
+ $this->_set(ProductLink::POSITION, $value);
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Tree.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Tree.php
new file mode 100644
index 00000000000..1b77875b87c
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/Tree.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+class Tree extends \Magento\Framework\Service\Data\AbstractObject
+{
+ const ID = 'id';
+ const PARENT_ID = 'parent_id';
+ const NAME = 'name';
+ const ACTIVE = 'active';
+ const POSITION = 'position';
+ const LEVEL = 'level';
+ const CHILDREN = 'children';
+
+ /**
+ * Get category ID
+ *
+ * @return int
+ */
+ public function getId()
+ {
+ return $this->_get(self::ID);
+ }
+
+ /**
+ * Get parent category ID
+ *
+ * @return int
+ */
+ public function getParentId()
+ {
+ return $this->_get(self::PARENT_ID);
+ }
+
+ /**
+ * Get category name
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->_get(self::NAME);
+ }
+
+ /**
+ * Check whether category is active
+ *
+ * @return bool
+ */
+ public function isActive()
+ {
+ return $this->_get(self::ACTIVE);
+ }
+
+ /**
+ * Get category position
+ *
+ * @return int
+ */
+ public function getPosition()
+ {
+ return $this->_get(self::POSITION);
+ }
+
+ /**
+ * Get category level
+ *
+ * @return int
+ */
+ public function getLevel()
+ {
+ return $this->_get(self::LEVEL);
+ }
+
+ /**
+ * Get category level
+ *
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Category\Tree[]
+ */
+ public function getChildren()
+ {
+ return $this->_get(self::CHILDREN);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/TreeBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/TreeBuilder.php
new file mode 100644
index 00000000000..b2250ff04e5
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Data/Eav/Category/TreeBuilder.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Eav\Category;
+
+use Magento\Framework\Service\Data\AbstractObjectBuilder;
+
+class TreeBuilder extends AbstractObjectBuilder
+{
+ /**
+ * Set category ID
+ *
+ * @param int $categoryId
+ * @return $this
+ */
+ public function setId($categoryId)
+ {
+ return $this->_set(Tree::ID, $categoryId);
+ }
+
+ /**
+ * Set parent category ID
+ *
+ * @param int $parentId
+ * @return $this
+ */
+ public function setParentId($parentId)
+ {
+ return $this->_set(Tree::PARENT_ID, $parentId);
+ }
+
+ /**
+ * Set category name
+ *
+ * @param string $name
+ * @return $this
+ */
+ public function setName($name)
+ {
+ return $this->_set(Tree::NAME, $name);
+ }
+
+ /**
+ * Set whether category is active
+ *
+ * @param bool $isActive
+ * @return $this
+ */
+ public function setActive($isActive)
+ {
+ return $this->_set(Tree::ACTIVE, $isActive);
+ }
+
+ /**
+ * Set category position
+ *
+ * @param int $position
+ * @return $this
+ */
+ public function setPosition($position)
+ {
+ return $this->_set(Tree::POSITION, $position);
+ }
+
+ /**
+ * Set category level
+ *
+ * @param int $level
+ * @return $this
+ */
+ public function setLevel($level)
+ {
+ return $this->_set(Tree::LEVEL, $level);
+ }
+
+ /**
+ * Set category level
+ *
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Category\Tree[] $children
+ * @return $this
+ */
+ public function setChildren(array $children)
+ {
+ return $this->_set(Tree::CHILDREN, $children);
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Product.php b/app/code/Magento/Catalog/Service/V1/Data/Product.php
index 73433ebe0d9..a7787e91123 100644
--- a/app/code/Magento/Catalog/Service/V1/Data/Product.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/Product.php
@@ -32,8 +32,6 @@ class Product extends \Magento\Framework\Service\Data\Eav\AbstractObject
/**#@+
* Constants defined for keys of array
*/
- const ID = 'id';
-
const SKU = 'sku';
const NAME = 'name';
@@ -57,14 +55,6 @@ class Product extends \Magento\Framework\Service\Data\Eav\AbstractObject
const STORE_ID = 'store_id';
/**#@-*/
- /**
- * @return int|null
- */
- public function getId()
- {
- return $this->_get(self::ID);
- }
-
/**
* @return string|null
*/
diff --git a/app/code/Magento/Catalog/Service/V1/Data/Product/Attribute/SearchResults.php b/app/code/Magento/Catalog/Service/V1/Data/Product/Attribute/SearchResults.php
index 01659feb567..79f94909345 100644
--- a/app/code/Magento/Catalog/Service/V1/Data/Product/Attribute/SearchResults.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/Product/Attribute/SearchResults.php
@@ -32,7 +32,7 @@ class SearchResults extends \Magento\Framework\Service\V1\Data\SearchResults
/**
* Get items
*
- * @return \Magento\Catalog\Service\V1\Data\Eav\Attribute[]
+ * @return \Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata[]
*/
public function getItems()
{
diff --git a/app/code/Magento/Catalog/Service/V1/Data/ProductBuilder.php b/app/code/Magento/Catalog/Service/V1/Data/ProductBuilder.php
index 0fdda2f1eea..a455f89851b 100644
--- a/app/code/Magento/Catalog/Service/V1/Data/ProductBuilder.php
+++ b/app/code/Magento/Catalog/Service/V1/Data/ProductBuilder.php
@@ -23,13 +23,13 @@
*/
namespace Magento\Catalog\Service\V1\Data;
-use Magento\Catalog\Service\V1\ProductMetadataServiceInterface;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface;
use Magento\Framework\Service\Data\Eav\AttributeValueBuilder;
class ProductBuilder extends \Magento\Framework\Service\Data\Eav\AbstractObjectBuilder
{
/**
- * @var ProductMetadataServiceInterface
+ * @var MetadataServiceInterface
*/
protected $metadataService;
@@ -38,12 +38,12 @@ class ProductBuilder extends \Magento\Framework\Service\Data\Eav\AbstractObjectB
*
* @param \Magento\Framework\Service\Data\ObjectFactory $objectFactory
* @param AttributeValueBuilder $valueBuilder
- * @param ProductMetadataServiceInterface $metadataService
+ * @param MetadataServiceInterface $metadataService
*/
public function __construct(
\Magento\Framework\Service\Data\ObjectFactory $objectFactory,
AttributeValueBuilder $valueBuilder,
- ProductMetadataServiceInterface $metadataService
+ MetadataServiceInterface $metadataService
) {
parent::__construct($objectFactory, $valueBuilder);
$this->metadataService = $metadataService;
@@ -63,17 +63,6 @@ class ProductBuilder extends \Magento\Framework\Service\Data\Eav\AbstractObjectB
return $attributeCodes;
}
- /**
- * Set id
- *
- * @param int|null $value
- * @return $this
- */
- public function setId($value)
- {
- return $this->_set(Product::ID, $value);
- }
-
/**
* Set Sku
*
diff --git a/app/code/Magento/Catalog/Service/V1/MetadataService.php b/app/code/Magento/Catalog/Service/V1/MetadataService.php
new file mode 100644
index 00000000000..e8ba90ca293
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/MetadataService.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Resource\Entity\Attribute\Collection;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
+use Magento\Catalog\Service\V1\Data\Eav\Product\Attribute\FrontendLabel;
+use Magento\Framework\Service\V1\Data\Search\FilterGroup;
+use Magento\Framework\Service\V1\Data\SearchCriteria;
+
+/**
+ * Class MetadataService
+ *
+ * @package Magento\Catalog\Service\V1
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MetadataService implements MetadataServiceInterface
+{
+ /**
+ * @var \Magento\Eav\Model\Config
+ */
+ private $eavConfig;
+
+ /**
+ * @var \Magento\Framework\App\ScopeResolverInterface
+ */
+ private $scopeResolver;
+
+ /**
+ * @var Data\Eav\AttributeMetadataBuilder
+ */
+ private $attributeMetadataBuilder;
+
+ /**
+ * @var \Magento\Eav\Model\Resource\Entity\Attribute\CollectionFactory
+ */
+ private $attributeCollectionFactory;
+
+ /**
+ * @var Data\Product\SearchResultsBuilder
+ */
+ private $searchResultsBuilder;
+
+ /**
+ * Attribute DTO Field Mapping
+ * @var array
+ */
+ private static $mapping = [
+ 'id' => 'attribute_id',
+ 'code' => 'attribute_code',
+ 'required' => 'is_required',
+ 'user_defined' => 'is_user_defined',
+ 'unique' => 'is_unique',
+ 'global' => 'is_global',
+ 'visible' => 'is_visible',
+ 'searchable' => 'is_searchable',
+ 'filterable' => 'is_filterable',
+ 'comparable' => 'is_comparable',
+ 'visible_on_front' => 'is_visible_on_front',
+ 'html_allowed_on_front' => 'is_html_allowed_on_front',
+ 'used_for_price_rules' => 'is_used_for_price_rules',
+ 'filterable_in_search' => 'is_filterable_in_search',
+ 'visible_in_advanced_search' => 'is_visible_in_advanced_search',
+ 'wysiwyg_enabled' => 'is_wysiwyg_enabled',
+ 'used_for_promo_rules' => 'is_used_for_promo_rules',
+ 'configurable' => 'is_configurable',
+ ];
+
+ /**
+ * @param \Magento\Eav\Model\Config $eavConfig
+ * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
+ * @param Data\Eav\AttributeMetadataBuilder $attributeMetadataBuilder
+ * @param \Magento\Eav\Model\Resource\Entity\Attribute\CollectionFactory $attributeCollectionFactory
+ * @param Data\Product\SearchResultsBuilder $searchResultsBuilder
+ */
+ public function __construct(
+ \Magento\Eav\Model\Config $eavConfig,
+ \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
+ \Magento\Catalog\Service\V1\Data\Eav\AttributeMetadataBuilder $attributeMetadataBuilder,
+ \Magento\Eav\Model\Resource\Entity\Attribute\CollectionFactory $attributeCollectionFactory,
+ Data\Product\SearchResultsBuilder $searchResultsBuilder
+ ) {
+ $this->eavConfig = $eavConfig;
+ $this->scopeResolver = $scopeResolver;
+ $this->attributeMetadataBuilder = $attributeMetadataBuilder;
+ $this->attributeCollectionFactory = $attributeCollectionFactory;
+ $this->searchResultsBuilder = $searchResultsBuilder;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAttributeMetadata($entityType, $attributeCode)
+ {
+ /** @var AbstractAttribute $attribute */
+ $attribute = $this->eavConfig->getAttribute($entityType, $attributeCode);
+ if ($attribute) {
+ $attributeMetadata = $this->createMetadataAttribute($attribute);
+ return $attributeMetadata;
+ } else {
+ throw (new NoSuchEntityException('entityType', array($entityType)))
+ ->singleField('attributeCode', $attributeCode);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAllAttributeMetadata(
+ $entityType,
+ SearchCriteria $searchCriteria
+ ) {
+ $this->searchResultsBuilder->setSearchCriteria($searchCriteria);
+ /** @var \Magento\Eav\Model\Resource\Entity\Attribute\Collection $attributeCollection */
+ $attributeCollection = $this->attributeCollectionFactory->create();
+ $attributeCollection->join(
+ array('entity_type' => $attributeCollection->getTable('eav_entity_type')),
+ 'main_table.entity_type_id = entity_type.entity_type_id',
+ []
+ );
+ $attributeCollection->addFieldToFilter('entity_type_code', ['eq' => $entityType]);
+ $attributeCollection->join(
+ ['eav_entity_attribute' => $attributeCollection->getTable('eav_entity_attribute')],
+ 'main_table.attribute_id = eav_entity_attribute.attribute_id',
+ ['attribute_set_id']
+ );
+ $attributeCollection->join(
+ array('additional_table' => $attributeCollection->getTable('catalog_eav_attribute')),
+ 'main_table.attribute_id = additional_table.attribute_id',
+ []
+ );
+ //Add filters from root filter group to the collection
+ foreach ($searchCriteria->getFilterGroups() as $group) {
+ $this->addFilterGroupToCollection($group, $attributeCollection);
+ }
+ foreach ((array)$searchCriteria->getSortOrders() as $field => $direction) {
+ $attributeCollection->addOrder(
+ $this->translateField($field),
+ $direction == SearchCriteria::SORT_ASC ? 'ASC' : 'DESC'
+ );
+ }
+ $totalCount = $attributeCollection->getSize();
+
+ $attributeCollection->setCurPage($searchCriteria->getCurrentPage());
+ $attributeCollection->setPageSize($searchCriteria->getPageSize());
+
+ $attributes = [];
+ /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
+ foreach ($attributeCollection as $attribute) {
+ $attributes[] = $this->getAttributeMetadata($entityType, $attribute->getAttributeCode());
+ }
+ $this->searchResultsBuilder->setItems($attributes);
+ $this->searchResultsBuilder->setTotalCount($totalCount);
+ return $this->searchResultsBuilder->create();
+ }
+
+ /**
+ * @param AbstractAttribute $attribute
+ * @return Data\Eav\AttributeMetadata
+ */
+ private function createMetadataAttribute($attribute)
+ {
+ $data = $this->booleanPrefixMapper($attribute->getData());
+
+ // fill options and validate rules
+ $data[AttributeMetadata::OPTIONS] = $attribute->usesSource()
+ ? $attribute->getSource()->getAllOptions() : array();
+ $data[AttributeMetadata::VALIDATION_RULES] = $attribute->getValidateRules();
+
+ // fill scope
+ $data[AttributeMetadata::SCOPE] = $attribute->isScopeGlobal()
+ ? 'global' : ($attribute->isScopeWebsite() ? 'website' : 'store');
+
+ $data[AttributeMetadata::FRONTEND_LABEL] = [];
+ $data[AttributeMetadata::FRONTEND_LABEL][0] = array(
+ FrontendLabel::STORE_ID => 0,
+ FrontendLabel::LABEL => $attribute->getFrontendLabel()
+ );
+ if (is_array($attribute->getStoreLabels())) {
+ foreach ($attribute->getStoreLabels() as $storeId => $label) {
+ $data[AttributeMetadata::FRONTEND_LABEL][$storeId] = array(
+ FrontendLabel::STORE_ID => $storeId,
+ FrontendLabel::LABEL => $label
+ );
+ }
+ }
+ return $this->attributeMetadataBuilder->populateWithArray($data)->create();
+ }
+
+ /**
+ * Remove 'is_' prefixes for Attribute fields to make DTO interface more natural
+ *
+ * @param array $attributeFields
+ * @return array
+ */
+ private function booleanPrefixMapper(array $attributeFields)
+ {
+ $prefix = 'is_';
+ foreach ($attributeFields as $key => $value) {
+ if (strpos($key, $prefix) !== 0) {
+ continue;
+ }
+ $postfix = substr($key, strlen($prefix));
+ if (!isset($attributeFields[$postfix])) {
+ $attributeFields[$postfix] = $value;
+ unset($attributeFields[$key]);
+ }
+ }
+ return $attributeFields;
+ }
+
+ /**
+ * Helper function that adds a FilterGroup to the collection.
+ *
+ * @param \Magento\Framework\Service\V1\Data\Search\FilterGroup $filterGroup
+ * @param \Magento\Eav\Model\Resource\Entity\Attribute\Collection $collection
+ * @return void
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ private function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
+ {
+ foreach ($filterGroup->getFilters() as $filter) {
+ $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+ $collection->addFieldToFilter(
+ $this->translateField($filter->getField()),
+ [$condition => $filter->getValue()]
+ );
+ }
+ }
+
+ /**
+ * Translates a field name to a DB column name for use in collection queries.
+ *
+ * @param string $field a field name that should be translated to a DB column name.
+ * @return string
+ */
+ private function translateField($field)
+ {
+ if (isset(self::$mapping[$field])) {
+ return self::$mapping[$field];
+ } else {
+ return $field;
+ }
+
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/ProductMetadataServiceInterface.php b/app/code/Magento/Catalog/Service/V1/MetadataServiceInterface.php
similarity index 57%
rename from app/code/Magento/Catalog/Service/V1/ProductMetadataServiceInterface.php
rename to app/code/Magento/Catalog/Service/V1/MetadataServiceInterface.php
index aabe06dd027..176d8c0359a 100644
--- a/app/code/Magento/Catalog/Service/V1/ProductMetadataServiceInterface.php
+++ b/app/code/Magento/Catalog/Service/V1/MetadataServiceInterface.php
@@ -23,51 +23,31 @@
*/
namespace Magento\Catalog\Service\V1;
+use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
+use Magento\Framework\Service\V1\Data\SearchCriteria;
+use Magento\Framework\Service\V1\Data\SearchResults;
+
/**
- * Class ProductMetadataServiceInterface
- * @package Magento\Catalog\Service\V1
+ * Class MetadataServiceInterface
*/
-interface ProductMetadataServiceInterface
+interface MetadataServiceInterface
{
- /**#@+
- * Predefined constants
- */
- const ENTITY_TYPE_PRODUCT = 'catalog_product';
-
- const ATTRIBUTE_SET_ID_PRODUCT = 4;
- /**#@-*/
-
- /**
- * Retrieve custom EAV attribute metadata of product
- *
- * @return array<Data\Eav\AttributeMetadata>
- */
- public function getCustomAttributesMetadata();
-
- /**
- * Retrieve EAV attribute metadata of product
- *
- * @return Data\Eav\AttributeMetadata[]
- */
- public function getProductAttributesMetadata();
-
/**
- * Returns all known attributes metadata for a given entity type
+ * Retrieve Attribute Metadata
*
* @param string $entityType
- * @param int $attributeSetId
- * @param int $storeId
- * @return Data\Eav\AttributeMetadata[]
+ * @param string $attributeCode
+ * @return AttributeMetadata
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
- public function getAllAttributeSetMetadata($entityType, $attributeSetId = 0, $storeId = null);
+ public function getAttributeMetadata($entityType, $attributeCode);
/**
- * Retrieve Attribute Metadata
+ * Returns all known attributes metadata for a entity corresponding to $searchCriteria
*
* @param string $entityType
- * @param string $attributeCode
- * @return Data\Eav\AttributeMetadata
- * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @param SearchCriteria $searchCriteria
+ * @return SearchResults
*/
- public function getAttributeMetadata($entityType, $attributeCode);
+ public function getAllAttributeMetadata($entityType, SearchCriteria $searchCriteria);
}
diff --git a/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadService.php b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadService.php
new file mode 100644
index 00000000000..94f52ad1e75
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadService.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Product\Attribute\Option;
+
+use \Magento\Catalog\Service\V1\MetadataServiceInterface as MetadataServiceInterface;
+
+class ReadService implements ReadServiceInterface
+{
+ /**
+ * @var MetadataServiceInterface
+ */
+ private $metadataService;
+
+ /**
+ * @param MetadataServiceInterface $metadataService
+ */
+ public function __construct(
+ MetadataServiceInterface $metadataService
+ ) {
+ $this->metadataService = $metadataService;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function options($id)
+ {
+ return $this->metadataService->getAttributeMetadata(
+ \Magento\Catalog\Service\V1\Product\MetadataServiceInterface::ENTITY_TYPE,
+ $id
+ )->getOptions();
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceInterface.php
new file mode 100644
index 00000000000..3f84807fe7d
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Product\Attribute\Option;
+
+/**
+ * Interface ReadServiceInterface
+ */
+interface ReadServiceInterface
+{
+ /**
+ * Retrieve list of attribute options
+ *
+ * @param string $id
+ * @return \Magento\Catalog\Service\V1\Data\Eav\Option[]
+ */
+ public function options($id);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/ProductAttributeService.php b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteService.php
similarity index 50%
rename from app/code/Magento/Catalog/Service/V1/ProductAttributeService.php
rename to app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteService.php
index 81afa4f9a32..9803779f8a9 100644
--- a/app/code/Magento/Catalog/Service/V1/ProductAttributeService.php
+++ b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteService.php
@@ -21,69 +21,43 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Catalog\Service\V1;
+namespace Magento\Catalog\Service\V1\Product\Attribute\Option;
-use Magento\Catalog\Model\Product\Attribute\Source\InputtypeFactory;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Service\V1\Data\Eav\Option as EavOption;
+use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
-/**
- * Class ProductAttributeService
- */
-class ProductAttributeService implements ProductAttributeServiceInterface
+class WriteService implements WriteServiceInterface
{
/**
- * @var ProductMetadataServiceInterface
- */
- private $metadataService;
-
- /**
- * @var \Magento\Eav\Model\Config
+ * @var Config
*/
private $eavConfig;
- /** @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory */
- private $optionCollectionFactory;
-
/**
- * @param ProductMetadataServiceInterface $metadataService
- * @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $optionCollectionFactory
+ * @param Config $eavConfig
*/
public function __construct(
- ProductMetadataServiceInterface $metadataService,
- \Magento\Eav\Model\Config $eavConfig,
- \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $optionCollectionFactory
+ Config $eavConfig
) {
- $this->metadataService = $metadataService;
$this->eavConfig = $eavConfig;
- $this->optionCollectionFactory = $optionCollectionFactory;
}
/**
* {@inheritdoc}
*/
- public function options($id)
+ public function addOption($id, EavOption $option)
{
- return $this->metadataService->getAttributeMetadata(
- ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT,
- $id
- )->getOptions();
- }
-
- /**
- * {@inheritdoc}
- */
- public function addOption($id, \Magento\Catalog\Service\V1\Data\Eav\Option $option)
- {
- $model = $this->eavConfig->getAttribute(
- \Magento\Catalog\Service\V1\ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT,
- $id
- );
- if (!$model) {
- throw new \Magento\Framework\Exception\StateException('Attribute does no exist');
+ $model = $this->eavConfig->getAttribute(ProductMetadataServiceInterface::ENTITY_TYPE, $id);
+ if (!$model || !$model->getId()) {
+ throw NoSuchEntityException::singleField(AttributeMetadata::ATTRIBUTE_ID, $id);
}
if (!$model->usesSource()) {
- throw new \Magento\Framework\Exception\StateException('Attribute doesn\'t have any option');
+ throw new StateException('Attribute doesn\'t have any option');
}
$key = 'new_option';
@@ -106,4 +80,31 @@ class ProductAttributeService implements ProductAttributeServiceInterface
$model->save();
return true;
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function removeOption($id, $optionId)
+ {
+ $model = $this->eavConfig->getAttribute(ProductMetadataServiceInterface::ENTITY_TYPE, $id);
+ if (!$model || !$model->getId()) {
+ throw NoSuchEntityException::singleField(AttributeMetadata::ATTRIBUTE_ID, $id);
+ }
+ if (!$model->usesSource()) {
+ throw new StateException('Attribute doesn\'t have any option');
+ }
+ if (!$model->getSource()->getOptionText($optionId)) {
+ throw new NoSuchEntityException(sprintf('Attribute %s does not contain option with Id %s', $id, $optionId));
+ }
+
+ $modelData = array('option' => array('value' => array($optionId => []), 'delete' => array($optionId => '1')));
+ $model->addData($modelData);
+ try {
+ $model->save();
+ } catch (\Exception $e) {
+ throw new StateException('Unable to remove option');
+ }
+
+ return true;
+ }
}
diff --git a/app/code/Magento/Catalog/Service/V1/ProductAttributeServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceInterface.php
similarity index 77%
rename from app/code/Magento/Catalog/Service/V1/ProductAttributeServiceInterface.php
rename to app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceInterface.php
index e4d5e1b0eab..8a2237e83ee 100644
--- a/app/code/Magento/Catalog/Service/V1/ProductAttributeServiceInterface.php
+++ b/app/code/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceInterface.php
@@ -21,31 +21,31 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Catalog\Service\V1;
-
-use Magento\Catalog\Service\V1\Data\ProductAttributeType;
+namespace Magento\Catalog\Service\V1\Product\Attribute\Option;
/**
- * Class ProductAttributeServiceInterface
+ * Interface WriteServiceInterface
*/
-interface ProductAttributeServiceInterface
+interface WriteServiceInterface
{
/**
- * Retrieve list of attribute options
+ * Add option to attribute
*
* @param string $id
- * @return \Magento\Catalog\Service\V1\Data\Eav\Option[]
- *
- * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @param \Magento\Catalog\Service\V1\Data\Eav\Option $option
+ * @throws \Magento\Framework\Exception\StateException
+ * @return bool
*/
- public function options($id);
+ public function addOption($id, \Magento\Catalog\Service\V1\Data\Eav\Option $option);
/**
- * Add option to attribute
+ * Delete option from attribute
*
* @param string $id
- * @param \Magento\Catalog\Service\V1\Data\Eav\Option $option
+ * @param int $optionId
+ * @throws \Magento\Framework\Exception\StateException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
* @return bool
*/
- public function addOption($id, \Magento\Catalog\Service\V1\Data\Eav\Option $option);
+ public function removeOption($id, $optionId);
}
diff --git a/app/code/Magento/Catalog/Service/V1/Product/Attribute/ReadService.php b/app/code/Magento/Catalog/Service/V1/Product/Attribute/ReadService.php
index 34124b5915e..c6940527c68 100644
--- a/app/code/Magento/Catalog/Service/V1/Product/Attribute/ReadService.php
+++ b/app/code/Magento/Catalog/Service/V1/Product/Attribute/ReadService.php
@@ -24,14 +24,9 @@
namespace Magento\Catalog\Service\V1\Product\Attribute;
use Magento\Catalog\Model\Product\Attribute\Source\InputtypeFactory;
-use Magento\Catalog\Service\V1\Data\Eav\Attribute;
-use Magento\Catalog\Service\V1\Data\Eav\AttributeBuilder;
use Magento\Catalog\Service\V1\Data\Eav\Product\Attribute\TypeBuilder;
-use Magento\Catalog\Service\V1\Data\Product\Attribute\SearchResultsBuilder;
-use Magento\Catalog\Service\V1\ProductMetadataServiceInterface;
-use Magento\Eav\Model\Resource\Entity\Attribute\Collection;
-use Magento\Framework\Service\V1\Data\Search\FilterGroup;
-use Magento\Framework\Service\V1\Data\SearchCriteria;
+use Magento\Catalog\Service\V1\MetadataServiceInterface;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
/**
* Class ReadService
@@ -42,7 +37,7 @@ use Magento\Framework\Service\V1\Data\SearchCriteria;
class ReadService implements ReadServiceInterface
{
/**
- * @var ProductMetadataServiceInterface
+ * @var MetadataServiceInterface
*/
private $metadataService;
@@ -57,42 +52,18 @@ class ReadService implements ReadServiceInterface
private $attributeTypeBuilder;
/**
- * @var SearchResultsBuilder
- */
- private $searchResultsBuilder;
-
- /**
- * @var Collection
- */
- private $attributeCollection;
-
- /**
- * @var AttributeBuilder
- */
- protected $attributeBuilder;
-
- /**
- * @param ProductMetadataServiceInterface $metadataService
+ * @param MetadataServiceInterface $metadataService
* @param InputtypeFactory $inputTypeFactory
- * @param SearchResultsBuilder $searchResultsBuilder
- * @param \Magento\Eav\Model\Resource\Entity\Attribute\Collection $attributeCollection
- * @param AttributeBuilder $attributeBuilder
* @param TypeBuilder $attributeTypeBuilder
*/
public function __construct(
- ProductMetadataServiceInterface $metadataService,
+ MetadataServiceInterface $metadataService,
InputtypeFactory $inputTypeFactory,
- SearchResultsBuilder $searchResultsBuilder,
- \Magento\Eav\Model\Resource\Entity\Attribute\Collection $attributeCollection,
- AttributeBuilder $attributeBuilder,
TypeBuilder $attributeTypeBuilder
) {
$this->metadataService = $metadataService;
$this->inputTypeFactory = $inputTypeFactory;
$this->attributeTypeBuilder = $attributeTypeBuilder;
- $this->searchResultsBuilder = $searchResultsBuilder;
- $this->attributeCollection = $attributeCollection;
- $this->attributeBuilder = $attributeBuilder;
}
/**
@@ -115,7 +86,7 @@ class ReadService implements ReadServiceInterface
public function info($id)
{
return $this->metadataService->getAttributeMetadata(
- ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT,
+ ProductMetadataServiceInterface::ENTITY_TYPE,
$id
);
}
@@ -125,103 +96,9 @@ class ReadService implements ReadServiceInterface
*/
public function search(\Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria)
{
- $this->searchResultsBuilder->setSearchCriteria($searchCriteria);
-
- //Add filters from root filter group to the collection
- foreach ($searchCriteria->getFilterGroups() as $group) {
- $this->addFilterGroupToCollection($group, $this->attributeCollection);
- }
- $sortOrders = $searchCriteria->getSortOrders();
- if ($sortOrders) {
- foreach ($searchCriteria->getSortOrders() as $field => $direction) {
- $field = $this->translateField($field);
- $this->attributeCollection->addOrder($field, $direction == SearchCriteria::SORT_ASC ? 'ASC' : 'DESC');
- }
- }
- $this->attributeCollection->join(
- array('additional_table' => $this->attributeCollection->getTable('catalog_eav_attribute')),
- 'main_table.attribute_id = additional_table.attribute_id',
- [
- 'frontend_input_renderer',
- 'is_global',
- 'is_visible',
- 'is_searchable',
- 'is_filterable',
- 'is_comparable',
- 'is_visible_on_front',
- 'is_html_allowed_on_front',
- 'is_used_for_price_rules',
- 'is_filterable_in_search',
- 'used_in_product_listing',
- 'used_for_sort_by',
- 'apply_to',
- 'is_visible_in_advanced_search',
- 'position',
- 'is_wysiwyg_enabled',
- 'is_used_for_promo_rules',
- 'is_configurable',
- 'search_weight',
- ]
+ return $this->metadataService->getAllAttributeMetadata(
+ ProductMetadataServiceInterface::ENTITY_TYPE,
+ $searchCriteria
);
-
- $this->attributeCollection->setCurPage($searchCriteria->getCurrentPage());
- $this->attributeCollection->setPageSize($searchCriteria->getPageSize());
- $this->searchResultsBuilder->setTotalCount($this->attributeCollection->getSize());
-
- $attributes = array();
- /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
- foreach ($this->attributeCollection as $attribute) {
- $attributes[] = $this->attributeBuilder->setId($attribute->getAttributeId())
- ->setCode($attribute->getAttributeCode())
- ->setFrontendLabel($attribute->getData('frontend_label'))
- ->setDefaultValue($attribute->getDefaultValue())
- ->setIsRequired((boolean)$attribute->getData('is_required'))
- ->setIsUserDefined((boolean)$attribute->getData('is_user_defined'))
- ->setFrontendInput($attribute->getData('frontend_input'))
- ->create();
- }
-
- $this->searchResultsBuilder->setItems($attributes);
- return $this->searchResultsBuilder->create();
- }
-
- /**
- * Helper function that adds a FilterGroup to the collection.
- *
- * @param FilterGroup $filterGroup
- * @param \Magento\Eav\Model\Resource\Entity\Attribute\Collection $collection
- * @return void
- * @throws \Magento\Framework\Exception\InputException
- */
- protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
- {
- $fields = [];
- $conditions = [];
- foreach ($filterGroup->getFilters() as $filter) {
- $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
- $fields[] = $this->translateField($filter->getField());
- $conditions[] = [$condition => $filter->getValue()];
- }
- if ($fields) {
- $collection->addFieldToFilter($fields, $conditions);
- }
- }
-
- /**
- * Translates a field name to a DB column name for use in collection queries.
- *
- * @param string $field a field name that should be translated to a DB column name.
- * @return string
- */
- protected function translateField($field)
- {
- switch ($field) {
- case Attribute::ID:
- return 'attribute_id';
- case Attribute::CODE:
- return 'attribute_code';
- default:
- return $field;
- }
}
}
diff --git a/app/code/Magento/Catalog/Service/V1/Product/Attribute/WriteService.php b/app/code/Magento/Catalog/Service/V1/Product/Attribute/WriteService.php
index 9edb7528dd1..1eb062acf9b 100644
--- a/app/code/Magento/Catalog/Service/V1/Product/Attribute/WriteService.php
+++ b/app/code/Magento/Catalog/Service/V1/Product/Attribute/WriteService.php
@@ -29,7 +29,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
use Magento\Catalog\Service\V1\Data\Eav\Product\Attribute\FrontendLabel;
-use Magento\Catalog\Service\V1\ProductMetadataServiceInterface;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface;
/**
* Class WriteService
@@ -177,7 +177,7 @@ class WriteService implements WriteServiceInterface
*/
public function remove($attributeId)
{
- $model = $this->eavConfig->getAttribute(ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT, $attributeId);
+ $model = $this->eavConfig->getAttribute(MetadataServiceInterface::ENTITY_TYPE, $attributeId);
if (!$model || !$model->getId()) {
//product attribute does not exist
throw NoSuchEntityException::singleField(AttributeMetadata::ATTRIBUTE_ID, $attributeId);
diff --git a/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteService.php b/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteService.php
index 70b97d184bd..0d63f0a33b7 100644
--- a/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteService.php
+++ b/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteService.php
@@ -71,7 +71,11 @@ class WriteService implements WriteServiceInterface
foreach ($basicData as $key => $value) {
$set->setData($key, $value);
}
- $set->validate();
+ try {
+ $set->validate();
+ } catch (\Magento\Eav\Exception $e) {
+ throw new InputException($e->getMessage());
+ }
$set->save();
//process skeleton data
$skeletonId = intval($skeletonId);
diff --git a/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceInterface.php
index 39fb14686af..700c7189292 100644
--- a/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceInterface.php
+++ b/app/code/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceInterface.php
@@ -39,7 +39,6 @@ interface WriteServiceInterface
* @return int
* @throws \Magento\Framework\Exception\InputException
* @throws \Magento\Framework\Exception\NoSuchEntityException
- * @throws \Magento\Eav\Exception from validate()
*/
public function create(AttributeSet $attributeSet, $skeletonId);
diff --git a/app/code/Magento/Catalog/Service/V1/Product/MetadataService.php b/app/code/Magento/Catalog/Service/V1/Product/MetadataService.php
new file mode 100644
index 00000000000..9dac9bbcfdf
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Product/MetadataService.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Product;
+
+use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
+
+/**
+ * Class AttributeMetadataService
+ */
+class MetadataService implements MetadataServiceInterface
+{
+ /** @var \Magento\Catalog\Service\V1\MetadataService */
+ protected $metadataService;
+
+ /**
+ * @var \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder
+ */
+ private $searchCriteriaBuilder;
+
+ /**
+ * @var \Magento\Framework\Service\V1\Data\FilterBuilder
+ */
+ private $filterBuilder;
+
+ /**
+ * @param \Magento\Catalog\Service\V1\MetadataService $metadataService
+ * @param \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder $searchCriteriaBuilder
+ * @param \Magento\Framework\Service\V1\Data\FilterBuilder $filterBuilder
+ */
+ public function __construct(
+ \Magento\Catalog\Service\V1\MetadataService $metadataService,
+ \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder $searchCriteriaBuilder,
+ \Magento\Framework\Service\V1\Data\FilterBuilder $filterBuilder
+ ) {
+ $this->metadataService = $metadataService;
+ $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+ $this->filterBuilder = $filterBuilder;
+ }
+
+ /**
+ * Retrieve custom EAV attribute metadata of product
+ *
+ * @param int $attributeSetId
+ * @return AttributeMetadata[]
+ */
+ public function getCustomAttributesMetadata($attributeSetId = self::DEFAULT_ATTRIBUTE_SET_ID)
+ {
+ $customAttributes = [];
+ foreach ($this->getProductAttributesMetadata($attributeSetId) as $attributeMetadata) {
+ $customAttributes[] = $attributeMetadata;
+ }
+ return $customAttributes;
+ }
+
+ /**
+ * Retrieve EAV attribute metadata of product
+ *
+ * @param int $attributeSetId
+ * @return AttributeMetadata[]
+ */
+ public function getProductAttributesMetadata($attributeSetId = self::DEFAULT_ATTRIBUTE_SET_ID)
+ {
+ /** @var \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder $searchCriteria */
+ $this->searchCriteriaBuilder->addFilter([
+ $this->filterBuilder
+ ->setField('attribute_set_id')
+ ->setValue($attributeSetId)
+ ->create()
+ ]);
+
+ return $this->metadataService->getAllAttributeMetadata(
+ MetadataServiceInterface::ENTITY_TYPE,
+ $this->searchCriteriaBuilder->create()
+ )->getItems();
+ }
+}
diff --git a/app/code/Magento/Catalog/Service/V1/Product/MetadataServiceInterface.php b/app/code/Magento/Catalog/Service/V1/Product/MetadataServiceInterface.php
new file mode 100644
index 00000000000..f0974ca9d31
--- /dev/null
+++ b/app/code/Magento/Catalog/Service/V1/Product/MetadataServiceInterface.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Product;
+
+/**
+ * Class Product MetadataServiceInterface
+ */
+interface MetadataServiceInterface
+{
+ /**#@+
+ * Predefined constants
+ */
+ const ENTITY_TYPE = 'catalog_product';
+
+ const DEFAULT_ATTRIBUTE_SET_ID = 4;
+ /**#@-*/
+
+ /**
+ * Retrieve custom EAV attribute metadata of product
+ *
+ * @param int $attributeSetId
+ * @return \Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata[]
+ */
+ public function getCustomAttributesMetadata($attributeSetId = self::DEFAULT_ATTRIBUTE_SET_ID);
+
+ /**
+ * Retrieve EAV attribute metadata of product
+ *
+ * @param int $attributeSetId
+ * @return \Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata[]
+ */
+ public function getProductAttributesMetadata($attributeSetId = self::DEFAULT_ATTRIBUTE_SET_ID);
+}
diff --git a/app/code/Magento/Catalog/Service/V1/ProductMetadataService.php b/app/code/Magento/Catalog/Service/V1/ProductMetadataService.php
deleted file mode 100644
index 8f2e5201bb7..00000000000
--- a/app/code/Magento/Catalog/Service/V1/ProductMetadataService.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-namespace Magento\Catalog\Service\V1;
-
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
-use Magento\Catalog\Service\V1\Data\Eav\Product\Attribute\FrontendLabel;
-
-/**
- * Class ProductMetadataService
- * @package Magento\Catalog\Service\V1
- */
-class ProductMetadataService implements ProductMetadataServiceInterface
-{
- /**
- * @var \Magento\Eav\Model\Config
- */
- private $eavConfig;
-
- /**
- * @var \Magento\Framework\App\ScopeResolverInterface
- */
- private $scopeResolver;
-
- /**
- * @var Data\Eav\AttributeMetadataBuilder
- */
- private $attributeMetadataBuilder;
-
- /**
- * @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
- * @param Data\Eav\AttributeMetadataBuilder $attributeMetadataBuilder
- */
- public function __construct(
- \Magento\Eav\Model\Config $eavConfig,
- \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
- Data\Eav\AttributeMetadataBuilder $attributeMetadataBuilder
- ) {
- $this->eavConfig = $eavConfig;
- $this->scopeResolver = $scopeResolver;
- $this->attributeMetadataBuilder = $attributeMetadataBuilder;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCustomAttributesMetadata()
- {
- $customAttributes = [];
- foreach ($this->getProductAttributesMetadata() as $attributeMetadata) {
- $customAttributes[] = $attributeMetadata;
- }
- return $customAttributes;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getProductAttributesMetadata()
- {
- return $this->getAllAttributeSetMetadata(self::ENTITY_TYPE_PRODUCT, self::ATTRIBUTE_SET_ID_PRODUCT);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAllAttributeSetMetadata($entityType, $attributeSetId = 0, $scopeCode = null)
- {
- if (null === $scopeCode) {
- $scopeCode = $this->scopeResolver->getScope()->getCode();
- }
- $object = new \Magento\Framework\Object(
- [
- 'store_id' => $scopeCode,
- 'attribute_set_id' => $attributeSetId,
- ]
- );
- $attributeCodes = $this->eavConfig->getEntityAttributeCodes($entityType, $object);
-
- $attributesMetadata = [];
- foreach ($attributeCodes as $attributeCode) {
- try {
- $attributesMetadata[] = $this->getAttributeMetadata($entityType, $attributeCode);
- } catch (NoSuchEntityException $e) {
- //If no such entity, skip
- }
- }
- return $attributesMetadata;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAttributeMetadata($entityType, $attributeCode)
- {
- /** @var AbstractAttribute $attribute */
- $attribute = $this->eavConfig->getAttribute($entityType, $attributeCode);
- if ($attribute) {
- $attributeMetadata = $this->createMetadataAttribute($attribute);
- return $attributeMetadata;
- } else {
- throw (new NoSuchEntityException('entityType', array($entityType)))
- ->singleField('attributeCode', $attributeCode);
- }
- }
-
- /**
- * @param AbstractAttribute $attribute
- * @return Data\Eav\AttributeMetadata
- */
- private function createMetadataAttribute($attribute)
- {
- $data = $this->booleanPrefixMapper($attribute->getData());
-
- // fill options and validate rules
- $data[AttributeMetadata::OPTIONS] = $attribute->usesSource()
- ? $attribute->getSource()->getAllOptions() : array();
- $data[AttributeMetadata::VALIDATION_RULES] = $attribute->getValidateRules();
-
- // fill scope
- $data[AttributeMetadata::SCOPE] = $attribute->isScopeGlobal()
- ? 'global' : ($attribute->isScopeWebsite() ? 'website' : 'store');
-
- $data[AttributeMetadata::FRONTEND_LABEL] = [];
- $data[AttributeMetadata::FRONTEND_LABEL][0] = array(
- FrontendLabel::STORE_ID => 0,
- FrontendLabel::LABEL => $attribute->getFrontendLabel()
- );
- if (is_array($attribute->getStoreLabels())) {
- foreach ($attribute->getStoreLabels() as $storeId => $label) {
- $data[AttributeMetadata::FRONTEND_LABEL][$storeId] = array(
- FrontendLabel::STORE_ID => $storeId,
- FrontendLabel::LABEL => $label
- );
- }
- }
- return $this->attributeMetadataBuilder->populateWithArray($data)->create();
- }
-
- /**
- * Remove 'is_' prefixes for Attribute fields to make DTO interface more natural
- *
- * @param array $attributeFields
- * @return array
- */
- private function booleanPrefixMapper(array $attributeFields)
- {
- $prefix = 'is_';
- foreach ($attributeFields as $key => $value) {
- if (strpos($key, $prefix) !== 0) {
- continue;
- }
- $postfix = substr($key, strlen($prefix));
- if (!isset($attributeFields[$postfix])) {
- $attributeFields[$postfix] = $value;
- unset($attributeFields[$key]);
- }
- }
- return $attributeFields;
- }
-}
diff --git a/app/code/Magento/Catalog/Service/V1/ProductService.php b/app/code/Magento/Catalog/Service/V1/ProductService.php
index 2e3b28eeeb0..b8efcb94790 100644
--- a/app/code/Magento/Catalog/Service/V1/ProductService.php
+++ b/app/code/Magento/Catalog/Service/V1/ProductService.php
@@ -24,12 +24,12 @@
namespace Magento\Catalog\Service\V1;
use Magento\Catalog\Controller\Adminhtml\Product;
-use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Catalog\Service\V1\Data\Converter;
use Magento\Framework\Service\V1\Data\SearchCriteria;
use Magento\Catalog\Service\V1\Data\Product as ProductData;
use Magento\Framework\Service\V1\Data\Search\FilterGroup;
use Magento\Catalog\Model\Resource\Product\Collection;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
/**
* Class ProductService
@@ -209,16 +209,12 @@ class ProductService implements ProductServiceInterface
foreach ($searchCriteria->getFilterGroups() as $group) {
$this->addFilterGroupToCollection($group, $collection);
}
- $sortOrders = $searchCriteria->getSortOrders();
- if ($sortOrders) {
- foreach ($searchCriteria->getSortOrders() as $field => $direction) {
- $field = $this->translateField($field);
- $collection->addOrder($field, $direction == SearchCriteria::SORT_ASC ? 'ASC' : 'DESC');
- }
+ foreach ((array)$searchCriteria->getSortOrders() as $field => $direction) {
+ $field = $this->translateField($field);
+ $collection->addOrder($field, $direction == SearchCriteria::SORT_ASC ? 'ASC' : 'DESC');
}
$collection->setCurPage($searchCriteria->getCurrentPage());
$collection->setPageSize($searchCriteria->getPageSize());
- $this->searchResultsBuilder->setTotalCount($collection->getSize());
$products = array();
/** @var \Magento\Catalog\Model\Product $productModel */
@@ -227,6 +223,7 @@ class ProductService implements ProductServiceInterface
}
$this->searchResultsBuilder->setItems($products);
+ $this->searchResultsBuilder->setTotalCount($collection->getSize());
return $this->searchResultsBuilder->create();
}
@@ -259,11 +256,6 @@ class ProductService implements ProductServiceInterface
*/
protected function translateField($field)
{
- switch ($field) {
- case ProductData::ID:
- return 'entity_id';
- default:
- return $field;
- }
+ return $field;
}
}
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 6d0094742ee..25163499344 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -24,11 +24,22 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
- <preference for="Magento\Catalog\Service\V1\ProductMetadataServiceInterface" type="Magento\Catalog\Service\V1\ProductMetadataService" />
+ <preference for="Magento\Catalog\Service\V1\MetadataServiceInterface" type="Magento\Catalog\Service\V1\MetadataService" />
+ <preference for="Magento\Catalog\Service\V1\Product\MetadataServiceInterface" type="Magento\Catalog\Service\V1\Product\MetadataService" />
+ <preference for="Magento\Catalog\Service\V1\Category\MetadataServiceInterface" type="Magento\Catalog\Service\V1\Category\MetadataService" />
<preference for="Magento\Catalog\Service\V1\ProductServiceInterface" type="Magento\Catalog\Service\V1\ProductService" />
+ <preference for="Magento\Catalog\Service\V1\Category\ReadServiceInterface" type="Magento\Catalog\Service\V1\Category\ReadService" />
+ <preference for="Magento\Catalog\Service\V1\Category\ProductLinks\ReadServiceInterface" type="Magento\Catalog\Service\V1\Category\ProductLinks\ReadService" />
+ <preference for="Magento\Catalog\Service\V1\Category\ProductLinks\WriteServiceInterface" type="Magento\Catalog\Service\V1\Category\ProductLinks\WriteService" />
<preference for="Magento\Catalog\Service\V1\Product\Attribute\ReadServiceInterface" type="Magento\Catalog\Service\V1\Product\Attribute\ReadService" />
+ <preference for="Magento\Catalog\Service\V1\Category\Attribute\ReadServiceInterface" type="Magento\Catalog\Service\V1\Category\Attribute\ReadService" />
<preference for="Magento\Catalog\Service\V1\Product\Attribute\WriteServiceInterface" type="Magento\Catalog\Service\V1\Product\Attribute\WriteService" />
+ <preference for="Magento\Catalog\Service\V1\Category\WriteServiceInterface" type="Magento\Catalog\Service\V1\Category\WriteService" />
+ <preference for="Magento\Catalog\Service\V1\Product\Attribute\OptionServiceInterface" type="Magento\Catalog\Service\V1\Product\Attribute\OptionService" />
<preference for="Magento\Catalog\Service\V1\ProductAttributeServiceInterface" type="Magento\Catalog\Service\V1\ProductAttributeService" />
+ <preference for="Magento\Catalog\Service\V1\Category\Tree\ReadServiceInterface" type="Magento\Catalog\Service\V1\Category\Tree\ReadService" />
+ <preference for="Magento\Catalog\Service\V1\Product\Attribute\Option\ReadServiceInterface" type="Magento\Catalog\Service\V1\Product\Attribute\Option\ReadService" />
+ <preference for="Magento\Catalog\Service\V1\Product\Attribute\Option\WriteServiceInterface" type="Magento\Catalog\Service\V1\Product\Attribute\Option\WriteService" />
<preference for="Magento\Catalog\Model\ProductTypes\ConfigInterface" type="Magento\Catalog\Model\ProductTypes\Config" />
<preference for="Magento\Catalog\Model\ProductOptions\ConfigInterface" type="Magento\Catalog\Model\ProductOptions\Config" />
<preference for="Magento\Catalog\Model\Product\PriceModifierInterface" type="Magento\Catalog\Model\Product\PriceModifier\Composite" />
@@ -45,7 +56,7 @@
<preference for="Magento\Catalog\Service\V1\Product\AttributeSet\WriteServiceInterface" type="Magento\Catalog\Service\V1\Product\AttributeSet\WriteService" />
<preference for="Magento\Catalog\Service\V1\Product\AttributeSet\AttributeServiceInterface" type="Magento\Catalog\Service\V1\Product\AttributeSet\AttributeService" />
<preference for="Magento\Catalog\Service\V1\Product\Attribute\Media\ReadServiceInterface" type="\Magento\Catalog\Service\V1\Product\Attribute\Media\ReadService" />
- <preference for="\Magento\Catalog\Service\V1\Product\Attribute\Media\WriteServiceInterface" type="\Magento\Catalog\Service\V1\Product\Attribute\Media\WriteService" />
+ <preference for="Magento\Catalog\Service\V1\Product\Attribute\Media\WriteServiceInterface" type="\Magento\Catalog\Service\V1\Product\Attribute\Media\WriteService" />
<preference for="Magento\Catalog\Service\V1\Product\Link\ReadServiceInterface" type="Magento\Catalog\Service\V1\Product\Link\ReadService" />
<preference for="Magento\Catalog\Service\V1\Product\Link\WriteServiceInterface" type="Magento\Catalog\Service\V1\Product\Link\WriteService" />
<preference for="Magento\Catalog\Service\V1\Product\Link\Data\ProductLink\DataMapperInterface" type="Magento\Catalog\Service\V1\Product\Link\Data\ProductLink\DataMapper\Composite" />
@@ -444,4 +455,14 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Catalog\Service\V1\Product\MetadataService">
+ <arguments>
+ <argument name="metadataService" xsi:type="object">Magento\Catalog\Service\V1\MetadataService\Proxy</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Catalog\Service\V1\ProductService">
+ <arguments>
+ <argument name="searchResultsBuilder" xsi:type="object" shared="false">Magento\Catalog\Service\V1\Data\Product\SearchResultsBuilder</argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/code/Magento/Catalog/etc/webapi.xml b/app/code/Magento/Catalog/etc/webapi.xml
index f4048537474..7279d6433d8 100644
--- a/app/code/Magento/Catalog/etc/webapi.xml
+++ b/app/code/Magento/Catalog/etc/webapi.xml
@@ -67,6 +67,30 @@
<resource ref="Magento_Catalog::attributes_attributes" />
</resources>
</route>
+ <route url="/V1/products/attributes" method="GET">
+ <service class="Magento\Catalog\Service\V1\Product\Attribute\ReadServiceInterface" method="search" />
+ <resources>
+ <resource ref="Magento_Catalog::attributes_attributes" />
+ </resources>
+ </route>
+ <route url="/V1/categories/attributes/:id/options" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\Attribute\ReadServiceInterface" method="options" />
+ <resources>
+ <resource ref="Magento_Catalog::attributes_attributes" />
+ </resources>
+ </route>
+ <route url="/V1/categories/attributes/:id" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\Attribute\ReadServiceInterface" method="info" />
+ <resources>
+ <resource ref="Magento_Catalog::attributes_attributes" />
+ </resources>
+ </route>
+ <route url="/V1/categories/attributes" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\Attribute\ReadServiceInterface" method="search" />
+ <resources>
+ <resource ref="Magento_Catalog::attributes_attributes" />
+ </resources>
+ </route>
<route url="/V1/products/attributes" method="POST">
<service class="Magento\Catalog\Service\V1\Product\Attribute\WriteServiceInterface" method="create"/>
<resources>
@@ -85,12 +109,6 @@
<resource ref="Magento_Catalog::attributes_attributes" />
</resources>
</route>
- <route url="/V1/products/attributes" method="GET">
- <service class="Magento\Catalog\Service\V1\Product\Attribute\ReadServiceInterface" method="search"/>
- <resources>
- <resource ref="Magento_Catalog::attributes_attributes" />
- </resources>
- </route>
<route url="/V1/products/types" method="GET">
<service class="Magento\Catalog\Service\V1\ProductTypeServiceInterface" method="getProductTypes"/>
<resources>
@@ -206,13 +224,19 @@
</resources>
</route>
<route url="/V1/products/attributes/:id/options" method="GET">
- <service class="Magento\Catalog\Service\V1\ProductAttributeServiceInterface" method="options"/>
+ <service class="Magento\Catalog\Service\V1\Product\Attribute\Option\ReadServiceInterface" method="options"/>
<resources>
<resource ref="Magento_Catalog::attributes_attributes" />
</resources>
</route>
<route url="/V1/products/attributes/:id/options" method="POST">
- <service class="Magento\Catalog\Service\V1\ProductAttributeServiceInterface" method="addOption" />
+ <service class="Magento\Catalog\Service\V1\Product\Attribute\Option\WriteServiceInterface" method="addOption" />
+ <resources>
+ <resource ref="Magento_Catalog::attributes_attributes" />
+ </resources>
+ </route>
+ <route url="/V1/products/attributes/:id/options/:optionId" method="DELETE">
+ <service class="Magento\Catalog\Service\V1\Product\Attribute\Option\WriteServiceInterface" method="removeOption" />
<resources>
<resource ref="Magento_Catalog::attributes_attributes" />
</resources>
@@ -289,6 +313,78 @@
<resource ref="Magento_Catalog::catalog"/>
</resources>
</route>
+ <route url="/V1/categories/:categoryId" method="DELETE">
+ <service class="Magento\Catalog\Service\V1\Category\WriteServiceInterface" method="delete" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\ReadServiceInterface" method="info" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId/products" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\ProductLinks\ReadServiceInterface" method="assignedProducts" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId/products" method="POST">
+ <service class="Magento\Catalog\Service\V1\Category\ProductLinks\WriteServiceInterface" method="assignProduct" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId/products" method="PUT">
+ <service class="Magento\Catalog\Service\V1\Category\ProductLinks\WriteServiceInterface" method="updateProduct" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId/products/:productSku" method="DELETE">
+ <service class="Magento\Catalog\Service\V1\Category\ProductLinks\WriteServiceInterface" method="removeProduct" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId/products" method="PUT">
+ <service class="Magento\Catalog\Service\V1\Category\ProductLinks\WriteServiceInterface" method="updateProduct" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories" method="POST">
+ <service class="Magento\Catalog\Service\V1\Category\WriteServiceInterface" method="create" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\ReadServiceInterface" method="info" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories" method="GET">
+ <service class="Magento\Catalog\Service\V1\Category\Tree\ReadServiceInterface" method="tree" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId" method="PUT">
+ <service class="Magento\Catalog\Service\V1\Category\WriteServiceInterface" method="update" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
+ <route url="/V1/categories/:categoryId/move" method="PUT">
+ <service class="Magento\Catalog\Service\V1\Category\WriteServiceInterface" method="move" />
+ <resources>
+ <resource ref="Magento_Catalog::categories" />
+ </resources>
+ </route>
<route url="/V1/products/options/types" method="GET">
<service class="Magento\Catalog\Service\V1\Product\CustomOptions\ReadServiceInterface" method="getTypes"/>
<resources>
diff --git a/app/code/Magento/Catalog/etc/widget.xml b/app/code/Magento/Catalog/etc/widget.xml
index 95711179c96..1d016f59609 100644
--- a/app/code/Magento/Catalog/etc/widget.xml
+++ b/app/code/Magento/Catalog/etc/widget.xml
@@ -86,7 +86,7 @@
</parameter>
</parameters>
<containers>
- <container name="left">
+ <container name="sidebar.main">
<template name="default" value="list_default" />
<template name="names_only" value="list_names" />
<template name="images_only" value="list_images" />
@@ -95,7 +95,7 @@
<template name="grid" value="default" />
<template name="list" value="list" />
</container>
- <container name="right">
+ <container name="sidebar.additional">
<template name="default" value="list_default" />
<template name="names_only" value="list_names" />
<template name="images_only" value="list_images" />
diff --git a/app/code/Magento/Catalog/i18n/de_DE.csv b/app/code/Magento/Catalog/i18n/de_DE.csv
index 500edd14173..afcf15d94d3 100644
--- a/app/code/Magento/Catalog/i18n/de_DE.csv
+++ b/app/code/Magento/Catalog/i18n/de_DE.csv
@@ -1,801 +1,639 @@
-"Uses","Anzahl der Verwendungen"
-"%1$s incl tax.","%1$s inkl. Steuern"
-"%s - %s","%s - %s"
-"%s Item(s)","%s Artikel"
-"%s and above","%s und darüber"
-"(%d)","(%d)"
-"(Copy data from: %s)","(Kopiere Daten von: %s)"
-"* Required Fields","* Notwendige Felder"
+All,Alle
+None,Keine
+"Are you sure?","Sind Sie sicher?"
+Cancel,Abbrechen
+Back,Zurück
+Product,Produktbezeichnung
+Price,Preis
+Quantity,Menge
+Products,Produkte
+ID,ProduktId
+SKU,Artikelposition
+No,Nein
+Qty,Qty
+Action,Aktion
+Reset,Zurücksetzen
+Edit,Bearbeiten
+"Add to Cart","Zum Warenkobrn hinzufügen"
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name",Vorname
+"Last Name","Letzter Name"
+Email,E-Mail
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,Löschen
+Save,speichern
+Store,Shop
"-- Please Select --","-- Bitte auswählen --"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","Standardwert 86400 wenn nicht eingetragen. Zum sofortigen Aktualisieren die Blocks HTML Ausgabe Cache leeren."
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">Warnung!</strong> Wenn Sie MAP als Standard anwenden, werden alle Produktpreise im Frontend versteckt."
-"A group with the same name already exists.","Gruppe mit dem gleichen Namen existiert bereits."
-"A name is required","Ein Name wird benötigt"
-"A product type is not defined for the indexer.","Produkttyp ist für den Indexer nicht definiert."
-"ALL GROUPS","ALLE GRUPPEN"
-"AM","AM"
-"Action","Aktion"
-"Actual Price","Tatsächlicher Preis"
-"Add","Hinzufügen"
-"Add Attribute","Eigenschaft hinzufügen"
-"Add Design Change","Designänderung hinzufügen"
-"Add Group","Gruppe hinzufügen"
-"Add Group Price","Gruppenpreis hinzufügen"
+"Custom Design","Eigene Gestaltung"
+Yes,Ja
+"Web Site","Web Site"
+Name,Name
+Status,Status
+Disabled,Deaktiviert
+Enabled,Aktiviert
+"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
+Title,Titel
+"Store View",Store-Ansicht
+Type,Typ
+Home,Startseite
+Search,Suche
+"Select All","Select All"
"Add New","Neu hinzufügen"
+"Please select items.","Bitte wählen Sie Artikel."
+Required,Required
+Website,Website
+"All Websites","Alle Webseiten"
+Next,Weiter
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,Katalog
+Images,Images
+"per page","pro Seite"
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,OK
+Visibility,Sichtbarkeit
+Position,Position
+Fixed,Fix
+"Use Default Value","Standardwert verwenden"
+N/A,"Nicht zutreffend"
+Percent,Percent
+"Option Title","Option Title"
+"Input Type",Eingabetyp
+"New Option","New Option"
+"Price Type",Preistyp
+"* Required Fields","* Notwendige Felder"
+Availability,Availability
+"In stock","Auf Lager"
+"Out of stock",Ausverkauft
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,Root
+"Save Category","Kategorie speichern"
+"Delete Category","Kategorie löschen"
+"New Subcategory","Neue Unterkategorie"
+"New Root Category","Neue Root Kategorie"
+"Set Root Category for Store","Rootkategorie für Store festlegen"
+"Use Config Settings","Konfigurations-Einstellungen verwenden"
+"Use All Available Attributes","Use All Available Attributes"
+"General Information","Allgemeine Information"
+"Category Data",Kategoriedaten
+"Category Products",Kategorieprodukte
+"Add Subcategory","Unterkategorie hinzufügen"
+"Add Root Category","Stammkategorie hinzufügen"
+"Create Permanent Redirect for old URL","Andauernde Umleitung für alte URL erstellen"
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor","WYSIWYG Editor"
+"Add Product","Produkt hinzufügen"
+label,label
+"Product Attributes","Produkt Attribute"
"Add New Attribute","Neues Attribut hinzufügen"
-"Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen"
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute","Eigenschaft speichern"
+"Delete Attribute","Attribute löschen"
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute","Neues Produktattribut"
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,Global
+Scope,Umfang
+"Declare attribute value saving scope","Definiere Attribut ""Wertsparender Spielraum"""
+"Frontend Properties",Frontend-Eigenschaften
+"Use in Quick Search","Bei Schnellsuche nutzen"
+"Use in Advanced Search","In erweiterter Suche verwenden"
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions","Für Promo Regelbedingungen verwenden"
+"Enable WYSIWYG","WYSIWYG aktivieren"
+"Allow HTML Tags on Frontend","HTML-Tags am Frontend zulassen"
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing","Im Produkt-Listing verwendet"
+"Depends on design theme","abhängig vom Design Thema"
+"Used for Sorting in Product Listing","Für Sortierung im Produkt-Listing verwendet"
+"Media Image",Bild
+Gallery,Gallerie
+"System Properties",Systemeinstellungen
+"Data Type for Saving in Database","Datentyp für das Speichern in Datenbank"
+Text,Text
+Varchar,Varchar
+Static,Statisch
+Datetime,Datetime
+Decimal,Dezimal
+Integer,Integer
+"Globally Editable","Global bearbeitbar"
+"Attribute Information",Eigenschafteninformation
+Properties,Eigenschaften
+"Manage Labels","Manage Labels"
+Visible,Sichtbar
+Searchable,Suchbar
+Comparable,Vergleichbar
+"Delete Selected Group","Ausgewählte Gruppe löschen"
+"Delete Attribute Set","Attributreihe löschen"
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set","Merkmale speichern"
+"New Set Name","Neuer Setname"
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,Leer
+"Add Attribute","Eigenschaft hinzufügen"
"Add New Group","Neue Gruppe hinzufügen"
-"Add New Images","Neue Bilder hinzufügen"
+"Add Group","Gruppe hinzufügen"
+"Edit Set Name","Name bearbeiten einstellen"
+"For internal use","For internal use"
+"Based On","Basierend auf"
+"Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen"
+"Add New Set","Neuen Satz hinzufügen"
+"Product Templates","Product Templates"
+"Close Window","Fenster Schließen"
+"New Product","Neues Produkt"
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,Attribute
+Change,Ändern
+"Advanced Inventory","Advanced Inventory"
+Websites,Webseiten
+"Products Information",Produktinformationen
+"Category Name","Category Name"
+"Parent Category",Ãœberkategorie
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.","Es gibt keine Kunden für diesen Wanhinweis."
+"Subscribe Date",Anmeldedatum
+"Last Notified","Letzte Benachrichtigung"
+"Send Count","Zählerstand senden"
+"New Attribute","New Attribute"
+"Attribute Set",Attributset
"Add New Option","Neue Option hinzufügen"
+"Import Options","Import Options"
+Import,Import
"Add New Row","Neue Zeile hinzufügen"
-"Add New Search Term","Neuen Suchbegriff hinzufügen"
-"Add New Set","Neuen Satz hinzufügen"
-"Add Product","Produkt hinzufügen"
-"Add Product To Websites","Produkt zu Webseiten hinzufügen"
-"Add Root Category","Stammkategorie hinzufügen"
-"Add Subcategory","Unterkategorie hinzufügen"
-"Add Tax","Steuer hinzufügen"
+"Delete Row","Reihe löschen"
+"Tier Pricing",Preisebene
+"Default Price","Vorgegebener Preis"
+"Add Group Price","Gruppenpreis hinzufügen"
+"ALL GROUPS","ALLE GRUPPEN"
"Add Tier","Ebene hinzufügen"
-"Add attribute into attribute set","Attribut zum Attribute-Set hinzufügen"
-"Add group into attribute set","Gruppe zum Attribute-Set hinzufügen"
-"Add new custom option into product","Spezifische Option zum Produkt hinzufügen"
-"Add new values into custom option","Neue Werte zur benutzerdefinierten Option hinzufügen"
-"Add option","Option hinzufügen"
-"Add to Cart","Zum Warenkobrn hinzufügen"
-"Add to Compare","Hinzufügen um zu vergleichen"
-"Add to Wishlist","Zum Wunschzettel hinzufügen"
-"Additional Information","Zusätzliche Information"
-"Alert Urls","Warn-Urls"
-"All","Alle"
-"All Product Types","Alle Produkttypen"
-"All Websites","Alle Webseiten"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Alle Produkte dieses Satzes werden gelöscht! Sind Sie sicher, dass Sie diesen Eigenschaftensatz löschen möchten?"
-"Allow All Products per Page","Alle Produkte pro Seite zulassen"
-"Allow Dynamic Media URLs in Products and Categories","Dynamische Medien-URLs in Produkten und Kategorien zu lassen"
-"Allow HTML Tags on Frontend","HTML-Tags am Frontend zulassen"
-"Allowed File Extensions","Erlaubte Dateierweiterungen"
-"Allowed file extensions to upload","Erlaubte Dateierweiterungen zum Hochladen"
-"Amount","Summe"
-"An error occurred while adding products to websites.","Ein Fehler ist aufgetreten, während Produkte zu Webseiten hinzugefügt wurden."
-"An error occurred while clearing comparison list.","Beim Löschen der Vergleichsliste ist ein Fehler aufgetreten."
-"An error occurred while removing products from websites.","Ein Fehler ist aufgetreten, während Produkte von Webseiten entfernt wurden."
-"An error occurred while saving the URL rewrite","Ein Fehler ist beim Speichern der URL-Umschreibung aufgetreten."
-"An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten."
-"An error occurred while saving the collection, aborting. Error message: %s","Beim Speichern der Sammlung ist ein Fehler aufgetreten. Abbruch erfolgt. Fehlermeldung: %s"
-"An error occurred while saving the product. ","Beim Speichern des Produktes ist ein Fehler aufgetreten."
-"An error occurred while saving the search query.","Beim Speichern der Suchanfrage ist ein Fehler aufgetreten."
-"An error occurred while saving this group.","Beim Speichern dieser Gruppe ist ein Fehler aufgetreten."
-"An error occurred while trying to delete the category.","Beim Versuch die Kategorie zu löschen ist ein Fehler aufgetreten."
-"An error occurred while updating the product(s) attributes.","Beim Aktualisieren der Eigenschaften der/des Produkte(s) ist ein Fehler aufgetreten."
-"An error occurred while updating the product(s) status.","Bei der Aktualisierung des Status der/des Produkte(s) ist ein Fehler aufgetreten."
-"An invalid group ID is specified, skipping the record.","Ungültige Gruppen-ID, Datensatz wird übersprungen."
-"An invalid option ID is specified for %s (%s), skipping the record.","Eine ungültige Options-ID wurde für %s angegeben (%s). Eintrag wird übersprungen."
-"An invalid store was specified.","Es wurde ein ungültiges Geschäft angegeben."
-"Anchor Custom Text","Anchor eigener Text"
-"Anchor Custom Title","Anchor eigener Titel"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Nur auf Katalogprodukte und Kategorien anwendbar. Jeder Medieninhalt wird in den Editor als ein statischer URL eingefügt. Er wird nicht aktualisiert, wenn der Systemkonfigurations-Basis-URL sich ändert."
-"Apply MAP (Default Value)","MAP anwenden (Standardwert)"
-"Apply To","Anwenden auf"
-"Approved","Bestätigt"
-"Are you sure you want to delete this category?","Möchten Sie diese Kategorie wirklich löschen?"
-"Are you sure you would like to remove all products from your comparison?","Sind Sie sicher, dass Sie alle Produkte von Ihrem Vergleich entfernen möchten?"
-"Are you sure you would like to remove this item from the compare products?","Sind Sie sicher, dass Sie diese Position vom Produktvergleich entfernen möchten?"
-"Are you sure?","Sind Sie sicher?"
-"As low as:","So niedrig wie:"
-"Assign","Zuordnen"
-"Assign product link","Produktlink zuordnen"
-"Assign product to category","Produkt zu Kategorie zuordnen"
-"Assigned Products","Zugeordnete Produkte"
-"Associated Products","Zugehörige Produkte"
-"Attribute Set","Name des Eigenschaftensatzes"
-"Attribute ""%s"" is invalid.","Attribut ""%s"" ist ungültig."
-"Attribute ""%s"" is required.","Attribut ""%s"" erforderlich."
-"Attribute Information","Eigenschafteninformation"
-"Attribute Model","Eigenschaftenmodell"
-"Attribute Name:","Eigenschaftenname:"
-"Attribute Set","Attributset"
-"Attribute Sets","Attribute-Sets"
-"Attribute add","Attribut hinzufügen"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Eingabecode ist ungültig. Bitte benutzen Sie nur Buchstaben (a-z), Zahlen (0-9) oder Unterstreichungen (_) in diesem Feld, das erste Zeichen sollte ein Buchstabe sein."
-"Attribute group with the \/name/\ name already exists","Es besteht schone eine Gruppe von Attributen mit dem \/name/\ Namen."
-"Attribute remove","Attribut löschen"
-"Attribute with the same code already exists","Die Eigenschaft ist mit dem gleichen Code bereits vorhanden"
-"Attributes","Attribute"
-"Attrribute names can be specified per store.","Eigenschaftennamen können pro Geschäft angegeben werden."
-"Autogenerate","Automatisch generieren"
-"Availability:","Verfügbarkeit:"
-"Back","Zurück"
-"Backend Model","Backend-Modell"
-"Backend Table","Backend-Tabelle"
-"Backend Table Title","Backend-Tabellentitel"
-"Backorders","Lieferückstand"
-"Based On","Basierend auf"
-"Before Order Confirmation","Vor der Bestellungsbestätigung"
-"Block after Info Column","Nach Infospalte sperren"
-"Bottom Block Options Wrapper","Unterseite Sperroptionendeckblatt"
-"Bottom/Left","Unten/Links"
-"Bottom/Right","Unten/Rechts"
-"Browse By","Durchsuchen nach"
-"Bundle Items","Gebündelte Artikel"
-"Buy %1$s","Kaufen Sie %1$s"
-"Buy %1$s for","Kaufen Sie %1$s für"
-"Buy %1$s for %2$s","Kaufen Sie %1$s für %2$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","Kaufen Sie %1$s für je %2$s (%3$s inkl. Steuer)"
-"Buy %1$s for %2$s each","Kaufen Sie %1$s für je %2$s"
-"Cache Lifetime (Seconds)","Cache-Lebensdauer (Sekunden)"
-"Cache refresh needed.","Cache-Auffrischung erforderlich."
-"Can be Divided into Multiple Boxes for Shipping","Kann für den Versand in mehrere Pakete unterteilt werden"
-"Can be used only with catalog input type Dropdown","Kann nur mit Katalogeingabeart Dropdown verwendet werden"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","Kann nur mit Katalogeingabeart Dropdown, Mehrfachauswahl und Preis verwendet werden."
-"Can't create image.","Kann kein Bild erzeugen."
-"Cancel","Abbrechen"
-"Cannot create image.","Kann kein Bild erzeugen."
-"Cannot create writeable directory '%s'.","Kann keine schreibbares Verzeichnis erstellen.'%s'."
-"Cart Item Attribute","Merkmal eines Einkaufswagen-Artikels"
-"Catalog","Katalog"
-"Catalog Category (Anchor)","Katalogkategorie (Fixpunkt)"
-"Catalog Category (Non-Anchor)","Katalogkategorie (kein Fixpunkt)"
-"Catalog Category Link","Katalogkategorie-Link"
-"Catalog New Products List","Neue Produktliste des Katalogs"
-"Catalog Price Scope","Preisspanne im Katalog"
-"Catalog Product Compare List","Katalogprodukte-Vergleichsliste"
-"Catalog Product Email to a Friend","Produkt aus dem Katalog per E-Mail an einen Freund senden"
-"Catalog Product Image Gallery Popup","Katalog-Popup der Produktbildergallerie"
-"Catalog Product Link","Link zu den Produkten im Katalog"
-"Catalog Product View (Any)","Produktansicht des Katalogs (beliebig)"
-"Catalog Product View (Simple)","Produktansicht des Katalogs (vereinfacht)"
-"Catalog Product View (Virtual)","Produktansicht des Katalogs (virtuell)"
-"Catalog Section","Katalogabschnitt"
-"Catalog Seo Popular Search Terms","Suchmaschinenoptimierung des Katalogs, beliebte Suchbegriffe"
-"Catalog Seo Sitemap (Category List)","Suchmaschinenoptimierungsindex des Katalogs (Kategorienliste)"
-"Catalog Seo Sitemap (Category Tree)","Suchmaschinenoptimierungsindex des Katalogs (Kategoriebaum)"
-"Catalog Seo Sitemap (Common)","Suchmaschinenoptimierungsindex des Katalogs (allgemein)"
-"Catalog Seo Sitemap (Product List)","Suchmaschinenoptimierungsindex des Katalogs (Produktliste)"
-"Catalog URL Rewrites","Umschreibung der Katalog-URL"
-"Catalog product custom option values API","API für benutzerdefinierte Optionswerte für Katalogprodukte"
-"Catalog product custom options API","API für benutzerdefinierte Katalogprodukt-Optionen"
-"Catalog, Search","Katalog, Suche"
-"Categories","Kategorien"
-"Categories Sitemap","Kategorienindex"
-"Category","Kategorie"
-"Category API","Kategorien-Programmierschnittstelle"
-"Category Data","Kategoriedaten"
-"Category Flat Data","Flache Kategoriedaten"
-"Category Link Block Template","Kategorielink, Blockschablone"
-"Category Link Inline Template","Kategorielink, eingebettet in Schablone"
-"Category Products","Kategorieprodukte"
-"Category Top Navigation","Obere Kategorien-Navigationsleiste"
-"Category URL Suffix","Kategorie, URL-Suffix"
-"Category attributes API","Kategorie-Merkmale, Programmierschnittstelle"
-"Category move error","Kategorie-Bewegungsfehler"
-"Category move operation is not possible: parent category is equal to child category.","Verschieben der Kategorie ist nicht möglich: Der übergeordnete Ordner gleicht dem untergeordneten."
-"Category move operation is not possible: the current category was not found.","Verschieben der Kategorie ist nicht möglich: Die aktuelle Kategorie wurde nicht gefunden."
-"Category move operation is not possible: the new parent category was not found.","Kategorie-Verschiebevorgang nicht möglich: die neue Position in der Baumstruktur konnte nicht gefunden werden."
-"Category must be an instance of \Magento\Catalog\Model\Category.","Kategorie muss eine Instanz von \Magento\Catalog\Model\Category sein."
-"Center","Mitte"
-"Change","Ändern"
-"Change or Retrieve attribute store view","Ändern und Wiederfinden der Speicheransicht der Eigenschaften"
+"Default Values",Standardwerte
+"Related Products",Zubehör
+Up-sells,Up-Selling
+Cross-sells,Querverkäufe
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS","Lagerbestand RSS"
"Change status","Status ändern"
-"Check items to add to the cart or","Artikel überprüfen, um sie dem Einkaufswagen zuzufügen oder"
-"Choose an Option...","Eine Option auswählen..."
-"Clear All","Alle löschen"
-"Clear Price","Preis löschen"
-"Click for price","Klicken für den Preis"
-"Close Window","Fenster Schließen"
-"Collapse All","Alle einklappen"
-"Comma-separated.","Durch Komma getrennt."
-"Comparable","Vergleichbar"
-"Comparable on Front-end","Vergleichbar am Frontend"
-"Comparable on the Frontend","Vergleichbar am Frontend"
-"Compare","Vergleichen"
-"Compare Products","Produkte vergleichen"
-"Conditions Combination","Bedingungenkombination"
-"Continue","Fortsetzen"
-"Country/State","Land/Staat"
-"Create","Erstellen"
-"Create (Upload)","Erstellen (hochladen)"
-"Create Empty","Leere Datei erstellen"
-"Create Permanent Redirect for URLs if URL Key Changed","Permanente Weiterleitung für URLs erstellen, wenn der URL-Schlüssel geändert wird"
-"Create Permanent Redirect for old URL","Andauernde Umleitung für alte URL erstellen"
-"Create Product Settings","Produkteinstellungen erstellen"
-"Create Simple Associated Product","Erstellen eines einfachen dazugehörigen Produkts"
-"Create attribute set based on another set","Attribute-Set aus einem anderen Set erstellen"
-"Create new attribute","Neues Attribut erstellen"
-"Create new category","Neue Kategorie erstellen"
-"Create new product","Neues Produkt erstellen"
-"Cross-sells","Querverkäufe"
-"Currently Shopping by:","Derzeit einkaufend bei:"
-"Custom Design","Eigene Gestaltung"
-"Custom Options","Kundenoptionen"
-"Custom options","Benutzerdefinierte Optionen"
-"Customer Group","Kundengruppe"
-"Customers Tagged Product","Produkt vom Kunden markiert"
-"Data Type for Saving in Database","Datentyp für das Speichern in Datenbank"
-"Date & Time Custom Options","Benutzerdefinierten Optionen bezüglich Datum und Uhrzeit"
-"Date Fields Order","Feldbefehl Datum"
-"Subscribe Date","Anmeldedatum"
-"Datetime","Datetime"
-"Decimal","Dezimal"
-"Declare attribute value saving scope","Definiere Attribut ""Wertsparender Spielraum"""
-"Default ""What's This"" Text Message","""Was ist das""-Standard-Textmitteilung"
-"Default Popup Text Message","Standard-Popup-Textmitteilung"
-"Default Price","Vorgegebener Preis"
-"Default Price Navigation Step","Navigationsschritt vorgegebener Preis"
-"Default Quantity","Standardanzahl"
-"Default Values","Standardwerte"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Definiert den Umfang der Basiswährung (""Einstellen der Währung"" > ""Währungsoptionen"" > ""Basiswährung"")."
-"Delete","Löschen"
-"Delete Attribute","Attribute löschen"
-"Delete Attribute Set","Attributreihe löschen"
-"Delete Category","Kategorie löschen"
-"Delete Group Price","Gruppenpreis löschen"
-"Delete Option","Option löschen"
-"Delete Row","Reihe löschen"
+"Update Attributes","Merkmale aktualisieren"
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images","Neue Bilder hinzufügen"
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term","Neuen Suchbegriff hinzufügen"
+"Save Search","Suche speichern"
"Delete Search","Suche löschen"
-"Delete Selected Group","Ausgewählte Gruppe löschen"
-"Delete Tier","Ebene löschen"
-"Delete attribute","Attribut löschen"
-"Delete category","Kategorie entfernen"
-"Delete product","Produkt löschen"
-"Depends on design theme","abhängig vom Design Thema"
-"Design","Gestaltung"
-"Details","Details"
-"Disabled","Deaktiviert"
-"Disallowed file type.","Nicht erlaubter Dateityp"
-"Display Actual Price","Tatsächlichen Preis anzeigen"
-"Display Price Interval as One Price","Preisintervall als einen Preis anzeigen"
-"Display Product Count","Produktanzahl anzeigen"
-"Display in Suggested Terms","Anzeige laut vorgeschlagener Nutzungsbedingungen"
-"Double click on a group to rename it","Doppel-Klick auf eine Gruppe um sie umzubennenen"
-"Double click on above image to view full picture","Doppel-Klick auf das obige Image um Vollbild anzuzeigen"
-"Downloadable Information","Informationen zum Herunterladen"
-"Duplicate","duplizieren"
-"Duplicate amount found.","Dupliziere die gefundene Menge (Summe)."
-"Duplicate website group price customer group.","Webseite Gruppenpreis Kundengruppe duplizieren."
-"Duplicate website tier price customer group and quantity.","Preisstruktur, Kundengruppe und Menge duplizieren."
-"Duplicate website, country and state tax found.","Dupliziere die gefundene Website, Land und Gebühr."
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","Zum Beispiel: {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamische Richtlinien-Analyse wirkt sich auf die Katalogleistung aus."
-"Edit","Bearbeiten"
-"Edit Attribute Set '%s'","Eigenschaftensatz '%s' bearbeiten"
-"Edit Product Attribute","Produkteigenschaften bearbeiten"
-"Edit Product Attribute ""%s""","Produkteigenschaft ""%s"" bearbeiten"
-"Edit Search","Suche bearbeiten"
-"Edit Search '%s'","Suche '%s' bearbeiten"
-"Edit Set Name","Name bearbeiten einstellen"
-"Email","E-Mail"
-"Email to a Friend","E-Mail an einen Freund"
-"Empty","Leer"
-"Enable MAP","MAP aktivieren"
-"Enable Quantity Increments","Anzahlzunahme aktivieren"
-"Enable WYSIWYG","WYSIWYG aktivieren"
-"Enabled","Aktiviert"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","Entity-Modelltyp muss eine Anwendung von \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType sein"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","Entity-Modelltyp muss eine Anwendung von \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType sein"
-"Error during retrieval of option value: %s","Fehler bei Abfragen von Optionswert: %s"
-"Exclude","Auschließen"
-"Expand All","Alle erweitern"
-"Failed","Fehlgeschlagen"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","Datei %s ließ sich nicht kopieren. Bitte löschen sie die Medien mit fehlenden Bildern und versuchen sie es erneut."
-"Failed to move file: %s","Datei konnte nicht verschoben werden: %s"
-"Feature Products","Produkte bieten"
-"Field is not complete","Feld ist nicht vollständig"
-"File options format is not valid.","Dateioptionsformat ist nicht gültig."
-"File upload failed","Dateiupload fehlgeschlagen"
-"Filter model name must be declared.","Filtermodulname muss angegeben werden."
-"Filter must be an object. Please set correct filter.","Filter muss ein Objekt sein. Stellen Sie bitte den korrekten Filter ein."
-"Filterable (no results)","Filterbar (keine Ergebnisse)"
-"Filterable (with results)","Filterbar (mit Ergebnissen)"
-"First Name","Vorname"
-"Fixed","Fix"
-"For internal use.","Für interne Verwendung"
+"Edit Search '%1'","Edit Search '%1'"
+"New Search","Neue Suchabfrage"
+"Search Information",Suchinformationen
+"Search Query",Suchanfrage
+"Number of results","Anzahl der Ergebnisse"
+"Number of results (For the last time placed)","Anzahl der Ergebnisse (für die letzte platzierte Zeit)"
"For the last time placed.","Letzte Bestellung aufgegeben am"
-"Frontend","Oberfläche"
-"Frontend Model","Oberflächenmodell"
-"Frontend Properties","Frontend-Eigenschaften"
-"Gallery","Gallerie"
-"General Information","Allgemeine Information"
-"Get full information about attribute with list of options","Vollständige Angaben zum Attribut mit Liste möglicher Optionen einblenden"
-"Get full information about custom option in product","Vollständige Informationen über die benutzerdefinierten Produktoptionen abrufen"
-"Get list of available custom option types","Liste der verfügbaren benutzerdefinierten Optionstypen abrufen"
-"Get list of non-default attributes by product type and attributes set","Liste nicht-standardmäßiger Attribute nach Art und Attributsatz einblenden"
-"Get list of possible attribute types","Liste möglicher Attributtypen abrufen"
-"Get special price","Angebote"
-"Global","Global"
-"Globally Editable","Global bearbeitbar"
+"Number of Uses","Number of Uses"
+"Synonym For","Synonym für"
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL",Weiterleitungs-URL
+"ex. http://domain.com","z.B. http://domain.com"
+"Display in Suggested Terms","Anzeige laut vorgeschlagener Nutzungsbedingungen"
"Go to Home Page","Zur Startseite gehen"
-"Grid","Raster"
-"Group add","Gruppe hinzufügen"
-"Group remove","Gruppe entfernen"
-"Groups","Gruppen"
-"Home","Startseite"
-"ID","ID"
-"ID: %s","ID: %s"
-"If empty, the Category Name will be used","Falls leer, wird der Kategoriename verwendet"
-"If empty, the Product will be used","Wenn nicht ausgefüllt, wird der Produktname genutzt"
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Wenn Sie keinen Optionswert für eine spezifische Shopansicht festlegen wird der Standard (Admin) Wert verwendet."
-"Image","Bild"
-"Image content is not valid base64 data.","Bildinhalt ist keine gültige base64 Datei."
-"Image does not exist.","Bild existiert nicht"
-"Image file was not found.","Bilddatei wurde nicht gefunden."
-"Image type and information need to be specified for each store view.","Bildtyp und Informationen müssen für jede Shopansicht festgelegt werden."
-"In Cart","Im Einkaufswagen"
-"In Stock","Auf Lager"
-"In stock","Auf Lager"
-"Incl. Tax","Mit Mwst."
-"Index product and categories URL rewrites","Index Produkt und Kategorien URL Neuschreibungen"
-"Index product attributes for layered navigation building","Produktattribute für einen mehrstufigen Navigationsaufbau indizieren"
-"Index product prices","Index Produktpreise"
-"Indexed category/products association","Indizierte Kategorie/Produkassoziierung"
-"Info","Informationen"
-"Info Column Options Wrapper","Deckblatt Optionen für Infospalte"
-"Input Type","Eingabetyp"
-"Integer","Integer"
-"Interval Division Limit","Internes Teilungslimit"
-"Invalid Tier Prices","Üngültige Stufenpreise"
-"Invalid attribute %s","Ungültiges Attribut %s"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Ungültige Option für Attribut %s definiert (%s), Eintrag wird übersprungen."
-"Invalid attribute set specified, skipping the record.","Ungültige Merkmale angegeben, Aufzeichnung wird übersprungen."
-"Invalid block: %s.","Ungültiger Block: %s."
-"Invalid category IDs.","Ungültige KategorieIDs."
-"Invalid category.","Ungültige Kategorie"
-"Invalid image file type.","Ungültiger Bilddateityp."
-"Invalid image type.","Ungültige Bildart."
-"Invalid option ID specified for %s (%s), skipping the record.","Ungültige OptionsID für %s (%s) festgelegt, wird übersprungen."
-"Invalid product type specified, skipping the record.","Ungültiger Produkttyp ausgewählt, Aufzeichnung wird übersprungen."
-"Invalid store specified","Ungültiger Store definiert"
-"Invalid store specified, skipping the record.","Ungültiger Store definiert, Eintrag wird übersprungen."
-"Invalid tier prices. The product is not associated to the requested website.","Ungültige Preisebene. Das Produkt ist nicht mit der angeforderten Webseite verbunden."
-"Inventory","Inventar"
-"Is Default","Als Standard"
-"Is Required","Ist erforderlich"
-"Items %s to %s of %s total","Artikel %s auf %s von %s gesamt"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Gegenstände die im Katalog oder den Suchergebnissen nicht erscheinen sollen, sollten den Status ""Deaktiviert"" im gewünschten Shop haben."
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Artikel, die nicht in den Suchergebnissen oder im Katalog angezeigt werden sollen, sollten den Status 'Deaktiviert' im gewünschten Shop haben."
-"Keep your eyes open for our special Back to School items and save A LOT!","Halten Sie die Augen offen für unsere speziellen Angebote zum Schulanfang und sparen Sie VIEL GELD!"
-"Label","Label"
-"Last Name","Letzter Name"
-"Last Notified","Letzte Benachrichtigung"
-"Layered Navigation","Mehstufige Navigation"
-"Learn More","mehr dazu"
-"Line %d, Email: %s","Zeile %d, Email: %s"
-"Line %d, SKU: %s","Zeile %d, SKU: %s"
-"Link (Related, Up sell, Cross sell)","Link (Verwandt, Angebot, Mehrfachangebot)"
-"Link product does not exist.","Verknüpftes Produkt existiert nicht."
-"Link to a Specified Category","Link zu einer bestimmten Kategorie"
-"Link to a Specified Product","Link zum angegebenen Produkt"
-"List","Liste"
-"List Mode","Listenmodus"
-"List of Products that are set as New","Liste von Produkten, die als neu klassifiziert sind"
-"List of types","Artenliste"
-"Manage Attribute Sets","Attributsets verwalten"
-"Manage Attributes","Attribute verwalten"
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List","Produkt Vergleichsliste"
+AM,AM
+PM,Nachmittags
+Categories,Kategorien
"Manage Catalog Categories","Katalogkategorien verwalten"
"Manage Categories","Kategorien verwalten"
-"Manage Label / Options","Bezeichnungen/Optionen verwalten"
-"Manage Options (values of your attribute)","Optionen (Werte Ihrer Attribute) verwalten"
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.","Dieses Produkt existiert nicht mehr."
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).","Wählen Sie bitte ein Produkt(e)."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
"Manage Product Attributes","Produktattribute verwalten"
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.","Dieses Merkmal kann nicht bearbeitet werden."
+"Edit Product Attribute","Produkteigenschaften bearbeiten"
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.","Diese Eigenschaft kann nicht gelöscht werden."
+"The product attribute has been deleted.","Das Produktattribut wurde gelöscht."
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.","Gruppe mit dem gleichen Namen existiert bereits."
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets","Attributsets verwalten"
+"New Set","New Set"
"Manage Product Sets","Produktsets verwalten"
-"Manage Products","Produkte verwalten"
-"Manage Stock","Lagerbestand verwalten"
+"This attribute set no longer exists.","Dieses Eigenschaftenset existiert nicht mehr."
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten."
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.","Diese Suche existiert nicht mehr."
+"Edit Search","Suche bearbeiten"
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.","Um den Produktpreis sehen zu können, müssen Sie das Produkt in Ihren Einkaufswagen legen. Sie können es später wieder löschen."
+"See price before order confirmation.","Preis vor Bestellbestätigung ansehen."
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
+Grid,Raster
+List,Liste
+"Product is not loaded","Produkt wurde nicht geladen"
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
+"No layout updates","Keine Aktualisierungen des Layouts"
+"Products only","Nur Produkte"
+"Static block only","Nur statischer Block"
+"Static block and products","Statischer Block und Produkte"
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,Dehnen
+Tile,Kachel
+Top/Left,"Oben links"
+Top/Right,Oben/Rechts
+Bottom/Left,Unten/Links
+Bottom/Right,Unten/Rechts
+Center,Mitte
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites","Umschreibung der Katalog-URL"
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,Kategorie
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price","Preis löschen"
+"The filters must be an array.","Die Filter müssen als Array vorliegen."
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config","config verwenden"
+"In Cart","Im Einkaufswagen"
+"Before Order Confirmation","Vor der Bestellungsbestätigung"
+"On Gesture","Gestik An"
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building","Produktattribute für einen mehrstufigen Navigationsaufbau indizieren"
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.","Typenoptionen für benötigte Wertezeilen auswählen."
+"Please specify date required option(s).","Bitte die benötigten Datum-Optionen angeben."
+"Please specify time required option(s).","Bitte die benötigten Zeit-Optionen angeben."
+"Please specify the product's required option(s).","Geben Sie bitte die obligatorischen Option(en) für das Produkt an."
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,px.
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually","Nicht individuell sichtbar"
+"Catalog, Search","Katalog, Suche"
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.","Produkttyp ist für den Indexer nicht definiert."
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:","So niedrig wie:"
+"Are you sure you want to delete this category?","Möchten Sie diese Kategorie wirklich löschen?"
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All","Alle einklappen"
+"Expand All","Alle erweitern"
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
"Manage Titles (Size, Color, etc.)","Titel verwalten (Größe, Farbe, etc.)"
-"Max Characters","Maximale Anzahl Zeichen"
-"Maximal Depth","Maximale Tiefe"
-"Maximum Image Size","Maximale Bildgröße"
-"Maximum Number of Price Intervals","Maximale Anzahl an Preisintervallen"
-"Maximum Quantity Allowed in Shopping Cart","Maximal im Warenkorb erlaubte Anzahl"
-"Maximum allowed image size for '%s' is %sx%s px.","Maximal erlaubte Bildgröße für '%s' ist %sx%s px."
-"Maximum image height","Maximale Bildhöhe"
+"Manage Options (values of your attribute)","Optionen (Werte Ihrer Attribute) verwalten"
+"Is Default","Als Standard"
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,Gruppen
+"Double click on a group to rename it","Doppel-Klick auf eine Gruppe um sie umzubennenen"
+"Unassigned Attributes","Nicht zugewiesene Attribute"
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.","Diese Gruppe enthält System Eigenschaften. Bitte verschieben Sie System Eigenschaften in eine andere Gruppe und versuchen Sie es noch einmal."
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options",Kundenoptionen
+"This is a required option.","This is a required option."
+"Field is not complete","Feld ist nicht vollständig"
+"Allowed file extensions to upload","Erlaubte Dateierweiterungen zum Hochladen"
"Maximum image width","Maximale Bildbreite"
+"Maximum image height","Maximale Bildhöhe"
"Maximum number of characters:","Maximale Anzahl Zeichen:"
-"Maximum number of price intervals is 100","Die maximale Anzahl an Preisintervallen ist 100."
-"Media Image","Bild"
-"Minimum Advertised Price","Beworbener Mindestpreis"
-"Minimum Lines per Page","Minimale Zeilenanzahl pro Seite"
-"Minimum Quantity Allowed in Shopping Cart","Minimal im Warenkorb zulässige Menge"
-"Minimum Quantity for Item's Status to be Out of Stock","Minimale Stückzahl für Nicht auf Lager-Status"
-"Missing SKU, skipping the record.","Artikelnummer fehlt, Eintrag übersprungen."
-"More Views","Mehr Ansichten"
-"Move","Verschieben"
-"Move category in tree","Kategorie in Verzeichnis verschieben"
-"Must be in the allowed values list.","Muss ein Wert aus der Liste gültiger Werte sein."
-"N/A","Nicht zutreffend"
-"Name","Name"
-"Name in %s","Name in %s"
-"New Product","Neues Produkt"
-"New Product Attribute","Neues Produktattribut"
-"New Products","Neue Produkte"
-"New Products Grid Template","Neue Produkt Rastervorlage"
-"New Products List Template","Neue Produkt Listenvorlage"
-"New Root Category","Neue Root Kategorie"
-"New Search","Neue Suchabfrage"
-"New Set Name","Neuer Setname"
-"New Subcategory","Neue Unterkategorie"
-"Next","Weiter"
-"No","Nein"
-"No image","Kein Bild"
-"No layout updates","Keine Aktualisierungen des Layouts"
-"No options of this product are available.","Es sind keine Optionen dieses Produkts verfügbar."
-"No product collections found.","Keine Produktsammlungen gefunden."
-"None","Keine"
-"Not Visible Individually","Nicht individuell sichtbar"
-"Notify Low Stock RSS","Lagerbestand RSS"
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock","Lagerbestand verwalten"
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,Lieferückstand
"Notify for Quantity Below","Bei unterer Anzahl benachrichtigen."
-"Number of Products to Display","Anzahl angezeigter Produkte"
-"Uses","Anzahl der Verwendungen"
-"Number of results","Anzahl der Ergebnisse"
-"Number of results (For the last time placed)","Anzahl der Ergebnisse (für die letzte platzierte Zeit)"
-"OK","OK"
-"OR","ODER"
-"Old Price:","Alter Preis:"
-"On Gesture","Gestik An"
-"Option validation failed to add product to cart.","Überprüfung von Produkt-Optionen beim Hinzufügen zum Warenkorb fehlgeschlagen."
-"Option values","Optionswerte"
-"Option:","Option:"
-"Options","Optionen"
-"Options Control","Optionenkontrolle"
-"Options is required","Optionen ist obligatorisch"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","Unser Kunden-Service ist 24/7 erreichbar. Kontaktieren Sie uns unter (555)555-0123."
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability",Lagerbestand
+"In Stock","Auf Lager"
"Out of Stock","Nicht vorrätig"
-"Out of stock","Ausverkauft"
-"PM","Nachmittags"
-"Page Title Separator","Trennzeichen im Seitentitel"
-"Parent Category","Ãœberkategorie"
-"Pending","Ausstehend"
-"Percentage","Prozentsatz"
-"Please add rows to option.","Bitte Zeilen zur Option hinzufügen."
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","ACHTUNG: Bei einem Klick auf die Zeile werden die Paketdaten geladen und überschreiben alle ungespeicherten Formulardaten."
-"Please click on the Close Window button if it is not closed automatically.","Klicken Sie bitte auf die Schaltfläche Fenster Schließen, wenn dies nicht automatisch erfolgt."
-"Please enter a new group name","Bitte geben Sie einen neuen Gruppennamen ein"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Bitte aktualisieren sie ""Katalog URL Versionen"" und ""Produkteigenschaften"" in System -> <a href=""%s"">Index Management</a>"
-"Please select a static block ...","Wählen Sie bitte einen statischen Block..."
-"Please select items.","Bitte wählen Sie Artikel."
-"Please select one or more attributes.","Bitte wählen Sie ein oder mehrere Attribut(e)."
-"Please select product(s).","Wählen Sie bitte ein Produkt(e)."
-"Please select products for attributes update","Wählen Sie bitte Produkte für die Aktualisierung der Merkmale"
-"Please set up merge date/time","Bitte Datum/Zeit-Verbindung einrichten"
-"Please set up merge date/time later then present date","Zusammenfassung von Datum/Uhrzeit einstellen und dann das Datum anzeigen"
-"Please specify date required option(s).","Bitte die benötigten Datum-Optionen angeben."
-"Please specify the number of products, that will not be divided into subintervals.","Geben sie bitte die Anzahl an Artikeln an, die nicht in Teilintervalle geteilt werden."
-"Please specify the product required option(s)","Bitte die obligatorischen Produktoption(en) angeben"
-"Please specify the product required option(s).","Geben Sie bitte die obligatorischen Produktoption(en) an."
-"Please specify the product's option(s).","Bitte die Produkt-Optionen angeben."
-"Please specify the product's required option(s).","Geben Sie bitte die obligatorischen Option(en) für das Produkt an."
-"Please specify the quantity of product(s).","Geben Sie bitte die Anzahl an Produkten an."
-"Please specify time required option(s).","Bitte die benötigten Zeit-Optionen angeben."
-"Please wait...","Bitte warten..."
-"Position","Position"
-"Position in Layered Navigation","Position in Filter-Navigation"
-"Position of attribute in layered navigation block","Position des Attributs in Filter-Navigation"
-"Prev","Vorschau"
-"Previous","Vorige"
-"Price","Preis"
-"Price Navigation Step Calculation","Preis-Navigation Schritt Berechnung"
-"Price Type","Preistyp"
-"Price is not available","Preis ist nicht verfügbar"
-"Price values for options should be specified in system base currency.","Preisangaben für Optionen sollten in der im Shop eingestellten Basiswährung eingegeben werden."
-"Price:","Preis:"
-"Price: %s","Preis: %s"
-"Print This Page","Diese Seite drucken"
-"Product","Produkt"
-"Product API","Produkt-API"
-"Product Alerts","Produktmeldungen"
-"Product Attribute","Produktattribut"
-"Product Attributes","Produkt Attribute"
-"Product Categories","Produktkategorien"
-"Product Extra Info","Zusatzinfo Produkt"
-"Product Flat Data","Produkt Flat Daten"
-"ID","ProduktId"
-"Product Image Placeholders","Produktbild Platzhalter"
-"Product Image Watermarks","Produktbild Wasserzeichen"
-"Product Images","Produktbilder"
-"Product Images API","Produktbilder-API"
+"Add Product To Websites","Produkt zu Webseiten hinzufügen"
+"Remove Product From Websites","Produkt von Websites entfernen"
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Gegenstände die im Katalog oder den Suchergebnissen nicht erscheinen sollen, sollten den Status ""Deaktiviert"" im gewünschten Shop haben."
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions","Erlaubte Dateierweiterungen"
+"Maximum Image Size","Maximale Bildgröße"
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters","Maximale Anzahl Zeichen"
+"Customer Group",Kundengruppe
+"Delete Group Price","Gruppenpreis löschen"
+"Item Price","Item Price"
+"and above","und oben"
+"Delete Tier","Ebene löschen"
"Product In Websites","Produkt auf Webseiten"
-"Product Info Column","Produktinformationsspalte"
-"Product Information","Produktinformation"
-"Product Link Block Template","Produkt-Link Block Vorlage"
-"Product Link Inline Template","Produkt-Link Inline Vorlage"
-"Product Listing Sort by","Verfügbare Produktauflistung sortiert nach"
-"Product","Produktbezeichnung"
-"Product Prices","Produktpreise"
-"Product Tags","Produkttags"
-"Product Tier Price API","Produktstaffelpreis API"
-"Product Type","Produkttyp"
-"Product URL Suffix","URL-Suffix des Produkts"
-"Product View Extra Hint","Produktansicht extra Hint"
-"Product attribute sets API","Produkt-Attributset API"
-"Product attributes API","Produktmerkmale API"
-"Product collection expected.","Produktsammlung erwartet."
-"Product is not loaded","Produkt wurde nicht geladen"
-"Product links API (related, cross sells, up sells)","Produktlink-API (Ähnliches, Cross-Selling, Up-Selling)"
-"Product name","Produktbezeichnung"
-"Product types API","API Produkttypen"
-"Products","Produkte"
-"Products Comparison List","Produkt Vergleichsliste"
-"Products Information","Produktinformationen"
-"Products Sitemap","Sitemap Produkte"
-"Products only","Nur Produkte"
-"Products per Page on Grid Allowed Values","Produkte pro Seite (erlaubte Werte für Gitter)"
-"Products per Page on Grid Default Value","Produkte pro Seite (Standardwert für Gitter)"
-"Products per Page on List Allowed Values","Produkte pro Seite (erlaubte Werte für Liste)"
-"Products per Page on List Default Value","Produkte pro Seite (Standardwert für Liste)"
-"Properties","Eigenschaften"
-"Quantity","Anzahl"
-"Quantity Increments","Menge Zuwachsrate"
-"Quantity Uses Decimals","Stückzahl kann dezimal sein"
-"Quantity for Item's Status to Become Out of Stock","Menge, bei der der Produktstatus zu ""Nicht vorrätig"" wechselt"
-"Quantity:","Anzahl:"
-"Quantity","Menge"
-"Quick Create","Schnellanlegen"
-"Quick Overview","Schnellübersicht"
-"Quick simple product creation","Schnelle und einfache Produkterstellung"
-"Records for ""","Einträge für """
-"Redirect","Umleiten"
-"Redirect URL","Weiterleitungs-URL"
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Artikel, die nicht in den Suchergebnissen oder im Katalog angezeigt werden sollen, sollten den Status 'Deaktiviert' im gewünschten Shop haben."
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
"Regular Price:","Regulärer Preis:"
-"Related Products","Zubehör"
-"Remove","Löschen"
-"Remove Product From Websites","Produkt von Websites entfernen"
-"Remove This Item","Diesen Gegenstand entfernen"
-"Remove attribute from attribute set","Attribut aus dem Attributsatz entfernen"
-"Remove attribute set","Attributsatz entfernen"
-"Remove custom option","Benutzerdefinierte Option entfernen"
-"Remove group from attribute set","Gruppe aus dem Attributsatz entfernen"
-"Remove option","Option löschen"
-"Remove product assignment","Produktzuweisungen entfernen"
-"Remove product image","Produktbild entfernen"
-"Remove product link","Produktlink entfernen"
-"Remove value from custom option","Wert aus benutzerdefinierter Option löschen"
-"Rename existing group","Existierende Gruppe umbenennen"
-"Rename group","Gruppe umbenennen"
-"Reorganize EAV category structure to flat structure","EAV Kategorie-Struktur in Flat-Struktur umwandeln"
-"Reorganize EAV product structure to flat structure","EAV Produkt-Struktur in Flat-Struktur umwandeln"
-"Reset","Zurücksetzen"
-"Results","Ergebnisse"
-"Retrieve attribute data","Merkmalsdaten abfragen"
-"Retrieve attribute list","Attributliste abrufen"
-"Retrieve attribute options","Optionen für Attribute abrufen"
-"Retrieve categories tree","Kategorien abfragen"
-"Retrieve category attributes","Kategorieattribute abrufen"
-"Retrieve category data","Kategoriedaten abrufen"
-"Retrieve hierarchical tree","Hierarchischen Baum abrufen"
-"Retrieve linked products","Verknüpfte Produkte abrufen"
-"Retrieve list of assigned products","Liste mit zugewiesenen Produkten abrufen"
-"Retrieve list of option values","Liste mit Optionswerten abrufen"
-"Retrieve list of product custom options","Liste der benutzerdefinierten Produktoptionen abrufen"
-"Retrieve one level of categories by website/store view/parent category","Eine Ebene von Kategorien pro Website/StoreView/Ãœberkategorie abrufen"
-"Retrieve option value info","Optionswert-Informationen abrufen"
-"Retrieve product","Produkt abrufen"
-"Retrieve product attribute sets","Produktmerkmale abfragen"
-"Retrieve product image","Produktbild abrufen"
-"Retrieve product image list","Liste der Produktbilder abfragen"
-"Retrieve product image types","Produktbildtypen abrufen"
-"Retrieve product link type attributes","Attribute des Produktlinktyps abrufen"
-"Retrieve product link types","Produktlinktypen abrufen"
-"Retrieve product tier prices","Produktstaffelpreise abrufen"
-"Retrieve product types","Produkttypen abrufen"
-"Retrieve products data","Produktdaten abfragen"
-"Retrieve products list by filters","Produktliste gemäß Filter abrufen"
-"Roll Over for preview","Darüber scrollen für eine Vorschau"
-"Root","Root"
-"SKU","Artikelposition"
-"SKU length should be %s characters maximum.","Die SKU-Länge sollte maximal %s Zeichen betragen"
-"Save","speichern"
-"Save Attribute","Eigenschaft speichern"
-"Save Attribute Set","Merkmale speichern"
-"Save Category","Kategorie speichern"
-"Save Search","Suche speichern"
-"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
-"Saved %d record(s)","%d gespeicherte(r) Eintrag/Einträge"
-"Scope","Umfang"
-"Search","Suche"
-"Search Engine Optimizations","Suchmaschinen Optimierung"
-"Search Information","Suchinformationen"
-"Search Query","Suchanfrage"
-"Search Term with such search query already exists.","Suchbegriff mit dieser Suchanfrage existiert bereits."
-"Search Weight","Gewicht durchsuchen"
-"Searchable","Suchbar"
-"See price before order confirmation.","Preis vor Bestellbestätigung ansehen."
-"Select Category...","Kategorie auswählen…"
-"Select Product...","Produkt aussuchen…"
-"Select type of option","Optionsart auswählen"
-"Select type options required values rows.","Typenoptionen für benötigte Wertezeilen auswählen."
-"Selected Product Types","Ausgewählte Produkttypen"
-"Selected configuration is not available.","Gewählte Konfiguration ist nicht verfügbar."
-"Send Count","Zählerstand senden"
-"Set Ascending Direction","Aufsteigende Sortierung einstellen"
-"Set Descending Direction","In absteigender Reihenfolge"
-"Set","Name einstellen"
-"Set Root Category for Store","Rootkategorie für Store festlegen"
-"Set root category for this store in the <a href=""%s"">configuration</a>","Stellen Sie eine Stammkategorie für diesen Shop in der <a href=""%s"">Konfiguration</a> ein."
-"Set special price","Sonderpreis festlegen"
-"Set/Get current store view","Aktuelle Shopansicht auswählen/anfordern"
-"Settings","Einstellungen"
-"Shop By","Shop nach"
-"Shopping Options","Einkaufsoptionen"
-"Show","Anzeigen"
-"Show Details","Details anzeigen"
-"Show Tags","Schlagworte anzeigen"
-"Simple Product","Einfaches Produkt"
-"Site Map","Sitemap"
-"Sitemap","Sitemap"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Import-Zeile überspringen, kein gültiger Wert ""%s"" für Feld ""%s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","Import der Reihe übersprungen. Das benötigte Feld ""%s"" für den neuen Kunden ist nicht definiert."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Import-Zeile überspringen, der Wert ""%s"" ist für Feld ""%s"" nicht gültig"
-"Skipping import row, required field ""%s"" for new products is not defined.","Importzeile übersprungen, das benötigte Feld ""%s"" für neue Produkte ist nicht definiert"
-"Skipping import row, required field ""%s"" is not defined.","Import der Reihe wird jetzt übersprungen. Das benötigte Feld ""%s"" ist nicht definiert."
-"Skipping import row, store ""%s"" field does not exist.","Import-Zeile wird übersprungen, ""%s"" Feld als nicht vorhanden speichern"
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Import der Reihe übersprungen. Der Wert ""%s"" ist nicht gültig für das Feld ""%s""."
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Für einige der verarbeiteten Produkte wurde kein SKU-Wert angegeben. Bitte geben Sie diese an, bevor Sie diese Produkte weiter bearbeiten."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Einige der unten angegebenen Produkte haben nicht alle benötigten Optionen. Bitte bearbeiten Sie sie und konfigurieren Sie alle benötigten Optionen."
-"Sort By","Sortieren nach"
-"Sort Order","Sortierfolge"
-"Source Model","Source-Modell"
-"Special Expires On: %s","Angebot läuft ab am: %s"
-"Special Price:","Sonderpreis:"
-"Special Price: %s","Sonderpreis: %s"
-"Starting at:","Ab:"
-"Static","Statisch"
-"Static block and products","Statischer Block und Produkte"
-"Static block only","Nur statischer Block"
-"Status","Status"
-"Stock Availability","Lagerbestand"
-"Store","Shop"
-"Store View","Store-Ansicht"
-"Stretch","Dehnen"
-"Subscribe to RSS Feed","Für RSS Feed anmelden"
-"Super product attributes configuration","Ãœberprodukt Attributkonfiguration"
-"Synonym For","Synonym für"
-"System Properties","Systemeinstellungen"
-"Tag","Tagname"
-"Tax","Steuer"
-"Template","Vorlage"
-"Text","Text"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","Der Wohnungskatalog lässt sich nur nach %2\$d Eigenschaften durchsuchen oder sortieren. Im Moment sind aber %1\$d angegeben. Für die Verwendung dieses Moduls verringern sie bitte die Anzahl der Filter-/Sortiereigenschaften."
-"The attribute model is not defined","Das Attributmuster ist nicht definiert"
-"The attribute set has been saved.","Die Merkmale wurden gespeichert"
-"The base directory to upload file is not specified.","Das Basisverzeichnis, in das die Datei hochgeladen werden soll, wurde nicht angegeben."
-"The category has been deleted.","Die Kategorie wurde gelöscht."
-"The category has been saved.","Die Kategorie wurde gespeichert."
-"The comparison list was cleared.","Die Vergleichsliste wurde geleert."
-"The file '%s' for '%s' has an invalid extension","Die Datei '%s' für '%s' hat eine unerlaubte Dateiendung"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","Die von Ihnen hochgeladene Datei '%s' ist größer als die vom Server erlaubten %s Megabyte"
-"The file you uploaded is larger than %s Megabytes allowed by server","Die Datei, die Sie hochladen möchten, ist größer als die vom Server erlaubten %s Megabytes."
-"The filters must be an array.","Die Filter müssen als Array vorliegen."
-"The image contents is not valid base64 data.","Die Bildinhalte sind keine gültigen Base64-Daten."
-"The image is not specified.","Das Bild ist nicht angegeben."
-"The model collection resource name is not defined.","Der Ressourcenname der Modellsammlung ist nicht definiert."
-"The product %s has been added to comparison list.","Das Produkt %s wurde zur Vergleichsliste hinzugefügt."
-"The product %s has been removed from comparison list.","Das Produkt %s wurde von Vergleichsliste entfernt."
-"The product attribute has been deleted.","Das Produktattribut wurde gelöscht."
-"The product attribute has been saved.","Das Produktattribut wurde gespeichert."
-"The product has been created.","Das Produkt wurde angelegt."
-"The product has been deleted.","Das Produkt wurde gelöscht."
-"The product has been duplicated.","Das Produkt wurde dupliziert."
-"The product has been saved.","Das Produkt wurde gespeichert."
-"The product has required options","Das Produkt hat Pflichtangaben"
-"The search was deleted.","Diese Suche wurde gelöscht."
-"The text is too long","Der Text ist zu lang"
-"There are no %s available.","Es sind keine %s verfügbar."
-"There are no customers for this alert","Es gibt keine Kunden für diesen Wanhinweis"
-"There are no customers for this alert.","Es gibt keine Kunden für diesen Wanhinweis."
-"There are no products matching the selection.","Es gibt keine Produkte, die dieser Auswahl entsprechen."
-"There was an error while request processing.","Bei der Bearbeitung der Anfrage ist ein Fehler aufgetreten."
-"This Attribute no longer exists","Dieses Merkmal existiert nicht mehr"
-"This attribute cannot be deleted.","Diese Eigenschaft kann nicht gelöscht werden."
-"This attribute cannot be edited.","Dieses Merkmal kann nicht bearbeitet werden."
-"This attribute cannot be updated.","Diese Eigenschaft kann nicht aktualisiert werden."
-"This attribute no longer exists","Dieses Attribut existiert nicht mehr."
-"This attribute set no longer exists.","Dieses Eigenschaftenset existiert nicht mehr."
-"This group contains system attributes. Please move system attributes to another group and try again.","Diese Gruppe enthält System Eigenschaften. Bitte verschieben Sie System Eigenschaften in eine andere Gruppe und versuchen Sie es noch einmal."
-"This is a required option","Dies ist eine obligatorische Option"
-"This product no longer exists.","Dieses Produkt existiert nicht mehr."
-"This search no longer exists.","Diese Suche existiert nicht mehr."
-"This setting will be applied when all prices in the specific price interval are equal.","Diese Einstellung wird angewandt, wenn alle Preise in dem spezifischen Preisintervall gleich sind."
-"Tier Pricing","Preisebene"
-"Tile","Kachel"
-"Time Format","Zeitformat"
-"Title","Titel"
-"To reindex the enabled product(s), the store or product must be specified","Um die aktivierten Produkte neu zu indexieren, muss der Shop oder das Produkt angegeben werden."
-"To see product price, add this item to your cart. You can always remove it later.","Um den Produktpreis sehen zu können, müssen Sie das Produkt in Ihren Einkaufswagen legen. Sie können es später wieder löschen."
-"Top/Left","Oben links"
-"Top/Right","Oben/Rechts"
-"Total Quantity Base Items","Gesamtanzahl der Produkte bei Google Base"
-"Total incl. Tax: %1$s","Gesamtsumme inkl. Steuern: %1$s"
-"Total of %d record(s) have been deleted.","Insgesamt %d Einträge wurden gelöscht."
-"Total of %d record(s) have been updated.","Insgesamt %d Einträge wurden aktualisiert."
-"Total of %d record(s) were updated","Insgeamt wurde(n) %d Aufzeichnung(en) aktualisiert"
-"Type","Typ"
-"URL Rewrite Management","URL Umformulierungsverwaltung"
-"Unable to complete this request.","Anfrage konnte nicht ausgeführt werden."
-"Unable to find a search term to delete.","Es wurde kein Suchbegriff zum Löschen gefunden."
-"Unable to find an attribute to delete.","Es wurde kein Attribut zum Löschen gefunden."
-"Unable to get the product ID.","Produktnummer konnte nicht ermittelt werden."
-"Unassigned Attributes","Nicht zugewiesene Attribute"
-"Unknown EAV indexer type ""%s"".","Unbekannter EAV Indizierungstyp ""%s""."
-"Unknown attribute: %s.","Unbekanntes Attribut: %s."
-"Unsupported product type ""%s"".","Nicht unterstützter Produkttyp ""%s""."
-"Up-sells","Up-Selling"
-"Update","Aktualisieren"
-"Update Attributes","Merkmale aktualisieren"
-"Update Tier Price","Staffelpreise aktualisieren"
-"Update assigned product","Zugewiesenes Produkt aktualisieren"
-"Update attribute","Attribut aktualisieren"
-"Update attributes","Attribute aktualisiert"
-"Update category","Kategorie aktualisieren"
-"Update custom option of product","Benutzerdefinierte Option des Produkts überspringen"
-"Update product","Produkt aktualisieren"
-"Update product image","Produktbild aktualisieren"
-"Update product link","Produktlink aktualisieren"
-"Update product tier prices","Produktstaffelpreise aktualisieren"
-"Update value of custom option","Wert der benutzerdefinierten Option aktualisieren"
-"Upload new product image ","Neues Produktbild hochladen"
-"Use Canonical Link Meta Tag For Categories","Canonical Link Element für Kategorien verwenden"
-"Use Canonical Link Meta Tag For Products","Canonical Link Meta Tag für Produkte nutzen"
-"Use Categories Path for Product URLs","Kategoriepfad für Produkt-URLs verwenden"
-"Use Config Settings","Konfigurations-Einstellungen verwenden"
-"Use Default Value","Standardwert verwenden"
-"Use Flat Catalog Category","Flat Catalog Category verwenden"
-"Use Flat Catalog Product","Flat Catalog Product verwenden"
-"Use In Layered Navigation","Filternavigation auf Suchergebnisseiten verwenden"
-"Use In Search Results Layered Navigation","Navigation in Suchergebnissen nutzen"
-"Use JavaScript Calendar","JavaScript Kalender verwenden"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","Statische URLs für Medieninhalt in WYSIWYG für Katalog nutzen"
-"Use Tree Like Category Sitemap","Kategorie-Sitemap in Baumansicht verwenden"
-"Use config","config verwenden"
-"Use default","Standard verwenden"
-"Use for Promo Rule Conditions","Für Promo Regelbedingungen verwenden"
-"Use four-digit year format.","Das 4-stellige Jahresformat verwenden."
-"Use in Advanced Search","In erweiterter Suche verwenden"
-"Use in Layered Navigation","In mehrschichtiger Navigation verwenden"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","In Filter-Navigation verwenden<br/>(Kann nur mit 'Dropdown' verwendet werden)"
-"Use in Quick Search","Bei Schnellsuche nutzen"
-"Used for Sorting in Product Listing","Für Sortierung im Produkt-Listing verwendet"
-"Used in Product Listing","Im Produkt-Listing verwendet"
-"Value for ""%s"" is invalid.","Wert für ""%s"" ist ungültig."
-"Value for ""%s"" is invalid: %s","Wert für ""%s"" ist ungültig: %s"
-"Varchar","Varchar"
-"View as","Darstellung als"
-"Virtual Product","Virtuelles Produkt"
-"Visibility","Sichtbarkeit"
-"Visible","Sichtbar"
-"Visible on Catalog Pages on Front-end","Sichtbar auf Katalogseiten im Frontend"
-"Visible on Product View Page on Front-end","Sichtbar auf Produkt-Infoseite im Frontend"
-"WYSIWYG Editor","WYSIWYG Editor"
-"Watermark","Wasserzeichen"
-"Watermark Default Size","Wasserzeichen Standardgröße"
-"Watermark Opacity, Percent","Wasserzeichen Opazität, Prozent"
-"Watermark Position","Wasserzeichen Position"
-"Website","Website"
-"Website Item Must be checked","Website Artikel muss geprüft sein"
-"Website Store Must be checked","Shop der Webseite muss geprüft werden"
-"Websites","Webseiten"
+"Special Price:",Sonderpreis:
+"Product Alerts",Produktmeldungen
+"Can be Divided into Multiple Boxes for Shipping","Kann für den Versand in mehrere Pakete unterteilt werden"
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price","Klicken für den Preis"
"What's this?","Was ist das?"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Ob die ""Alle""-Option in dem ""Zeige X pro Seite""-Dropdown-Menü angezeigt werden soll."
-"Will make search for the query above return results for this search.","Werde für die obenstehende Frage eine Suche starten und die Suchergebnisse mitteilen."
-"Wrong BuyRequest instance in options group.","Falsche Kauf-Anfrage der Instanz in der Options-Gruppe."
-"Wrong configuration item instance in options group.","Falsches Konfigurationselement Beispiel in Gruppe Optionen."
-"Wrong configuration item option instance in options group.","Falsches Konfigurationselement Optionsbeispiel in Gruppe Optionen."
-"Wrong option instance type in options group.","Falscher Optionsinstanz-Typ in der Options-Gruppe."
-"Wrong option type to get group instance.","Falscher Options-Typ um die Gruppen-Instanz zu erhalten."
-"Wrong product instance type in options group.","Falsches Produktbeispiel in Optionengruppe."
-"Wrong product type filter specified","Falscher Produkttyp Filter festgelegt"
-"Year Range","Jahres-Zeitraum"
-"Yes","Ja"
-"You cannot remove system attribute from this set.","Dieses Systemattribut kann aus dieser Gruppe nicht entfernt werden."
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,jede
+and,und
+save,Speichern
+"Actual Price","Tatsächlicher Preis"
+"Shop By","Shop nach"
+"Shopping Options",Einkaufsoptionen
+"Compare Products","Produkte vergleichen"
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page","Diese Seite drucken"
+"Remove Product","Remove Product"
+"Add to Wishlist","Zum Wunschzettel hinzufügen"
"You have no items to compare.","Sie haben keine Gegenstände zum Vergleich."
+"Are you sure you would like to remove this item from the compare products?","Sind Sie sicher, dass Sie diese Position vom Produktvergleich entfernen möchten?"
+"Are you sure you would like to remove all products from your comparison?","Sind Sie sicher, dass Sie alle Produkte von Ihrem Vergleich entfernen möchten?"
+"Remove This Item","Diesen Gegenstand entfernen"
+Compare,Vergleichen
+"Clear All","Alle löschen"
+Prev,Vorschau
+"There are no products matching the selection.","Es gibt keine Produkte, die dieser Auswahl entsprechen."
+"Add to Compare","Hinzufügen um zu vergleichen"
+"Learn More","mehr dazu"
"You may also be interested in the following product(s)","Sie könnten auch an folgenden Produkten interessiert sein"
-"Zoom In","Vergrößern"
-"Zoom Out","Verkleinern"
-"and","und"
-"and above","und oben"
-"categories","Kategorien"
-"each","jede"
-"ex. http://domain.com","z.B. http://domain.com"
-"leave blank if its not an image","Leer lassen falls es kein Bild ist"
-"per page","pro Seite"
-"products","Produkte"
-"px.","px."
-"save","Speichern"
+"More Choices:","More Choices:"
+"New Products","Neue Produkte"
+"Check items to add to the cart or","Artikel überprüfen, um sie dem Einkaufswagen zuzufügen oder"
"select all","Alles auswählen"
+"View as","Darstellung als"
+"Sort By","Sortieren nach"
+"Set Ascending Direction","Aufsteigende Sortierung einstellen"
+"Set Descending Direction","In absteigender Reihenfolge"
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Anzeigen
+"Additional Information","Zusätzliche Information"
+"More Views","Mehr Ansichten"
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend","E-Mail an einen Freund"
+Details,Details
+Template,Vorlage
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Bitte Zeilen zur Option hinzufügen."
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
"unselect all","Alles abwählen"
-"x","x"
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text","Anchor eigener Text"
+"Anchor Custom Title","Anchor eigener Titel"
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
+"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
+"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
+"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
+"Products per Page on List Default Value","Products per Page on List Default Value"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
+"Search Engine Optimizations","Search Engine Optimizations"
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
+"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
+"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
+"Use JavaScript Calendar","Use JavaScript Calendar"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
+"Watermark Default Size","Watermark Default Size"
+"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
+"Watermark Position","Watermark Position"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data","Produkt Flat Daten"
+"Reorganize EAV product structure to flat structure","EAV Produkt-Struktur in Flat-Struktur umwandeln"
+"Category Flat Data","Flache Kategoriedaten"
+"Reorganize EAV category structure to flat structure","EAV Kategorie-Struktur in Flat-Struktur umwandeln"
+"Indexed category/products association","Indizierte Kategorie/Produkassoziierung"
+"Product Categories",Produktkategorien
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices","Index Produktpreise"
+"Catalog New Products List","Neue Produktliste des Katalogs"
+"List of Products that are set as New","Liste von Produkten, die als neu klassifiziert sind"
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display","Anzahl angezeigter Produkte"
+"New Products Grid Template","Neue Produkt Rastervorlage"
+"New Products List Template","Neue Produkt Listenvorlage"
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)","Cache-Lebensdauer (Sekunden)"
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link","Link zu den Produkten im Katalog"
+"Link to a Specified Product","Link zum angegebenen Produkt"
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template","Produkt-Link Block Vorlage"
+"Product Link Inline Template","Produkt-Link Inline Vorlage"
+"Catalog Category Link",Katalogkategorie-Link
+"Link to a Specified Category","Link zu einer bestimmten Kategorie"
+"If empty, the Category Name will be used","Falls leer, wird der Kategoriename verwendet"
+"Category Link Block Template","Kategorielink, Blockschablone"
+"Category Link Inline Template","Kategorielink, eingebettet in Schablone"
+Set,"Name einstellen"
+none,none
+Overview,Overview
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index 8fb4e90e6c5..b90461bb4d0 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -1,805 +1,639 @@
-"Uses","Uses"
-"%1$s incl tax.","%1$s incl tax."
-"%s - %s","%s - %s"
-"%s Item(s)","%s Item(s)"
-"%s and above","%s and above"
-"(%d)","(%d)"
-"(Copy data from: %s)","(Copy data from: %s)"
-"* Required Fields","* Required Fields"
+All,All
+None,None
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+Products,Products
+ID,ID
+SKU,SKU
+No,No
+Qty,Qty
+Action,Action
+Reset,Reset
+Edit,Edit
+"Add to Cart","Add to Cart"
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,Delete
+Save,Save
+Store,Store
"-- Please Select --","-- Please Select --"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache."
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend."
-"A group with the same name already exists.","A group with the same name already exists."
-"A name is required","A name is required"
-"A product type is not defined for the indexer.","A product type is not defined for the indexer."
-"ALL GROUPS","ALL GROUPS"
-"AM","AM"
-"Action","Action"
-"Actual Price","Actual Price"
-"Add","Add"
-"Add Attribute","Add Attribute"
-"Add Design Change","Add Design Change"
-"Add Group","Add Group"
-"Add Group Price","Add Group Price"
+"Custom Design","Custom Design"
+Yes,Yes
+"Web Site","Web Site"
+Name,Name
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Save and Continue Edit","Save and Continue Edit"
+Title,Title
+"Store View","Store View"
+Type,Type
+Home,Home
+Search,Search
+"Select All","Select All"
"Add New","Add New"
-"Add New Attribute","Add New Attribute"
-"Add New Attribute Set","Add New Attribute Set"
-"Add New Group","Add New Group"
-"Add New Images","Add New Images"
-"Add New Option","Add New Option"
-"Add New Row","Add New Row"
-"Add New Search Term","Add New Search Term"
-"Add New Set","Add New Set"
-"Add Product","Add Product"
-"Add Product To Websites","Add Product To Websites"
-"Add Root Category","Add Root Category"
-"Add Subcategory","Add Subcategory"
-"Add Tax","Add Tax"
-"Add Tier","Add Tier"
-"Add attribute into attribute set","Add attribute into attribute set"
-"Add group into attribute set","Add group into attribute set"
-"Add new custom option into product","Add new custom option into product"
-"Add new values into custom option","Add new values into custom option"
-"Add option","Add option"
-"Add to Cart","Add to Cart"
-"Add to Compare","Add to Compare"
-"Add to Wishlist","Add to Wishlist"
-"Additional Information","Additional Information"
-"Alert Urls","Alert Urls"
-"All","All"
-"All Product Types","All Product Types"
+"Please select items.","Please select items."
+Required,Required
+Website,Website
"All Websites","All Websites"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","All products of this set will be deleted! Are you sure you want to delete this attribute set?"
-"Allow All Products per Page","Allow All Products per Page"
-"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
-"Allow HTML Tags on Frontend","Allow HTML Tags on Frontend"
-"Allowed File Extensions","Allowed File Extensions"
-"Allowed file extensions to upload","Allowed file extensions to upload"
-"Amount","Amount"
-"An error occurred while adding products to websites.","An error occurred while adding products to websites."
-"An error occurred while clearing comparison list.","An error occurred while clearing comparison list."
-"An error occurred while removing products from websites.","An error occurred while removing products from websites."
-"An error occurred while saving the URL rewrite","An error occurred while saving the URL rewrite"
-"An error occurred while saving the attribute set.","An error occurred while saving the attribute set."
-"An error occurred while saving the collection, aborting. Error message: %s","An error occurred while saving the collection, aborting. Error message: %s"
-"An error occurred while saving the product. ","An error occurred while saving the product. "
-"An error occurred while saving the search query.","An error occurred while saving the search query."
-"An error occurred while saving this group.","An error occurred while saving this group."
-"An error occurred while trying to delete the category.","An error occurred while trying to delete the category."
-"An error occurred while updating the product(s) attributes.","An error occurred while updating the product(s) attributes."
-"An error occurred while updating the product(s) status.","An error occurred while updating the product(s) status."
-"An invalid group ID is specified, skipping the record.","An invalid group ID is specified, skipping the record."
-"An invalid option ID is specified for %s (%s), skipping the record.","An invalid option ID is specified for %s (%s), skipping the record."
-"An invalid store was specified.","An invalid store was specified."
-"Anchor Custom Text","Anchor Custom Text"
-"Anchor Custom Title","Anchor Custom Title"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes."
-"Apply MAP (Default Value)","Apply MAP (Default Value)"
-"Apply To","Apply To"
-"Approved","Approved"
-"Are you sure you want to delete this category?","Are you sure you want to delete this category?"
-"Are you sure you would like to remove all products from your comparison?","Are you sure you would like to remove all products from your comparison?"
-"Are you sure you would like to remove this item from the compare products?","Are you sure you would like to remove this item from the compare products?"
-"Are you sure?","Are you sure?"
-"As low as:","As low as:"
-"Assign","Assign"
-"Assign product link","Assign product link"
-"Assign product to category","Assign product to category"
-"Assigned Products","Assigned Products"
-"Associated Products","Associated Products"
-"Attribute Set","Attribute Set"
-"Attribute ""%s"" is invalid.","Attribute ""%s"" is invalid."
-"Attribute ""%s"" is required.","Attribute ""%s"" is required."
-"Attribute Information","Attribute Information"
-"Attribute Model","Attribute Model"
-"Attribute Name:","Attribute Name:"
-"Attribute Set","Attribute Set"
-"Attribute Sets","Attribute Sets"
-"Attribute add","Attribute add"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
-"Attribute group with the \"/name/\" name already exists","Attribute group with the \"/name/\" name already exists"
-"Attribute remove","Attribute remove"
-"Attribute with the same code already exists","Attribute with the same code already exists"
-"Attributes","Attributes"
-"Attrribute names can be specified per store.","Attrribute names can be specified per store."
-"Autogenerate","Autogenerate"
-"Availability:","Availability:"
-"Back","Back"
-"Backend Model","Backend Model"
-"Backend Table","Backend Table"
-"Backend Table Title","Backend Table Title"
-"Backorders","Backorders"
-"Based On","Based On"
-"Before Order Confirmation","Before Order Confirmation"
-"Block after Info Column","Block after Info Column"
-"Bottom Block Options Wrapper","Bottom Block Options Wrapper"
-"Bottom/Left","Bottom/Left"
-"Bottom/Right","Bottom/Right"
-"Browse By","Browse By"
-"Bundle Items","Bundle Items"
-"Buy %1$s","Buy %1$s"
-"Buy %1$s for","Buy %1$s for"
-"Buy %1$s for %2$s","Buy %1$s for %2$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each"
-"Buy %1$s for %2$s each","Buy %1$s for %2$s each"
-"Cache Lifetime (Seconds)","Cache Lifetime (Seconds)"
-"Cache refresh needed.","Cache refresh needed."
-"Can be Divided into Multiple Boxes for Shipping","Can be Divided into Multiple Boxes for Shipping"
-"Can be used only with catalog input type Dropdown","Can be used only with catalog input type Dropdown"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
-"Can't create image.","Can't create image."
-"Cancel","Cancel"
-"Cannot create image.","Cannot create image."
-"Cannot create writeable directory '%s'.","Cannot create writeable directory '%s'."
-"Cart Item Attribute","Cart Item Attribute"
-"Catalog","Catalog"
-"Catalog Category (Anchor)","Catalog Category (Anchor)"
-"Catalog Category (Non-Anchor)","Catalog Category (Non-Anchor)"
-"Catalog Category (Without Subcategories)","Catalog Category (Without Subcategories)"
-"Catalog Category Link","Catalog Category Link"
-"Catalog New Products List","Catalog New Products List"
-"Catalog Price Scope","Catalog Price Scope"
-"Catalog Product Compare List","Catalog Product Compare List"
-"Catalog Product Email to a Friend","Catalog Product Email to a Friend"
-"Catalog Product Image Gallery Popup","Catalog Product Image Gallery Popup"
-"Catalog Product Link","Catalog Product Link"
-"Catalog Product View (Any)","Catalog Product View (Any)"
-"Catalog Product View (Simple)","Catalog Product View (Simple)"
-"Catalog Product View (Virtual)","Catalog Product View (Virtual)"
-"Catalog Section","Catalog Section"
-"Catalog Seo Popular Search Terms","Catalog Seo Popular Search Terms"
-"Catalog Seo Sitemap (Category List)","Catalog Seo Sitemap (Category List)"
-"Catalog Seo Sitemap (Category Tree)","Catalog Seo Sitemap (Category Tree)"
-"Catalog Seo Sitemap (Common)","Catalog Seo Sitemap (Common)"
-"Catalog Seo Sitemap (Product List)","Catalog Seo Sitemap (Product List)"
-"Catalog URL Rewrites","Catalog URL Rewrites"
-"Catalog product custom option values API","Catalog product custom option values API"
-"Catalog product custom options API","Catalog product custom options API"
-"Catalog, Search","Catalog, Search"
-"Categories","Categories"
-"Categories Sitemap","Categories Sitemap"
-"Category","Category"
-"Category API","Category API"
+Next,Next
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,Catalog
+Images,Images
+"per page","per page"
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,OK
+Visibility,Visibility
+Position,Position
+Fixed,Fixed
+"Use Default Value","Use Default Value"
+N/A,N/A
+Percent,Percent
+"Option Title","Option Title"
+"Input Type","Input Type"
+"New Option","New Option"
+"Price Type","Price Type"
+"* Required Fields","* Required Fields"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,Root
+"Save Category","Save Category"
+"Delete Category","Delete Category"
+"New Subcategory","New Subcategory"
+"New Root Category","New Root Category"
+"Set Root Category for Store","Set Root Category for Store"
+"Use Config Settings","Use Config Settings"
+"Use All Available Attributes","Use All Available Attributes"
+"General Information","General Information"
"Category Data","Category Data"
-"Category Flat Data","Category Flat Data"
-"Category Link Block Template","Category Link Block Template"
-"Category Link Inline Template","Category Link Inline Template"
"Category Products","Category Products"
-"Category Top Navigation","Category Top Navigation"
-"Category URL Suffix","Category URL Suffix"
-"Category attributes API","Category attributes API"
-"Category move error","Category move error"
-"Category move operation is not possible: parent category is equal to child category.","Category move operation is not possible: parent category is equal to child category."
-"Category move operation is not possible: the current category was not found.","Category move operation is not possible: the current category was not found."
-"Category move operation is not possible: the new parent category was not found.","Category move operation is not possible: the new parent category was not found."
-"Category must be an instance of \Magento\Catalog\Model\Category.","Category must be an instance of \Magento\Catalog\Model\Category."
-"Center","Center"
-"Change","Change"
-"Change or Retrieve attribute store view","Change or Retrieve attribute store view"
-"Change status","Change status"
-"Check items to add to the cart or","Check items to add to the cart or"
-"Choose an Option...","Choose an Option..."
-"Clear All","Clear All"
-"Clear Price","Clear Price"
-"Click for price","Click for price"
-"Close Window","Close Window"
-"Collapse All","Collapse All"
-"Comma-separated.","Comma-separated."
-"Comparable","Comparable"
-"Comparable on Front-end","Comparable on Front-end"
-"Comparable on the Frontend","Comparable on the Frontend"
-"Compare","Compare"
-"Compare Products","Compare Products"
-"Conditions Combination","Conditions Combination"
-"Continue","Continue"
-"Country/State","Country/State"
-"Create","Create"
-"Create (Upload)","Create (Upload)"
-"Create Empty","Create Empty"
-"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Add Subcategory","Add Subcategory"
+"Add Root Category","Add Root Category"
"Create Permanent Redirect for old URL","Create Permanent Redirect for old URL"
-"Create Product Settings","Create Product Settings"
-"Create Simple Associated Product","Create Simple Associated Product"
-"Create attribute set based on another set","Create attribute set based on another set"
-"Create new attribute","Create new attribute"
-"Create new category","Create new category"
-"Create new product","Create new product"
-"Cross-sells","Cross-sells"
-"Currently Shopping by:","Currently Shopping by:"
-"Custom Design","Custom Design"
-"Custom Options","Custom Options"
-"Custom options","Custom options"
-"Customer Group","Customer Group"
-"Customers Tagged Product","Customers Tagged Product"
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor","WYSIWYG Editor"
+"Add Product","Add Product"
+label,label
+"Product Attributes","Product Attributes"
+"Add New Attribute","Add New Attribute"
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute","Save Attribute"
+"Delete Attribute","Delete Attribute"
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute","New Product Attribute"
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,Global
+Scope,Scope
+"Declare attribute value saving scope","Declare attribute value saving scope"
+"Frontend Properties","Frontend Properties"
+"Use in Quick Search","Use in Quick Search"
+"Use in Advanced Search","Use in Advanced Search"
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions","Use for Promo Rule Conditions"
+"Enable WYSIWYG","Enable WYSIWYG"
+"Allow HTML Tags on Frontend","Allow HTML Tags on Frontend"
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing","Used in Product Listing"
+"Depends on design theme","Depends on design theme"
+"Used for Sorting in Product Listing","Used for Sorting in Product Listing"
+"Media Image","Media Image"
+Gallery,Gallery
+"System Properties","System Properties"
"Data Type for Saving in Database","Data Type for Saving in Database"
-"Date & Time Custom Options","Date & Time Custom Options"
-"Date Fields Order","Date Fields Order"
+Text,Text
+Varchar,Varchar
+Static,Static
+Datetime,Datetime
+Decimal,Decimal
+Integer,Integer
+"Globally Editable","Globally Editable"
+"Attribute Information","Attribute Information"
+Properties,Properties
+"Manage Labels","Manage Labels"
+Visible,Visible
+Searchable,Searchable
+Comparable,Comparable
+"Delete Selected Group","Delete Selected Group"
+"Delete Attribute Set","Delete Attribute Set"
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set","Save Attribute Set"
+"New Set Name","New Set Name"
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,Empty
+"Add Attribute","Add Attribute"
+"Add New Group","Add New Group"
+"Add Group","Add Group"
+"Edit Set Name","Edit Set Name"
+"For internal use","For internal use"
+"Based On","Based On"
+"Add New Attribute Set","Add New Attribute Set"
+"Add New Set","Add New Set"
+"Product Templates","Product Templates"
+"Close Window","Close Window"
+"New Product","New Product"
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,Attributes
+Change,Change
+"Advanced Inventory","Advanced Inventory"
+Websites,Websites
+"Products Information","Products Information"
+"Category Name","Category Name"
+"Parent Category","Parent Category"
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.","There are no customers for this alert."
"Subscribe Date","Subscribe Date"
-"Datetime","Datetime"
-"Decimal","Decimal"
-"Declare attribute value saving scope","Declare attribute value saving scope"
-"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
-"Default Popup Text Message","Default Popup Text Message"
+"Last Notified","Last Notified"
+"Send Count","Send Count"
+"New Attribute","New Attribute"
+"Attribute Set","Attribute Set"
+"Add New Option","Add New Option"
+"Import Options","Import Options"
+Import,Import
+"Add New Row","Add New Row"
+"Delete Row","Delete Row"
+"Tier Pricing","Tier Pricing"
"Default Price","Default Price"
-"Default Price Navigation Step","Default Price Navigation Step"
-"Default Quantity","Default Quantity"
+"Add Group Price","Add Group Price"
+"ALL GROUPS","ALL GROUPS"
+"Add Tier","Add Tier"
"Default Values","Default Values"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
-"Delete","Delete"
-"Delete Attribute","Delete Attribute"
-"Delete Attribute Set","Delete Attribute Set"
-"Delete Category","Delete Category"
-"Delete Group Price","Delete Group Price"
-"Delete Option","Delete Option"
-"Delete Row","Delete Row"
+"Related Products","Related Products"
+Up-sells,Up-sells
+Cross-sells,Cross-sells
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS","Notify Low Stock RSS"
+"Change status","Change status"
+"Update Attributes","Update Attributes"
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images","Add New Images"
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term","Add New Search Term"
+"Save Search","Save Search"
"Delete Search","Delete Search"
-"Delete Selected Group","Delete Selected Group"
-"Delete Tier","Delete Tier"
-"Delete attribute","Delete attribute"
-"Delete category","Delete category"
-"Delete product","Delete product"
-"Depends on design theme","Depends on design theme"
-"Design","Design"
-"Details","Details"
-"Disabled","Disabled"
-"Disallowed file type.","Disallowed file type."
-"Display Actual Price","Display Actual Price"
-"Display Price Interval as One Price","Display Price Interval as One Price"
-"Display Product Count","Display Product Count"
-"Display in Suggested Terms","Display in Suggested Terms"
-"Double click on a group to rename it","Double click on a group to rename it"
-"Double click on above image to view full picture","Double click on above image to view full picture"
-"Downloadable Information","Downloadable Information"
-"Duplicate","Duplicate"
-"Duplicate amount found.","Duplicate amount found."
-"Duplicate website group price customer group.","Duplicate website group price customer group."
-"Duplicate website tier price customer group and quantity.","Duplicate website tier price customer group and quantity."
-"Duplicate website, country and state tax found.","Duplicate website, country and state tax found."
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
-"Edit","Edit"
-"Edit Attribute Set '%s'","Edit Attribute Set '%s'"
-"Edit Product Attribute","Edit Product Attribute"
-"Edit Product Attribute ""%s""","Edit Product Attribute ""%s"""
-"Edit Search","Edit Search"
-"Edit Search '%s'","Edit Search '%s'"
-"Edit Set Name","Edit Set Name"
-"Email","Email"
-"Email to a Friend","Email to a Friend"
-"Empty","Empty"
-"Enable MAP","Enable MAP"
-"Enable Quantity Increments","Enable Quantity Increments"
-"Enable WYSIWYG","Enable WYSIWYG"
-"Enabled","Enabled"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType"
-"Error during retrieval of option value: %s","Error during retrieval of option value: %s"
-"Exclude","Exclude"
-"Expand All","Expand All"
-"Failed","Failed"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","Failed to copy file %s. Please, delete media with non-existing images and try again."
-"Failed to move file: %s","Failed to move file: %s"
-"Feature Products","Feature Products"
-"Field is not complete","Field is not complete"
-"File options format is not valid.","File options format is not valid."
-"File upload failed","File upload failed"
-"Filter model name must be declared.","Filter model name must be declared."
-"Filter must be an object. Please set correct filter.","Filter must be an object. Please set correct filter."
-"Filterable (no results)","Filterable (no results)"
-"Filterable (with results)","Filterable (with results)"
-"First Name","First Name"
-"Fixed","Fixed"
-"For internal use.","For internal use."
+"Edit Search '%1'","Edit Search '%1'"
+"New Search","New Search"
+"Search Information","Search Information"
+"Search Query","Search Query"
+"Number of results","Number of results"
+"Number of results (For the last time placed)","Number of results (For the last time placed)"
"For the last time placed.","For the last time placed."
-"Frontend","Frontend"
-"Frontend Model","Frontend Model"
-"Frontend Properties","Frontend Properties"
-"Gallery","Gallery"
-"General Information","General Information"
-"Get full information about attribute with list of options","Get full information about attribute with list of options"
-"Get full information about custom option in product","Get full information about custom option in product"
-"Get list of available custom option types","Get list of available custom option types"
-"Get list of non-default attributes by product type and attributes set","Get list of non-default attributes by product type and attributes set"
-"Get list of possible attribute types","Get list of possible attribute types"
-"Get special price","Get special price"
-"Global","Global"
-"Globally Editable","Globally Editable"
+"Number of Uses","Number of Uses"
+"Synonym For","Synonym For"
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL","Redirect URL"
+"ex. http://domain.com","ex. http://domain.com"
+"Display in Suggested Terms","Display in Suggested Terms"
"Go to Home Page","Go to Home Page"
-"Grid","Grid"
-"Group add","Group add"
-"Group remove","Group remove"
-"Groups","Groups"
-"Home","Home"
-"ID","ID"
-"ID: %s","ID: %s"
-"If empty, the Category Name will be used","If empty, the Category Name will be used"
-"If empty, the Product will be used","If empty, the Product will be used"
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","If you do not specify an option value for a specific store view then the default (Admin) value will be used."
-"Image","Image"
-"Image content is not valid base64 data.","Image content is not valid base64 data."
-"Image does not exist.","Image does not exist."
-"Image file was not found.","Image file was not found."
-"Image type and information need to be specified for each store view.","Image type and information need to be specified for each store view."
-"In Cart","In Cart"
-"In Stock","In Stock"
-"In stock","In stock"
-"Incl. Tax","Incl. Tax"
-"Index product and categories URL rewrites","Index product and categories URL rewrites"
-"Index product attributes for layered navigation building","Index product attributes for layered navigation building"
-"Index product prices","Index product prices"
-"Indexed category/products association","Indexed category/products association"
-"Info","Info"
-"Info Column Options Wrapper","Info Column Options Wrapper"
-"Input Type","Input Type"
-"Integer","Integer"
-"Interval Division Limit","Interval Division Limit"
-"Invalid Tier Prices","Invalid Tier Prices"
-"Invalid attribute %s","Invalid attribute %s"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Invalid attribute option specified for attribute %s (%s), skipping the record."
-"Invalid attribute set specified, skipping the record.","Invalid attribute set specified, skipping the record."
-"Invalid block: %s.","Invalid block: %s."
-"Invalid category IDs.","Invalid category IDs."
-"Invalid category.","Invalid category."
-"Invalid image file type.","Invalid image file type."
-"Invalid image type.","Invalid image type."
-"Invalid option ID specified for %s (%s), skipping the record.","Invalid option ID specified for %s (%s), skipping the record."
-"Invalid product type specified, skipping the record.","Invalid product type specified, skipping the record."
-"Invalid store specified","Invalid store specified"
-"Invalid store specified, skipping the record.","Invalid store specified, skipping the record."
-"Invalid tier prices. The product is not associated to the requested website.","Invalid tier prices. The product is not associated to the requested website."
-"Inventory","Inventory"
-"Is Default","Is Default"
-"Is Required","Is Required"
-"Items %s to %s of %s total","Items %s to %s of %s total"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store."
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store."
-"Keep your eyes open for our special Back to School items and save A LOT!","Keep your eyes open for our special Back to School items and save A LOT!"
-"Label","Label"
-"Last Name","Last Name"
-"Last Notified","Last Notified"
-"Layered Navigation","Layered Navigation"
-"Learn More","Learn More"
-"Line %d, Email: %s","Line %d, Email: %s"
-"Line %d, SKU: %s","Line %d, SKU: %s"
-"Link (Related, Up sell, Cross sell)","Link (Related, Up sell, Cross sell)"
-"Link product does not exist.","Link product does not exist."
-"Link to a Specified Category","Link to a Specified Category"
-"Link to a Specified Product","Link to a Specified Product"
-"List","List"
-"List Mode","List Mode"
-"List of Products that are set as New","List of Products that are set as New"
-"List of types","List of types"
-"Manage Attribute Sets","Manage Attribute Sets"
-"Manage Attributes","Manage Attributes"
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List","Products Comparison List"
+AM,AM
+PM,PM
+Categories,Categories
"Manage Catalog Categories","Manage Catalog Categories"
"Manage Categories","Manage Categories"
-"Manage Label / Options","Manage Label / Options"
-"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.","This product no longer exists."
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).","Please select product(s)."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
"Manage Product Attributes","Manage Product Attributes"
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.","This attribute cannot be edited."
+"Edit Product Attribute","Edit Product Attribute"
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.","This attribute cannot be deleted."
+"The product attribute has been deleted.","The product attribute has been deleted."
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.","A group with the same name already exists."
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets","Manage Attribute Sets"
+"New Set","New Set"
"Manage Product Sets","Manage Product Sets"
-"Manage Products","Manage Products"
-"Manage Stock","Manage Stock"
+"This attribute set no longer exists.","This attribute set no longer exists."
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.","An error occurred while saving the attribute set."
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.","This search no longer exists."
+"Edit Search","Edit Search"
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.","To see product price, add this item to your cart. You can always remove it later."
+"See price before order confirmation.","See price before order confirmation."
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+Grid,Grid
+List,List
+"Product is not loaded","Product is not loaded"
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
+"No layout updates","No layout updates"
+"Products only","Products only"
+"Static block only","Static block only"
+"Static block and products","Static block and products"
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,Stretch
+Tile,Tile
+Top/Left,Top/Left
+Top/Right,Top/Right
+Bottom/Left,Bottom/Left
+Bottom/Right,Bottom/Right
+Center,Center
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites","Catalog URL Rewrites"
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,Category
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price","Clear Price"
+"The filters must be an array.","The filters must be an array."
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config","Use config"
+"In Cart","In Cart"
+"Before Order Confirmation","Before Order Confirmation"
+"On Gesture","On Gesture"
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building","Index product attributes for layered navigation building"
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.","Select type options required values rows."
+"Please specify date required option(s).","Please specify date required option(s)."
+"Please specify time required option(s).","Please specify time required option(s)."
+"Please specify the product's required option(s).","Please specify the product's required option(s)."
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,px.
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually","Not Visible Individually"
+"Catalog, Search","Catalog, Search"
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.","A product type is not defined for the indexer."
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:","As low as:"
+"Are you sure you want to delete this category?","Are you sure you want to delete this category?"
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
-"Max Characters","Max Characters"
-"Maximal Depth","Maximal Depth"
-"Maximum Image Size","Maximum Image Size"
-"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
-"Maximum Quantity Allowed in Shopping Cart","Maximum Quantity Allowed in Shopping Cart"
-"Maximum allowed image size for '%s' is %sx%s px.","Maximum allowed image size for '%s' is %sx%s px."
-"Maximum image height","Maximum image height"
+"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
+"Is Default","Is Default"
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,Groups
+"Double click on a group to rename it","Double click on a group to rename it"
+"Unassigned Attributes","Unassigned Attributes"
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.","This group contains system attributes. Please move system attributes to another group and try again."
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options","Custom Options"
+"This is a required option.","This is a required option."
+"Field is not complete","Field is not complete"
+"Allowed file extensions to upload","Allowed file extensions to upload"
"Maximum image width","Maximum image width"
+"Maximum image height","Maximum image height"
"Maximum number of characters:","Maximum number of characters:"
-"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
-"Media Image","Media Image"
-"Minimum Advertised Price","Minimum Advertised Price"
-"Minimum Lines per Page","Minimum Lines per Page"
-"Minimum Quantity Allowed in Shopping Cart","Minimum Quantity Allowed in Shopping Cart"
-"Minimum Quantity for Item's Status to be Out of Stock","Minimum Quantity for Item's Status to be Out of Stock"
-"Missing SKU, skipping the record.","Missing SKU, skipping the record."
-"More Views","More Views"
-"Move","Move"
-"Move category in tree","Move category in tree"
-"Must be in the allowed values list.","Must be in the allowed values list."
-"N/A","N/A"
-"Name","Name"
-"Name in %s","Name in %s"
-"New Product","New Product"
-"New Product Attribute","New Product Attribute"
-"New Products","New Products"
-"New Products Grid Template","New Products Grid Template"
-"New Products List Template","New Products List Template"
-"New Root Category","New Root Category"
-"New Search","New Search"
-"New Set Name","New Set Name"
-"New Subcategory","New Subcategory"
-"Next","Next"
-"No","No"
-"No image","No image"
-"No layout updates","No layout updates"
-"No options of this product are available.","No options of this product are available."
-"No product collections found.","No product collections found."
-"None","None"
-"Not Visible Individually","Not Visible Individually"
-"Notify Low Stock RSS","Notify Low Stock RSS"
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock","Manage Stock"
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,Backorders
"Notify for Quantity Below","Notify for Quantity Below"
-"Number of Products to Display","Number of Products to Display"
-"Uses","Uses"
-"Number of results","Number of results"
-"Number of results (For the last time placed)","Number of results (For the last time placed)"
-"OK","OK"
-"OR","OR"
-"Old Price:","Old Price:"
-"On Gesture","On Gesture"
-"Option validation failed to add product to cart.","Option validation failed to add product to cart."
-"Option values","Option values"
-"Option:","Option:"
-"Options","Options"
-"Options Control","Options Control"
-"Options is required","Options is required"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","Our customer service is available 24/7. Call us at (555) 555-0123."
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
"Out of Stock","Out of Stock"
-"Out of stock","Out of stock"
-"PM","PM"
-"Page Title Separator","Page Title Separator"
-"Parent Category","Parent Category"
-"Pending","Pending"
-"Percentage","Percentage"
-"Please add rows to option.","Please add rows to option."
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost."
-"Please click on the Close Window button if it is not closed automatically.","Please click on the Close Window button if it is not closed automatically."
-"Please enter a new group name","Please enter a new group name"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>"
-"Please select a static block ...","Please select a static block ..."
-"Please select items.","Please select items."
-"Please select one or more attributes.","Please select one or more attributes."
-"Please select product(s).","Please select product(s)."
-"Please select products for attributes update","Please select products for attributes update"
-"Please set up merge date/time","Please set up merge date/time"
-"Please set up merge date/time later then present date","Please set up merge date/time later then present date"
-"Please specify date required option(s).","Please specify date required option(s)."
-"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
-"Please specify the product required option(s)","Please specify the product required option(s)"
-"Please specify the product required option(s).","Please specify the product required option(s)."
-"Please specify the product's option(s).","Please specify the product's option(s)."
-"Please specify the product's required option(s).","Please specify the product's required option(s)."
-"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
-"Please specify time required option(s).","Please specify time required option(s)."
-"Please wait...","Please wait..."
-"Position","Position"
-"Position in Layered Navigation","Position in Layered Navigation"
-"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
-"Prev","Prev"
-"Previous","Previous"
-"Price","Price"
-"Price Navigation Step Calculation","Price Navigation Step Calculation"
-"Price Type","Price Type"
-"Price is not available","Price is not available"
-"Price values for options should be specified in system base currency.","Price values for options should be specified in system base currency."
-"Price:","Price:"
-"Price: %s","Price: %s"
-"Print This Page","Print This Page"
-"Product","Product"
-"Product API","Product API"
-"Product Alerts","Product Alerts"
-"Product Attribute","Product Attribute"
-"Product Attributes","Product Attributes"
-"Product Categories","Product Categories"
-"Product Description","Product Description"
-"Product Extra Info","Product Extra Info"
-"Product Flat Data","Product Flat Data"
-"ID","ID"
-"Product Image Placeholders","Product Image Placeholders"
-"Product Image Watermarks","Product Image Watermarks"
-"Product Images","Product Images"
-"Product Images API","Product Images API"
+"Add Product To Websites","Add Product To Websites"
+"Remove Product From Websites","Remove Product From Websites"
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store."
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions","Allowed File Extensions"
+"Maximum Image Size","Maximum Image Size"
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters","Max Characters"
+"Customer Group","Customer Group"
+"Delete Group Price","Delete Group Price"
+"Item Price","Item Price"
+"and above","and above"
+"Delete Tier","Delete Tier"
"Product In Websites","Product In Websites"
-"Product Info Column","Product Info Column"
-"Product Information","Product Information"
-"Product Link Block Template","Product Link Block Template"
-"Product Link Inline Template","Product Link Inline Template"
-"Product Listing Sort by","Product Listing Sort by"
-"Product","Product"
-"Product Prices","Product Prices"
-"Product Tags","Product Tags"
-"Product Tier Price API","Product Tier Price API"
-"Product Type","Product Type"
-"Product URL Suffix","Product URL Suffix"
-"Product View Extra Hint","Product View Extra Hint"
-"Product attribute sets API","Product attribute sets API"
-"Product attributes API","Product attributes API"
-"Product collection expected.","Product collection expected."
-"Product is not loaded","Product is not loaded"
-"Product links API (related, cross sells, up sells)","Product links API (related, cross sells, up sells)"
-"Product name","Product name"
-"Product types API","Product types API"
-"Products","Products"
-"Products Comparison List","Products Comparison List"
-"Products Information","Products Information"
-"Products Sitemap","Products Sitemap"
-"Products only","Products only"
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store."
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
+"Regular Price:","Regular Price:"
+"Special Price:","Special Price:"
+"Product Alerts","Product Alerts"
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Can be Divided into Multiple Boxes for Shipping","Can be Divided into Multiple Boxes for Shipping"
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price","Click for price"
+"What's this?","What's this?"
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,each
+and,and
+save,save
+"Actual Price","Actual Price"
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Compare Products","Compare Products"
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page","Print This Page"
+"Remove Product","Remove Product"
+"Add to Wishlist","Add to Wishlist"
+"You have no items to compare.","You have no items to compare."
+"Are you sure you would like to remove this item from the compare products?","Are you sure you would like to remove this item from the compare products?"
+"Are you sure you would like to remove all products from your comparison?","Are you sure you would like to remove all products from your comparison?"
+"Remove This Item","Remove This Item"
+Compare,Compare
+"Clear All","Clear All"
+Prev,Prev
+"There are no products matching the selection.","There are no products matching the selection."
+"Add to Compare","Add to Compare"
+"Learn More","Learn More"
+"You may also be interested in the following product(s)","You may also be interested in the following product(s)"
+"More Choices:","More Choices:"
+"New Products","New Products"
+"Check items to add to the cart or","Check items to add to the cart or"
+"select all","select all"
+"View as","View as"
+"Sort By","Sort By"
+"Set Ascending Direction","Set Ascending Direction"
+"Set Descending Direction","Set Descending Direction"
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Show
+"Additional Information","Additional Information"
+"More Views","More Views"
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend","Email to a Friend"
+Details,Details
+Template,Template
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"unselect all","unselect all"
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text","Anchor Custom Text"
+"Anchor Custom Title","Anchor Custom Title"
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
"Products per Page on List Default Value","Products per Page on List Default Value"
-"Properties","Properties"
-"Quantity","Quantity"
-"Quantity Increments","Quantity Increments"
-"Quantity Uses Decimals","Quantity Uses Decimals"
-"Quantity for Item's Status to Become Out of Stock","Quantity for Item's Status to Become Out of Stock"
-"Quantity:","Quantity:"
-"Quantity","Quantity"
-"Quick Create","Quick Create"
-"Quick Overview","Quick Overview"
-"Quick simple product creation","Quick simple product creation"
-"Records for ""","Records for """
-"Redirect","Redirect"
-"Redirect URL","Redirect URL"
-"Regular Price:","Regular Price:"
-"Related Products","Related Products"
-"Remove","Remove"
-"Remove Product From Websites","Remove Product From Websites"
-"Remove This Item","Remove This Item"
-"Remove attribute from attribute set","Remove attribute from attribute set"
-"Remove attribute set","Remove attribute set"
-"Remove custom option","Remove custom option"
-"Remove group from attribute set","Remove group from attribute set"
-"Remove option","Remove option"
-"Remove product assignment","Remove product assignment"
-"Remove product image","Remove product image"
-"Remove product link","Remove product link"
-"Remove value from custom option","Remove value from custom option"
-"Rename existing group","Rename existing group"
-"Rename group","Rename group"
-"Reorganize EAV category structure to flat structure","Reorganize EAV category structure to flat structure"
-"Reorganize EAV product structure to flat structure","Reorganize EAV product structure to flat structure"
-"Reset","Reset"
-"Results","Results"
-"Retrieve attribute data","Retrieve attribute data"
-"Retrieve attribute list","Retrieve attribute list"
-"Retrieve attribute options","Retrieve attribute options"
-"Retrieve categories tree","Retrieve categories tree"
-"Retrieve category attributes","Retrieve category attributes"
-"Retrieve category data","Retrieve category data"
-"Retrieve hierarchical tree","Retrieve hierarchical tree"
-"Retrieve linked products","Retrieve linked products"
-"Retrieve list of assigned products","Retrieve list of assigned products"
-"Retrieve list of option values","Retrieve list of option values"
-"Retrieve list of product custom options","Retrieve list of product custom options"
-"Retrieve one level of categories by website/store view/parent category","Retrieve one level of categories by website/store view/parent category"
-"Retrieve option value info","Retrieve option value info"
-"Retrieve product","Retrieve product"
-"Retrieve product attribute sets","Retrieve product attribute sets"
-"Retrieve product image","Retrieve product image"
-"Retrieve product image list","Retrieve product image list"
-"Retrieve product image types","Retrieve product image types"
-"Retrieve product link type attributes","Retrieve product link type attributes"
-"Retrieve product link types","Retrieve product link types"
-"Retrieve product tier prices","Retrieve product tier prices"
-"Retrieve product types","Retrieve product types"
-"Retrieve products data","Retrieve products data"
-"Retrieve products list by filters","Retrieve products list by filters"
-"Roll Over for preview","Roll Over for preview"
-"Root","Root"
-"SKU","SKU"
-"SKU length should be %s characters maximum.","SKU length should be %s characters maximum."
-"Save","Save"
-"Save Attribute","Save Attribute"
-"Save Attribute Set","Save Attribute Set"
-"Save Category","Save Category"
-"Save Search","Save Search"
-"Save and Continue Edit","Save and Continue Edit"
-"Saved %d record(s)","Saved %d record(s)"
-"Scope","Scope"
-"Search","Search"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
"Search Engine Optimizations","Search Engine Optimizations"
-"Search Information","Search Information"
-"Search Query","Search Query"
-"Search Term with such search query already exists.","Search Term with such search query already exists."
-"Search Weight","Search Weight"
-"Searchable","Searchable"
-"See price before order confirmation.","See price before order confirmation."
-"Select Category...","Select Category..."
-"Select Product...","Select Product..."
-"Select type of option","Select type of option"
-"Select type options required values rows.","Select type options required values rows."
-"Selected Product Types","Selected Product Types"
-"Selected configuration is not available.","Selected configuration is not available."
-"Send Count","Send Count"
-"Set Ascending Direction","Set Ascending Direction"
-"Set Descending Direction","Set Descending Direction"
-"Set Name","Set Name"
-"Set Root Category for Store","Set Root Category for Store"
-"Set root category for this store in the <a href=""%s"">configuration</a>","Set root category for this store in the <a href=""%s"">configuration</a>"
-"Set special price","Set special price"
-"Set/Get current store view","Set/Get current store view"
-"Settings","Settings"
-"Shop By","Shop By"
-"Shopping Options","Shopping Options"
-"Show","Show"
-"Show Details","Show Details"
-"Show Tags","Show Tags"
-"Simple Product","Simple Product"
-"Site Map","Site Map"
-"Sitemap","Sitemap"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Skip import row, is not valid value ""%s"" for field ""%s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","Skip import row, required field ""%s"" for the new customer is not defined."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Skip import row, the value ""%s"" is invalid for field ""%s"""
-"Skipping import row, required field ""%s"" for new products is not defined.","Skipping import row, required field ""%s"" for new products is not defined."
-"Skipping import row, required field ""%s"" is not defined.","Skipping import row, required field ""%s"" is not defined."
-"Skipping import row, store ""%s"" field does not exist.","Skipping import row, store ""%s"" field does not exist."
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Skipping import row, the value ""%s"" is not valid for the ""%s"" field."
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Some of the products below do not have all the required options. Please edit them and configure all the required options."
-"Sort By","Sort By"
-"Sort Order","Sort Order"
-"Source Model","Source Model"
-"Special Expires On: %s","Special Expires On: %s"
-"Special Price:","Special Price:"
-"Special Price: %s","Special Price: %s"
-"Starting at:","Starting at:"
-"Static","Static"
-"Static block and products","Static block and products"
-"Static block only","Static block only"
-"Status","Status"
-"Stock Availability","Stock Availability"
-"Store","Store"
-"Store View","Store View"
-"Stretch","Stretch"
-"Subscribe to RSS Feed","Subscribe to RSS Feed"
-"Super product attributes configuration","Super product attributes configuration"
-"Synonym For","Synonym For"
-"System Properties","System Properties"
-"Tag","Tag"
-"Tax","Tax"
-"Template","Template"
-"Text","Text"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module"
-"The attribute model is not defined","The attribute model is not defined"
-"The attribute set has been saved.","The attribute set has been saved."
-"The base directory to upload file is not specified.","The base directory to upload file is not specified."
-"The category has been deleted.","The category has been deleted."
-"The category has been saved.","The category has been saved."
-"The comparison list was cleared.","The comparison list was cleared."
-"The file '%s' for '%s' has an invalid extension","The file '%s' for '%s' has an invalid extension"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","The file '%s' you uploaded is larger than %s Megabytes allowed by server"
-"The file you uploaded is larger than %s Megabytes allowed by server","The file you uploaded is larger than %s Megabytes allowed by server"
-"The filters must be an array.","The filters must be an array."
-"The image contents is not valid base64 data.","The image contents is not valid base64 data."
-"The image is not specified.","The image is not specified."
-"The model collection resource name is not defined.","The model collection resource name is not defined."
-"The product %s has been added to comparison list.","The product %s has been added to comparison list."
-"The product %s has been removed from comparison list.","The product %s has been removed from comparison list."
-"The product attribute has been deleted.","The product attribute has been deleted."
-"The product attribute has been saved.","The product attribute has been saved."
-"The product has been created.","The product has been created."
-"The product has been deleted.","The product has been deleted."
-"The product has been duplicated.","The product has been duplicated."
-"The product has been saved.","The product has been saved."
-"The product has required options","The product has required options"
-"The search was deleted.","The search was deleted."
-"The text is too long","The text is too long"
-"There are no %s available.","There are no %s available."
-"There are no customers for this alert","There are no customers for this alert"
-"There are no customers for this alert.","There are no customers for this alert."
-"There are no products matching the selection.","There are no products matching the selection."
-"There was an error while request processing.","There was an error while request processing."
-"This Attribute no longer exists","This Attribute no longer exists"
-"This attribute cannot be deleted.","This attribute cannot be deleted."
-"This attribute cannot be edited.","This attribute cannot be edited."
-"This attribute cannot be updated.","This attribute cannot be updated."
-"This attribute no longer exists","This attribute no longer exists"
-"This attribute set no longer exists.","This attribute set no longer exists."
-"This group contains system attributes. Please move system attributes to another group and try again.","This group contains system attributes. Please move system attributes to another group and try again."
-"This is a required option","This is a required option"
-"This product no longer exists.","This product no longer exists."
-"This search no longer exists.","This search no longer exists."
-"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
-"Tier Pricing","Tier Pricing"
-"Tile","Tile"
-"Time Format","Time Format"
-"Title","Title"
-"To reindex the enabled product(s), the store or product must be specified","To reindex the enabled product(s), the store or product must be specified"
-"To see product price, add this item to your cart. You can always remove it later.","To see product price, add this item to your cart. You can always remove it later."
-"Top/Left","Top/Left"
-"Top/Right","Top/Right"
-"Total Quantity Base Items","Total Quantity Base Items"
-"Total Quantity Content Items","Total Quantity Content Items"
-"Total incl. Tax: %1$s","Total incl. Tax: %1$s"
-"Total of %d record(s) have been deleted.","Total of %d record(s) have been deleted."
-"Total of %d record(s) have been updated.","Total of %d record(s) have been updated."
-"Total of %d record(s) were updated","Total of %d record(s) were updated"
-"Type","Type"
-"URL Rewrite Management","URL Rewrite Management"
-"Unable to complete this request.","Unable to complete this request."
-"Unable to find a search term to delete.","Unable to find a search term to delete."
-"Unable to find an attribute to delete.","Unable to find an attribute to delete."
-"Unable to get the product ID.","Unable to get the product ID."
-"Unassigned Attributes","Unassigned Attributes"
-"Unknown EAV indexer type ""%s"".","Unknown EAV indexer type ""%s""."
-"Unknown attribute: %s.","Unknown attribute: %s."
-"Unsupported product type ""%s"".","Unsupported product type ""%s""."
-"Up-sells","Up-sells"
-"Update","Update"
-"Update Attributes","Update Attributes"
-"Update Tier Price","Update Tier Price"
-"Update assigned product","Update assigned product"
-"Update attribute","Update attribute"
-"Update attributes","Update attributes"
-"Update category","Update category"
-"Update custom option of product","Update custom option of product"
-"Update product","Update product"
-"Update product image","Update product image"
-"Update product link","Update product link"
-"Update product tier prices","Update product tier prices"
-"Update value of custom option","Update value of custom option"
-"Upload new product image ","Upload new product image "
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
-"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
-"Use Config Settings","Use Config Settings"
-"Use Default Value","Use Default Value"
-"Use Flat Catalog Category","Use Flat Catalog Category"
-"Use Flat Catalog Product","Use Flat Catalog Product"
-"Use In Layered Navigation","Use In Layered Navigation"
-"Use In Search Results Layered Navigation","Use In Search Results Layered Navigation"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
"Use JavaScript Calendar","Use JavaScript Calendar"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
-"Use Tree Like Category Sitemap","Use Tree Like Category Sitemap"
-"Use config","Use config"
-"Use default","Use default"
-"Use for Promo Rule Conditions","Use for Promo Rule Conditions"
-"Use four-digit year format.","Use four-digit year format."
-"Use in Advanced Search","Use in Advanced Search"
-"Use in Layered Navigation","Use in Layered Navigation"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')"
-"Use in Quick Search","Use in Quick Search"
-"Used for Sorting in Product Listing","Used for Sorting in Product Listing"
-"Used in Product Listing","Used in Product Listing"
-"Value for ""%s"" is invalid.","Value for ""%s"" is invalid."
-"Value for ""%s"" is invalid: %s","Value for ""%s"" is invalid: %s"
-"Varchar","Varchar"
-"View as","View as"
-"Virtual Product","Virtual Product"
-"Visibility","Visibility"
-"Visible","Visible"
-"Visible on Catalog Pages on Front-end","Visible on Catalog Pages on Front-end"
-"Visible on Product View Page on Front-end","Visible on Product View Page on Front-end"
-"WYSIWYG Editor","WYSIWYG Editor"
-"Watermark","Watermark"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
"Watermark Default Size","Watermark Default Size"
"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
"Watermark Position","Watermark Position"
-"We Also Recommend","We Also Recommend"
-"Website","Website"
-"Website Item Must be checked","Website Item Must be checked"
-"Website Store Must be checked","Website Store Must be checked"
-"Websites","Websites"
-"What's this?","What's this?"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Whether to show ""All"" option in the ""Show X Per Page"" dropdown."
-"Will make search for the query above return results for this search.","Will make search for the query above return results for this search."
-"Wrong BuyRequest instance in options group.","Wrong BuyRequest instance in options group."
-"Wrong configuration item instance in options group.","Wrong configuration item instance in options group."
-"Wrong configuration item option instance in options group.","Wrong configuration item option instance in options group."
-"Wrong option instance type in options group.","Wrong option instance type in options group."
-"Wrong option type to get group instance.","Wrong option type to get group instance."
-"Wrong product instance type in options group.","Wrong product instance type in options group."
-"Wrong product type filter specified","Wrong product type filter specified"
-"Year Range","Year Range"
-"Yes","Yes"
-"You cannot remove system attribute from this set.","You cannot remove system attribute from this set."
-"You have no items to compare.","You have no items to compare."
-"You may also be interested in the following product(s)","You may also be interested in the following product(s)"
-"Zoom In","Zoom In"
-"Zoom Out","Zoom Out"
-"and","and"
-"and above","and above"
-"categories","categories"
-"each","each"
-"ex. http://domain.com","ex. http://domain.com"
-"leave blank if its not an image","leave blank if its not an image"
-"per page","per page"
-"products","products"
-"px.","px."
-"save","save"
-"select all","select all"
-"unselect all","unselect all"
-"x","x"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data","Product Flat Data"
+"Reorganize EAV product structure to flat structure","Reorganize EAV product structure to flat structure"
+"Category Flat Data","Category Flat Data"
+"Reorganize EAV category structure to flat structure","Reorganize EAV category structure to flat structure"
+"Indexed category/products association","Indexed category/products association"
+"Product Categories","Product Categories"
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices","Index product prices"
+"Catalog New Products List","Catalog New Products List"
+"List of Products that are set as New","List of Products that are set as New"
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display","Number of Products to Display"
+"New Products Grid Template","New Products Grid Template"
+"New Products List Template","New Products List Template"
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)","Cache Lifetime (Seconds)"
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link","Catalog Product Link"
+"Link to a Specified Product","Link to a Specified Product"
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template","Product Link Block Template"
+"Product Link Inline Template","Product Link Inline Template"
+"Catalog Category Link","Catalog Category Link"
+"Link to a Specified Category","Link to a Specified Category"
+"If empty, the Category Name will be used","If empty, the Category Name will be used"
+"Category Link Block Template","Category Link Block Template"
+"Category Link Inline Template","Category Link Inline Template"
+Set,Set
+none,none
+Overview,Overview
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
diff --git a/app/code/Magento/Catalog/i18n/es_ES.csv b/app/code/Magento/Catalog/i18n/es_ES.csv
index 7978c1de1e2..c7f09578e43 100644
--- a/app/code/Magento/Catalog/i18n/es_ES.csv
+++ b/app/code/Magento/Catalog/i18n/es_ES.csv
@@ -1,801 +1,639 @@
-"Uses","# de uso"
-"%1$s incl tax.","%1$s con impuestos incluidos."
-"%s - %s","%s - %s"
-"%s Item(s)","%s artÃculo(s)"
-"%s and above","%s y superior"
-"(%d)","(%d)"
-"(Copy data from: %s)","(Copiar datos de: %s)"
-"* Required Fields","* Campos Requeridos"
+All,Todo
+None,Nada
+"Are you sure?","¿Está seguro?"
+Cancel,Cancelar
+Back,Volver
+Product,"Nombre de Producto"
+Price,Precio
+Quantity,Cantidad
+Products,Productos
+ID,"ID de Producto"
+SKU,"SKU (Número de Referencia)"
+No,No
+Qty,Qty
+Action,Acción
+Reset,Reiniciar
+Edit,Editar
+"Add to Cart","Añadir al Carrito"
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name",Nombre
+"Last Name",Apellido
+Email,"Correo electrónico"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,Eliminar
+Save,guardar
+Store,Tienda
"-- Please Select --","-- Seleccionar, por favor --"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","La opción predeterminada es 86400, si no se la configura. Para actualizarla instantáneamente, borre la memoria caché de salida HTML del bloque."
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">¡Atención!</strong> El MAP aplicado por defecto esconderá todos los precios de productos en la parte frontal."
-"A group with the same name already exists.","Ya existe un grupo con el mismo nombre."
-"A name is required","Se requiere un nombre"
-"A product type is not defined for the indexer.","No hay un tipo de producto definido para el motor de indexación."
-"ALL GROUPS","TODOS LOS GRUPOS"
-"AM","AM"
-"Action","Acción"
-"Actual Price","Precio Actual"
-"Add","Añadir"
-"Add Attribute","Añadir Atributo"
-"Add Design Change","Agregar cambio de diseño"
-"Add Group","Agregar grupo"
-"Add Group Price","Añadir precio de grupo"
+"Custom Design","Diseño Personalizado"
+Yes,SÃ
+"Web Site","Web Site"
+Name,Nombre
+Status,Estado
+Disabled,Deshabilitado
+Enabled,Habilitado
+"Save and Continue Edit","Guardar y continuar editando"
+Title,TÃtulo
+"Store View","Ver Tienda"
+Type,Tipo
+Home,Inicio
+Search,Buscar
+"Select All","Select All"
"Add New","Añadir Nuevo"
-"Add New Attribute","Añadir Nuevo Atributo"
-"Add New Attribute Set","Agregar nuevo conjunto de atributos"
-"Add New Group","Agregar nuevo grupo"
-"Add New Images","Agregar nuevas imágenes"
-"Add New Option","Añadir Nueva Opción"
-"Add New Row","Agregar nueva fila"
-"Add New Search Term","Añadir Nueva Cláusula de Búsqueda"
-"Add New Set","Agregar nuevo conjunto"
-"Add Product","Agregar producto"
-"Add Product To Websites","Agregar producto a sitios web"
-"Add Root Category","Agregar categorÃa raÃz"
-"Add Subcategory","Agregar subcategorÃa"
-"Add Tax","Agregar impuestos"
-"Add Tier","Agregar capa"
-"Add attribute into attribute set","Añadir atributo al conjunto de atributos"
-"Add group into attribute set","Añadir grupo al conjunto de atributos"
-"Add new custom option into product","Añadir nueva opción de personalización al producto"
-"Add new values into custom option","Añadir nuevos valores a la opción de personalización"
-"Add option","Añadir opción"
-"Add to Cart","Añadir al Carrito"
-"Add to Compare","Añadir para comparar."
-"Add to Wishlist","Añadir a lista que quieres."
-"Additional Information","Información adicional"
-"Alert Urls","Direcciones URL de alerta"
-"All","Todo"
-"All Product Types","Todos los tipos de productos"
+"Please select items.","Seleccione artÃculos."
+Required,Required
+Website,"Sitio web"
"All Websites","Todos los Sitios Web"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","¡Todos los productos de este conjunto serán eliminados! ¿Estás seguro que quieres eliminar este conjunto de atributos?"
-"Allow All Products per Page","Permitir todos los productos por página"
-"Allow Dynamic Media URLs in Products and Categories","Permitir direcciones URL multimedia dinámicas en productos y categorÃas"
-"Allow HTML Tags on Frontend","Permitir etiquetas HTML en la interfaz del cliente"
-"Allowed File Extensions","Extensiones de archivo permitidas"
-"Allowed file extensions to upload","Extensiones de archivo permitidas para la carga"
-"Amount","Importe"
-"An error occurred while adding products to websites.","Se produjo un error mientras se agregaban productos a los sitios web."
-"An error occurred while clearing comparison list.","Se produjo un error mientras se borraba la lista de comparación."
-"An error occurred while removing products from websites.","Se produjo un error mientras se eliminaban productos de sitios web."
-"An error occurred while saving the URL rewrite","Se produjo un error al guardar la URL reescrita"
-"An error occurred while saving the attribute set.","Se produjo un error mientras se guardaba el conjunto de atributos."
-"An error occurred while saving the collection, aborting. Error message: %s","Se produjo un error al guardar la recopilación, abortando. Mensaje de error: %s"
-"An error occurred while saving the product. ","Se produjo un error mientras se guardaba el producto."
-"An error occurred while saving the search query.","Se produjo un error mientras se guardaba el enunciado de búsqueda."
-"An error occurred while saving this group.","Se produjo un error mientras se guardaba este grupo."
-"An error occurred while trying to delete the category.","Se produjo un error mientras se intentaba eliminar la categorÃa."
-"An error occurred while updating the product(s) attributes.","Se produjo un error al actualizar los atributos del producto o productos."
-"An error occurred while updating the product(s) status.","Se produjo un error al actualizar el estado del producto o productos."
-"An invalid group ID is specified, skipping the record.","Se ha especificado una identificación de grupo inválida, saltando el registro."
-"An invalid option ID is specified for %s (%s), skipping the record.","Se especificó un ID de opción no válido para %s (%s). Se omitirá este registro."
-"An invalid store was specified.","Se especificó una tienda no válida."
-"Anchor Custom Text","Texto personalizado del delimitador"
-"Anchor Custom Title","TÃtulo personalizado del delimitador"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Aplicable únicamente a las categorÃas y los productos de catálogo. Todo el contenido multimedia se insertará en el editor como una dirección URL estática. No se actualiza si cambia la dirección URL básica de configuración del sistema."
-"Apply MAP (Default Value)","Aplicar MAP (Valor por Defecto)"
-"Apply To","Aplicar a."
-"Approved","Aprobado"
-"Are you sure you want to delete this category?","¿Está seguro de que desea eliminar esta categorÃa?"
-"Are you sure you would like to remove all products from your comparison?","¿Está seguro de que desea eliminar todos los productos de la comparación?"
-"Are you sure you would like to remove this item from the compare products?","¿Está seguro de que desea eliminar este artÃculo de los productos de la comparación?"
-"Are you sure?","¿Está seguro?"
-"As low as:","Valor mÃnimo:"
-"Assign","Asignar"
-"Assign product link","Asignar enlace de producto"
-"Assign product to category","Asignar producto a categorÃa"
-"Assigned Products","Productos asignados"
-"Associated Products","Productos asociados"
-"Attribute Set","Nombre de conjunto de atributos"
-"Attribute ""%s"" is invalid.","El atributo ""%s"" es inválido."
-"Attribute ""%s"" is required.","El atributo ""%s"" es requerido."
-"Attribute Information","Información de Atributo"
-"Attribute Model","Modelo de atributo"
-"Attribute Name:","Nombre de atributo:"
-"Attribute Set","Conjunto de atributos"
-"Attribute Sets","Conjunto de atributos"
-"Attribute add","Añadir atributo"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","El código de atributo no es válido. Por favor, usa solo letras (a-z), números (0-9) o guión bajo(_) en este campo, el primer carácter ha de ser una letra."
-"Attribute group with the \/name/\ name already exists","El grupo de atributo con el nombre \/name/\ ya existe."
-"Attribute remove","Eliminar atributo"
-"Attribute with the same code already exists","Ya existe un atributo con el mismo código"
-"Attributes","Atributos"
-"Attrribute names can be specified per store.","Pueden especificarse nombres de atributos por tienda."
-"Autogenerate","Generar automáticamente"
-"Availability:","Disponibilidad:"
-"Back","Volver"
-"Backend Model","Modelo de administración del sitio:"
-"Backend Table","Tabla de administración del sitio"
-"Backend Table Title","TÃtulo de la tabla de administración del sitio"
-"Backorders","Pedidos Pendientes"
-"Based On","Basado en"
-"Before Order Confirmation","Antes de la Confirmación del Pedido"
-"Block after Info Column","Bloque posterior a la columna de información"
-"Bottom Block Options Wrapper","Ajuste de opciones del bloque inferior"
-"Bottom/Left","Inferior/izquierda"
-"Bottom/Right","Inferior/derecha"
-"Browse By","Ver por"
-"Bundle Items","Elementos en Paquete"
-"Buy %1$s","Comprar %1$s"
-"Buy %1$s for","Comprar %1$s por"
-"Buy %1$s for %2$s","Comprar %1$s por %2$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","Comprar %1$s por %2$s (%3$s con impuestos incluidos) cada uno"
-"Buy %1$s for %2$s each","Comprar %1$s por %2$s cada uno"
-"Cache Lifetime (Seconds)","Duración máxima de la memoria caché (segundos)"
-"Cache refresh needed.","Es necesario actualizar la memoria caché."
-"Can be Divided into Multiple Boxes for Shipping","Puede dividirse en varias cajas para el envÃo"
-"Can be used only with catalog input type Dropdown","Sólo puede utilizarse con el tipo de entrada de catálogo Lista desplegable"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","Sólo puede utilizarse con los tipos de entrada de catálogo Lista desplegable, Selección múltiple y Precio"
-"Can't create image.","No se puede crear la imagen."
-"Cancel","Cancelar"
-"Cannot create image.","No se puede crear la imagen."
-"Cannot create writeable directory '%s'.","No se puede crear el directorio con permiso de escritura '%s'."
-"Cart Item Attribute","Atributo de artÃculo del carrito"
-"Catalog","Catálogo"
-"Catalog Category (Anchor)","CategorÃa de Catálogo (Ancla)"
-"Catalog Category (Non-Anchor)","CategorÃa de catálogo (Sin ancla)"
-"Catalog Category Link","Enlace a la CategorÃa de Catálogo"
-"Catalog New Products List","Lista de Nuevos Productos del Catálogo"
-"Catalog Price Scope","Rango de Precios del Catálogo"
-"Catalog Product Compare List","Lista de Comparación de Productos del Catálogo"
-"Catalog Product Email to a Friend","Enviar Email a un amigo con el Catálogo de Productos"
-"Catalog Product Image Gallery Popup","GalerÃa de imágenes emergente del Catálogo de Productos"
-"Catalog Product Link","Enlace al Catálgo de Productos"
-"Catalog Product View (Any)","Vista del Catálogo de Producto (cualquiera)"
-"Catalog Product View (Simple)","Vista del Catálogo de Producto (Simple)"
-"Catalog Product View (Virtual)","Vista del Catálogo de Producto (Virtual)"
-"Catalog Section","Sección de Catálogo"
-"Catalog Seo Popular Search Terms","Términos de búsqueda frecuentes del Catálogo Seo"
-"Catalog Seo Sitemap (Category List)","Mapa del Sitio Catálogo Seo (Lista de categorÃas)"
-"Catalog Seo Sitemap (Category Tree)","Mapa del Sitio Catálogo Seo (Ãrbol de CategorÃas)"
-"Catalog Seo Sitemap (Common)","Mapa del Sitio Catálogo Seo (Común)"
-"Catalog Seo Sitemap (Product List)","Mapa del Sitio Catálogo Seo (Lista de Productos)"
-"Catalog URL Rewrites","Nueva versión de URL de Catálogo"
-"Catalog product custom option values API","API para los valores de las opciones de personalización del producto de catálogo"
-"Catalog product custom options API","API para las opciones de personalización del producto de catálogo"
-"Catalog, Search","Catálogo, Búsqueda"
-"Categories","CategorÃas"
-"Categories Sitemap","Mapa del Sitio CategorÃas"
-"Category","CategorÃa"
-"Category API","API CategorÃa"
+Next,Siguiente
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,Catálogo
+Images,Images
+"per page","por página"
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,Aceptar
+Visibility,Visibilidad
+Position,Posición
+Fixed,Fijo
+"Use Default Value","Usar Valor por Defecto"
+N/A,N/A
+Percent,Percent
+"Option Title","Option Title"
+"Input Type","Introducir tipo"
+"New Option","New Option"
+"Price Type","Tipo de precio"
+"* Required Fields","* Campos Requeridos"
+Availability,Availability
+"In stock","En existencias"
+"Out of stock","Sin existencias"
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,RaÃz
+"Save Category","Guardar CategorÃa"
+"Delete Category","Borrar categorÃa"
+"New Subcategory","Nueva SubcategorÃa"
+"New Root Category","Nueva CategorÃa RaÃz"
+"Set Root Category for Store","Establecer categorÃa raÃz para la tienda"
+"Use Config Settings","Usar Opciones de Configuración"
+"Use All Available Attributes","Use All Available Attributes"
+"General Information","Información general"
"Category Data","Datos de CategorÃa"
-"Category Flat Data","Datos planos de CategorÃa"
-"Category Link Block Template","Modelo del bloque de enlaces de CategorÃas"
-"Category Link Inline Template","Modelo de enlaces en lÃnea a CategorÃas"
"Category Products","CategorÃa de Productos"
-"Category Top Navigation","Navegación superior en CategorÃa"
-"Category URL Suffix","Sufijo URL de CategorÃa"
-"Category attributes API","API de atributos de CategorÃa"
-"Category move error","Error al mover CategorÃa"
-"Category move operation is not possible: parent category is equal to child category.","La operación de mover categorÃa no es posible: categorÃa padre es igual a categorÃa niño."
-"Category move operation is not possible: the current category was not found.","La operación de mover categorÃa no es posible: no se encontró la categorÃa actual."
-"Category move operation is not possible: the new parent category was not found.","No es posible la operación de mover CategorÃa: no se ha encontrado una nueva categorÃa de origen."
-"Category must be an instance of \Magento\Catalog\Model\Category.","La CategorÃa debe ser una instancia de Magento_Catálogo_Modelo_CategorÃa."
-"Center","Centro"
-"Change","Cambio"
-"Change or Retrieve attribute store view","Cambiar o Recuperar la caracterÃsitica de vista de tienda"
-"Change status","Cambiar estado"
-"Check items to add to the cart or","Comprueba los productos para añadir al carro o."
-"Choose an Option...","Elegir una Opción..."
-"Clear All","Limpiar Todo"
-"Clear Price","Borrar precio"
-"Click for price","Clic para precio"
-"Close Window","Cerrar Ventana"
-"Collapse All","Desplegar Todo"
-"Comma-separated.","Separados por comas."
-"Comparable","Comparable"
-"Comparable on Front-end","Comparable en el Panel Frontal"
-"Comparable on the Frontend","Comparable en el Panel Frontal"
-"Compare","Comparar"
-"Compare Products","Comparar Productos"
-"Conditions Combination","Combinación de condiciones"
-"Continue","Continuar"
-"Country/State","PaÃs/Estado"
-"Create","Crear."
-"Create (Upload)","Crear (Cargar)"
-"Create Empty","Crear VacÃo"
-"Create Permanent Redirect for URLs if URL Key Changed","Crear redirección permanente para las URL si cambia la clave de URL"
+"Add Subcategory","Agregar subcategorÃa"
+"Add Root Category","Agregar categorÃa raÃz"
"Create Permanent Redirect for old URL","Crear Redirección Permanente para la antigua URL"
-"Create Product Settings","Crear Configuración de Producto"
-"Create Simple Associated Product","Crear Producto Asociado Simple"
-"Create attribute set based on another set","Crear conjunto de atributos basándose en otro conjunto"
-"Create new attribute","Crear un nuevo atributo"
-"Create new category","Crear nueva categorÃa"
-"Create new product","Crear nuevo producto"
-"Cross-sells","Ventas cruzadas."
-"Currently Shopping by:","Actualmente Comprando en:"
-"Custom Design","Diseño Personalizado"
-"Custom Options","Opciones Personalizadas"
-"Custom options","Opciones de personalización"
-"Customer Group","Grupo de Clientes"
-"Customers Tagged Product","Producto Etiquetado de Clientes"
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor","Editor WYSIWYG"
+"Add Product","Agregar producto"
+label,label
+"Product Attributes","Atributos del producto"
+"Add New Attribute","Añadir Nuevo Atributo"
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute","Guardar Atributo"
+"Delete Attribute","Borrar Atributo"
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute","Nuevo atributo de producto"
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,Global
+Scope,Alcance
+"Declare attribute value saving scope","Declarar alcance de grabación de valor de atributo"
+"Frontend Properties","Propiedades del Panel Delantero"
+"Use in Quick Search","Utilizar en búsqueda rápida"
+"Use in Advanced Search","Utilizar en búsqueda avanzada"
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions","Utilizar para condiciones de reglas de promoción"
+"Enable WYSIWYG","Habilitar WYSIWYG"
+"Allow HTML Tags on Frontend","Permitir etiquetas HTML en la interfaz del cliente"
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing","Se utiliza en las listas de productos"
+"Depends on design theme","Depende del tema de diseño"
+"Used for Sorting in Product Listing","Se utiliza para ordenar las listas de productos"
+"Media Image","Imagen multimedia"
+Gallery,GalerÃa
+"System Properties","Propiedades del sistema"
"Data Type for Saving in Database","Tipo de Datos a Guardar en la Base de Datos"
-"Date & Time Custom Options","Opciones Personalizadas de Fecha y Hora"
-"Date Fields Order","Pedido de Campos de Fecha"
+Text,Texto
+Varchar,Varchar
+Static,Estático
+Datetime,Fecha
+Decimal,Decimal
+Integer,Entero
+"Globally Editable","Editable globalmente"
+"Attribute Information","Información de Atributo"
+Properties,Propiedades
+"Manage Labels","Manage Labels"
+Visible,Visible
+Searchable,"Puede buscarse"
+Comparable,Comparable
+"Delete Selected Group","Borrar Grupo Seleccionado"
+"Delete Attribute Set","Establecer Atributo de Borrado"
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set","Grabar conjunto de atributos"
+"New Set Name","Nuevo nombre de conjunto"
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,VacÃo(a)
+"Add Attribute","Añadir Atributo"
+"Add New Group","Agregar nuevo grupo"
+"Add Group","Agregar grupo"
+"Edit Set Name","Editar nombre del conjunto"
+"For internal use","For internal use"
+"Based On","Basado en"
+"Add New Attribute Set","Agregar nuevo conjunto de atributos"
+"Add New Set","Agregar nuevo conjunto"
+"Product Templates","Product Templates"
+"Close Window","Cerrar Ventana"
+"New Product","Nuevo producto"
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,Atributos
+Change,Cambio
+"Advanced Inventory","Advanced Inventory"
+Websites,"Páginas web"
+"Products Information","Información de Productos"
+"Category Name","Category Name"
+"Parent Category","CategorÃa principal"
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.","No hay clientes para esta alerta."
"Subscribe Date","Fecha suscrita"
-"Datetime","Fecha"
-"Decimal","Decimal"
-"Declare attribute value saving scope","Declarar alcance de grabación de valor de atributo"
-"Default ""What's This"" Text Message","Mensaje de Texto ""Qué es esto"" por defecto"
-"Default Popup Text Message","Mensaje de Texto Emergente por Defecto"
+"Last Notified","Última notificación"
+"Send Count","Cantidad de envÃos"
+"New Attribute","New Attribute"
+"Attribute Set","Conjunto de atributos"
+"Add New Option","Añadir Nueva Opción"
+"Import Options","Import Options"
+Import,Import
+"Add New Row","Agregar nueva fila"
+"Delete Row","Borrar Fila"
+"Tier Pricing","Precio de nivel"
"Default Price","Precio por Defecto"
-"Default Price Navigation Step","Paso de Navegación de Precio por Defecto"
-"Default Quantity","Cantidad por Defecto"
+"Add Group Price","Añadir precio de grupo"
+"ALL GROUPS","TODOS LOS GRUPOS"
+"Add Tier","Agregar capa"
"Default Values","Valores por Defecto"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Define el ámbito de la divisa base (""Configuración de Divisas"" > ""Opciones de Divisas"" > ""Divisa Base"")."
-"Delete","Eliminar"
-"Delete Attribute","Borrar Atributo"
-"Delete Attribute Set","Establecer Atributo de Borrado"
-"Delete Category","Borrar categorÃa"
-"Delete Group Price","Eliminar precio de grupo"
-"Delete Option","Borrar Opción"
-"Delete Row","Borrar Fila"
+"Related Products","Productos Relacionados"
+Up-sells,"Ventas Sugestivas"
+Cross-sells,"Ventas cruzadas."
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS","RSS de notificación de bajas cantidades en inventario"
+"Change status","Cambiar estado"
+"Update Attributes","Actualizar atributos"
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images","Agregar nuevas imágenes"
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term","Añadir Nueva Cláusula de Búsqueda"
+"Save Search","Guardar Búsqueda"
"Delete Search","Borrar Búsqueda"
-"Delete Selected Group","Borrar Grupo Seleccionado"
-"Delete Tier","Borrar escalonamiento"
-"Delete attribute","Eliminar atributo"
-"Delete category","Eliminar categorÃa"
-"Delete product","Borrar producto"
-"Depends on design theme","Depende del tema de diseño"
-"Design","Diseño"
-"Details","Detalles"
-"Disabled","Deshabilitado"
-"Disallowed file type.","Tipo de archivo no permitido"
-"Display Actual Price","Mostrar Precio Actual"
-"Display Price Interval as One Price","Mostrar intervalo de precios como un único precio"
-"Display Product Count","Mostrar la cuenta de productos"
-"Display in Suggested Terms","Mostrar Cláusulas Sugeridas"
-"Double click on a group to rename it","Pinchar dos veces en un grupo para renombrarlo"
-"Double click on above image to view full picture","Pinchar dos veces en la imagen superior para verla completa"
-"Downloadable Information","Información Descargable"
-"Duplicate","Duplicar"
-"Duplicate amount found.","Cantidad duplicada encontrada"
-"Duplicate website group price customer group.","Duplicar grupo de cliente precio de grupo de sitio web"
-"Duplicate website tier price customer group and quantity.","Duplicar precio de nivel de página web grupo de cliente y cantidad."
-"Duplicate website, country and state tax found.","Encontrados página web duplicada, impuesto de paÃs y estado"
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","P. ej. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Rendimiento de catálogo de impactos de análisis de directivas dinámicas."
-"Edit","Editar"
-"Edit Attribute Set '%s'","Editar el conjunto de caracterÃsticas ""%s"""
-"Edit Product Attribute","Editar caracterÃstica de producto"
-"Edit Product Attribute ""%s""","Editar Atributo ""%s"" de Producto"
-"Edit Search","Editar búsqueda"
-"Edit Search '%s'","Editar búsqueda ""%s"""
-"Edit Set Name","Editar nombre del conjunto"
-"Email","Correo electrónico"
-"Email to a Friend","Escribir un Email a un amigo"
-"Empty","VacÃo(a)"
-"Enable MAP","Activar MAP"
-"Enable Quantity Increments","Posibilitar Incrementos de Cantidad"
-"Enable WYSIWYG","Habilitar WYSIWYG"
-"Enabled","Habilitado"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","El modelo de tipo de entidad debe ser una instancia de \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","El modelo de tipo de entidad debe ser una instancia de \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType"
-"Error during retrieval of option value: %s","Error al recuperar el valor de la opción: %s"
-"Exclude","Excluir"
-"Expand All","Expandir todo"
-"Failed","Ha fallado"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","Error al copiar el archivo %s. Por favor, elimina los medios con imágenes no existentes e inténtalo de nuevo."
-"Failed to move file: %s","Error al mover el fichero: %s"
-"Feature Products","Presentar productos"
-"Field is not complete","No se ha completado el campo"
-"File options format is not valid.","El formato de opciones de archivo no es válido."
-"File upload failed","Fallo al cargar el archivo"
-"Filter model name must be declared.","Debe indicarse el nombre del modelo de filtro."
-"Filter must be an object. Please set correct filter.","El filtro tiene que ser un objeto. Por favor, establezca un filtro válido."
-"Filterable (no results)","Filtrable (sin resultados)"
-"Filterable (with results)","Filtrable (con resultados)"
-"First Name","Nombre"
-"Fixed","Fijo"
-"For internal use.","Para uso interno."
+"Edit Search '%1'","Edit Search '%1'"
+"New Search","Nueva búsqueda"
+"Search Information","Información de búsqueda"
+"Search Query","Consulta de búsqueda"
+"Number of results","Número de resultados"
+"Number of results (For the last time placed)","Número de resultados (colocado por última vez)"
"For the last time placed.","Para la última vez que se ha colocado."
-"Frontend","Entrada"
-"Frontend Model","Modelo de entrada"
-"Frontend Properties","Propiedades del Panel Delantero"
-"Gallery","GalerÃa"
-"General Information","Información general"
-"Get full information about attribute with list of options","Obtener completa información sobre el atributo con lista de opciones"
-"Get full information about custom option in product","Obtener toda la información sobre las opciones de personalización del producto"
-"Get list of available custom option types","Obtener una lista de los tipos de opciones de personalización disponibles"
-"Get list of non-default attributes by product type and attributes set","Obtener lista de atributos no predeterminados por tipo de producto y conjunto de atributos"
-"Get list of possible attribute types","Obtener lista de tipos de atributos posibles"
-"Get special price","Obtener un precio especial"
-"Global","Global"
-"Globally Editable","Editable globalmente"
+"Number of Uses","Number of Uses"
+"Synonym For","Sinónimo para"
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL","Redirigir URL"
+"ex. http://domain.com","por ejemplo, http:/dominio.com"
+"Display in Suggested Terms","Mostrar Cláusulas Sugeridas"
"Go to Home Page","Ir a la página de inicio"
-"Grid","Parrilla"
-"Group add","Añadir grupo"
-"Group remove","Eliminación de grupo"
-"Groups","Grupos"
-"Home","Inicio"
-"ID","ID"
-"ID: %s","ID: %s"
-"If empty, the Category Name will be used","Si se deja en blanco, se usará el Nombre de CategorÃa"
-"If empty, the Product will be used","Si está vacÃo se utilizará el nombre del producto"
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Si usted no especifica un valor de opción para una vista de tienda concreta, entonces se usará el valor por defecto (Admin)."
-"Image","Imagen"
-"Image content is not valid base64 data.","El contenido de imagen no es un dato base64 válido."
-"Image does not exist.","La imagen no existe."
-"Image file was not found.","No se ha encontrado el fichero de imagen."
-"Image type and information need to be specified for each store view.","Se necesita especificar el tipo de imagen y la información para cada vista de tienda"
-"In Cart","Carrito"
-"In Stock","En stock"
-"In stock","En existencias"
-"Incl. Tax","Impuestos incluidos"
-"Index product and categories URL rewrites","Indexar las nuevas versiones de las URL de productos y categorÃas"
-"Index product attributes for layered navigation building","Indexar las caracterÃsticas de producto para construir una navegación en capas"
-"Index product prices","Indexar los precios de productos"
-"Indexed category/products association","Asociación categorÃa/productos indexada"
-"Info","Información"
-"Info Column Options Wrapper","Envoltorio de las opciones de columna de información"
-"Input Type","Introducir tipo"
-"Integer","Entero"
-"Interval Division Limit","LÃmite de División de Intervalo"
-"Invalid Tier Prices","Precios de capa no válidos"
-"Invalid attribute %s","Atributo %s inválido"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Se especificó una opción de atributo no válida para el atributo %s (%s). Se omitirá el registro."
-"Invalid attribute set specified, skipping the record.","Se ha especificado un conjunto de atributos no válido. Saltando el registro."
-"Invalid block: %s.","Bloque no válido: %s."
-"Invalid category IDs.","ID de categorÃa no válidos."
-"Invalid category.","CategorÃa no válida."
-"Invalid image file type.","Tipo de imagen no válido."
-"Invalid image type.","Tipo de imagen no válido."
-"Invalid option ID specified for %s (%s), skipping the record.","Se especificó un ID de opción no válido para %s (%s). Se omitirá el registro."
-"Invalid product type specified, skipping the record.","Se ha especificado un tipo de producto no válido. Saltando el registro."
-"Invalid store specified","Se especificó una tienda no válida"
-"Invalid store specified, skipping the record.","Se especificó una tienda no válida. Se omitirá el registro."
-"Invalid tier prices. The product is not associated to the requested website.","Precios de nivel no válidos. El producto no está asociado a la página web solicitada."
-"Inventory","Inventario"
-"Is Default","Es Por Defecto"
-"Is Required","Es Requerido"
-"Items %s to %s of %s total","Elementos %s a %s de un total de %s"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Los artÃculos que no quieres mostrar en el catálogo o en los resultados de búsqueda deberÃan tener el estado ""Inhabilitado"" en la tienda solicitada."
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Los artÃculos que no desee ver en el catálogo o en los resultados de búsqueda deben tener el estado 'Desactivado' en la tienda correspondiente."
-"Keep your eyes open for our special Back to School items and save A LOT!","Esté atento a nuestros artÃculos especiales para el comienzo de clases y AHORRE."
-"Label","Etiqueta"
-"Last Name","Apellido"
-"Last Notified","Última notificación"
-"Layered Navigation","Navegación en capas"
-"Learn More","Más información"
-"Line %d, Email: %s","LÃnea %d, correo electrónico: %s"
-"Line %d, SKU: %s","LÃnea %d, código de artÃculo (SKU): %s"
-"Link (Related, Up sell, Cross sell)","Enlace (relacionado, venta adicional, venta cruzada)"
-"Link product does not exist.","El producto de enlace no existe."
-"Link to a Specified Category","Enlace a una categorÃa especÃfica"
-"Link to a Specified Product","Enlace a un producto especÃfico"
-"List","Lista"
-"List Mode","Modo de lista"
-"List of Products that are set as New","Lista de productos marcados como nuevos"
-"List of types","Lista de tipos"
-"Manage Attribute Sets","Administrar conjuntos de atributos"
-"Manage Attributes","Administrar atributos"
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List","Lista de Comparación de Productos"
+AM,AM
+PM,PM
+Categories,CategorÃas
"Manage Catalog Categories","Gestionar categorÃas del catálogo"
"Manage Categories","Administrar categorÃas"
-"Manage Label / Options","Gestionar etiquetas y opciones"
-"Manage Options (values of your attribute)","Administrar opciones (valores del atributo)"
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.","Este producto ya no existe."
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).","Por favor, seleccione el/los producto(s)."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
"Manage Product Attributes","Administrar atributos del producto"
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.","No se puede editar este atributo."
+"Edit Product Attribute","Editar caracterÃstica de producto"
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.","No puede eliminarse este atributo."
+"The product attribute has been deleted.","Se eliminó el atributo de producto."
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.","Ya existe un grupo con el mismo nombre."
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets","Administrar conjuntos de atributos"
+"New Set","New Set"
"Manage Product Sets","Administrar conjuntos de productos"
-"Manage Products","Administrar productos"
-"Manage Stock","Gestionar Existencias"
-"Manage Titles (Size, Color, etc.)","Administrar tÃtulos (tamaño, color, etc.)"
-"Max Characters","Número máximos de caractéres"
-"Maximal Depth","Profundidad Máxima"
-"Maximum Image Size","Tamaño máximo de imagen"
-"Maximum Number of Price Intervals","Número máximo de intervalos de precios"
-"Maximum Quantity Allowed in Shopping Cart","Cantidad Máxima Permitida en el Carro de la Compra"
-"Maximum allowed image size for '%s' is %sx%s px.","Tamaño máximo de imagen permitido para '%s' es %sx%s px."
-"Maximum image height","Altura máxima de imagen"
-"Maximum image width","Anchura máxima de la imagen"
-"Maximum number of characters:","Cantidad máxima de caracteres"
-"Maximum number of price intervals is 100","El número máximo de intervalos de precios es 100"
-"Media Image","Imagen multimedia"
-"Minimum Advertised Price","Precio mÃnimo anunciado"
-"Minimum Lines per Page","Cant. máxima de lÃneas por página"
-"Minimum Quantity Allowed in Shopping Cart","Cantidad mÃnima permitida en el carro de la compra"
-"Minimum Quantity for Item's Status to be Out of Stock","Cant. mÃnima para que el estado del artÃculo pase a ""Sin inventario"""
-"Missing SKU, skipping the record.","Falta el código de producto (SKU). Se omitirá el registro."
-"More Views","Más vistas"
-"Move","Mover"
-"Move category in tree","Mover la categorÃa en el árbol"
-"Must be in the allowed values list.","Debe estar en la lista de valores permitidos."
-"N/A","N/A"
-"Name","Nombre"
-"Name in %s","Nombre en %s"
-"New Product","Nuevo producto"
-"New Product Attribute","Nuevo atributo de producto"
-"New Products","Nuevos productos"
-"New Products Grid Template","Plantilla de cuadrÃcula de nuevos productos"
-"New Products List Template","Plantilla de lista de nuevos productos"
-"New Root Category","Nueva CategorÃa RaÃz"
-"New Search","Nueva búsqueda"
-"New Set Name","Nuevo nombre de conjunto"
-"New Subcategory","Nueva SubcategorÃa"
-"Next","Siguiente"
-"No","No"
-"No image","Sin imagen"
+"This attribute set no longer exists.","Este conjunto de atributos ya no existe."
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.","Se produjo un error mientras se guardaba el conjunto de atributos."
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.","Esta búsqueda ya no existe."
+"Edit Search","Editar búsqueda"
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.","Para ver el precio del producto añade este artÃculo al carrito. Siempre puedes eliminarlo posteriormente."
+"See price before order confirmation.","Ver precio antes de la confirmación del pedido."
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
+Grid,Parrilla
+List,Lista
+"Product is not loaded","El producto no se ha cargado"
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
"No layout updates","No hay actualizaciones de diseño"
-"No options of this product are available.","No hay opciones disponibles de este producto"
-"No product collections found.","No se han encontrado colecciones de producto"
-"None","Nada"
-"Not Visible Individually","No es visible individualmente"
-"Notify Low Stock RSS","RSS de notificación de bajas cantidades en inventario"
-"Notify for Quantity Below","Notificar cuando la Cantidad sea Inferior a"
-"Number of Products to Display","Número de productos a mostrar"
-"Uses","Número de Usos"
-"Number of results","Número de resultados"
-"Number of results (For the last time placed)","Número de resultados (colocado por última vez)"
-"OK","Aceptar"
-"OR","O BIEN"
-"Old Price:","Precio anterior:"
+"Products only","Sólo productos"
+"Static block only","Solo bloque estático"
+"Static block and products","Bloque y productos estáticos"
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,Flexibilidad
+Tile,Mosaico
+Top/Left,Superior/izquierda
+Top/Right,Arriba/Derecha
+Bottom/Left,Inferior/izquierda
+Bottom/Right,Inferior/derecha
+Center,Centro
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites","Nueva versión de URL de Catálogo"
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,CategorÃa
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price","Borrar precio"
+"The filters must be an array.","Los filtros deben ser una disposición."
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config","Usar configuración"
+"In Cart",Carrito
+"Before Order Confirmation","Antes de la Confirmación del Pedido"
"On Gesture","Sobre el gesto"
-"Option validation failed to add product to cart.","La validación de opción no pudo agregar el producto al carrito."
-"Option values","Valores de opción"
-"Option:","Opción:"
-"Options","Opciones"
-"Options Control","Control de opciones"
-"Options is required","Opciones requeridas"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","Nuestro departamento de servicio al cliente está disponible todos los dÃas, las 24 horas. Llámenos al teléfono (555) 555-0123."
-"Out of Stock","Agotado"
-"Out of stock","Sin existencias"
-"PM","PM"
-"Page Title Separator","Separador de tÃtulo de página"
-"Parent Category","CategorÃa principal"
-"Pending","Pendiente"
-"Percentage","Porcentaje"
-"Please add rows to option.","Por favor, añadir filas a la opción."
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Tenga en cuenta que al hacer clic en la fila se cargarán los datos de paquete del archivo seleccionado, y se perderán todos los datos del formulario que no se hayan guardado."
-"Please click on the Close Window button if it is not closed automatically.","Por favor, pinche en el botón de cerrar ventana si no se cierra automáticamente."
-"Please enter a new group name","Ingrese un nuevo nombre de grupo"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Por favor, actualiza ""Reescrituras de URL de Catálogo"" y ""Atributos de Producto"" en Sistema -> <a href=""%s"">Administración de Ãndice</a>"
-"Please select a static block ...","Por favor, seleccione un bloque estático..."
-"Please select items.","Seleccione artÃculos."
-"Please select one or more attributes.","Seleccione un atributo o atributos."
-"Please select product(s).","Por favor, seleccione el/los producto(s)."
-"Please select products for attributes update","Por favor, seleccione productos para actualización de atributos"
-"Please set up merge date/time","Configure la fecha/hora de la combinación"
-"Please set up merge date/time later then present date","Por favor, establezca una fecha y hora de fusión mayor que la fecha actual"
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building","Indexar las caracterÃsticas de producto para construir una navegación en capas"
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.","Determinados tipos de opciones requieren filas de valores."
"Please specify date required option(s).","Especifique las opciones obligatorias de la fecha."
-"Please specify the number of products, that will not be divided into subintervals.","Por favor, especifica el número de productos, que no será dividido en subintervalos."
-"Please specify the product required option(s)","Por favor, especifique la(s) opcioón/opciones obligatoria(s) de producto"
-"Please specify the product required option(s).","Por favor, especifique la(s) opción/opciones obligatoria(s) de producto"
-"Please specify the product's option(s).","Especifique las opciones del producto."
-"Please specify the product's required option(s).","Por favor, especifique la(s) opción/opciones obligatoria(s) del producto."
-"Please specify the quantity of product(s).","Por favor, especifique la cantidad de producto(s)."
"Please specify time required option(s).","Especifique las opciones obligatorias de la hora."
-"Please wait...","Por favor, espera..."
-"Position","Posición"
-"Position in Layered Navigation","Posición de navegación en capas"
-"Position of attribute in layered navigation block","Posición de atributo en el bloque de navegación en capas"
-"Prev","Prev"
-"Previous","Anterior"
-"Price","Precio"
-"Price Navigation Step Calculation","Cálculo de paso de navegación de precios"
-"Price Type","Tipo de precio"
-"Price is not available","Precio no disponible"
-"Price values for options should be specified in system base currency.","Los valores de precio de las opciones deben especificarse en la moneda básica del sistema."
-"Price:","Precio:"
-"Price: %s","Precio: %s"
-"Print This Page","Imprimir esta página"
-"Product","Producto"
-"Product API","API de Producto"
-"Product Alerts","Alertas de producto"
-"Product Attribute","Atributos del producto"
-"Product Attributes","Atributos del producto"
-"Product Categories","CategorÃas de Producto"
-"Product Extra Info","Información Extra del Producto"
-"Product Flat Data","Datos Fijos de Producto"
-"ID","ID de Producto"
-"Product Image Placeholders","Marcadores de Posición de Imagen de Producto"
-"Product Image Watermarks","Marcas de Agua de Imagen de Producto"
-"Product Images","Imágenes de Producto"
-"Product Images API","API de Imágenes de Producto"
+"Please specify the product's required option(s).","Por favor, especifique la(s) opción/opciones obligatoria(s) del producto."
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,px.
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually","No es visible individualmente"
+"Catalog, Search","Catálogo, Búsqueda"
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.","No hay un tipo de producto definido para el motor de indexación."
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:","Valor mÃnimo:"
+"Are you sure you want to delete this category?","¿Está seguro de que desea eliminar esta categorÃa?"
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All","Desplegar Todo"
+"Expand All","Expandir todo"
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
+"Manage Titles (Size, Color, etc.)","Administrar tÃtulos (tamaño, color, etc.)"
+"Manage Options (values of your attribute)","Administrar opciones (valores del atributo)"
+"Is Default","Es Por Defecto"
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,Grupos
+"Double click on a group to rename it","Pinchar dos veces en un grupo para renombrarlo"
+"Unassigned Attributes","Atributos sin asignar"
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.","Este grupo contiene atributos del sistema. Pase los atributos del sistema a otro grupo y vuelva a intentarlo."
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options","Opciones Personalizadas"
+"This is a required option.","This is a required option."
+"Field is not complete","No se ha completado el campo"
+"Allowed file extensions to upload","Extensiones de archivo permitidas para la carga"
+"Maximum image width","Anchura máxima de la imagen"
+"Maximum image height","Altura máxima de imagen"
+"Maximum number of characters:","Cantidad máxima de caracteres"
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock","Gestionar Existencias"
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,"Pedidos Pendientes"
+"Notify for Quantity Below","Notificar cuando la Cantidad sea Inferior a"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability","Disponibilidad de inventario"
+"In Stock","En stock"
+"Out of Stock",Agotado
+"Add Product To Websites","Agregar producto a sitios web"
+"Remove Product From Websites","Eliminar el Producto de los sitios de Internet"
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Los artÃculos que no quieres mostrar en el catálogo o en los resultados de búsqueda deberÃan tener el estado ""Inhabilitado"" en la tienda solicitada."
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions","Extensiones de archivo permitidas"
+"Maximum Image Size","Tamaño máximo de imagen"
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters","Número máximos de caractéres"
+"Customer Group","Grupo de Clientes"
+"Delete Group Price","Eliminar precio de grupo"
+"Item Price","Item Price"
+"and above","y por encima"
+"Delete Tier","Borrar escalonamiento"
"Product In Websites","Producto en Sitios Web"
-"Product Info Column","Columna de Información de Producto"
-"Product Information","Información de producto"
-"Product Link Block Template","Plantilla de Bloque de VÃnculo de Producto"
-"Product Link Inline Template","Plantilla En LÃnea de VÃnculo de Producto"
-"Product Listing Sort by","Listado de Productos Ordenar Por"
-"Product","Nombre de Producto"
-"Product Prices","Precios de Producto"
-"Product Tags","Etiqueta de Producto"
-"Product Tier Price API","API de Precio de Nivel de Producto"
-"Product Type","Tipo de Producto"
-"Product URL Suffix","Sufijo de URL de producto"
-"Product View Extra Hint","Sugerencia Adicional de Vista de Producto"
-"Product attribute sets API","API de conjuntos de atributo de producto"
-"Product attributes API","API de atributos de producto"
-"Product collection expected.","Colección esperada de producto."
-"Product is not loaded","El producto no se ha cargado"
-"Product links API (related, cross sells, up sells)","API de vÃnculos de producto (relacionados, ventas cruzadas, ventas incrementadas)"
-"Product name","Nombre de producto"
-"Product types API","API de tipos de producto"
-"Products","Productos"
-"Products Comparison List","Lista de Comparación de Productos"
-"Products Information","Información de Productos"
-"Products Sitemap","Mapa del sitio de productos"
-"Products only","Sólo productos"
-"Products per Page on Grid Allowed Values","Productos por Página en Valores Permitidos por la CuadrÃcula"
-"Products per Page on Grid Default Value","Productos por Página en Valor Predeterminado por la CuadrÃcula"
-"Products per Page on List Allowed Values","Productos por Página en Valores Permitidos por la Lista"
-"Products per Page on List Default Value","Productos por Página en Valor Predeterminado de la Lista"
-"Properties","Propiedades"
-"Quantity","Cantidad"
-"Quantity Increments","Incrementos de cantidad"
-"Quantity Uses Decimals","La Cantidad Usa Decimales"
-"Quantity for Item's Status to Become Out of Stock","La cant. para el estado del artÃculo se va a quedar sin unidades disponibles"
-"Quantity:","Cantidad:"
-"Quantity","Cantidad"
-"Quick Create","Creación Rápida"
-"Quick Overview","Descripción rápida"
-"Quick simple product creation","Creación rápida de producto sencillo"
-"Records for ""","Registro para """
-"Redirect","Redirigir"
-"Redirect URL","Redirigir URL"
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Los artÃculos que no desee ver en el catálogo o en los resultados de búsqueda deben tener el estado 'Desactivado' en la tienda correspondiente."
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
"Regular Price:","Precio Habitual:"
-"Related Products","Productos Relacionados"
-"Remove","Borrar"
-"Remove Product From Websites","Eliminar el Producto de los sitios de Internet"
-"Remove This Item","Eliminar este artÃculo"
-"Remove attribute from attribute set","Eliminar atributo de conjunto de atributos"
-"Remove attribute set","Eliminar conjunto de atributos"
-"Remove custom option","Eliminar opción personalizada"
-"Remove group from attribute set","Eliminar grupo de conjunto de atributos"
-"Remove option","Eliminar opción"
-"Remove product assignment","Eliminar la asignación de producto"
-"Remove product image","Eliminar imagen del producto"
-"Remove product link","Eliminar el enlace del producto"
-"Remove value from custom option","Eliminar valor de las opciones de personalización"
-"Rename existing group","Renombrar un grupo existente"
-"Rename group","Renombrar un grupo"
-"Reorganize EAV category structure to flat structure","Reorganizar la esctructura de categorÃa EAV a una estructura plana"
-"Reorganize EAV product structure to flat structure","Reorganizar la esctructura de producto EAV a una estructura plana"
-"Reset","Reiniciar"
-"Results","Resultados"
-"Retrieve attribute data","Recuperar datos de atributo"
-"Retrieve attribute list","Recuperar la lista de atributo"
-"Retrieve attribute options","Recuperar las opciones de atributo"
-"Retrieve categories tree","Recuperar árbol de categorÃas"
-"Retrieve category attributes","Recuperar los atributos de categorÃas"
-"Retrieve category data","Recuperar los datos de categorÃas"
-"Retrieve hierarchical tree","Recuperar el árbol jerárquico"
-"Retrieve linked products","Recuperar los productos enlazados"
-"Retrieve list of assigned products","Recuperar la lista de productos asignados"
-"Retrieve list of option values","Recuperar lista de valores de opción"
-"Retrieve list of product custom options","Recuperar lista de opciones de personalización del producto"
-"Retrieve one level of categories by website/store view/parent category","Recuperar un nivel de categorÃas por sitio de Internet/vista de tienda/categorÃa matriz"
-"Retrieve option value info","Recuperar información sobre el valor de opción"
-"Retrieve product","Recuperar producto"
-"Retrieve product attribute sets","Recuperar conjuntos de atributos de producto"
-"Retrieve product image","Recuperar imagen del producto"
-"Retrieve product image list","Recuperar lista de imágenes de producto"
-"Retrieve product image types","Recuperar tipos de imágenes de producto"
-"Retrieve product link type attributes","Recuperar atributos de tipo de enlace de producto"
-"Retrieve product link types","Recuperar tipos de enlace de producto"
-"Retrieve product tier prices","Recuperar precios de nivel de producto"
-"Retrieve product types","Recuperar tipos de producto"
-"Retrieve products data","Recuperar datos de productos"
-"Retrieve products list by filters","Recuperar lista de productos por medio de filtros"
-"Roll Over for preview","Desplegar para visualización previa"
-"Root","RaÃz"
-"SKU","SKU (Número de Referencia)"
-"SKU length should be %s characters maximum.","La longitud de SKU debe ser de un máximo de % carácteres."
-"Save","guardar"
-"Save Attribute","Guardar Atributo"
-"Save Attribute Set","Grabar conjunto de atributos"
-"Save Category","Guardar CategorÃa"
-"Save Search","Guardar Búsqueda"
-"Save and Continue Edit","Guardar y continuar editando"
-"Saved %d record(s)","Registro(s) %d Guardado(s)"
-"Scope","Alcance"
-"Search","Buscar"
-"Search Engine Optimizations","Optimizaciones de motor de búsqueda"
-"Search Information","Información de búsqueda"
-"Search Query","Consulta de búsqueda"
-"Search Term with such search query already exists.","Ya existe un término de búsqueda con esa consulta."
-"Search Weight","Buscar peso"
-"Searchable","Puede buscarse"
-"See price before order confirmation.","Ver precio antes de la confirmación del pedido."
-"Select Category...","Seleccionar categorÃa..."
-"Select Product...","Seleccionar producto..."
-"Select type of option","Seleccionar tipo de opción"
-"Select type options required values rows.","Determinados tipos de opciones requieren filas de valores."
-"Selected Product Types","Tipos de productos seleccionados"
-"Selected configuration is not available.","La configuración seleccionada no está disponible."
-"Send Count","Cantidad de envÃos"
-"Set Ascending Direction","En sentido ascendente"
-"Set Descending Direction","Establecer dirección descendente"
-"Set","Establecer nombre"
-"Set Root Category for Store","Establecer categorÃa raÃz para la tienda"
-"Set root category for this store in the <a href=""%s"">configuration</a>","Programar una categorÃa raÃz de esta tienda en la <a href=""%s"">configuración</a>"
-"Set special price","Establecer precio especial"
-"Set/Get current store view","Establecer/Obtener la vista actual de la tienda"
-"Settings","Configuración"
-"Shop By","Comprar por"
-"Shopping Options","Opciones de compra"
-"Show","Mostrar"
-"Show Details","Mostrar detalles"
-"Show Tags","Mostrar etiquetas"
-"Simple Product","Producto simple"
-"Site Map","Mapa de sitio"
-"Sitemap","Mapa del sitio"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Saltarse importar fila, no es un valor válido ""%s"" para el campo ""%s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","Omitir la fila de importación, el campo obligatorio ""%s"" para el nuevo cliente no está definido."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Saltarse importar la fila, el valor ""%s"" no es válido para el campo ""%s"""
-"Skipping import row, required field ""%s"" for new products is not defined.","Saltando una fila importante, el campo obligatorio ""%s"" para nuevos productos no está definido."
-"Skipping import row, required field ""%s"" is not defined.","Omitir la fila de importación, el campo obligatorio ""%s"" no está definido."
-"Skipping import row, store ""%s"" field does not exist.","Saltándose la importación de fila, el campo de reserva ""%s"" no existe."
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Omitir la fila de importación, el valor ""%s"" no es válido para el campo ""%s""."
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Algunos de los productos procesados no tienen un valor SKU definido. Por favor, rellénalo antes de operar con esos productos."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Algunos de los productos a continuación no tienen todas las opciones necesarias. Por favor, edÃtalos y configura todas las opciones necesarias."
-"Sort By","Ordenar por"
-"Sort Order","Orden de selección"
-"Source Model","Modelo de origen"
-"Special Expires On: %s","Especial Expira en: %s"
"Special Price:","Precio especial:"
-"Special Price: %s","Precio especial: %"
-"Starting at:","Inicio:"
-"Static","Estático"
-"Static block and products","Bloque y productos estáticos"
-"Static block only","Solo bloque estático"
-"Status","Estado"
-"Stock Availability","Disponibilidad de inventario"
-"Store","Tienda"
-"Store View","Ver Tienda"
-"Stretch","Flexibilidad"
-"Subscribe to RSS Feed","Suscribirse a las noticias por RSS"
-"Super product attributes configuration","Configuración de atributos de producto superior"
-"Synonym For","Sinónimo para"
-"System Properties","Propiedades del sistema"
-"Tag","Nombre de la etiqueta"
-"Tax","Impuestos"
-"Template","Plantilla"
-"Text","Texto"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","El módulo de Catálogo de Planos tiene un lÃmite de %2\$d atributos filtrables y ordenables. Actualmente hay %1\$d de ellos. Por favor, reduce el número de atributos filtrables/ordenables para poder usar este módulo"
-"The attribute model is not defined","El modelo de atributo no está definido"
-"The attribute set has been saved.","Se ha guardado el conjunto de atributos."
-"The base directory to upload file is not specified.","El directorio base para cargar el archivo no ha sido especificado."
-"The category has been deleted.","Se eliminó la categorÃa."
-"The category has been saved.","Se ha guardado la categorÃa."
-"The comparison list was cleared.","Se borró la lista de comparación."
-"The file '%s' for '%s' has an invalid extension","El archivo '%s' para '%s' tiene una extensión no válida"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","El archivo '%s' subido es mayor que los '%s' Megabytes permitidos por el servidor"
-"The file you uploaded is larger than %s Megabytes allowed by server","El archivo que has subido es más grande de % Megabytes admitidos por el servidor."
-"The filters must be an array.","Los filtros deben ser una disposición."
-"The image contents is not valid base64 data.","El contenido de la imagen no es un dato base64 válido."
-"The image is not specified.","No se especificó la imagen."
-"The model collection resource name is not defined.","El nombre del recurso de la colección de modelos no está definido."
-"The product %s has been added to comparison list.","Se agregó el producto %s a la lista de comparación."
-"The product %s has been removed from comparison list.","Se eliminó el producto %s de la lista de comparación."
-"The product attribute has been deleted.","Se eliminó el atributo de producto."
-"The product attribute has been saved.","Se guardó el atributo de producto."
-"The product has been created.","Se creó el producto."
-"The product has been deleted.","Se eliminó el producto."
-"The product has been duplicated.","Se duplicó el producto."
-"The product has been saved.","Se ha guardado el producto."
-"The product has required options","El producto tiene opciones obligatorias"
-"The search was deleted.","Se eliminó la búsqueda."
-"The text is too long","El texto es demasiado largo."
-"There are no %s available.","No hay %s disponibles."
-"There are no customers for this alert","No hay clientes para esta alerta"
-"There are no customers for this alert.","No hay clientes para esta alerta."
-"There are no products matching the selection.","No hay ningún producto que se ajuste a su selección."
-"There was an error while request processing.","Ocurrió un error al procesar la petición."
-"This Attribute no longer exists","El atributo ya no existe"
-"This attribute cannot be deleted.","No puede eliminarse este atributo."
-"This attribute cannot be edited.","No se puede editar este atributo."
-"This attribute cannot be updated.","No puede actualizarse este atributo."
-"This attribute no longer exists","Este atributo ya no existe."
-"This attribute set no longer exists.","Este conjunto de atributos ya no existe."
-"This group contains system attributes. Please move system attributes to another group and try again.","Este grupo contiene atributos del sistema. Pase los atributos del sistema a otro grupo y vuelva a intentarlo."
-"This is a required option","Esta es una opción obligatoria"
-"This product no longer exists.","Este producto ya no existe."
-"This search no longer exists.","Esta búsqueda ya no existe."
-"This setting will be applied when all prices in the specific price interval are equal.","Esta configuración se aplicará cuando todos los precios en el intervalo de precios especÃficos sean iguales."
-"Tier Pricing","Precio de nivel"
-"Tile","Mosaico"
-"Time Format","Formato de hora"
-"Title","TÃtulo"
-"To reindex the enabled product(s), the store or product must be specified","Para reindexar el producto(s) activado(s), se ha de especificar la tienda o el producto"
-"To see product price, add this item to your cart. You can always remove it later.","Para ver el precio del producto añade este artÃculo al carrito. Siempre puedes eliminarlo posteriormente."
-"Top/Left","Superior/izquierda"
-"Top/Right","Arriba/Derecha"
-"Total Quantity Base Items","Cant. total de artÃculos básicos"
-"Total incl. Tax: %1$s","Total con impuestos inculido: %1$"
-"Total of %d record(s) have been deleted.","Total de % registrado se ha eliminado."
-"Total of %d record(s) have been updated.","Se actualizó un total de %d registro(s)."
-"Total of %d record(s) were updated","Se han actualizado un total de %d registro(s)"
-"Type","Tipo"
-"URL Rewrite Management","Gestión de reescritura de URL"
-"Unable to complete this request.","No se puede completar esta solicitud."
-"Unable to find a search term to delete.","No se puede encontrar un término de búsqueda para eliminar."
-"Unable to find an attribute to delete.","No se puede encontrar un atributo para eliminar."
-"Unable to get the product ID.","No ha sido posible obtener el ID de producto."
-"Unassigned Attributes","Atributos sin asignar"
-"Unknown EAV indexer type ""%s"".","Tipo de indexador EAV desconocido ""%s""."
-"Unknown attribute: %s.","Atributo desconocido: %s."
-"Unsupported product type ""%s"".","Tipo de producto no compatible ""%s""."
-"Up-sells","Ventas Sugestivas"
-"Update","Actualización"
-"Update Attributes","Actualizar atributos"
-"Update Tier Price","Actualizar precio de capa"
-"Update assigned product","Actualizar producto asignado"
-"Update attribute","Actualizar atributo"
-"Update attributes","Actualizar atributos"
-"Update category","Actualizar categorÃa"
-"Update custom option of product","Actualizar opción personalizada de producto"
-"Update product","Actualizar producto"
-"Update product image","Actualizar imagen de producto"
-"Update product link","Actualizar enlace del producto"
-"Update product tier prices","Actualizar precios de capa de productos"
-"Update value of custom option","Actualizar valor de la opción personalizada"
-"Upload new product image ","Cargar nueva imagen de producto"
-"Use Canonical Link Meta Tag For Categories","Utilizar metaetiqueta de enlace canónico para categorÃas"
-"Use Canonical Link Meta Tag For Products","Utilizar meta-etiqueta de enlace canónico para los productos"
-"Use Categories Path for Product URLs","Utilizar ruta de categorÃas para direcciones URL de productos"
-"Use Config Settings","Usar Opciones de Configuración"
-"Use Default Value","Usar Valor por Defecto"
-"Use Flat Catalog Category","Utilizar categorÃa de catálogo plano"
-"Use Flat Catalog Product","Utilizar producto de catálogo plano"
-"Use In Layered Navigation","Utilizar en navegación en capas"
-"Use In Search Results Layered Navigation","Utilizar en la navegación por capas de los resultados de búsqueda"
-"Use JavaScript Calendar","Utilizar calendario de JavaScript"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","Utilizar URL estáticas para contenido multimedia en WYSIWYG para el catálogo"
-"Use Tree Like Category Sitemap","Utilizar mapa de sitio con categorÃas jerárquicas"
-"Use config","Usar configuración"
-"Use default","Uso por defecto"
-"Use for Promo Rule Conditions","Utilizar para condiciones de reglas de promoción"
-"Use four-digit year format.","Utilizar formato de año de cuatro dÃgitos."
-"Use in Advanced Search","Utilizar en búsqueda avanzada"
-"Use in Layered Navigation","Usar en navegación por capas"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","Utilizar en navegación en capas<br/>(Puede utilizarse sólo con el tipo de entrada de catálogo 'Lista desplegable')"
-"Use in Quick Search","Utilizar en búsqueda rápida"
-"Used for Sorting in Product Listing","Se utiliza para ordenar las listas de productos"
-"Used in Product Listing","Se utiliza en las listas de productos"
-"Value for ""%s"" is invalid.","El valor para ""%s"" es inválido."
-"Value for ""%s"" is invalid: %s","Valor para ""%"" no es válido: %"
-"Varchar","Varchar"
-"View as","Ver como"
-"Virtual Product","Producto virtual"
-"Visibility","Visibilidad"
-"Visible","Visible"
-"Visible on Catalog Pages on Front-end","Visible en páginas de catálogo en la vista del cliente"
-"Visible on Product View Page on Front-end","Visible en páginas de vista de productos en la vista del cliente"
-"WYSIWYG Editor","Editor WYSIWYG"
-"Watermark","Marca de agua"
-"Watermark Default Size","Tamaño predeterminado de la marca de agua"
-"Watermark Opacity, Percent","Opacidad de la marca de agua, porcentaje"
-"Watermark Position","Posición de la marca de agua"
-"Website","Sitio web"
-"Website Item Must be checked","Debe controlarse el artÃculo del sitio web"
-"Website Store Must be checked","Se tiene que comprobar la tienda de la página web"
-"Websites","Páginas web"
+"Product Alerts","Alertas de producto"
+"Can be Divided into Multiple Boxes for Shipping","Puede dividirse en varias cajas para el envÃo"
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price","Clic para precio"
"What's this?","¿Qué es esto?"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Preguntar si mostrar ""Todas"" las opciones en el desplegable ""Mostrar X por página""."
-"Will make search for the query above return results for this search.","Realizar la búsqueda para la consulta anterior devuelve resultados para esta búsqueda."
-"Wrong BuyRequest instance in options group.","Instancia incorrecta de BuyRequest en el grupo de opciones."
-"Wrong configuration item instance in options group.","Configuración de ejemplo de artÃculo incorrecta en el grupo de opciones."
-"Wrong configuration item option instance in options group.","Configuración de ejemplo de opción de artÃculo incorrecta en el grupo de opciones."
-"Wrong option instance type in options group.","Instancia de opción incorrecta en el grupo de opciones."
-"Wrong option type to get group instance.","Tipo de opción incorrecto en el grupo de opciones."
-"Wrong product instance type in options group.","Tipo de instancia de producto no válido en el grupo de opciones."
-"Wrong product type filter specified","Se especificó un filtro de tipo de producto incorrecto"
-"Year Range","Rango de años"
-"Yes","SÃ"
-"You cannot remove system attribute from this set.","No es posible eliminar atributos del sistema de este conjunto."
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,cada
+and,y
+save,guardar
+"Actual Price","Precio Actual"
+"Shop By","Comprar por"
+"Shopping Options","Opciones de compra"
+"Compare Products","Comparar Productos"
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page","Imprimir esta página"
+"Remove Product","Remove Product"
+"Add to Wishlist","Añadir a lista que quieres."
"You have no items to compare.","No tiene artÃculos para comparar."
+"Are you sure you would like to remove this item from the compare products?","¿Está seguro de que desea eliminar este artÃculo de los productos de la comparación?"
+"Are you sure you would like to remove all products from your comparison?","¿Está seguro de que desea eliminar todos los productos de la comparación?"
+"Remove This Item","Eliminar este artÃculo"
+Compare,Comparar
+"Clear All","Limpiar Todo"
+Prev,Prev
+"There are no products matching the selection.","No hay ningún producto que se ajuste a su selección."
+"Add to Compare","Añadir para comparar."
+"Learn More","Más información"
"You may also be interested in the following product(s)","Te podrÃa(n) interesar también el/los siguiente(s) producto(s)"
-"Zoom In","Aumentar"
-"Zoom Out","Alejar"
-"and","y"
-"and above","y por encima"
-"categories","categorÃas"
-"each","cada"
-"ex. http://domain.com","por ejemplo, http:/dominio.com"
-"leave blank if its not an image","dejar en blanco si no es una imagen"
-"per page","por página"
-"products","productos"
-"px.","px."
-"save","guardar"
+"More Choices:","More Choices:"
+"New Products","Nuevos productos"
+"Check items to add to the cart or","Comprueba los productos para añadir al carro o."
"select all","seleccionar todo"
+"View as","Ver como"
+"Sort By","Ordenar por"
+"Set Ascending Direction","En sentido ascendente"
+"Set Descending Direction","Establecer dirección descendente"
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Mostrar
+"Additional Information","Información adicional"
+"More Views","Más vistas"
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend","Escribir un Email a un amigo"
+Details,Detalles
+Template,Plantilla
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Por favor, añadir filas a la opción."
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
"unselect all","Deseleccionar todo"
-"x","x"
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text","Texto personalizado del delimitador"
+"Anchor Custom Title","TÃtulo personalizado del delimitador"
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
+"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
+"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
+"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
+"Products per Page on List Default Value","Products per Page on List Default Value"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
+"Search Engine Optimizations","Search Engine Optimizations"
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
+"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
+"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
+"Use JavaScript Calendar","Use JavaScript Calendar"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
+"Watermark Default Size","Watermark Default Size"
+"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
+"Watermark Position","Watermark Position"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data","Datos Fijos de Producto"
+"Reorganize EAV product structure to flat structure","Reorganizar la esctructura de producto EAV a una estructura plana"
+"Category Flat Data","Datos planos de CategorÃa"
+"Reorganize EAV category structure to flat structure","Reorganizar la esctructura de categorÃa EAV a una estructura plana"
+"Indexed category/products association","Asociación categorÃa/productos indexada"
+"Product Categories","CategorÃas de Producto"
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices","Indexar los precios de productos"
+"Catalog New Products List","Lista de Nuevos Productos del Catálogo"
+"List of Products that are set as New","Lista de productos marcados como nuevos"
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display","Número de productos a mostrar"
+"New Products Grid Template","Plantilla de cuadrÃcula de nuevos productos"
+"New Products List Template","Plantilla de lista de nuevos productos"
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)","Duración máxima de la memoria caché (segundos)"
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link","Enlace al Catálgo de Productos"
+"Link to a Specified Product","Enlace a un producto especÃfico"
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template","Plantilla de Bloque de VÃnculo de Producto"
+"Product Link Inline Template","Plantilla En LÃnea de VÃnculo de Producto"
+"Catalog Category Link","Enlace a la CategorÃa de Catálogo"
+"Link to a Specified Category","Enlace a una categorÃa especÃfica"
+"If empty, the Category Name will be used","Si se deja en blanco, se usará el Nombre de CategorÃa"
+"Category Link Block Template","Modelo del bloque de enlaces de CategorÃas"
+"Category Link Inline Template","Modelo de enlaces en lÃnea a CategorÃas"
+Set,"Establecer nombre"
+none,none
+Overview,Overview
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
diff --git a/app/code/Magento/Catalog/i18n/fr_FR.csv b/app/code/Magento/Catalog/i18n/fr_FR.csv
index ccbe17f0aa1..a066af4b25e 100644
--- a/app/code/Magento/Catalog/i18n/fr_FR.csv
+++ b/app/code/Magento/Catalog/i18n/fr_FR.csv
@@ -1,801 +1,639 @@
-"Uses","Utilisation numéro #"
-"%1$s incl tax.","%1$s TTC"
-"%s - %s","%s - %s"
-"%s Item(s)","%s article(s)"
-"%s and above","%s et au dessus"
-"(%d)","(%d)"
-"(Copy data from: %s)","(Copier les données à partir de: %s)"
-"* Required Fields","* Champs obligatoires"
+All,Tous
+None,aucun
+"Are you sure?","Etes-vous sûr ?"
+Cancel,Annuler
+Back,Retour
+Product,"Nom du produit"
+Price,Prix
+Quantity,Quantité
+Products,Produits
+ID,"ID produit"
+SKU,UGS
+No,Non
+Qty,Qty
+Action,Action
+Reset,Réinitialiser
+Edit,Éditer
+"Add to Cart","Ajouter au panier"
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name",Prénom
+"Last Name","Nom de famille"
+Email,Email
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,Supprimer
+Save,Sauvegarder
+Store,Magasin
"-- Please Select --","-- Veuillez sélectionner --"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 par défaut, si non défini. Pour réactualiser instantanément, Vider le cache des Blocs HTML de sortie."
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">Avertissement !</strong> Appliquer MAP par défaut masquera tous les prix de produits."
-"A group with the same name already exists.","Un group avec le même nom existe déjà ."
-"A name is required","Un nom est nécessaire"
-"A product type is not defined for the indexer.","Un type de produit n'est pas défini dans l'index."
-"ALL GROUPS","TOUS LES GROUPES"
-"AM","Avant midi"
-"Action","Action"
-"Actual Price","Prix"
-"Add","Ajouter"
-"Add Attribute","Ajouter un Attribut"
-"Add Design Change","Ajouter une modification de design"
-"Add Group","Ajouter un groupe"
-"Add Group Price","Ajouter un prix de groupe"
+"Custom Design","Dessin sur mesure"
+Yes,Oui
+"Web Site","Web Site"
+Name,Nom
+Status,Statut
+Disabled,Désactivé
+Enabled,Activé
+"Save and Continue Edit","Sauvegarder et continuer l'édition"
+Title,Titre
+"Store View","Vue du magasin"
+Type,Type
+Home,Accueil
+Search,Rechercher
+"Select All","Select All"
"Add New","Ajouter un nouveau"
-"Add New Attribute","Ajouter un nouvel attribut"
-"Add New Attribute Set","Ajouter un nouveau jeu d'attributs"
-"Add New Group","Ajouter un nouveau groupe"
-"Add New Images","Ajouter de nouvelles images"
-"Add New Option","Ajouter nouvelle option"
-"Add New Row","Ajouter nouvelle ligne"
-"Add New Search Term","Ajouter un nouveau terme de recherche"
-"Add New Set","Ajouter une nouvelle série"
-"Add Product","Ajouter un produit"
-"Add Product To Websites","Ajouter un produits aux sites Internet"
-"Add Root Category","Ajouter une catégorie racine"
-"Add Subcategory","Ajouter une sous-catégorie"
-"Add Tax","Ajouter une taxe"
-"Add Tier","Ajouter un niveau"
-"Add attribute into attribute set","Ajouter l'attribut à l'ensemble d'attributs"
-"Add group into attribute set","Ajouter le groupe à l'ensemble d'attributs"
-"Add new custom option into product","Ajouter une nouvelle option personnalisée dans le produit"
-"Add new values into custom option","Ajouter de nouvelles valeurs dans l'option personnalisée"
-"Add option","Ajouter une option"
-"Add to Cart","Ajouter au panier"
-"Add to Compare","Ajouter au comparateur"
-"Add to Wishlist","Ajouter à la liste de cadeaux"
-"Additional Information","Informations supplémentaires"
-"Alert Urls","Alertes Urls"
-"All","Tous"
-"All Product Types","Tous les types de produits"
+"Please select items.","Veuillez sélectionner des articles."
+Required,Required
+Website,Site
"All Websites","Tous les sites web"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Tous les produits de cette série seront effacés ! Etes-vous sur de vouloir supprimer cette série d'attributs ?"
-"Allow All Products per Page","Autoriser tous les produits par page"
-"Allow Dynamic Media URLs in Products and Categories","Autoriser les URLs de medias dynamiques dans les Produits et les Catégories"
-"Allow HTML Tags on Frontend","Autoriser les marqueurs HTML sur le frontal"
-"Allowed File Extensions","Extensions de fichiers autorisées"
-"Allowed file extensions to upload","Extensions de fichiers autorisées pour le téléchargement montant"
-"Amount","Montant"
-"An error occurred while adding products to websites.","Une erreur est survenue pendant l'ajout de produits sur les sites Internet."
-"An error occurred while clearing comparison list.","Une erreur est survenue pendant la suppression de la list de comparaison."
-"An error occurred while removing products from websites.","Une erreur est survenue pendant le retrait de produits des sites Internet."
-"An error occurred while saving the URL rewrite","Une erreur est survenue lors de l'enregistrement de la réécriture de l'URL"
-"An error occurred while saving the attribute set.","Une erreur est survenue pendant la sauvegarde de la série d'attributs."
-"An error occurred while saving the collection, aborting. Error message: %s","Une erreur est survenue lors de la sauvegarde de la collection. qui a échoué. Message d'erreur : %s"
-"An error occurred while saving the product. ","Une erreur est survenue pendant la sauvegarde du produit."
-"An error occurred while saving the search query.","Une erreur est survenue pendant la sauvegarde de la demande de recherche."
-"An error occurred while saving this group.","Une erreur est survenue pendant la sauvegarde de ce groupe."
-"An error occurred while trying to delete the category.","Une erreur est survenue en essayant de supprimer cette catégorie."
-"An error occurred while updating the product(s) attributes.","Une erreur est survenue pendant la mise à jour des attributs du/des produit(s)."
-"An error occurred while updating the product(s) status.","Une erreur est survenue pendant la mise à jour du statut du/des produit(s)."
-"An invalid group ID is specified, skipping the record.","Identifiant de groupe invalide, ignorer."
-"An invalid option ID is specified for %s (%s), skipping the record.","Un identifiant d'option invalide est spécifié pour %s (%s), ignorer."
-"An invalid store was specified.","Un stockage invalide a été défini."
-"Anchor Custom Text","Fixer texte personnalisé"
-"Anchor Custom Title","Fixer titre personnalisé"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Applicable aux produits et aux catégories du catalogue seulement. Tout contenu media sera inséré dans l'éditeur comme une URL statique. Cela n'est pas mis à jour si l'URL de base de la configuration système est modifiée."
-"Apply MAP (Default Value)","Appliquer MAP (Valeur par défaut"
-"Apply To","Appliquer à "
-"Approved","Approuvé"
-"Are you sure you want to delete this category?","Etes-vous sur de vouloir supprimer cette catégorie ?"
-"Are you sure you would like to remove all products from your comparison?","Etes-vous sur de vouloir enlever tous les produits de votre comparaison ?"
-"Are you sure you would like to remove this item from the compare products?","Etes-vous sur de vouloir enlever cet article des produits comparés ?"
-"Are you sure?","Etes-vous sûr ?"
-"As low as:","Aussi bas que:"
-"Assign","Attribuer"
-"Assign product link","Attribuer le lien du produit"
-"Assign product to category","Attribuer le produit à la catégorie"
-"Assigned Products","Produits Attribués"
-"Associated Products","Produits Associés"
-"Attribute Set","Attib. Nom de la Série"
-"Attribute ""%s"" is invalid.","Attribut ""%s"" invalide."
-"Attribute ""%s"" is required.","Attribut ""%s"" requis."
-"Attribute Information","Informations sur l'attribut"
-"Attribute Model","Modèle de l'attribut"
-"Attribute Name:","Nom de l'attribut:"
-"Attribute Set","Ensemble d'attributs"
-"Attribute Sets","Ensembles d'attributs"
-"Attribute add","Attribut ajouter"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Le code d'attribut est invalide. Veuillez n'utiliser que des lettres (a-z), chiffres (0-9) ou underscores (_) dans ce champ, le premier caractère devant être une lettre."
-"Attribute group with the \/name/\ name already exists","Groupe d'attribut avec le nom \/name/\ existe déjà "
-"Attribute remove","Attribut effacer"
-"Attribute with the same code already exists","Un attribut avec le même code existe déjà "
-"Attributes","Attributs"
-"Attrribute names can be specified per store.","Les noms des attributs peuvent être définis par magasin"
-"Autogenerate","Générer automatiquement"
-"Availability:","Disponibilité:"
-"Back","Retour"
-"Backend Model","Modèle d'interface"
-"Backend Table","Tableau d'interface"
-"Backend Table Title","Titre du tableau d'interface"
-"Backorders","Ruptures de stock"
-"Based On","Basé sur"
-"Before Order Confirmation","Avant la confirmation de commande"
-"Block after Info Column","Bloc après Colonne Info"
-"Bottom Block Options Wrapper","Bloc Inférieur Options d'Emballage"
-"Bottom/Left","Inférieur/Gauche"
-"Bottom/Right","Inférieur/ Droite"
-"Browse By","Parcourir par"
-"Bundle Items","Lot d'objets"
-"Buy %1$s","Acheter %1$s"
-"Buy %1$s for","Acheter %1$s pour"
-"Buy %1$s for %2$s","Acheter %1$s pour %2$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","Acheter %1$s pour %2$s (%3$s TTC) chacun"
-"Buy %1$s for %2$s each","Acheter %1$s pour %2$s chacun"
-"Cache Lifetime (Seconds)","Durée de vie du Cache (Secondes)"
-"Cache refresh needed.","Réactualisation du Cache nécessaire"
-"Can be Divided into Multiple Boxes for Shipping","Peut être divisé en plusieurs boîtes pour le transport"
-"Can be used only with catalog input type Dropdown","Ne peut être utilisé qu'avec un type d'entrée catalogue Menu Déroulant"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","Ne peut être utilisé qu'avec un type d'entrée catalogue Menu Déroulant, Sélection Multiple et Prix"
-"Can't create image.","Ne peut pas créer l'image."
-"Cancel","Annuler"
-"Cannot create image.","Ne peut pas créer l'image."
-"Cannot create writeable directory '%s'.","Ne peut pas créer un répertoire enregistrable '%s'."
-"Cart Item Attribute","Attribut de l'article du panier"
-"Catalog","Catalogue"
-"Catalog Category (Anchor)","Catégorie Catalogue (Attaché)"
-"Catalog Category (Non-Anchor)","Catégorie Catalogue (Non-Attaché)"
-"Catalog Category Link","Lien de la Catégorie Catalogue"
-"Catalog New Products List","List des Nouveaux Produits du Catalogue"
-"Catalog Price Scope","Etendue des Prix du Catalogue"
-"Catalog Product Compare List","Liste de Comparaison des Produits du Catalogue"
-"Catalog Product Email to a Friend","Envoyer le catalogue de produits par email à un ami"
-"Catalog Product Image Gallery Popup","Popup Galerie d'Images du Produit du Catalogue"
-"Catalog Product Link","Lien du Produit Catalogue"
-"Catalog Product View (Any)","Affichage du Produit Catalogue (Tous)"
-"Catalog Product View (Simple)","Affichage du Produit Catalogue (Simple)"
-"Catalog Product View (Virtual)","Affichage du Produit Catalogue (Virtuel)"
-"Catalog Section","Section Catalogue"
-"Catalog Seo Popular Search Terms","Catalogue SEO Termes de Recherche Populaires"
-"Catalog Seo Sitemap (Category List)","Catalogue SEO Plan du Site (Liste des catégories)"
-"Catalog Seo Sitemap (Category Tree)","Catalogue SEO Plan du Site (Arbre des catégories)"
-"Catalog Seo Sitemap (Common)","Catalogue SEO Plan du Site (Courant)"
-"Catalog Seo Sitemap (Product List)","Catalogue SEO Plan du Site (Liste des Produits)"
-"Catalog URL Rewrites","Catalogue Réécritures URL"
-"Catalog product custom option values API","Interface de Programmation Applicative (API) des valeurs de l'option personnalisée des produits du catalogue"
-"Catalog product custom options API","Interface de Programmation Applicative (API) des options personnalisées des produits du catalogue"
-"Catalog, Search","Catalogue, Recherche"
-"Categories","catégories"
-"Categories Sitemap","Catégories Plan du Site"
-"Category","Catégorie"
-"Category API","Catégorie API"
+Next,Suivant
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,Catalogue
+Images,Images
+"per page","par page"
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,OK
+Visibility,Visibilité
+Position,Position
+Fixed,Fixé
+"Use Default Value","Utiliser la valeur par défaut"
+N/A,N/A
+Percent,Percent
+"Option Title","Option Title"
+"Input Type","Entrer le type"
+"New Option","New Option"
+"Price Type","Type de prix"
+"* Required Fields","* Champs obligatoires"
+Availability,Availability
+"In stock","En stock"
+"Out of stock",Epuisé
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,Racine
+"Save Category","Sauvegarder catégorie"
+"Delete Category","Supprimer catégorie"
+"New Subcategory","Nouvelle sous-catégorie"
+"New Root Category","Nouvelle catégorie principale"
+"Set Root Category for Store","Sélectionner Catégorie d'Origine pour Boutique"
+"Use Config Settings","Utiliser les Paramètres de Configuration"
+"Use All Available Attributes","Use All Available Attributes"
+"General Information","Informations générales"
"Category Data","Données de la Catégorie"
-"Category Flat Data","Données Fixes de la Catégorie"
-"Category Link Block Template","Bloc Modèle du Lien de la Catégorie"
-"Category Link Inline Template","Modèle Préféré du Lien de la Catégorie"
"Category Products","Produits de la Catégorie"
-"Category Top Navigation","Haut de la Catégorie Navigation"
-"Category URL Suffix","Suffixe de l'URL de la Catégorie"
-"Category attributes API","Attributs API de la Catégorie"
-"Category move error","Erreur de déplacement de catégorie"
-"Category move operation is not possible: parent category is equal to child category.","L'opération de déplacement de catégorie n'est pas possible : la catégorie parent est la même que la catégorie enfant."
-"Category move operation is not possible: the current category was not found.","L'opération de déplacement de catégorie n'est pas possible : la catégorie actuelle n'a pas été trouvée."
-"Category move operation is not possible: the new parent category was not found.","L'opération de déplacement de la catégorie n'est pas possible: la nouvelle catégorie mère n'a pas été trouvée."
-"Category must be an instance of \Magento\Catalog\Model\Category.","La catégorie doit être un exemple de Magento_Catalogue_Modèle_Catégorie."
-"Center","Centrer"
-"Change","Changer"
-"Change or Retrieve attribute store view","Modifier ou récupérer des attributs de la vue de la boutique"
-"Change status","Changer le satut"
-"Check items to add to the cart or","Cocher les articles à ajouter au panier ou"
-"Choose an Option...","Choisir une option..."
-"Clear All","Tout effacer"
-"Clear Price","Réinitialiser le prix"
-"Click for price","Cliquez pour le prix"
-"Close Window","Fermer la fenêtre"
-"Collapse All","Afficher tout"
-"Comma-separated.","Séparé(es) par des virgules."
-"Comparable","Comparable"
-"Comparable on Front-end","Comparable depuis l'interface"
-"Comparable on the Frontend","Comparable depuis l'interface"
-"Compare","Comparer"
-"Compare Products","Comparer des produits"
-"Conditions Combination","Combinaison de conditions"
-"Continue","Continuer"
-"Country/State","Pays/État"
-"Create","Créer"
-"Create (Upload)","Créer (envoyer)"
-"Create Empty","Créer vide"
-"Create Permanent Redirect for URLs if URL Key Changed","Créer une Redirection Permanente pour les URL si la Combinaison URL a changé"
+"Add Subcategory","Ajouter une sous-catégorie"
+"Add Root Category","Ajouter une catégorie racine"
"Create Permanent Redirect for old URL","Créer une redirection permanente pour une vieille URL"
-"Create Product Settings","Créer les réglages du produits"
-"Create Simple Associated Product","Créer des produits simples associés"
-"Create attribute set based on another set","Créer un ensemble d'attributs basé sur un autre ensemble"
-"Create new attribute","Créer un nouvel attribut"
-"Create new category","Créer une nouvelle catégorie"
-"Create new product","Créer un nouveau produit"
-"Cross-sells","Ventes liées"
-"Currently Shopping by:","Shopping actuel par :"
-"Custom Design","Dessin sur mesure"
-"Custom Options","Personnaliser les options"
-"Custom options","Options personnalisées"
-"Customer Group","Groupe du client"
-"Customers Tagged Product","Les acheteurs ont étiqueté le produit"
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor","Éditeur WYSIWYG"
+"Add Product","Ajouter un produit"
+label,label
+"Product Attributes","Attributs Produit"
+"Add New Attribute","Ajouter un nouvel attribut"
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute","Sauvegarder Attribut"
+"Delete Attribute","Supprimer l'attribut"
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute","Nouvel attribut de produit"
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,Global
+Scope,Portée
+"Declare attribute value saving scope","Déclarer la valeur d'économies"
+"Frontend Properties","Propriétés front-end"
+"Use in Quick Search","Utilisation dans la recherche rapide"
+"Use in Advanced Search","Utiliser en recherche avancée"
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions","Utiliser pour les conditions de la promotion"
+"Enable WYSIWYG","Permettre WYSIWYG"
+"Allow HTML Tags on Frontend","Autoriser les marqueurs HTML sur le frontal"
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing","Utilisé dans une Liste de Produits"
+"Depends on design theme","Dépend du thème visuel"
+"Used for Sorting in Product Listing","Utilisé pour Trier dans une Liste de Produits"
+"Media Image","Image media"
+Gallery,Galerie
+"System Properties","Propriétés Système"
"Data Type for Saving in Database","Type de données pour enregistrement dans la base de données"
-"Date & Time Custom Options","Options de date et d'heure personnalisées"
-"Date Fields Order","Ordre des champs de date"
+Text,Texte
+Varchar,Varchar
+Static,Statique
+Datetime,"Date et heure"
+Decimal,Décimal
+Integer,Entier
+"Globally Editable","Globalement modifiable"
+"Attribute Information","Informations sur l'attribut"
+Properties,Propriétés
+"Manage Labels","Manage Labels"
+Visible,Visible
+Searchable,Consultable
+Comparable,Comparable
+"Delete Selected Group","Supprimer le groupe sélectionné"
+"Delete Attribute Set","Supprimer l'ensemble d'attributs"
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set","Enregistrer l'ensemble d'attributs"
+"New Set Name","Nouveau nom d'ensemble"
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,Vide
+"Add Attribute","Ajouter un Attribut"
+"Add New Group","Ajouter un nouveau groupe"
+"Add Group","Ajouter un groupe"
+"Edit Set Name","Modifier le nom défini"
+"For internal use","For internal use"
+"Based On","Basé sur"
+"Add New Attribute Set","Ajouter un nouveau jeu d'attributs"
+"Add New Set","Ajouter une nouvelle série"
+"Product Templates","Product Templates"
+"Close Window","Fermer la fenêtre"
+"New Product","Nouveau produit"
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,Attributs
+Change,Changer
+"Advanced Inventory","Advanced Inventory"
+Websites,"Site web"
+"Products Information","Information des produits"
+"Category Name","Category Name"
+"Parent Category","Catégorie parent"
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.","Il n'y a pas de client pour cette alerte."
"Subscribe Date","Date d'abonnement"
-"Datetime","Date et heure"
-"Decimal","Décimal"
-"Declare attribute value saving scope","Déclarer la valeur d'économies"
-"Default ""What's This"" Text Message","Message texte par défaut ""Qu'est-ce"""
-"Default Popup Text Message","Message text pop-up par défaut"
+"Last Notified","Dernière notification"
+"Send Count","Envoyer Compte"
+"New Attribute","New Attribute"
+"Attribute Set","Ensemble d'attributs"
+"Add New Option","Ajouter nouvelle option"
+"Import Options","Import Options"
+Import,Import
+"Add New Row","Ajouter nouvelle ligne"
+"Delete Row","Supprimer ligne"
+"Tier Pricing","Catégorie de prix"
"Default Price","Prix par défaut"
-"Default Price Navigation Step","Prix par défaut pour la navigation"
-"Default Quantity","Qté par défaut"
+"Add Group Price","Ajouter un prix de groupe"
+"ALL GROUPS","TOUS LES GROUPES"
+"Add Tier","Ajouter un niveau"
"Default Values","Valeurs par défaut"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Définit l'étendue de base des monnaies (""Monnaies"" > ""Options des monnaies"" > ""Monnaies de base"")"
-"Delete","Supprimer"
-"Delete Attribute","Supprimer l'attribut"
-"Delete Attribute Set","Supprimer l'ensemble d'attributs"
-"Delete Category","Supprimer catégorie"
-"Delete Group Price","Supprimer le prix de groupe"
-"Delete Option","Supprimer option"
-"Delete Row","Supprimer ligne"
+"Related Products","Produits apparentés"
+Up-sells,"Ventes additionnelles"
+Cross-sells,"Ventes liées"
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS","Notifier le faible stock dans le RSS"
+"Change status","Changer le satut"
+"Update Attributes","Mettre à jour les attributs"
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images","Ajouter de nouvelles images"
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term","Ajouter un nouveau terme de recherche"
+"Save Search","Sauvegarder recherche"
"Delete Search","Supprimer recherche"
-"Delete Selected Group","Supprimer le groupe sélectionné"
-"Delete Tier","Supprimer le niveau"
-"Delete attribute","Supprimer l'attribut"
-"Delete category","Supprimer catégorie"
-"Delete product","Supprimer produit"
-"Depends on design theme","Dépend du thème visuel"
-"Design","Design"
-"Details","Détails"
-"Disabled","Désactivé"
-"Disallowed file type.","Type de fichier non autorisé."
-"Display Actual Price","Afficher le prix réel"
-"Display Price Interval as One Price","Afficher l'intervalle de prix comme Un Prix"
-"Display Product Count","Afficher le nombre de produits"
-"Display in Suggested Terms","Afficher dans les termes suggérés."
-"Double click on a group to rename it","Double cliquez sur un groupe pour le renommer"
-"Double click on above image to view full picture","Double cliquez sur une image pour taille réelle"
-"Downloadable Information","Informations téléchargeables"
-"Duplicate","Copier"
-"Duplicate amount found.","Montant copié trouvé."
-"Duplicate website group price customer group.","Copier le site internet prix de groupe clientèle."
-"Duplicate website tier price customer group and quantity.","Dupliquer le prix de groupe client du site et la quantité."
-"Duplicate website, country and state tax found.","Copie du site web, du pays et de la région trouvée."
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}.Des chemins dynamiques ont un impact sur les performances du catalogue."
-"Edit","Éditer"
-"Edit Attribute Set '%s'","Modifier le jeu d'attributs : '%s'"
-"Edit Product Attribute","Modifier l'attribut du produit"
-"Edit Product Attribute ""%s""","Modifier attribut de produit ""%s"""
-"Edit Search","Modifier la recherche"
-"Edit Search '%s'","Modifier la recherche '%s'"
-"Edit Set Name","Modifier le nom défini"
-"Email","Email"
-"Email to a Friend","Envoyer à un ami par email"
-"Empty","Vide"
-"Enable MAP","Activer MAP"
-"Enable Quantity Increments","Activer quantité"
-"Enable WYSIWYG","Permettre WYSIWYG"
-"Enabled","Activé"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","Le type de modèle de l'entité doit être une instance de \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","Le type de modèle de l'entité doit être une instance de \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType"
-"Error during retrieval of option value: %s","Erreur lors de la récupération de la valeur de l'option:% s"
-"Exclude","Exclure"
-"Expand All","Tout développer"
-"Failed","Echoué"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","Echec de la copie du fichier %s. Veuillez supprimer les fichiers avec des images non existantes, et réessayer."
-"Failed to move file: %s","Impossible de déplacer le fichier: %s"
-"Feature Products","Produits à l'affiche"
-"Field is not complete","Le champ n'est pas complet"
-"File options format is not valid.","Le format des options du fichier n'est pas valide."
-"File upload failed","L'envoi du fichier a échoué."
-"Filter model name must be declared.","Un nom de modèle de filtre doit être précisé."
-"Filter must be an object. Please set correct filter.","Le filtre doit être un objet. Veuillez définir un filtre correct."
-"Filterable (no results)","Filtrable (pas de résultat)"
-"Filterable (with results)","Filtrable (avec résultats)"
-"First Name","Prénom"
-"Fixed","Fixé"
-"For internal use.","Pour usage interne."
+"Edit Search '%1'","Edit Search '%1'"
+"New Search","Nouvelle recherche"
+"Search Information","Informations de recherche"
+"Search Query","Demande de recherche"
+"Number of results","Nombre de résultats"
+"Number of results (For the last time placed)","Nombre de résultats (pour la dernière fois)"
"For the last time placed.","Placé pour la dernière fois."
-"Frontend","Interface"
-"Frontend Model","Modèle d'interface"
-"Frontend Properties","Propriétés front-end"
-"Gallery","Galerie"
-"General Information","Informations générales"
-"Get full information about attribute with list of options","Obtenez toutes les informations des attributs avec une liste des options"
-"Get full information about custom option in product","Obtenez des renseignements complets sur l'option personnalisée dans le produit"
-"Get list of available custom option types","Obtenez la liste des types d'options personnalisées disponibles"
-"Get list of non-default attributes by product type and attributes set","Obtenez une liste des attributs, autres que celui par défaut, par type de produits et ensemble d'attributs"
-"Get list of possible attribute types","Obtenir la liste des types d'attributs possibles"
-"Get special price","Obtenez un prix spécial"
-"Global","Global"
-"Globally Editable","Globalement modifiable"
+"Number of Uses","Number of Uses"
+"Synonym For","Synonyme de"
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL","Rediriger l'adresse URL"
+"ex. http://domain.com","ex. http://domain.com"
+"Display in Suggested Terms","Afficher dans les termes suggérés."
"Go to Home Page","Aller à la page d'accueil"
-"Grid","Grille"
-"Group add","Groupe ajouter"
-"Group remove","Suppression de groupe"
-"Groups","Groupes"
-"Home","Accueil"
-"ID","ID"
-"ID: %s","Identifiant : %s"
-"If empty, the Category Name will be used","Si vide, la catégorie Nom sera utilisé."
-"If empty, the Product will be used","Si vide, le nom du produit sera utilisé"
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Si vous ne précisez pas une valeur d'option pour une vue spécifique de boutique alors la valeur par défaut sera utilisée."
-"Image","Image"
-"Image content is not valid base64 data.","Le contenu de l'image n'est pas valide à base64."
-"Image does not exist.","L'image n'existe pas."
-"Image file was not found.","Fichier image introuvable."
-"Image type and information need to be specified for each store view.","Le type d'image et les informations doivent être précisés pour chaque vue de la boutique."
-"In Cart","Dans le panier"
-"In Stock","En stock."
-"In stock","En stock"
-"Incl. Tax","TTC"
-"Index product and categories URL rewrites","Réécriture de l'index des produits et catégories"
-"Index product attributes for layered navigation building","Attributs de la navigation par couches de l'index des produits"
-"Index product prices","Prix de l'index des produits"
-"Indexed category/products association","Catégorie indexée/association de produits"
-"Info","Détails"
-"Info Column Options Wrapper","Colonne infos options enrouler"
-"Input Type","Entrer le type"
-"Integer","Entier"
-"Interval Division Limit","Limite de la division d'intervalle"
-"Invalid Tier Prices","Prix invalides"
-"Invalid attribute %s","Attribut %s invalide"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Option d'attribut invalide spécifiée pour l'attribut %s (%s), enregistrement sauté."
-"Invalid attribute set specified, skipping the record.","Attribut de l'ensemble spécifié non-valide, passer le dossier."
-"Invalid block: %s.","Bloc invalide : %s."
-"Invalid category IDs.","Identifiants de catégorie invalides."
-"Invalid category.","Catégorie non-valide."
-"Invalid image file type.","Type de fichier image invalide."
-"Invalid image type.","Type d'image non-valide."
-"Invalid option ID specified for %s (%s), skipping the record.","Identifiant de l'option invalide pour %s (%s), ignorer."
-"Invalid product type specified, skipping the record.","Le type de produit spécifié n'est pas valide, passer le dossier."
-"Invalid store specified","Boutique spécifiée invalide"
-"Invalid store specified, skipping the record.","Magasin spécifié invalide, enregistrement sauté."
-"Invalid tier prices. The product is not associated to the requested website.","Niveau de prix non-valide. Le produit n'est pas associé au site demandé."
-"Inventory","Inventaire"
-"Is Default","Est par défaut"
-"Is Required","Est requis"
-"Items %s to %s of %s total","Éléments %s à %s sur un total de %s"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Les éléments que vous ne souhaitez pas afficher dans les résultats de recherche ou dans le catalogue devrait avoir le statut ""Désactivé"" dans le magasin souhaité."
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Objets que vous ne voulez pas afficher dans le catalogue ou les résultats de recherche doivent avoir le statut ""Désactivé"" dans la boutique en question."
-"Keep your eyes open for our special Back to School items and save A LOT!","Gardez vos yeux ouverts pour nos articles spécialement destinés à la rentrée scolaire et économisez UN MAX !"
-"Label","Label"
-"Last Name","Nom de famille"
-"Last Notified","Dernière notification"
-"Layered Navigation","Navigation par couches"
-"Learn More","En savoir plus"
-"Line %d, Email: %s","Ligne %d, email : %s"
-"Line %d, SKU: %s","Ligne %d, SKU : %s"
-"Link (Related, Up sell, Cross sell)","Lien (lié, vente)"
-"Link product does not exist.","Le lien du produit n'existe pas."
-"Link to a Specified Category","Lien vers une catégorie précise"
-"Link to a Specified Product","Lien vers un produit déterminé"
-"List","Liste"
-"List Mode","Mode liste"
-"List of Products that are set as New","Liste de produits nouveaux"
-"List of types","Liste de types"
-"Manage Attribute Sets","Gérer les jeux d'attributs"
-"Manage Attributes","Gérer attributs"
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List","Liste de comparaison des produits"
+AM,"Avant midi"
+PM,PM
+Categories,catégories
"Manage Catalog Categories","Gérer les catégories de catalogue"
"Manage Categories","Gérer les catégories"
-"Manage Label / Options","Gérer les labels/options"
-"Manage Options (values of your attribute)","Gérer les options (valeurs de l'attribut)"
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.","Ce produit n'existe plus."
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).","Veuillez sélectionner le(s) produit(s)."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
"Manage Product Attributes","Gérer les attributs de produit"
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.","Cet attribut ne peut pas être modifié."
+"Edit Product Attribute","Modifier l'attribut du produit"
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.","L'attribut ne peut pas être supprimé."
+"The product attribute has been deleted.","L'attribut produit a été supprimé."
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.","Un group avec le même nom existe déjà ."
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets","Gérer les jeux d'attributs"
+"New Set","New Set"
"Manage Product Sets","Gérer les jeux de produits"
-"Manage Products","Gérer les produits"
-"Manage Stock","Gérer le stock"
+"This attribute set no longer exists.","La série d'attributs n'existe plus."
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.","Une erreur est survenue pendant la sauvegarde de la série d'attributs."
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.","Cette recherche n'existe plus."
+"Edit Search","Modifier la recherche"
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.","Pour voir le prix du produit, ajoutez ce produit à votre panier. Vous pourrez toujours le supprimer plus tard."
+"See price before order confirmation.","Voir le prix avant la confirmation de commande."
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
+Grid,Grille
+List,Liste
+"Product is not loaded","Le produit n'est pas chargé"
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
+"No layout updates","Aucune mise à jour de mise en page"
+"Products only","Produits seulement"
+"Static block only","Bloc statique uniquement"
+"Static block and products","Bloc statique et produits"
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,Étirer
+Tile,Carreau
+Top/Left,Supérieur/Gauche
+Top/Right,"Haut / Droite"
+Bottom/Left,Inférieur/Gauche
+Bottom/Right,"Inférieur/ Droite"
+Center,Centrer
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites","Catalogue Réécritures URL"
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,Catégorie
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price","Réinitialiser le prix"
+"The filters must be an array.","Les filtres doivent être une matrice."
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config","Utiliser config"
+"In Cart","Dans le panier"
+"Before Order Confirmation","Avant la confirmation de commande"
+"On Gesture","Par geste"
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building","Attributs de la navigation par couches de l'index des produits"
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.","La sélection du type d'options a requis des rangs de valeurs."
+"Please specify date required option(s).","Veuillez spécifier l'(les) option(s) requise(s) pour la date."
+"Please specify time required option(s).","Veuillez spécifier les options dépendant du temps."
+"Please specify the product's required option(s).","Veuillez spécifier l'option/les options requise(s) du produit."
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,px.
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually","Pas visibles individuellement"
+"Catalog, Search","Catalogue, Recherche"
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.","Un type de produit n'est pas défini dans l'index."
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:","Aussi bas que:"
+"Are you sure you want to delete this category?","Etes-vous sur de vouloir supprimer cette catégorie ?"
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All","Afficher tout"
+"Expand All","Tout développer"
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
"Manage Titles (Size, Color, etc.)","Gérer les titres (taille, couleur, etc)"
-"Max Characters","Caractères max."
-"Maximal Depth","Profondeur maximale"
-"Maximum Image Size","Taille maximum de l'image"
-"Maximum Number of Price Intervals","Nombre maximal d'intervalles de prix"
-"Maximum Quantity Allowed in Shopping Cart","Quantité maximum autorisée dans le panier"
-"Maximum allowed image size for '%s' is %sx%s px.","La taille d'image maximale autorisée pour '%s' est %sx%sp px."
-"Maximum image height","Hauteur maximale de l'image"
+"Manage Options (values of your attribute)","Gérer les options (valeurs de l'attribut)"
+"Is Default","Est par défaut"
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,Groupes
+"Double click on a group to rename it","Double cliquez sur un groupe pour le renommer"
+"Unassigned Attributes","Attributs non assignés"
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.","Le groupe contient des attributs système. Veuillez déplacer les attributs système vers un autre groupe et réessayer."
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options","Personnaliser les options"
+"This is a required option.","This is a required option."
+"Field is not complete","Le champ n'est pas complet"
+"Allowed file extensions to upload","Extensions de fichiers autorisées pour le téléchargement montant"
"Maximum image width","Largeur maximale de l'image"
+"Maximum image height","Hauteur maximale de l'image"
"Maximum number of characters:","Nombre de caractères maximum :"
-"Maximum number of price intervals is 100","Le nombre maximal d'intervalles de prix est de 100"
-"Media Image","Image media"
-"Minimum Advertised Price","Prix minimum annoncés"
-"Minimum Lines per Page","Lignes minimum par page"
-"Minimum Quantity Allowed in Shopping Cart","Quantité minimum autorisée dans le panier"
-"Minimum Quantity for Item's Status to be Out of Stock","Quantité minimum pour que le statut de l'article soit ""Rupture de stock"""
-"Missing SKU, skipping the record.","SKU manquant, le dossier est sauté."
-"More Views","Plus de vues"
-"Move","Déplacer"
-"Move category in tree","Déplacez la catégorie dans l'arbre"
-"Must be in the allowed values list.","Doit être dans la liste des valeurs autorisées."
-"N/A","N/A"
-"Name","Nom"
-"Name in %s","Nom dans %s"
-"New Product","Nouveau produit"
-"New Product Attribute","Nouvel attribut de produit"
-"New Products","Nouveaux produits"
-"New Products Grid Template","Modèle de grille nouveaux produits"
-"New Products List Template","Modèle de liste nouveaux produits"
-"New Root Category","Nouvelle catégorie principale"
-"New Search","Nouvelle recherche"
-"New Set Name","Nouveau nom d'ensemble"
-"New Subcategory","Nouvelle sous-catégorie"
-"Next","Suivant"
-"No","Non"
-"No image","Pas d'image"
-"No layout updates","Aucune mise à jour de mise en page"
-"No options of this product are available.","Il n'y a pas d'options disponibles pour ce produit"
-"No product collections found.","Pas de collection de produits trouvée."
-"None","aucun"
-"Not Visible Individually","Pas visibles individuellement"
-"Notify Low Stock RSS","Notifier le faible stock dans le RSS"
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock","Gérer le stock"
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,"Ruptures de stock"
"Notify for Quantity Below","Notifier pour les quantités en dessous de"
-"Number of Products to Display","Nombre de produits à afficher"
-"Uses","Nombre d'utilisations"
-"Number of results","Nombre de résultats"
-"Number of results (For the last time placed)","Nombre de résultats (pour la dernière fois)"
-"OK","OK"
-"OR","OU"
-"Old Price:","Ancien prix :"
-"On Gesture","Par geste"
-"Option validation failed to add product to cart.","Échec de l'ajout de la validation de l'option au panier."
-"Option values","Valeurs d'option"
-"Option:","Option:"
-"Options","Options"
-"Options Control","Contrôle de l'option"
-"Options is required","Option requise"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","Notre service client est disponible 24 heures sur 24, 7 jours sur 7. Appelez-nous au (555) 555-0123."
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability","Disponibilité du Stock"
+"In Stock","En stock."
"Out of Stock","En rupture de stock"
-"Out of stock","Epuisé"
-"PM","PM"
-"Page Title Separator","Séparateur titre de la page"
-"Parent Category","Catégorie parent"
-"Pending","En cours"
-"Percentage","Pourcentage"
-"Please add rows to option.","Veuillez ajouter des lignes à l'option."
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Veuillez faire attention : une fois que vous cliquez sur la ligne, les données du paquet sélectionné se chargeront et toutes les données non-enregistrées seront perdues."
-"Please click on the Close Window button if it is not closed automatically.","Veuillez cliquer sur le bouton Fermer la fenêtre si celle-ci n'est pas fermée automatiquement."
-"Please enter a new group name","Veuillez entrer un nouveau nom de groupe"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Veuillez actualiser""URL de réécriture du catalogue"" et ""Attributs de produits"" dans Système -> <a href=""%s"">Gestion de l'Index</a>"
-"Please select a static block ...","Veuillez sélectionner un bloc statique..."
-"Please select items.","Veuillez sélectionner des articles."
-"Please select one or more attributes.","Veuillez sélectionner un ou plusieurs attribut(s)."
-"Please select product(s).","Veuillez sélectionner le(s) produit(s)."
-"Please select products for attributes update","Veuillez sélectionner des produits pour la mise à jour des attributs"
-"Please set up merge date/time","Veuillez définir la fusion date/heure"
-"Please set up merge date/time later then present date","Veuillez mettre en place une fusion date/heure ultérieure à la date actuelle"
-"Please specify date required option(s).","Veuillez spécifier l'(les) option(s) requise(s) pour la date."
-"Please specify the number of products, that will not be divided into subintervals.","Veuillez spécifier le nombre de produits qui ne seront pas divisés en sous-intervalles."
-"Please specify the product required option(s)","Veuillez spécifier l'option/ les options requise(s) pour le produit"
-"Please specify the product required option(s).","Veuillez spécifier l'option/les options requise(s) pour le produit."
-"Please specify the product's option(s).","Veuillez spécifier les options du produit."
-"Please specify the product's required option(s).","Veuillez spécifier l'option/les options requise(s) du produit."
-"Please specify the quantity of product(s).","Veuillez spécifier la quantité de produit(s)."
-"Please specify time required option(s).","Veuillez spécifier les options dépendant du temps."
-"Please wait...","Veuillez patienter..."
-"Position","Position"
-"Position in Layered Navigation","Position dans la navigation par niveau"
-"Position of attribute in layered navigation block","Position de l'attribut dans le bloc navigation par niveaux"
-"Prev","Préc"
-"Previous","Précédent"
-"Price","Prix"
-"Price Navigation Step Calculation","Calcul Prix Etape de Navigation"
-"Price Type","Type de prix"
-"Price is not available","Le prix n'est pas disponible"
-"Price values for options should be specified in system base currency.","Les valeurs des prix pour les options devraient être définies dans une devise de base du système"
-"Price:","Prix:"
-"Price: %s","Prix : %s"
-"Print This Page","Imprimer cette page"
-"Product","Produit"
-"Product API","Produit API"
-"Product Alerts","Alertes produit"
-"Product Attribute","Attribut de produit"
-"Product Attributes","Attributs Produit"
-"Product Categories","Catégories Produit"
-"Product Extra Info","Informations supplémentaires sur le produit"
-"Product Flat Data","Données fixes du produit"
-"ID","ID produit"
-"Product Image Placeholders","Paramètres Image du Produit"
-"Product Image Watermarks","Filigranes Image du Produit"
-"Product Images","Images du Produit"
-"Product Images API","Images API du Produit"
+"Add Product To Websites","Ajouter un produits aux sites Internet"
+"Remove Product From Websites","Supprimer le produit des sites web"
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Les éléments que vous ne souhaitez pas afficher dans les résultats de recherche ou dans le catalogue devrait avoir le statut ""Désactivé"" dans le magasin souhaité."
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions","Extensions de fichiers autorisées"
+"Maximum Image Size","Taille maximum de l'image"
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters","Caractères max."
+"Customer Group","Groupe du client"
+"Delete Group Price","Supprimer le prix de groupe"
+"Item Price","Item Price"
+"and above","et ci-dessus"
+"Delete Tier","Supprimer le niveau"
"Product In Websites","Produit dans les Sites Internet"
-"Product Info Column","Colonne d'informations du Produit"
-"Product Information","Information produit"
-"Product Link Block Template","Produit Lien Modèle Bloc"
-"Product Link Inline Template","Produit Lien Modèle Conforme"
-"Product Listing Sort by","Liste des Produits triés par"
-"Product","Nom du produit"
-"Product Prices","Prix des Produits"
-"Product Tags","Étiquettes des produits"
-"Product Tier Price API","Produit Niveau de Prix API"
-"Product Type","Type de Produit"
-"Product URL Suffix","Suffixe URL du produit"
-"Product View Extra Hint","Vue par produit trace supplémentaire"
-"Product attribute sets API","Jeux d'attributs Produit API"
-"Product attributes API","Attributs API du produit"
-"Product collection expected.","Collection du produit attendu."
-"Product is not loaded","Le produit n'est pas chargé"
-"Product links API (related, cross sells, up sells)","API de liens de produits (liés, ventes croisées ...)"
-"Product name","Nom du produit"
-"Product types API","Types API du produit"
-"Products","Produits"
-"Products Comparison List","Liste de comparaison des produits"
-"Products Information","Information des produits"
-"Products Sitemap","Plan du site produits"
-"Products only","Produits seulement"
-"Products per Page on Grid Allowed Values","Produits par page sur les valeurs autorisées des lignes"
-"Products per Page on Grid Default Value","Produits par page sur les valeurs par défaut des lignes"
-"Products per Page on List Allowed Values","Produit par page sur les valeurs autorisées des listes"
-"Products per Page on List Default Value","Produits par page sur la valeur par défaut de la liste"
-"Properties","Propriétés"
-"Quantity","Qté"
-"Quantity Increments","Augmentation de la quantité"
-"Quantity Uses Decimals","La quantité utilise des décimales"
-"Quantity for Item's Status to Become Out of Stock","Nombre de statuts de produits bientôt épuisés"
-"Quantity:","Qté:"
-"Quantity","Quantité"
-"Quick Create","Création Rapide"
-"Quick Overview","Vue générale rapide"
-"Quick simple product creation","Création de produit rapide et simple"
-"Records for ""","Enregistrements pour """
-"Redirect","Redirection"
-"Redirect URL","Rediriger l'adresse URL"
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Objets que vous ne voulez pas afficher dans le catalogue ou les résultats de recherche doivent avoir le statut ""Désactivé"" dans la boutique en question."
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
"Regular Price:","Prix normal"
-"Related Products","Produits apparentés"
-"Remove","Supprimer"
-"Remove Product From Websites","Supprimer le produit des sites web"
-"Remove This Item","Retirer cet article"
-"Remove attribute from attribute set","Supprimer un attribut de l'ensemble des attributs"
-"Remove attribute set","Supprimer un ensemble d'attributs"
-"Remove custom option","Supprimer l'option personnalisée"
-"Remove group from attribute set","Supprimer un groupe de l'ensemble des attributs"
-"Remove option","Retirer l'option"
-"Remove product assignment","Supprimer l'affectation du produit"
-"Remove product image","Enlever l'image du produit"
-"Remove product link","Supprimer le lien du produit"
-"Remove value from custom option","Retirer la valeur de l'option personnalisée"
-"Rename existing group","Renommer un groupe existant"
-"Rename group","Renommer un groupe"
-"Reorganize EAV category structure to flat structure","Réorganiser la structure de la catégorie EAV en structure plate"
-"Reorganize EAV product structure to flat structure","Réorganiser la structure du produit EAV en structure plate"
-"Reset","Réinitialiser"
-"Results","Résultats"
-"Retrieve attribute data","Récupérer les données d'attributs"
-"Retrieve attribute list","Extraire la liste de l'attribut"
-"Retrieve attribute options","Extraire les options de l'attribut"
-"Retrieve categories tree","Récupérer l'arbre des catégories"
-"Retrieve category attributes","Extraire les attributs de la catégorie"
-"Retrieve category data","Extraire les données de la catégorie"
-"Retrieve hierarchical tree","Extraire l'arborescence hiérarchique"
-"Retrieve linked products","Extraire les produits apparentés"
-"Retrieve list of assigned products","Extraire la liste des produits affectés"
-"Retrieve list of option values","Récupérer la liste des valeurs d'option"
-"Retrieve list of product custom options","Récupérer la liste des options personnalisées de produit"
-"Retrieve one level of categories by website/store view/parent category","Extraire un niveau de catégorie par site web/magasin/catégorie apparentée"
-"Retrieve option value info","Récupérer les informations sur la valeur optionnelle"
-"Retrieve product","Extraire le produit"
-"Retrieve product attribute sets","Récupérer les ensembles d'attributs du produit"
-"Retrieve product image","Extraire l'image du produit"
-"Retrieve product image list","Récupérer la liste image du produit"
-"Retrieve product image types","Extraire les types d'images du produit"
-"Retrieve product link type attributes","Extraire les attributs du type de lien du produit"
-"Retrieve product link types","Extraire les types de lien du produit"
-"Retrieve product tier prices","Extraire les niveaux de prix du produit"
-"Retrieve product types","Extraire les types de produit"
-"Retrieve products data","Récupérer les données produits"
-"Retrieve products list by filters","Extraire la liste des produits par filtrage"
-"Roll Over for preview","Passez votre souris par-dessus pour la prévisualisation"
-"Root","Racine"
-"SKU","UGS"
-"SKU length should be %s characters maximum.","La longueur de l'UGS doit être de %s caractères maximum."
-"Save","Sauvegarder"
-"Save Attribute","Sauvegarder Attribut"
-"Save Attribute Set","Enregistrer l'ensemble d'attributs"
-"Save Category","Sauvegarder catégorie"
-"Save Search","Sauvegarder recherche"
-"Save and Continue Edit","Sauvegarder et continuer l'édition"
-"Saved %d record(s)","Sauvegardé %d enregistrement(s)"
-"Scope","Portée"
-"Search","Rechercher"
-"Search Engine Optimizations","Optimisations du Moteur de Recherche"
-"Search Information","Informations de recherche"
-"Search Query","Demande de recherche"
-"Search Term with such search query already exists.","Le terme recherché avec la même interrogation existe déjà ."
-"Search Weight","Recherche de poids"
-"Searchable","Consultable"
-"See price before order confirmation.","Voir le prix avant la confirmation de commande."
-"Select Category...","Sélectionner Catégorie"
-"Select Product...","Sélectionner Produit..."
-"Select type of option","Sélectionner le type d'option"
-"Select type options required values rows.","La sélection du type d'options a requis des rangs de valeurs."
-"Selected Product Types","Types de Produits Sélectionnés"
-"Selected configuration is not available.","La Configuration sélectionnée n'est pas valide."
-"Send Count","Envoyer Compte"
-"Set Ascending Direction","Par ordre croissant"
-"Set Descending Direction","Définir Direction Descendante"
-"Set","Définir le nom"
-"Set Root Category for Store","Sélectionner Catégorie d'Origine pour Boutique"
-"Set root category for this store in the <a href=""%s"">configuration</a>","Définir une catégorie source pour ce magasin dans la <a href=""%s"">configuration</a>"
-"Set special price","Définir prix spécial"
-"Set/Get current store view","Réglez/Obtenez la vue actuelle du magasin"
-"Settings","Options"
-"Shop By","Acheter par"
-"Shopping Options","Options d'Achat"
-"Show","Afficher"
-"Show Details","Afficher les détails"
-"Show Tags","Afficher Tags"
-"Simple Product","Produit Simple"
-"Site Map","Plan du Site"
-"Sitemap","Plan du site"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Sauter la ligne d'importation, ""%s"" n'est une valeur valable pour le champ ""%s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","Sauter la ligne importation, le champ requis ""%s"" pour le nouveau client n'est pas défini."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Sauter la ligne d'importation, la valeur ""%s"" n'est pas valable pour le champ ""%s"""
-"Skipping import row, required field ""%s"" for new products is not defined.","Saut de la ligne importation en cours, le champ ""%s"", requis pour les nouveaux produits, n'est pas défini."
-"Skipping import row, required field ""%s"" is not defined.","Sauter la ligne d'importation, le champ requis ""%s"" n'est pas défini."
-"Skipping import row, store ""%s"" field does not exist.","Sauter la ligne d'importation, le champ point de vente ""%s"" n'existe pas."
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Sauter la ligne d'importation, la valeur ""%s"" est invalide pour le champ ""%s""."
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Certains des produits traités n'ont pas de valeur UGS définie. Veuillez la saisir avant d'effectuer des opérations sur ces produits."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Certains de produits ci-dessous n'ont pas toutes les options requises. Veuillez les éditer et configurer toutes les options requises."
-"Sort By","Trier par"
-"Sort Order","Trier la commande"
-"Source Model","Modèle source"
-"Special Expires On: %s","Spécial expire le : %s"
"Special Price:","Prix Spécial:"
-"Special Price: %s","Prix spécial : %s"
-"Starting at:","Dès:"
-"Static","Statique"
-"Static block and products","Bloc statique et produits"
-"Static block only","Bloc statique uniquement"
-"Status","Statut"
-"Stock Availability","Disponibilité du Stock"
-"Store","Magasin"
-"Store View","Vue du magasin"
-"Stretch","Étirer"
-"Subscribe to RSS Feed","S'abonner au flux RSS"
-"Super product attributes configuration","Configuration attributs super produit"
-"Synonym For","Synonyme de"
-"System Properties","Propriétés Système"
-"Tag","Nom de l'étiquette"
-"Tax","Taxe"
-"Template","Modèle visuel"
-"Text","Texte"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","La module du Catalogue fixe a une limite de %2\$d attributs filtrables et/ou triables. Il y en a actuellement %1\$d. Veuillez réduire le nombre d'attributs filtrables/triables afin d'utiliser ce module."
-"The attribute model is not defined","Le modèle d'attribut n'est pas défini."
-"The attribute set has been saved.","L'ensemble d'attributs a été enregistré."
-"The base directory to upload file is not specified.","Le répertoire de base pour télécharger le fichier n'est pas spécifié."
-"The category has been deleted.","La catégorie a été supprimée."
-"The category has been saved.","La catégorie a été sauvegardée."
-"The comparison list was cleared.","La liste de comparative a été vidée."
-"The file '%s' for '%s' has an invalid extension","Le fichier '%s' pour '%s' a une extension invalide"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","Le fichier '%s' que vous ave envoyé est plus gros que les %s Mb autorisés par le serveur"
-"The file you uploaded is larger than %s Megabytes allowed by server","Le fichier que vous avez téléchargé est supérieur aux %s Mb autorisés par le serveur"
-"The filters must be an array.","Les filtres doivent être une matrice."
-"The image contents is not valid base64 data.","Le contenu de l'image n'est pas valide en données de base64."
-"The image is not specified.","L'image n'est pas spécifiée."
-"The model collection resource name is not defined.","Le nom de la ressource du modèle collection n'est pas défini."
-"The product %s has been added to comparison list.","Le produit %s a été ajouté à la liste comparative."
-"The product %s has been removed from comparison list.","Le produit %s a été retiré de la liste comparative."
-"The product attribute has been deleted.","L'attribut produit a été supprimé."
-"The product attribute has been saved.","L'attribut produit a été sauvegardé."
-"The product has been created.","Le produit a été créé."
-"The product has been deleted.","Le produit a été supprimé."
-"The product has been duplicated.","Le produit a été dupliqué."
-"The product has been saved.","Le produit a été sauvegardé."
-"The product has required options","Le produit a des options obligatoires."
-"The search was deleted.","La recherche a été supprimée."
-"The text is too long","Le texte est trop long"
-"There are no %s available.","Il n'y a pas de %s disponible."
-"There are no customers for this alert","Il n'y a pas de client pour cette alerte."
-"There are no customers for this alert.","Il n'y a pas de client pour cette alerte."
-"There are no products matching the selection.","Aucun produit ne correspond à la sélection."
-"There was an error while request processing.","Une erreur s'est produite lors du traitement de votre demande."
-"This Attribute no longer exists","Cet attribut n'existe plus"
-"This attribute cannot be deleted.","L'attribut ne peut pas être supprimé."
-"This attribute cannot be edited.","Cet attribut ne peut pas être modifié."
-"This attribute cannot be updated.","L'attribut ne peut pas être mis à jour."
-"This attribute no longer exists","Cet attribut n'existe plus"
-"This attribute set no longer exists.","La série d'attributs n'existe plus."
-"This group contains system attributes. Please move system attributes to another group and try again.","Le groupe contient des attributs système. Veuillez déplacer les attributs système vers un autre groupe et réessayer."
-"This is a required option","Cette option est requise"
-"This product no longer exists.","Ce produit n'existe plus."
-"This search no longer exists.","Cette recherche n'existe plus."
-"This setting will be applied when all prices in the specific price interval are equal.","Ce paramètre sera appliqué lorsque tous les prix dans l'intervalle de prix spécifique sont égaux."
-"Tier Pricing","Catégorie de prix"
-"Tile","Carreau"
-"Time Format","Format horaire"
-"Title","Titre"
-"To reindex the enabled product(s), the store or product must be specified","Pour réindexer les produits activés, la boutique ou le produit doit être spécifié"
-"To see product price, add this item to your cart. You can always remove it later.","Pour voir le prix du produit, ajoutez ce produit à votre panier. Vous pourrez toujours le supprimer plus tard."
-"Top/Left","Supérieur/Gauche"
-"Top/Right","Haut / Droite"
-"Total Quantity Base Items","Qté Totale d'articles de base"
-"Total incl. Tax: %1$s","Total, TVA incl. : %1s"
-"Total of %d record(s) have been deleted.","Un total de %d entrée(s) ont été supprimées."
-"Total of %d record(s) have been updated.","Un total de %d entrée(s) ont été mises à jour."
-"Total of %d record(s) were updated","Un total de %d enregistrements ont été mis à jour."
-"Type","Type"
-"URL Rewrite Management","Gestion de réécriture d'URL"
-"Unable to complete this request.","Impossible de répondre à la demande."
-"Unable to find a search term to delete.","Impossible de trouver un terme de recherche à supprimer."
-"Unable to find an attribute to delete.","Impossible de trouver un attribut à supprimer."
-"Unable to get the product ID.","Impossible d'obtenir l'ID produit."
-"Unassigned Attributes","Attributs non assignés"
-"Unknown EAV indexer type ""%s"".","Type d’indexer EAV inconnu ""%s""."
-"Unknown attribute: %s.","Attribut inconnu: %s."
-"Unsupported product type ""%s"".","Type de produit ""%s"" non pris en charge."
-"Up-sells","Ventes additionnelles"
-"Update","Mise à jour"
-"Update Attributes","Mettre à jour les attributs"
-"Update Tier Price","Mettre à jour le niveau de prix"
-"Update assigned product","Mettre à jour le produit assigné"
-"Update attribute","Mettre à jour l'attribut"
-"Update attributes","Attributs de la mise à jour"
-"Update category","Mettre à jour la catégorie"
-"Update custom option of product","Mettre à jour l'option personnalisée du produit"
-"Update product","Mettre à jour le produit"
-"Update product image","Mettre à jour l'image du produit"
-"Update product link","Mettre à jour le lien du produit"
-"Update product tier prices","Mettre à jour le niveau des prix du produit"
-"Update value of custom option","Mettre à jour la valeur de l'option personnalisée"
-"Upload new product image ","Charger une nouvelle image produit"
-"Use Canonical Link Meta Tag For Categories","Utiliser les méta-données du lien canonique pour les catégories"
-"Use Canonical Link Meta Tag For Products","Utiliser Canonical Link Meta Tag pour les produits"
-"Use Categories Path for Product URLs","Utiliser le Chemin des Catégories pour les URL de Produits"
-"Use Config Settings","Utiliser les Paramètres de Configuration"
-"Use Default Value","Utiliser la valeur par défaut"
-"Use Flat Catalog Category","Utiliser la Catégorie des Catalogues à Plat"
-"Use Flat Catalog Product","Utiliser un Produit de Catalogue à Plat"
-"Use In Layered Navigation","Utiliser en Navigation par Couches"
-"Use In Search Results Layered Navigation","Utilisez la page de résultats de navigation en couches"
-"Use JavaScript Calendar","Utiliser le Calendrier JavaScript"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","Utilisez des URL statiques pour le contenu multimédia en mode WYSIWYG pour le catalogue"
-"Use Tree Like Category Sitemap","Utiliser la carte du site sous forme de hiérarchie"
-"Use config","Utiliser config"
-"Use default","Utiliser le défaut"
-"Use for Promo Rule Conditions","Utiliser pour les conditions de la promotion"
-"Use four-digit year format.","Utiliser un format de date sur quatre caractères"
-"Use in Advanced Search","Utiliser en recherche avancée"
-"Use in Layered Navigation","Utiliser dans la navigation en couches"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","Utiliser en Navigation par Couches<br/>(Utilisable seulement avec le type d'entrée catalogue 'Liste déroulante')"
-"Use in Quick Search","Utilisation dans la recherche rapide"
-"Used for Sorting in Product Listing","Utilisé pour Trier dans une Liste de Produits"
-"Used in Product Listing","Utilisé dans une Liste de Produits"
-"Value for ""%s"" is invalid.","La valeur pour ""%s"" est invalide."
-"Value for ""%s"" is invalid: %s","La valeur pour ""%s"" est invalide : %s"
-"Varchar","Varchar"
-"View as","Visualiser comme"
-"Virtual Product","Produit virtuel"
-"Visibility","Visibilité"
-"Visible","Visible"
-"Visible on Catalog Pages on Front-end","Visible sur les Pages Catalogue dans l'interface utilisateur"
-"Visible on Product View Page on Front-end","Visible sur la Page Vue Produit dans l'interface utilisateur"
-"WYSIWYG Editor","Éditeur WYSIWYG"
-"Watermark","Filigrane"
-"Watermark Default Size","Taille par Défaut du Filigrane"
-"Watermark Opacity, Percent","Opacité du Filigrane, en Pourcentage"
-"Watermark Position","Position du Filigrane"
-"Website","Site"
-"Website Item Must be checked","L'élément de Site Web doit être vérifié"
-"Website Store Must be checked","Le site web du magasin doit être vérifié"
-"Websites","Site web"
+"Product Alerts","Alertes produit"
+"Can be Divided into Multiple Boxes for Shipping","Peut être divisé en plusieurs boîtes pour le transport"
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price","Cliquez pour le prix"
"What's this?","Qu'est-ce ?"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Afficher ""Toutes"" les options dans la liste déroulante ""Afficher x par page""."
-"Will make search for the query above return results for this search.","Effectuera une recherche pour la question ci-dessus et reviendra aux résultats de cette recherche."
-"Wrong BuyRequest instance in options group.","Mauvaise instance de Buyrequest dans le groupe d'options."
-"Wrong configuration item instance in options group.","Configuration de l'instance d'objet incorrecte dans les options de groupe"
-"Wrong configuration item option instance in options group.","Configuration de l'instance d'objet incorrecte dans les options de groupe"
-"Wrong option instance type in options group.","Mauvaise instance d'options dans le groupe d'options."
-"Wrong option type to get group instance.","Mauvais type d'option pour obtenir l'instance du groupe."
-"Wrong product instance type in options group.","Mauvais type de produit d'exemple dans le groupe d'options."
-"Wrong product type filter specified","Mauvais filtre de type de produit spécifié"
-"Year Range","Années"
-"Yes","Oui"
-"You cannot remove system attribute from this set.","Vous ne pouvez pas retirer d'attribut système de cet ensemble."
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,chaque
+and,et
+save,enregistrer
+"Actual Price",Prix
+"Shop By","Acheter par"
+"Shopping Options","Options d'Achat"
+"Compare Products","Comparer des produits"
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page","Imprimer cette page"
+"Remove Product","Remove Product"
+"Add to Wishlist","Ajouter à la liste de cadeaux"
"You have no items to compare.","Vous n'avez pas d'articles à comparer."
+"Are you sure you would like to remove this item from the compare products?","Etes-vous sur de vouloir enlever cet article des produits comparés ?"
+"Are you sure you would like to remove all products from your comparison?","Etes-vous sur de vouloir enlever tous les produits de votre comparaison ?"
+"Remove This Item","Retirer cet article"
+Compare,Comparer
+"Clear All","Tout effacer"
+Prev,Préc
+"There are no products matching the selection.","Aucun produit ne correspond à la sélection."
+"Add to Compare","Ajouter au comparateur"
+"Learn More","En savoir plus"
"You may also be interested in the following product(s)","Vous pourriez aussi être intéressé(e) par le(s) produit(s) suivant(s)"
-"Zoom In","Zoom avant"
-"Zoom Out","Zoom Arrière"
-"and","et"
-"and above","et ci-dessus"
-"categories","catégories"
-"each","chaque"
-"ex. http://domain.com","ex. http://domain.com"
-"leave blank if its not an image","laisser vide si ce n'est pas une image"
-"per page","par page"
-"products","produits"
-"px.","px."
-"save","enregistrer"
+"More Choices:","More Choices:"
+"New Products","Nouveaux produits"
+"Check items to add to the cart or","Cocher les articles à ajouter au panier ou"
"select all","sélectionner tous"
+"View as","Visualiser comme"
+"Sort By","Trier par"
+"Set Ascending Direction","Par ordre croissant"
+"Set Descending Direction","Définir Direction Descendante"
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Afficher
+"Additional Information","Informations supplémentaires"
+"More Views","Plus de vues"
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend","Envoyer à un ami par email"
+Details,Détails
+Template,"Modèle visuel"
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Veuillez ajouter des lignes à l'option."
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
"unselect all","désélectionner tous"
-"x","x"
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text","Fixer texte personnalisé"
+"Anchor Custom Title","Fixer titre personnalisé"
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
+"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
+"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
+"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
+"Products per Page on List Default Value","Products per Page on List Default Value"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
+"Search Engine Optimizations","Search Engine Optimizations"
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
+"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
+"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
+"Use JavaScript Calendar","Use JavaScript Calendar"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
+"Watermark Default Size","Watermark Default Size"
+"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
+"Watermark Position","Watermark Position"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data","Données fixes du produit"
+"Reorganize EAV product structure to flat structure","Réorganiser la structure du produit EAV en structure plate"
+"Category Flat Data","Données Fixes de la Catégorie"
+"Reorganize EAV category structure to flat structure","Réorganiser la structure de la catégorie EAV en structure plate"
+"Indexed category/products association","Catégorie indexée/association de produits"
+"Product Categories","Catégories Produit"
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices","Prix de l'index des produits"
+"Catalog New Products List","List des Nouveaux Produits du Catalogue"
+"List of Products that are set as New","Liste de produits nouveaux"
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display","Nombre de produits à afficher"
+"New Products Grid Template","Modèle de grille nouveaux produits"
+"New Products List Template","Modèle de liste nouveaux produits"
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)","Durée de vie du Cache (Secondes)"
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link","Lien du Produit Catalogue"
+"Link to a Specified Product","Lien vers un produit déterminé"
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template","Produit Lien Modèle Bloc"
+"Product Link Inline Template","Produit Lien Modèle Conforme"
+"Catalog Category Link","Lien de la Catégorie Catalogue"
+"Link to a Specified Category","Lien vers une catégorie précise"
+"If empty, the Category Name will be used","Si vide, la catégorie Nom sera utilisé."
+"Category Link Block Template","Bloc Modèle du Lien de la Catégorie"
+"Category Link Inline Template","Modèle Préféré du Lien de la Catégorie"
+Set,"Définir le nom"
+none,none
+Overview,Overview
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
diff --git a/app/code/Magento/Catalog/i18n/nl_NL.csv b/app/code/Magento/Catalog/i18n/nl_NL.csv
index c2249b5662d..06558ec32e2 100644
--- a/app/code/Magento/Catalog/i18n/nl_NL.csv
+++ b/app/code/Magento/Catalog/i18n/nl_NL.csv
@@ -1,801 +1,639 @@
-"Uses","# van Gebruik"
-"%1$s incl tax.","%1$s incl. BTW."
-"%s - %s","%s - %s"
-"%s Item(s)","%s Artikel(en)"
-"%s and above","% s en meer"
-"(%d)","(%d)"
-"(Copy data from: %s)","(Kopieer data van: %s)"
-"* Required Fields","* Vereiste velden"
+All,Alles
+None,Geen
+"Are you sure?","Weet u het zeker?"
+Cancel,Annuleren
+Back,Terug
+Product,Productnaam
+Price,Prijs
+Quantity,Hoeveelheid
+Products,Producten
+ID,"Product Identificatie"
+SKU,SKU
+No,Nee
+Qty,Qty
+Action,Actie
+Reset,Opnieuw
+Edit,Bewerken
+"Add to Cart","Aan mandje toevoegen"
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name",Voornaam
+"Last Name",Achternaam
+Email,Email
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,Verwijderen
+Save,Opslaan
+Store,Winkel
"-- Please Select --","-- Selecteer alstublieft --"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 standaard, indien niet ingesteld. Om direct te verversen, Verwijder de Blokken HTML Output Cache."
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">Waarschuwing!</strong> Het gebruik van MAP zal standaard alle product prijzen in de frontend verbergen."
-"A group with the same name already exists.","Een groep met dezelfde naam bestaat reeds."
-"A name is required","Een naam is benodigd."
-"A product type is not defined for the indexer.","Een product type is niet gedefinieerd voor de indexer."
-"ALL GROUPS","ALLE GROEPEN"
-"AM","AM"
-"Action","Actie"
-"Actual Price","Werkelijke Prijs"
-"Add","Toevoegen"
-"Add Attribute","Voeg Attribuut toe"
-"Add Design Change","Voeg Design Verandering toe"
-"Add Group","Voeg Groep toe"
-"Add Group Price","Groepsprijs toevoegen"
+"Custom Design",Custom-design
+Yes,Ja
+"Web Site","Web Site"
+Name,Naam
+Status,Status
+Disabled,Uitgeschakeld
+Enabled,Aan
+"Save and Continue Edit","Opslaan en doorgaan met bewerken"
+Title,Titel
+"Store View","Aanblik winkel"
+Type,Type
+Home,Thuis
+Search,Zoeken
+"Select All","Select All"
"Add New","Nieuwe Toevoegen"
-"Add New Attribute","Nieuwe attribuut toevoegen"
-"Add New Attribute Set","Voeg Nieuwe Attribuut Set toe"
-"Add New Group","Voeg Nieuwe Groep toe"
-"Add New Images","Voeg Nieuwe Plaatjes toe"
-"Add New Option","Voeg Nieuwe Optie Toe"
-"Add New Row","Voeg Nieuwe Rij Toe"
-"Add New Search Term","Voeg Nieuwe Zoekterm Toe"
-"Add New Set","Voeg Nieuwe Reeks Toe"
-"Add Product","Voeg Product Toe"
-"Add Product To Websites","Voeg Product Toe Aan Websites"
-"Add Root Category","Voeg Root Categorie Toe"
-"Add Subcategory","Voeg Subcategorie Toe"
-"Add Tax","Voeg BTW Toe"
-"Add Tier","Voeg Rang Toe"
-"Add attribute into attribute set","Voeg attribuut toe aan de attribuut set"
-"Add group into attribute set","Voeg groep toe aan attribuut set"
-"Add new custom option into product","Voeg een nieuwe aangepaste optie toe aan het product"
-"Add new values into custom option","Voeg nieuwe waarden toe aan aangepaste optie"
-"Add option","Voeg optie toe"
-"Add to Cart","Aan mandje toevoegen"
-"Add to Compare","Voeg toe om te Vergelijken"
-"Add to Wishlist","Aan verlanglijst toevoegen"
-"Additional Information","Aanvullende Informatie"
-"Alert Urls","Melding Url's"
-"All","Alles"
-"All Product Types","Alle Product Types"
+"Please select items.","Selecteer artikelen."
+Required,Required
+Website,Website
"All Websites","Alle Websites"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Alle producten van deze reeks zullen worden verwijderd! Weet u zeker dat u deze attributenreeks wilt verwijderen?"
-"Allow All Products per Page","Sta Alle Producten per Pagina Toe"
-"Allow Dynamic Media URLs in Products and Categories","Sta Dynamische Media URL's in Producten en Categorieën Toe"
-"Allow HTML Tags on Frontend","Sta HTML Tags op Front-end toe"
-"Allowed File Extensions","Toegestane Bestandsextensies"
-"Allowed file extensions to upload","Toegestane bestandsextensies om te uploaden"
-"Amount","Aantal"
-"An error occurred while adding products to websites.","Er is een fout opgetreden tijdens het toevoegen van producten aan websites."
-"An error occurred while clearing comparison list.","Er is een fout opgetreden tijdens het opschonen vergelijkingslijst."
-"An error occurred while removing products from websites.","Er is een fout opgetreden tijdens het verwijderen van producten van websites."
-"An error occurred while saving the URL rewrite","Er is een fout opgetreden tijdens het opslaan van de URL rewrite"
-"An error occurred while saving the attribute set.","Er is een fout opgetreden tijdens het opslaan van de attribuut set."
-"An error occurred while saving the collection, aborting. Error message: %s","Er is een fout opgetreden bij het opslaan van de collectie, afbreken. Foutmelding:% s"
-"An error occurred while saving the product. ","Er is een fout opgetreden tijdens het opslaan van het product."
-"An error occurred while saving the search query.","Er is een fout opgetreden tijdens het opslaan van de zoek query."
-"An error occurred while saving this group.","Er is een fout opgetreden tijdens het opslaan van deze groep."
-"An error occurred while trying to delete the category.","Er is een fout opgetreden tijdens het proberen de categorie te verwijderen."
-"An error occurred while updating the product(s) attributes.","Er is een fout opgetreden tijdens het updaten van de product attributen."
-"An error occurred while updating the product(s) status.","Er is een fout opgetreden tijdens het updaten van de product status."
-"An invalid group ID is specified, skipping the record.","Een ongeldige groeps-ID is opgegeven, het dossier wordt overgeslagen."
-"An invalid option ID is specified for %s (%s), skipping the record.","Een ongeldige optie ID is gespecificeerd voor %s (%s), het record overslaan."
-"An invalid store was specified.","Een ongeldige winkel is gespecificeerd."
-"Anchor Custom Text","Anker Custom Tekst"
-"Anchor Custom Title","Anker Custom Titel"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Geschikt om alleen producten en categorieën te catalogiseren. Elke mediacontent zal worden ingevoegd in de editor als een statische URL. Het wordt niet geüpdatet als de systeemconfiguratie URL veranderingen baseert."
-"Apply MAP (Default Value)","Pas MAP toe (Vaststaande Waarde)"
-"Apply To","Pas Toe Op"
-"Approved","Goed Gekeurd"
-"Are you sure you want to delete this category?","Weet u zeker dat u deze categorie wilt verwijderen?"
-"Are you sure you would like to remove all products from your comparison?","Weet u zeker dat u alle producten van uw vergelijking wilt verwijderen?"
-"Are you sure you would like to remove this item from the compare products?","Weet u zeker dat u dit item van uw vergeleken producten wilt verwijderen?"
-"Are you sure?","Weet u het zeker?"
-"As low as:","Zo laag als:"
-"Assign","Toewijzen"
-"Assign product link","Productlink toewijzen"
-"Assign product to category","Ken product toe aan categorie"
-"Assigned Products","Toegekende producten"
-"Associated Products","Geassocieerde Producten"
-"Attribute Set","Stel naam attrib. in"
-"Attribute ""%s"" is invalid.","Attribuut ""%s"" is ongeldig."
-"Attribute ""%s"" is required.","Attribuut ""%s"" is vereist."
-"Attribute Information","Kenmerk Informatie"
-"Attribute Model","Kenmerk Model"
-"Attribute Name:","Kenmerk Naam:"
-"Attribute Set","Attributenset"
-"Attribute Sets","Attribuut Sets"
-"Attribute add","Voeg attribuut toe"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribuutcode is ongeldig. Gebruik alleen letter (a-z) of underscore(_) in dit veld, eerste teken moet een letter zijn."
-"Attribute group with the \/name/\ name already exists","Attribuutgroep met de \/naam/\ bestaat al"
-"Attribute remove","Verwijder attribuut"
-"Attribute with the same code already exists","Kenmerk met dezelfde code bestaat reeds"
-"Attributes","Attributen"
-"Attrribute names can be specified per store.","Namen van kenmerken kunnen per opslag worden gespecificeerd."
-"Autogenerate","Automatisch genereren"
-"Availability:","Beschikbaarheid:"
-"Back","Terug"
-"Backend Model","Achterkant Model"
-"Backend Table","Achterkant Tafel"
-"Backend Table Title","Achterkant Tafel Titel"
-"Backorders","Backorders"
-"Based On","Gebaseerd op"
-"Before Order Confirmation","Voor Bestelling Bevestiging"
-"Block after Info Column","Blok na Info Kolom"
-"Bottom Block Options Wrapper","Onderaan Blokkeer Opties Omslag"
-"Bottom/Left","Onderaan/Links"
-"Bottom/Right","Onderaan/Rechts"
-"Browse By","Browse met"
-"Bundle Items","Items samenvoegen"
-"Buy %1$s","Koop % 1$s"
-"Buy %1$s for","Koop %1$s voor"
-"Buy %1$s for %2$s","Koop %1$s voor %2$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","Koop %1$s voor %2$s (%3$s inclusief belasting) elk"
-"Buy %1$s for %2$s each","Koop %1$s voor %2$s elk"
-"Cache Lifetime (Seconds)","Cache levensduur (Seconden)"
-"Cache refresh needed.","Cache moet worden vernieuwd"
-"Can be Divided into Multiple Boxes for Shipping","Kan Worden Verdeeld over Meerdere Dozen bij Verzending"
-"Can be used only with catalog input type Dropdown","Kan worden gebruikt met catalogusinvoer type Dropdown"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","Kan alleen worden gebruikt met catalogusinvoer type Dropdown. Meervoudige selectie en Prijs"
-"Can't create image.","Kan geen beeld maken"
-"Cancel","Annuleren"
-"Cannot create image.","Kan beeld niet creëren."
-"Cannot create writeable directory '%s'.","Kan geen beschrijfbare directory '%s' aanmaken"
-"Cart Item Attribute","Winkelwagen artikel attribuut"
-"Catalog","Catalogus"
-"Catalog Category (Anchor)","Catalogus categorie (anker)"
-"Catalog Category (Non-Anchor)","Catalogus categorie (niet anker)"
-"Catalog Category Link","Catalogus categorie link"
-"Catalog New Products List","Catalogus Nieuwe Producten Lijst"
-"Catalog Price Scope","Catalogus prijs bereik"
-"Catalog Product Compare List","Catalogus productvergelijkingslijst"
-"Catalog Product Email to a Friend","Catalogus Product E-mail naar een Vriend"
-"Catalog Product Image Gallery Popup","Catalogus productbeeldenreeks popup"
-"Catalog Product Link","Catalogus Product Link"
-"Catalog Product View (Any)","Catalogus Product Bezichtiging (Elke)"
-"Catalog Product View (Simple)","Catalogus Product Bezichtiging (Simpel)"
-"Catalog Product View (Virtual)","Catalogus Product Bezichtiging (Virtueel)"
-"Catalog Section","Catalogus Gedeelte"
-"Catalog Seo Popular Search Terms","Catalogus Seo Populaire Zoektermen"
-"Catalog Seo Sitemap (Category List)","Catalogus Seo Sitemap (Categorielijst)"
-"Catalog Seo Sitemap (Category Tree)","Catalogus Seo Sitemap (Categorieboom)"
-"Catalog Seo Sitemap (Common)","Catalogus Seo Sitemap (Algemeen)"
-"Catalog Seo Sitemap (Product List)","Catalogus Seo Sitemap (Productlijst)"
-"Catalog URL Rewrites","Catalogus URL Herschrijvingen"
-"Catalog product custom option values API","Catalogusproduct op maat optiewaarden API"
-"Catalog product custom options API","Catalogusproduct op maat opties API"
-"Catalog, Search","Catalogus, Zoeken"
-"Categories","Categoriën"
-"Categories Sitemap","Categorieën Sitemap"
-"Category","Categorie"
-"Category API","Categorie API"
+Next,Volgende
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,Catalogus
+Images,Images
+"per page","per pagina"
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,OK
+Visibility,Zichtbaarheid
+Position,Positie
+Fixed,Gemaakt
+"Use Default Value","Standaardwaarde gebruiken"
+N/A,Nvt
+Percent,Percent
+"Option Title","Option Title"
+"Input Type","Invoer Type"
+"New Option","New Option"
+"Price Type",Prijstype
+"* Required Fields","* Vereiste velden"
+Availability,Availability
+"In stock","In voorraad"
+"Out of stock","Uit voorraad"
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,Root
+"Save Category","Categorie opslaan"
+"Delete Category","Verwijder Categorie"
+"New Subcategory","Nieuwe subcategorie"
+"New Root Category","Nieuwe categorie"
+"Set Root Category for Store","Stel Basiscategorie voor Winkel in"
+"Use Config Settings","Gebruik Configuratiesettings"
+"Use All Available Attributes","Use All Available Attributes"
+"General Information","Algemene informatie"
"Category Data","Categorie Data"
-"Category Flat Data","Categorie Flat Data"
-"Category Link Block Template","Categorie Link Bloktemplate"
-"Category Link Inline Template","Categorie Link Inline Template"
"Category Products","Categorie Producten"
-"Category Top Navigation","Categorie Topnavigatie"
-"Category URL Suffix","Categorie URL Achtervoegsel"
-"Category attributes API","Categorie attributen API"
-"Category move error","Categorie verplaatsfout"
-"Category move operation is not possible: parent category is equal to child category.","Categorie verplaatsoperatie is niet mogelijk: broncategorie is gelijk aan kindcategorie."
-"Category move operation is not possible: the current category was not found.","Categorie verplaatsoperatie is niet mogelijk: de huidige categorie werd niet gevonden."
-"Category move operation is not possible: the new parent category was not found.","Categorie verplaatsoperatie is niet mogelijk: de nieuwe broncategorie werd niet gevonden."
-"Category must be an instance of \Magento\Catalog\Model\Category.","Categorie moet een instantie zijn van \Magento\Catalog\Model\Category."
-"Center","Centrum"
-"Change","Verander"
-"Change or Retrieve attribute store view","Verander of Herstel attribuut winkelbezichtiging"
-"Change status","Verander status"
-"Check items to add to the cart or","Controleer items om aan het winkelwagentje toe te voegen of"
-"Choose an Option...","Kies een Optie..."
-"Clear All","Verwijder Alles"
-"Clear Price","Verwijder Prijs"
-"Click for price","Klik voor de prijs"
-"Close Window","Venster Sluiten"
-"Collapse All","Vouw Alles Op"
-"Comma-separated.","Komma-gescheiden."
-"Comparable","Vergelijkbaar"
-"Comparable on Front-end","Vergelijkbaar op front-end"
-"Comparable on the Frontend","Vergelijkbaar op de Front-end"
-"Compare","Vergelijk"
-"Compare Products","Vergelijk Producten"
-"Conditions Combination","Voorwaarden Combinatie"
-"Continue","Doorgaan"
-"Country/State","Land/Provincie"
-"Create","Maak aan"
-"Create (Upload)","Creëer (Upload)"
-"Create Empty","Creëer Leeg"
-"Create Permanent Redirect for URLs if URL Key Changed","Maak een Permanente Omleiding voor URL's als URL-Key is Gewijzigd"
+"Add Subcategory","Voeg Subcategorie Toe"
+"Add Root Category","Voeg Root Categorie Toe"
"Create Permanent Redirect for old URL","Creëer Permanente Omleiding voor oude URL"
-"Create Product Settings","Creëer Product Instellingen"
-"Create Simple Associated Product","Creëer Eenvoudig Samenhangend Product"
-"Create attribute set based on another set","Maak een attribuut set op basis van een andere set"
-"Create new attribute","Maak nieuw attribuut"
-"Create new category","Creëer nieuwe Categorie"
-"Create new product","Creëer nieuw product"
-"Cross-sells","Cross-sells"
-"Currently Shopping by:","Op het moment Winkelt:"
-"Custom Design","Custom-design"
-"Custom Options","Custom Opties"
-"Custom options","Aangepaste opties"
-"Customer Group","Klantgroep"
-"Customers Tagged Product","Door Klanten Getagd Product"
-"Data Type for Saving in Database","Data type om in Database op te slaan"
-"Date & Time Custom Options","Datum & Tijd Custom Opties"
-"Date Fields Order","Datum Velden Bestelling"
-"Subscribe Date","Datum Ingeschreven"
-"Datetime","Datumtijd"
-"Decimal","Decimaal"
-"Declare attribute value saving scope","Verklaar attribuut waarde opslagscope"
-"Default ""What's This"" Text Message","Vaststaande ""Wat is dit"" Tekstbericht"
-"Default Popup Text Message","Vaststaand Popup Tekstbericht"
-"Default Price","Vaststaande Prijs"
-"Default Price Navigation Step","Vaststaande Prijs Navigatie Stap"
-"Default Quantity","Vaststaande Quantity"
-"Default Values","Standaardwaardes"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Definieert de standaard munteenheid (""Munteenheid instellingen"" > ""Munteenheid opties"" > ""Basis munteenheid"")."
-"Delete","Verwijderen"
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor","WYSIWYG Editor"
+"Add Product","Voeg Product Toe"
+label,label
+"Product Attributes",Productattributen
+"Add New Attribute","Nieuwe attribuut toevoegen"
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute","Attribuut opslaan"
"Delete Attribute","Verwijder Attribuut"
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute","Nieuw Productkenmerk"
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,Wereldwijd
+Scope,Reikwijdte
+"Declare attribute value saving scope","Verklaar attribuut waarde opslagscope"
+"Frontend Properties","Front end Eigenschappen"
+"Use in Quick Search","Gebruik in Quick Search"
+"Use in Advanced Search","Gebruik in Geavanceerd Zoeken"
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions","Gebruik voor Promotie Regels Voorwaarden"
+"Enable WYSIWYG","Sta WYSIWYG toe"
+"Allow HTML Tags on Frontend","Sta HTML Tags op Front-end toe"
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing","Gebruik in Product Listing"
+"Depends on design theme","Hangt van ontwerpthema af"
+"Used for Sorting in Product Listing","Gebruikt voor Sortering in Product Listing"
+"Media Image","Media Beeld"
+Gallery,Galerij
+"System Properties",Systeemeigenschappen
+"Data Type for Saving in Database","Data type om in Database op te slaan"
+Text,Tekst
+Varchar,Varlet
+Static,Statisch
+Datetime,Datumtijd
+Decimal,Decimaal
+Integer,"Heel getal"
+"Globally Editable","Wereldwijd te bewerken"
+"Attribute Information","Kenmerk Informatie"
+Properties,Eigenschappen
+"Manage Labels","Manage Labels"
+Visible,Zichtbaar
+Searchable,Zoekbaar
+Comparable,Vergelijkbaar
+"Delete Selected Group","Verwijder Geselecteerde Groep"
"Delete Attribute Set","Verwijder Attribuut Set"
-"Delete Category","Verwijder Categorie"
-"Delete Group Price","Verwijder Groepsprijs"
-"Delete Option","Verwijder Optie"
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set","Sla Attributen Set Op"
+"New Set Name","Nieuwe Serie Naam"
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,Leeg
+"Add Attribute","Voeg Attribuut toe"
+"Add New Group","Voeg Nieuwe Groep toe"
+"Add Group","Voeg Groep toe"
+"Edit Set Name","Bewerk Set Naam"
+"For internal use","For internal use"
+"Based On","Gebaseerd op"
+"Add New Attribute Set","Voeg Nieuwe Attribuut Set toe"
+"Add New Set","Voeg Nieuwe Reeks Toe"
+"Product Templates","Product Templates"
+"Close Window","Venster Sluiten"
+"New Product","Nieuw Product"
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,Attributen
+Change,Verander
+"Advanced Inventory","Advanced Inventory"
+Websites,Websites
+"Products Information",Producteninformatie
+"Category Name","Category Name"
+"Parent Category","Parent Categorie"
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.","Er zijn geen klanten voor deze melding."
+"Subscribe Date","Datum Ingeschreven"
+"Last Notified","Laatste Notificatie"
+"Send Count","Aantal Versturen"
+"New Attribute","New Attribute"
+"Attribute Set",Attributenset
+"Add New Option","Voeg Nieuwe Optie Toe"
+"Import Options","Import Options"
+Import,Import
+"Add New Row","Voeg Nieuwe Rij Toe"
"Delete Row","Verwijder Rij"
+"Tier Pricing","Niveau Prijsstelling"
+"Default Price","Vaststaande Prijs"
+"Add Group Price","Groepsprijs toevoegen"
+"ALL GROUPS","ALLE GROEPEN"
+"Add Tier","Voeg Rang Toe"
+"Default Values",Standaardwaardes
+"Related Products","Gerelateerde Producten"
+Up-sells,Up-sells
+Cross-sells,Cross-sells
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS","Geef Lage Voorraad RSS aan"
+"Change status","Verander status"
+"Update Attributes","Update Attributen"
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images","Voeg Nieuwe Plaatjes toe"
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term","Voeg Nieuwe Zoekterm Toe"
+"Save Search","Sla Zoekactie Op"
"Delete Search","Verwijder Zoekopdracht"
-"Delete Selected Group","Verwijder Geselecteerde Groep"
-"Delete Tier","Verwijder Rij"
-"Delete attribute","Verwijder attribuut"
-"Delete category","Categorie verwijderen"
-"Delete product","Verwijder product"
-"Depends on design theme","Hangt van ontwerpthema af"
-"Design","Ontwerp"
-"Details","Details"
-"Disabled","Uitgeschakeld"
-"Disallowed file type.","Niet toegestaan bestandstype."
-"Display Actual Price","Toon Actuele Prijzen"
-"Display Price Interval as One Price","Toon Prijs Interval als Een prijs"
-"Display Product Count","Geef Aantal Producten weer"
-"Display in Suggested Terms","Toon in Voorgestelde Voorwaarden"
-"Double click on a group to rename it","Dubbelklik op een groep om van naam te veranderen"
-"Double click on above image to view full picture","Dubbelklik op bovenstaande afbeelding om volledige foto te bekijken"
-"Downloadable Information","Downloadbare informatie"
-"Duplicate","Duplicaat"
-"Duplicate amount found.","Dupliceer gevonden aantal."
-"Duplicate website group price customer group.","Dubbele website groep prijs klantengroep."
-"Duplicate website tier price customer group and quantity.","Dupliceer website prijs klantengroep en hoeveelheid."
-"Duplicate website, country and state tax found.","Dupliceer gevonden belasting van website, land en staat."
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","Bijvoorbeeld {{media url=""pad/naar/plaatje.jpg""}} {{view url=""pad/naar/plaatje.gif""}}. Dynamische opdrachtenverwerking heeft invloed op de performantie van de catalogus."
-"Edit","Bewerken"
-"Edit Attribute Set '%s'","Bewerken attribuutset '%s'"
-"Edit Product Attribute","Bewerken productattribuut"
-"Edit Product Attribute ""%s""","Bewerk productattribuut ""%s"""
-"Edit Search","Bewerk Zoekopdracht"
-"Edit Search '%s'","Bewerk Zoekopdracht '%s'"
-"Edit Set Name","Bewerk Set Naam"
-"Email","Email"
-"Email to a Friend","E-mail Vriend"
-"Empty","Leeg"
-"Enable MAP","Sta MAP toe"
-"Enable Quantity Increments","Sta Quantity Incrementen toe"
-"Enable WYSIWYG","Sta WYSIWYG toe"
-"Enabled","Aan"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","Entiteit type model moet een instantie zijn van \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","Entiteit type model moet een instantie zijn van \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType"
-"Error during retrieval of option value: %s","Fout bij het ophalen van optie waarde: %s"
-"Exclude","Sluit Uit"
-"Expand All","Klap Alles Uit"
-"Failed","Mislukt"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","Kopiëren van het bestand %s mislukt. Verwijder alstublieft media met niet-bestaande afbeeldingen en probeer het opnieuw."
-"Failed to move file: %s","Niet gelukt om bestand te verplaatsen: %s"
-"Feature Products","Eigenschap Producten"
-"Field is not complete","Veld is incompleet"
-"File options format is not valid.","Bestandsopties formaat is niet geldig."
-"File upload failed","Bestandsupload gefaald"
-"Filter model name must be declared.","Filter modelnaam moet worden gedeclareerd."
-"Filter must be an object. Please set correct filter.","Filter moet een object zijn. Stel alstublieft een correct filter in."
-"Filterable (no results)","Filtreerbaar (geen resultaten)"
-"Filterable (with results)","Filtreerbaar (met resultaten)"
-"First Name","Voornaam"
-"Fixed","Gemaakt"
-"For internal use.","Voor intern gebruik."
+"Edit Search '%1'","Edit Search '%1'"
+"New Search","Nieuwe Zoekopdracht"
+"Search Information",Zoekinformatie
+"Search Query","Zoek Query"
+"Number of results","Aantal resultaten"
+"Number of results (For the last time placed)","Aantal resultaten (Voor de laatste keer geplaatst)"
"For the last time placed.","Het laatst geplaatst"
-"Frontend","Voorkant"
-"Frontend Model","Model Voorkant"
-"Frontend Properties","Front end Eigenschappen"
-"Gallery","Galerij"
-"General Information","Algemene informatie"
-"Get full information about attribute with list of options","Ontvang volledige informatie over attribuut met een lijst van opties"
-"Get full information about custom option in product","Verkrijg volledige informatie over aangepaste optie in product"
-"Get list of available custom option types","Verkrijg lijst met beschikbare aangepaste optie typen"
-"Get list of non-default attributes by product type and attributes set","Ontvang een lijst van niet-standaard attributen per type product en de in te stellen attributen"
-"Get list of possible attribute types","Verkrijg lijst met mogelijke attribuuttypen"
-"Get special price","Ontvang speciale prijs"
-"Global","Wereldwijd"
-"Globally Editable","Wereldwijd te bewerken"
+"Number of Uses","Number of Uses"
+"Synonym For","Synoniem voor"
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL","Omleiding URL"
+"ex. http://domain.com","bijv. http://domein.nl"
+"Display in Suggested Terms","Toon in Voorgestelde Voorwaarden"
"Go to Home Page","Ga naar Homepage"
-"Grid","Rooster"
-"Group add","Voeg groep toe"
-"Group remove","Groep verwijderen"
-"Groups","Groepen"
-"Home","Thuis"
-"ID","ID"
-"ID: %s","ID: %s"
-"If empty, the Category Name will be used","Als u het leeg laat, zal de Categorie Naam gebruikt worden"
-"If empty, the Product will be used","Als u het leeg laat, zal de Product Naam gebruikt worden"
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Als u geen optiewaarde voor een specifieke store view specificeert, wordt de vaststaande waarde (admin) worden gebruikt."
-"Image","Beeld"
-"Image content is not valid base64 data.","Afbeelding content is geen geldige base64 data."
-"Image does not exist.","Afbeelding bestaat niet."
-"Image file was not found.","Afbeelding bestand niet gevonden."
-"Image type and information need to be specified for each store view.","Afbeelding type en informatie moeten voor elke store view gespecificeerd worden."
-"In Cart","In Winkelwagen"
-"In Stock","In voorraad"
-"In stock","In voorraad"
-"Incl. Tax","Incl. BTW"
-"Index product and categories URL rewrites","Index product en categorieën URL rewrites"
-"Index product attributes for layered navigation building","Index product attributen voor layered navigatie building"
-"Index product prices","Index product prijzen"
-"Indexed category/products association","Geïndexeerde categorie/producten verbinding"
-"Info","Info"
-"Info Column Options Wrapper","Info Kolom Opties Omslag"
-"Input Type","Invoer Type"
-"Integer","Heel getal"
-"Interval Division Limit","interval divisie limiet"
-"Invalid Tier Prices","Ongeldige Rij Prijzen"
-"Invalid attribute %s","Ongeldig kenmerk %s"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Onjuist attribuut optie gekozen voor attribuut %s (%s), record wordt overgeslagen."
-"Invalid attribute set specified, skipping the record.","Ongeldige reeks kenmerken gespecificeerd, vermelding wordt overgeslagen"
-"Invalid block: %s.","Ongeldig blok: %s"
-"Invalid category IDs.","Onjuiste categorie ID's."
-"Invalid category.","Ongeldige categorie"
-"Invalid image file type.","Ongeldig bestandstype beeld"
-"Invalid image type.","Ongeldig beeldtype."
-"Invalid option ID specified for %s (%s), skipping the record.","Ongeldige optie ID gespecificeerd voor %s (%s), record wordt overgeslagen."
-"Invalid product type specified, skipping the record.","Ongeldig producttype gespecificeerd, record wordt overgeslagen."
-"Invalid store specified","Ongeldige winkel gespecificeerd"
-"Invalid store specified, skipping the record.","Ongeldige winkel gespecificeerd, record wordt overgeslagen."
-"Invalid tier prices. The product is not associated to the requested website.","Onjuiste tier prijzen. Het product is niet gerelateerd aan de opgevraagde website."
-"Inventory","Voorraad"
-"Is Default","Is Standaard"
-"Is Required","Is Benodigd"
-"Items %s to %s of %s total","Onderdelen %s tot %s van totaal %s"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items waarvan u niet wilt dat ze te zien zijn in de catalogus of zoekresultaten, dienen de status 'Uitgeschakeld' te hebben in de gewenste winkel."
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items waarvan u niet wilt dat ze te zien zijn in de catalogus of zoekresultaten, dienen de status 'Uitgeschakeld' te hebben in de gewenste winkel."
-"Keep your eyes open for our special Back to School items and save A LOT!","Houd onze speciale Terug naar School items in de gaten en bespaar EEN BOEL!"
-"Label","Label"
-"Last Name","Achternaam"
-"Last Notified","Laatste Notificatie"
-"Layered Navigation","Gelaagde Navigatie"
-"Learn More","Meer Informatie"
-"Line %d, Email: %s","Regel %d, Email: %s"
-"Line %d, SKU: %s","Lijn %d, SKU: %s"
-"Link (Related, Up sell, Cross sell)","Link (Gerelateerd, Up sell, Cross sell)"
-"Link product does not exist.","Gelinkt product bestaat niet."
-"Link to a Specified Category","Link naar een Gespecificeerde Categorie"
-"Link to a Specified Product","Link naar een Gespecificeerd Product"
-"List","Lijst"
-"List Mode","Lijstmodus"
-"List of Products that are set as New","Lijst van Producten die zijn ingesteld als Nieuw"
-"List of types","Lijst van types"
-"Manage Attribute Sets","Beheer Attribuut Sets"
-"Manage Attributes","Attributen beheren"
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List",Productvergelijkingslijst
+AM,AM
+PM,PM
+Categories,Categoriën
"Manage Catalog Categories","Manage Catalogus Categorieën"
"Manage Categories","Beheer Categorieën"
-"Manage Label / Options","Beheer Label / Opties"
-"Manage Options (values of your attribute)","Beheer Opties (waarden van uw attribuut)"
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.","Dit product bestaat niet meer."
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).","Selecteer alstublieft product(en)."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
"Manage Product Attributes","Beheer Productkenmerken"
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.","Dit attribuut kan niet gewijzigd worden."
+"Edit Product Attribute","Bewerken productattribuut"
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.","Dit attribuut kan niet verwijderd worden."
+"The product attribute has been deleted.","Het productattribuut is verwijderd."
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.","Een groep met dezelfde naam bestaat reeds."
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets","Beheer Attribuut Sets"
+"New Set","New Set"
"Manage Product Sets","Beheer Productgroepen"
-"Manage Products","Manage Producten"
-"Manage Stock","Beheer Voorraad"
+"This attribute set no longer exists.","Deze attribuutset bestaat niet meer."
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.","Er is een fout opgetreden tijdens het opslaan van de attribuut set."
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.","Deze zoekactie bestaat niet langer."
+"Edit Search","Bewerk Zoekopdracht"
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.","Om de product prijs te zien, voeg dit artikel toe aan uw winkelwagen. U kunt het later altijd nog verwijderen."
+"See price before order confirmation.","Zie prijs voor bevestiging van bestelling."
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
+Grid,Rooster
+List,Lijst
+"Product is not loaded","Produkt is niet geladen"
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
+"No layout updates","Geen lay-out updates"
+"Products only","Producten alleen"
+"Static block only","Alleen statisch blok"
+"Static block and products","Statisch blok en producten"
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,Periode
+Tile,Tegel
+Top/Left,Boven/Links
+Top/Right,Top/Rechts
+Bottom/Left,Onderaan/Links
+Bottom/Right,Onderaan/Rechts
+Center,Centrum
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites","Catalogus URL Herschrijvingen"
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,Categorie
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price","Verwijder Prijs"
+"The filters must be an array.","De filters moeten een array zijn."
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config","Gebruik config"
+"In Cart","In Winkelwagen"
+"Before Order Confirmation","Voor Bestelling Bevestiging"
+"On Gesture","Op Gebaar"
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building","Index product attributen voor layered navigatie building"
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.","Selecteer optietype verplichte rijwaarden."
+"Please specify date required option(s).","Specificeer alstublieft de benodige optie(s) voor de datum."
+"Please specify time required option(s).","Specificeer alstublieft de benodigde optie(s) voor de tijd."
+"Please specify the product's required option(s).","Gelieve het artikel's benodigde optie(s) te specificeren."
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,px.
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually","Niet afzonderlijk zichtbaar"
+"Catalog, Search","Catalogus, Zoeken"
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.","Een product type is niet gedefinieerd voor de indexer."
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:","Zo laag als:"
+"Are you sure you want to delete this category?","Weet u zeker dat u deze categorie wilt verwijderen?"
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All","Vouw Alles Op"
+"Expand All","Klap Alles Uit"
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
"Manage Titles (Size, Color, etc.)","Beheer Titels (Grootte, Kleur, etc.)"
-"Max Characters","Max Karakters"
-"Maximal Depth","Maximale diepte"
-"Maximum Image Size","Maximum Grootte Afbeelding"
-"Maximum Number of Price Intervals","Maximum Aantal Prijsintervallen"
-"Maximum Quantity Allowed in Shopping Cart","Maximaal toegestaan aantal in winkelwagen"
-"Maximum allowed image size for '%s' is %sx%s px.","Maximum toegestane afbeeldingsgrote voor '%s' is %sx%s pixels."
-"Maximum image height","Maximale beeldhoogte"
+"Manage Options (values of your attribute)","Beheer Opties (waarden van uw attribuut)"
+"Is Default","Is Standaard"
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,Groepen
+"Double click on a group to rename it","Dubbelklik op een groep om van naam te veranderen"
+"Unassigned Attributes","Niet Toegewezen Attributen"
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.","Deze groep bevat systeemattributen. Verplaats de systeemattributen naar een andere groep en probeer het opnieuw."
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options","Custom Opties"
+"This is a required option.","This is a required option."
+"Field is not complete","Veld is incompleet"
+"Allowed file extensions to upload","Toegestane bestandsextensies om te uploaden"
"Maximum image width","Maximale beeldbreedte"
+"Maximum image height","Maximale beeldhoogte"
"Maximum number of characters:","Maximaal aantal karakters"
-"Maximum number of price intervals is 100","Maximum aantal prijsintervallen is 100"
-"Media Image","Media Beeld"
-"Minimum Advertised Price","Minimum Geadverteerde Prijs"
-"Minimum Lines per Page","Minimum Regels per Pagina"
-"Minimum Quantity Allowed in Shopping Cart","Minimum Quantity Toegestaan in Winkelwagen"
-"Minimum Quantity for Item's Status to be Out of Stock","Minimum aantal waarbij Status van Item op geen voorraad komt"
-"Missing SKU, skipping the record.","SKU mist, record wordt overgeslagen."
-"More Views","Meer Views"
-"Move","Verplaats"
-"Move category in tree","Verplaats categorie in tree"
-"Must be in the allowed values list.","Behoord in toegestane waarden lijst te staan."
-"N/A","Nvt"
-"Name","Naam"
-"Name in %s","Naam in %s"
-"New Product","Nieuw Product"
-"New Product Attribute","Nieuw Productkenmerk"
-"New Products","Nieuwe Producten"
-"New Products Grid Template","Patroon Nieuwe Producten Rooster"
-"New Products List Template","Nieuw Product Lijst Sjabloon"
-"New Root Category","Nieuwe categorie"
-"New Search","Nieuwe Zoekopdracht"
-"New Set Name","Nieuwe Serie Naam"
-"New Subcategory","Nieuwe subcategorie"
-"Next","Volgende"
-"No","Nee"
-"No image","Geen beeld"
-"No layout updates","Geen lay-out updates"
-"No options of this product are available.","Voor dit product zijn geen opties beschikbaar"
-"No product collections found.","Geen productverzamelingen gevonden"
-"None","Geen"
-"Not Visible Individually","Niet afzonderlijk zichtbaar"
-"Notify Low Stock RSS","Geef Lage Voorraad RSS aan"
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock","Beheer Voorraad"
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,Backorders
"Notify for Quantity Below","Geef Kwantiteit Beneden aan"
-"Number of Products to Display","Aantal Producten Weer te Geven"
-"Uses","Aantal Gebruiken"
-"Number of results","Aantal resultaten"
-"Number of results (For the last time placed)","Aantal resultaten (Voor de laatste keer geplaatst)"
-"OK","OK"
-"OR","OF"
-"Old Price:","Oude prijs"
-"On Gesture","Op Gebaar"
-"Option validation failed to add product to cart.","Optie bevestiging is er niet in geslaagd een product aan kar toe te voegen."
-"Option values","Optie waarden"
-"Option:","Optie:"
-"Options","Opties"
-"Options Control","Opties Controle"
-"Options is required","Opties zijn benodigd"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","Onze klantenservice is 24 per dag beschikbaar. Bel ons op (555) 555-0123."
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability","Voorraad beschikbaarheid"
+"In Stock","In voorraad"
"Out of Stock","Niet voorradig"
-"Out of stock","Uit voorraad"
-"PM","PM"
-"Page Title Separator","Pagina Titel Afscheider"
-"Parent Category","Parent Categorie"
-"Pending","In afwachting"
-"Percentage","Percentage"
-"Please add rows to option.","Voeg rijen toe aan optie."
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Wees voorzichtig aangezien er een pakket data formulier geladen wordt zodra u op de rij klikt en alle niet opgeslagen data zal verloren gaan."
-"Please click on the Close Window button if it is not closed automatically.","Klik alstublieft op de Venster Sluiten knop als het niet automatisch wordt afgesloten."
-"Please enter a new group name","Voer een nieuwe groepsnaam in"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Ververs alstublieft ""Catalogus URL herschrijvingen"" en ""Productattributen in Systeem -> <a href=""%s"">Indexbeheer</a>"
-"Please select a static block ...","Selecteer een statisch blok ..."
-"Please select items.","Selecteer artikelen."
-"Please select one or more attributes.","Selecteer een of meer attributen."
-"Please select product(s).","Selecteer alstublieft product(en)."
-"Please select products for attributes update","Selecteer alstublieft producten voor attributen update"
-"Please set up merge date/time","Stel alstublieft het samenvoegen van datum/tijd in"
-"Please set up merge date/time later then present date","Stel alstublieft de samenvoegdatum/tijd later dan de huidige datum in"
-"Please specify date required option(s).","Specificeer alstublieft de benodige optie(s) voor de datum."
-"Please specify the number of products, that will not be divided into subintervals.","Geef het aantal producten op, die niet in sub-intervallen zullen worden verdeeld."
-"Please specify the product required option(s)","Specificeer alstublieft de benodige optie(s) voor het product."
-"Please specify the product required option(s).","Specificeer alstublieft de benodige optie(s) voor de datum."
-"Please specify the product's option(s).","Specificeer de product optie(s)."
-"Please specify the product's required option(s).","Gelieve het artikel's benodigde optie(s) te specificeren."
-"Please specify the quantity of product(s).","Specificeer alstublieft de hoeveelheid product(en)."
-"Please specify time required option(s).","Specificeer alstublieft de benodigde optie(s) voor de tijd."
-"Please wait...","Even geduld..."
-"Position","Positie"
-"Position in Layered Navigation","Positie in Gelaagde Navigatie"
-"Position of attribute in layered navigation block","Positie van attribuut in gelaagd navigatieblok"
-"Prev","Vorige"
-"Previous","Vorige"
-"Price","Prijs"
-"Price Navigation Step Calculation","Prijs Navigatie Stap Berekening"
-"Price Type","Prijstype"
-"Price is not available","Prijs is niet beschikbaar"
-"Price values for options should be specified in system base currency.","Prijswaarden voor opties dienen gespecificeerd te zijn in de basisvaluta van het systeem."
-"Price:","Prijs:"
-"Price: %s","Prijs: %s"
-"Print This Page","Deze pagina afdrukken"
-"Product","Product"
-"Product API","Product API"
-"Product Alerts","Product Waarschuwingen"
-"Product Attribute","Productattribuut"
-"Product Attributes","Productattributen"
-"Product Categories","Product Categorieën"
-"Product Extra Info","Product extra informatie"
-"Product Flat Data","Product Platte Gegevens"
-"ID","Product Identificatie"
-"Product Image Placeholders","Product Afbeelding Plaatshouder"
-"Product Image Watermarks","Product Afbeelding Watermerken"
-"Product Images","Product Afbeeldingen"
-"Product Images API","Productbeelden API"
+"Add Product To Websites","Voeg Product Toe Aan Websites"
+"Remove Product From Websites","Verwijder product van websites"
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items waarvan u niet wilt dat ze te zien zijn in de catalogus of zoekresultaten, dienen de status 'Uitgeschakeld' te hebben in de gewenste winkel."
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions","Toegestane Bestandsextensies"
+"Maximum Image Size","Maximum Grootte Afbeelding"
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters","Max Karakters"
+"Customer Group",Klantgroep
+"Delete Group Price","Verwijder Groepsprijs"
+"Item Price","Item Price"
+"and above","en hoger"
+"Delete Tier","Verwijder Rij"
"Product In Websites","Product in websites"
-"Product Info Column","Product Informatie Kolom"
-"Product Information","Productinformatie"
-"Product Link Block Template","Productlink blok sjabloon"
-"Product Link Inline Template","Productlink inline sjabloon"
-"Product Listing Sort by","Sorteer Product Lijst op"
-"Product","Productnaam"
-"Product Prices","Productprijzen"
-"Product Tags","Productlabels"
-"Product Tier Price API","Product niveau prijs API"
-"Product Type","Product Type"
-"Product URL Suffix","Product URL Achtervoegsel"
-"Product View Extra Hint","Product bekijk extra hint"
-"Product attribute sets API","Product attribuut zet API"
-"Product attributes API","Product attributen API"
-"Product collection expected.","Product collectie verwacht."
-"Product is not loaded","Produkt is niet geladen"
-"Product links API (related, cross sells, up sells)","Product links API (gerelateerd, kruisverkoop, omhoogverkoop)"
-"Product name","Productnaam"
-"Product types API","Product types API"
-"Products","Producten"
-"Products Comparison List","Productvergelijkingslijst"
-"Products Information","Producteninformatie"
-"Products Sitemap","Producten sitemap"
-"Products only","Producten alleen"
-"Products per Page on Grid Allowed Values","Producten per pagina op raamwerk toegestane waardes"
-"Products per Page on Grid Default Value","Producten per Pagina op Rooster Standaard Waarde"
-"Products per Page on List Allowed Values","Producten per Pagina op Lijst Toegestane Waardes"
-"Products per Page on List Default Value","Producten per pagina op lijst standaardwaarde"
-"Properties","Eigenschappen"
-"Quantity","Hoeveelheid"
-"Quantity Increments","Hoeveelheid Stappen"
-"Quantity Uses Decimals","Hoeveelheid Gebruikt Decimalen"
-"Quantity for Item's Status to Become Out of Stock","Hoeveelheid voor Status van Items die niet Op Voorraad Zijn"
-"Quantity:","Hoeveelheid:"
-"Quantity","Hoeveelheid"
-"Quick Create","Snel aanmaken"
-"Quick Overview","Snel Overzicht"
-"Quick simple product creation","Snel en eenvoudig een product aanmaken"
-"Records for ""","Documentatie voor """
-"Redirect","Doorverwijzing"
-"Redirect URL","Omleiding URL"
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items waarvan u niet wilt dat ze te zien zijn in de catalogus of zoekresultaten, dienen de status 'Uitgeschakeld' te hebben in de gewenste winkel."
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
"Regular Price:","Normale prijs:"
-"Related Products","Gerelateerde Producten"
-"Remove","Verwijderen"
-"Remove Product From Websites","Verwijder product van websites"
-"Remove This Item","Verwijder Dit Item"
-"Remove attribute from attribute set","Verwijder attribuut uit de attribuut reeks"
-"Remove attribute set","Verwijder attributen reeks"
-"Remove custom option","Verwijder de aangepaste optie"
-"Remove group from attribute set","Verwijder groep uit de attributen reeks"
-"Remove option","Verwijder optie"
-"Remove product assignment","Verwijder product opdracht"
-"Remove product image","Verwijder productbeeld"
-"Remove product link","Verwijder product link"
-"Remove value from custom option","Verwijder de waarde van de aangepaste optie"
-"Rename existing group","Geef bestaande groep nieuwe naam"
-"Rename group","Geef groep nieuwe naam"
-"Reorganize EAV category structure to flat structure","Reorganiseer EAV categoriestructuur naar platte structuur"
-"Reorganize EAV product structure to flat structure","Organiseer EAV product structuur naar een platte structuur"
-"Reset","Opnieuw"
-"Results","Resultaten"
-"Retrieve attribute data","Haal attribuut informatie op"
-"Retrieve attribute list","Haal attributen lijst op"
-"Retrieve attribute options","Haal attributen opties op"
-"Retrieve categories tree","Ophalen categorieboom"
-"Retrieve category attributes","Ophalen categorieattributen"
-"Retrieve category data","Ophalen categoriedata"
-"Retrieve hierarchical tree","Ophalen hiërarchische boom"
-"Retrieve linked products","Haal gelinkte producten op"
-"Retrieve list of assigned products","Ophalen lijst toegewezen producten"
-"Retrieve list of option values","Ophalen lijst van optiewaarden"
-"Retrieve list of product custom options","Ophalen lijst van aangepaste productopties"
-"Retrieve one level of categories by website/store view/parent category","Haal een niveau van categorieën uit de website/winkel zicht/wortel categorie"
-"Retrieve option value info","Ophalen optiewaarde info"
-"Retrieve product","Haal product op"
-"Retrieve product attribute sets","Ophalen productattributensets"
-"Retrieve product image","Ophalen productbeeld"
-"Retrieve product image list","Haal product afbeelding lijst op"
-"Retrieve product image types","Haal product afbeelding types op"
-"Retrieve product link type attributes","Ophalen productlink type attributen"
-"Retrieve product link types","Ophalen productlink types"
-"Retrieve product tier prices","Haal producten van dit niveau prijzen op"
-"Retrieve product types","Ophalen producttypes"
-"Retrieve products data","Haal product data op"
-"Retrieve products list by filters","Ophalen productlijst op filters"
-"Roll Over for preview","Beweeg uw muis erover heen voor een voorvertoning"
-"Root","Root"
-"SKU","SKU"
-"SKU length should be %s characters maximum.","SKU lengte moet minimum %s karakters zijn."
-"Save","Opslaan"
-"Save Attribute","Attribuut opslaan"
-"Save Attribute Set","Sla Attributen Set Op"
-"Save Category","Categorie opslaan"
-"Save Search","Sla Zoekactie Op"
-"Save and Continue Edit","Opslaan en doorgaan met bewerken"
-"Saved %d record(s)","%d archief(ven) opgeslagen"
-"Scope","Reikwijdte"
-"Search","Zoeken"
-"Search Engine Optimizations","Zoekmachine optimalisaties"
-"Search Information","Zoekinformatie"
-"Search Query","Zoek Query"
-"Search Term with such search query already exists.","Een zoekwoord met deze zoekvraag bestaat al."
-"Search Weight","Zoek Gewicht"
-"Searchable","Zoekbaar"
-"See price before order confirmation.","Zie prijs voor bevestiging van bestelling."
-"Select Category...","Selecteer categorie..."
-"Select Product...","Selecteer Product..."
-"Select type of option","Selecteer optietype"
-"Select type options required values rows.","Selecteer optietype verplichte rijwaarden."
-"Selected Product Types","Geselecteerde Product Types"
-"Selected configuration is not available.","Geselecteerde configuratie is niet beschikbaar."
-"Send Count","Aantal Versturen"
-"Set Ascending Direction","Stel een Oplopende Directie in"
-"Set Descending Direction","Stel een Aflopende Directie in"
-"Set","Stel Naam in"
-"Set Root Category for Store","Stel Basiscategorie voor Winkel in"
-"Set root category for this store in the <a href=""%s"">configuration</a>","Stel de basiscategorie voor deze winkel in op de <a href=""%s"">configuratie</a>"
-"Set special price","Stel aanbieding in"
-"Set/Get current store view","Stel in/Haal op huidige winkel zicht"
-"Settings","Instellingen"
-"Shop By","Shoppen op"
-"Shopping Options","Winkel Opties"
-"Show","Toon"
-"Show Details","Laat Details zien"
-"Show Tags","Labels tonen"
-"Simple Product","Simpel Product"
-"Site Map","Sitekaart"
-"Sitemap","Sitemap"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Sla import rij over, geen geldige waarde ""% s"" voor veld ""% s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","Sla import rij over, gevraagd veld ""%s"" voor nieuwe klant is onbekend."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Sla import rij over, de waarde ""% s"" is ongeldig voor veld ""% s"""
-"Skipping import row, required field ""%s"" for new products is not defined.","Het overslaan van import rij, verplicht veld ""%s"" voor nieuwe producten is niet gedefinieerd."
-"Skipping import row, required field ""%s"" is not defined.","Sla import rij over, gevraagd veld ""%s"" is onbekend."
-"Skipping import row, store ""%s"" field does not exist.","Sla import rij over, opslag ""% s"" veld bestaat niet."
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Sla import rij over, waarde ""%s"" is ongeldig voor ""%s"" veld."
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Sommige van de bewerkte produkten hebben onbekende SKU waarde. Vul in voor gebruik van deze producten."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Sommige van onderstaande produkten hebben niet alle benodigde opties. Pas ze aan en configureer alle benodigde opties."
-"Sort By","Sorteren op"
-"Sort Order","Sorteer Bestelling"
-"Source Model","Bron model"
-"Special Expires On: %s","Aanbieding Verloopt Op: %s"
"Special Price:","Speciale prijs:"
-"Special Price: %s","Speciale Aanbieding: %s"
-"Starting at:","Begint bij:"
-"Static","Statisch"
-"Static block and products","Statisch blok en producten"
-"Static block only","Alleen statisch blok"
-"Status","Status"
-"Stock Availability","Voorraad beschikbaarheid"
-"Store","Winkel"
-"Store View","Aanblik winkel"
-"Stretch","Periode"
-"Subscribe to RSS Feed","Aanmelden voor de RSS feed"
-"Super product attributes configuration","Super product attributen configuratie"
-"Synonym For","Synoniem voor"
-"System Properties","Systeemeigenschappen"
-"Tag","Tag Naam"
-"Tax","Belasting"
-"Template","Sjabloon"
-"Text","Tekst"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","De Flat Catalogus module heeft een limiet van %2\$d filterbare en/of sorteerbare attributen. Op dit moment zijn er %1\$d. Verminder het aantal filterbare/sorteerbare attributen om deze module te kunnen gebruiken"
-"The attribute model is not defined","Het attribuutmodel is niet gedefinieerd"
-"The attribute set has been saved.","De attributenreeks is opgeslagen."
-"The base directory to upload file is not specified.","De basisdirectory om bestand te uploaden is onbekend."
-"The category has been deleted.","De categorie is verwijderd."
-"The category has been saved.","De categorie is bewaard."
-"The comparison list was cleared.","De vergelijkingslijst is gewist."
-"The file '%s' for '%s' has an invalid extension","Het bestand '%' voor '%' heeft een ongeldige uitgang"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","Het bestand '%s' dat u heeft geüpload is groter dan de %s Megabyte toegestaan door de server"
-"The file you uploaded is larger than %s Megabytes allowed by server","Het bestand dat u heeft geüpload is groter dan de %s Megabytes toegestaan door de server"
-"The filters must be an array.","De filters moeten een array zijn."
-"The image contents is not valid base64 data.","De inhoud van de afbeelding is geen geldige base64 data."
-"The image is not specified.","De afbeelding is niet gespecificeerd."
-"The model collection resource name is not defined.","De model collectie bronnaam is niet gedefinieerd."
-"The product %s has been added to comparison list.","Het product %s is toegevoegd aan de vergelijkingslijst."
-"The product %s has been removed from comparison list.","Het product %s is verwijderd van de vergelijkingslijst."
-"The product attribute has been deleted.","Het productattribuut is verwijderd."
-"The product attribute has been saved.","Het productattribuut is opgeslagen."
-"The product has been created.","Het product is aangemaakt."
-"The product has been deleted.","Het product is verwijderd."
-"The product has been duplicated.","Het product is verdubbeld."
-"The product has been saved.","Het product is opgeslagen."
-"The product has required options","Het product heeft verplichte opties"
-"The search was deleted.","De zoekactie werd verwijderd."
-"The text is too long","De tekst is te lang"
-"There are no %s available.","Er zijn geen %s beschikbaar."
-"There are no customers for this alert","Er zijn geen klanten voor deze alert"
-"There are no customers for this alert.","Er zijn geen klanten voor deze melding."
-"There are no products matching the selection.","Er zijn geen producten die overeenkomen met de selectie."
-"There was an error while request processing.","Er heeft zich een fout voorgedaan tijdens het verwerken van uw verzoek."
-"This Attribute no longer exists","Dit Attribuut bestaat niet langer"
-"This attribute cannot be deleted.","Dit attribuut kan niet verwijderd worden."
-"This attribute cannot be edited.","Dit attribuut kan niet gewijzigd worden."
-"This attribute cannot be updated.","Dit attribuut kan niet bijgewerkt worden."
-"This attribute no longer exists","Deze eigenschap bestaat niet meer"
-"This attribute set no longer exists.","Deze attribuutset bestaat niet meer."
-"This group contains system attributes. Please move system attributes to another group and try again.","Deze groep bevat systeemattributen. Verplaats de systeemattributen naar een andere groep en probeer het opnieuw."
-"This is a required option","Dit is een verplichte optie"
-"This product no longer exists.","Dit product bestaat niet meer."
-"This search no longer exists.","Deze zoekactie bestaat niet langer."
-"This setting will be applied when all prices in the specific price interval are equal.","Deze instelling wordt toegepast wanneer alle prijzen in de specifieke prijsinterval gelijk zijn."
-"Tier Pricing","Niveau Prijsstelling"
-"Tile","Tegel"
-"Time Format","Tijdsformat"
-"Title","Titel"
-"To reindex the enabled product(s), the store or product must be specified","Om de ingeschakelde product(en) te herindexeren, moet de winkel of het product worden gespecificeerd"
-"To see product price, add this item to your cart. You can always remove it later.","Om de product prijs te zien, voeg dit artikel toe aan uw winkelwagen. U kunt het later altijd nog verwijderen."
-"Top/Left","Boven/Links"
-"Top/Right","Top/Rechts"
-"Total Quantity Base Items","Totale Hoeveelheid Opgenomen Items"
-"Total incl. Tax: %1$s","Totaal inclusief belasting: %1$s"
-"Total of %d record(s) have been deleted.","Er zijn in totaal %d dossier(s) verwijderd"
-"Total of %d record(s) have been updated.","Er zijn in totaal %d dossier(s) bijgewerkt"
-"Total of %d record(s) were updated","Totaal van %d verslag(en) zijn bijgewerkt"
-"Type","Type"
-"URL Rewrite Management","URL Herschrijf Management"
-"Unable to complete this request.","Niet in staat deze aanvraag te voltooien."
-"Unable to find a search term to delete.","Niet in staat een zoekterm te vinden om te verwijderen."
-"Unable to find an attribute to delete.","Niet instaat om een attribuut te vinden om te verwijderen."
-"Unable to get the product ID.","Niet in staat om product ID op te halen."
-"Unassigned Attributes","Niet Toegewezen Attributen"
-"Unknown EAV indexer type ""%s"".","Onbekende EAV indexeertype ""%s""."
-"Unknown attribute: %s.","Onbekend attribuut: %s."
-"Unsupported product type ""%s"".","Niet ondersteund produkttype ""%s""."
-"Up-sells","Up-sells"
-"Update","Update"
-"Update Attributes","Update Attributen"
-"Update Tier Price","Update Prijs"
-"Update assigned product","Update toegewezen product"
-"Update attribute","Update attribuut"
-"Update attributes","Update eigenschappen"
-"Update category","Update categorie"
-"Update custom option of product","Update de custom optie van het product"
-"Update product","Update product"
-"Update product image","Update product afbeelding"
-"Update product link","Update product link"
-"Update product tier prices","Update product niveau prijzen"
-"Update value of custom option","Update waarde van aangepaste optie"
-"Upload new product image ","Upload nieuwe productafbeelding"
-"Use Canonical Link Meta Tag For Categories","Use Canonisch Link Meta Tag Voor Categorieën"
-"Use Canonical Link Meta Tag For Products","Gebruik een Kanonieke Link Meta Label Voor Product"
-"Use Categories Path for Product URLs","Gebruik Categorieën Pad voor Product URL's"
-"Use Config Settings","Gebruik Configuratiesettings"
-"Use Default Value","Standaardwaarde gebruiken"
-"Use Flat Catalog Category","Gebruik Flat Catalogus Categorie"
-"Use Flat Catalog Product","Gebruik Flat Catalogus Product"
-"Use In Layered Navigation","Gebruik in Layered Navigatie"
-"Use In Search Results Layered Navigation","Gebruik in Zoek Resultaten een Gelaagde Navigatie"
-"Use JavaScript Calendar","Gebruik Javascript Kalender"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","Gebruik Vaste URL's voor Media Inhoud in WYSIWYG voor de Catalogus"
-"Use Tree Like Category Sitemap","Gebruik Boomnetwerk Als Categorie Sitemap"
-"Use config","Gebruik config"
-"Use default","Gebruik standaard"
-"Use for Promo Rule Conditions","Gebruik voor Promotie Regels Voorwaarden"
-"Use four-digit year format.","Gebruik 4-cijferig jaar formaat."
-"Use in Advanced Search","Gebruik in Geavanceerd Zoeken"
-"Use in Layered Navigation","Gebruik in Layered Navigation"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","Gebruik in Layered Navigatie<br/>(Kan alleen gebruikt worden met catalogus inputtype 'Dropdown')"
-"Use in Quick Search","Gebruik in Quick Search"
-"Used for Sorting in Product Listing","Gebruikt voor Sortering in Product Listing"
-"Used in Product Listing","Gebruik in Product Listing"
-"Value for ""%s"" is invalid.","Waarde voor ""%s"" is ongeldig."
-"Value for ""%s"" is invalid: %s","Waarde voor ""%s"" is ongeldig: %s"
-"Varchar","Varlet"
-"View as","Bekijk als"
-"Virtual Product","Virtueel product"
-"Visibility","Zichtbaarheid"
-"Visible","Zichtbaar"
-"Visible on Catalog Pages on Front-end","Zichtbaar op Catalogus Pagina's op Front-end"
-"Visible on Product View Page on Front-end","Zichtbaar op de productaanblikpagina op het front-end"
-"WYSIWYG Editor","WYSIWYG Editor"
-"Watermark","Watermerk"
-"Watermark Default Size","Watermerk Standaard Grootte"
-"Watermark Opacity, Percent","Watermerk doorzichtigheid, percentage"
-"Watermark Position","Watermerk positie"
-"Website","Website"
-"Website Item Must be checked","Website artikel moet gecontroleerd worden"
-"Website Store Must be checked","Webwinkel Moet gecheckt worden"
-"Websites","Websites"
+"Product Alerts","Product Waarschuwingen"
+"Can be Divided into Multiple Boxes for Shipping","Kan Worden Verdeeld over Meerdere Dozen bij Verzending"
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price","Klik voor de prijs"
"What's this?","Wat is dit?"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Of u de ""All"" optie toont in de ""Show X Per Page"" dropdown."
-"Will make search for the query above return results for this search.","Maakt zoektocht naar de query hierboven, geef resultaten voor deze zoekopdracht."
-"Wrong BuyRequest instance in options group.","Verkeerde KoopVerzoek instantie in opties groep."
-"Wrong configuration item instance in options group.","Verkeerde configuratie artikel in optiegroep."
-"Wrong configuration item option instance in options group.","Verkeerde configuratie artikel optie in optiegroep."
-"Wrong option instance type in options group.","Verkeerde optie instantie type in opties groep."
-"Wrong option type to get group instance.","Verkeerde optie type om groep voorbeeld te krijgen."
-"Wrong product instance type in options group.","Verkeerd productvoorbeeld type in optiegroep."
-"Wrong product type filter specified","Verkeerd product type filter opgegeven"
-"Year Range","Jaar Range"
-"Yes","Ja"
-"You cannot remove system attribute from this set.","U kunt geen systeemattributen uit deze set verwijderen."
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,ieder
+and,en
+save,bewaar
+"Actual Price","Werkelijke Prijs"
+"Shop By","Shoppen op"
+"Shopping Options","Winkel Opties"
+"Compare Products","Vergelijk Producten"
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page","Deze pagina afdrukken"
+"Remove Product","Remove Product"
+"Add to Wishlist","Aan verlanglijst toevoegen"
"You have no items to compare.","U heeft geen artikelen om te vergelijken."
+"Are you sure you would like to remove this item from the compare products?","Weet u zeker dat u dit item van uw vergeleken producten wilt verwijderen?"
+"Are you sure you would like to remove all products from your comparison?","Weet u zeker dat u alle producten van uw vergelijking wilt verwijderen?"
+"Remove This Item","Verwijder Dit Item"
+Compare,Vergelijk
+"Clear All","Verwijder Alles"
+Prev,Vorige
+"There are no products matching the selection.","Er zijn geen producten die overeenkomen met de selectie."
+"Add to Compare","Voeg toe om te Vergelijken"
+"Learn More","Meer Informatie"
"You may also be interested in the following product(s)","U heeft wellicht ook interesse in de volgende product(en):"
-"Zoom In","Inzoomen"
-"Zoom Out","Zoom Uit"
-"and","en"
-"and above","en hoger"
-"categories","categorieën"
-"each","ieder"
-"ex. http://domain.com","bijv. http://domein.nl"
-"leave blank if its not an image","Laat leeg als het geen afbeelding is"
-"per page","per pagina"
-"products","producten"
-"px.","px."
-"save","bewaar"
+"More Choices:","More Choices:"
+"New Products","Nieuwe Producten"
+"Check items to add to the cart or","Controleer items om aan het winkelwagentje toe te voegen of"
"select all","alle selecteren"
+"View as","Bekijk als"
+"Sort By","Sorteren op"
+"Set Ascending Direction","Stel een Oplopende Directie in"
+"Set Descending Direction","Stel een Aflopende Directie in"
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Toon
+"Additional Information","Aanvullende Informatie"
+"More Views","Meer Views"
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend","E-mail Vriend"
+Details,Details
+Template,Sjabloon
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Voeg rijen toe aan optie."
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
"unselect all","Onselecteer alles"
-"x","x"
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text","Anker Custom Tekst"
+"Anchor Custom Title","Anker Custom Titel"
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
+"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
+"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
+"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
+"Products per Page on List Default Value","Products per Page on List Default Value"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
+"Search Engine Optimizations","Search Engine Optimizations"
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
+"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
+"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
+"Use JavaScript Calendar","Use JavaScript Calendar"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
+"Watermark Default Size","Watermark Default Size"
+"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
+"Watermark Position","Watermark Position"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data","Product Platte Gegevens"
+"Reorganize EAV product structure to flat structure","Organiseer EAV product structuur naar een platte structuur"
+"Category Flat Data","Categorie Flat Data"
+"Reorganize EAV category structure to flat structure","Reorganiseer EAV categoriestructuur naar platte structuur"
+"Indexed category/products association","Geïndexeerde categorie/producten verbinding"
+"Product Categories","Product Categorieën"
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices","Index product prijzen"
+"Catalog New Products List","Catalogus Nieuwe Producten Lijst"
+"List of Products that are set as New","Lijst van Producten die zijn ingesteld als Nieuw"
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display","Aantal Producten Weer te Geven"
+"New Products Grid Template","Patroon Nieuwe Producten Rooster"
+"New Products List Template","Nieuw Product Lijst Sjabloon"
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)","Cache levensduur (Seconden)"
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link","Catalogus Product Link"
+"Link to a Specified Product","Link naar een Gespecificeerd Product"
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template","Productlink blok sjabloon"
+"Product Link Inline Template","Productlink inline sjabloon"
+"Catalog Category Link","Catalogus categorie link"
+"Link to a Specified Category","Link naar een Gespecificeerde Categorie"
+"If empty, the Category Name will be used","Als u het leeg laat, zal de Categorie Naam gebruikt worden"
+"Category Link Block Template","Categorie Link Bloktemplate"
+"Category Link Inline Template","Categorie Link Inline Template"
+Set,"Stel Naam in"
+none,none
+Overview,Overview
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
diff --git a/app/code/Magento/Catalog/i18n/pt_BR.csv b/app/code/Magento/Catalog/i18n/pt_BR.csv
index 967d22f0d00..406868b73d4 100644
--- a/app/code/Magento/Catalog/i18n/pt_BR.csv
+++ b/app/code/Magento/Catalog/i18n/pt_BR.csv
@@ -1,801 +1,639 @@
-"Uses","# de Uso"
-"%1$s incl tax.","%1$s de imposto incluÃdo"
-"%s - %s","%s - %s"
-"%s Item(s)","%s Item(s)"
-"%s and above","%s ou mais"
-"(%d)","(%d)"
-"(Copy data from: %s)","(Copiar dados de: %s)"
-"* Required Fields","* Campos obrigatórios"
+All,Todos
+None,Nenhum
+"Are you sure?","Tem certeza?"
+Cancel,Cancelar
+Back,Voltar
+Product,"Nome do produto"
+Price,Preço
+Quantity,Quantidade
+Products,Produtos
+ID,"ID do Produto"
+SKU,"Unidade de Manutenção de Estoque"
+No,Não
+Qty,Qty
+Action,Ação
+Reset,Redefinir
+Edit,Editar
+"Add to Cart","Adicionar ao carrinho"
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name","Primeiro nome"
+"Last Name","Último nome"
+Email,E-mail
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,Excluir
+Save,Salvar
+Store,Loja
"-- Please Select --","- Por Favor Selecione -"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 por defeito, se não definido. Para atualizar instantaneamente, Limpar a Cache de SaÃda de Blocos HTML."
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">Aviso!</strong> Aplicar MAP por defeito vai esconder todos os preços de produto no frontend."
-"A group with the same name already exists.","Um grupo com o mesmo nome já existe."
-"A name is required","Um nome é necessário"
-"A product type is not defined for the indexer.","Um tipo de produto não está definido para o indexador."
-"ALL GROUPS","TODOS OS GRUPOS"
-"AM","AM"
-"Action","Ação"
-"Actual Price","Preço Real"
-"Add","Adicionar"
-"Add Attribute","Adicione Atributo"
-"Add Design Change","Adicionar Mudança de Design"
-"Add Group","Adicionar Grupo"
-"Add Group Price","Adicionar preço de grupo"
+"Custom Design","Personalizar Design"
+Yes,Sim
+"Web Site","Web Site"
+Name,Nome
+Status,Status
+Disabled,Desativado
+Enabled,Ativado
+"Save and Continue Edit","Salvar e continuar a editar"
+Title,TÃtulo
+"Store View","Visualização da loja"
+Type,Tipo
+Home,InÃcio
+Search,Pesquisa
+"Select All","Select All"
"Add New","Adicione Novo"
-"Add New Attribute","Adicionar Novo Atributo"
-"Add New Attribute Set","Adicionar Novo Conjunto de Atributos"
-"Add New Group","Adicionar Novo Grupo"
-"Add New Images","Adicionar Novas Imagens"
-"Add New Option","Adicione Nova Opção"
-"Add New Row","Adicionar Nova Linha"
-"Add New Search Term","Adicionar Novo Termo de Busca"
-"Add New Set","Adicionar Novo Conjunto"
-"Add Product","Adicionar Produto"
-"Add Product To Websites","Adicionar Produto a Websites"
-"Add Root Category","Adicionar Categoria Raiz"
-"Add Subcategory","Adicionar Subcategoria"
-"Add Tax","Adicionar Imposto"
-"Add Tier","Adicionar Camada"
-"Add attribute into attribute set","Adicionar atributo ao conjunto de atributos"
-"Add group into attribute set","Adicionar grupo ao conjunto de atributos"
-"Add new custom option into product","Adicionar nova opção personalizada ao produto"
-"Add new values into custom option","Adicionar novos valores à opção personalizada"
-"Add option","Adicionar opção"
-"Add to Cart","Adicionar ao carrinho"
-"Add to Compare","Adicionar para Comparar"
-"Add to Wishlist","Adicionar à Lista de Desejos"
-"Additional Information","Informações Adicionais"
-"Alert Urls","Urls de Alerta"
-"All","Todos"
-"All Product Types","Todos Tipos de Produtos"
+"Please select items.","Favor selecionar itens."
+Required,Required
+Website,Website
"All Websites","Todos os sites"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Todos produtos deste conjunto serão excluÃdos! Tem certeza que quer excluir este conjunto de atributos?"
-"Allow All Products per Page","Permitir Todos Produtos por Página"
-"Allow Dynamic Media URLs in Products and Categories","Permitir URLs de MÃdia Dinâmica em Produtos e Categorias"
-"Allow HTML Tags on Frontend","Permitir Tags HTML no Frontend"
-"Allowed File Extensions","Extensões de Arquivo Permitidas"
-"Allowed file extensions to upload","Extensões de arquivo permitidas para upload"
-"Amount","Valor"
-"An error occurred while adding products to websites.","Ocorreu um erro durante a adição de produtos aos websites."
-"An error occurred while clearing comparison list.","Ocorreu um erro durante a limpeza da lista de comparação."
-"An error occurred while removing products from websites.","Ocorreu um erro durante a retirada de produtos dos sites."
-"An error occurred while saving the URL rewrite","Ocorreu um erro ao salvar o URL reescrito"
-"An error occurred while saving the attribute set.","Ocorreu um erro ao salvar o conjunto de atributos."
-"An error occurred while saving the collection, aborting. Error message: %s","Ocorreu um erro ao salvar a coleção. Abortando. Mensagem de erro: %s"
-"An error occurred while saving the product. ","Ocorreu um erro ao salvar o produto."
-"An error occurred while saving the search query.","Ocorreu um erro ao salvar a consulta de pesquisa."
-"An error occurred while saving this group.","Ocorreu um erro ao salvar este grupo."
-"An error occurred while trying to delete the category.","Ocorreu um erro ao tentar eliminar a categoria."
-"An error occurred while updating the product(s) attributes.","Ocorreu um erro durante a atualização do(s) atributo(s) do(s) produto(s)."
-"An error occurred while updating the product(s) status.","Ocorreu um erro durante a atualização do status do(s) produto(s)."
-"An invalid group ID is specified, skipping the record.","Um ID inválido de grupo é especificado, ignorando o registro."
-"An invalid option ID is specified for %s (%s), skipping the record.","Um ID de opção inválido é especificado para %s (%s), ignorando o registro."
-"An invalid store was specified.","Uma loja inválida foi especificada."
-"Anchor Custom Text","Texto âncora personalizado"
-"Anchor Custom Title","TÃtulo âncora personalizado"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Aplicável ​​somente aos produtos de catálogo e categorias. Qualquer conteúdo de mÃdia será inserido no editor como um URL estático. Não é atualizado se o URL de sistema base de configurações mudar."
-"Apply MAP (Default Value)","Aplicar MAP (Valor Padrão)"
-"Apply To","Aplicar a"
-"Approved","Aprovado"
-"Are you sure you want to delete this category?","Tem certeza de que quer apagar esta categoria?"
-"Are you sure you would like to remove all products from your comparison?","Tem certeza de que gostaria de remover todos os produtos de sua comparação?"
-"Are you sure you would like to remove this item from the compare products?","Tem certeza de que deseja remover este item dos produtos comparados?"
-"Are you sure?","Tem certeza?"
-"As low as:","A partir de:"
-"Assign","Atribuir"
-"Assign product link","Atribuir link do produto"
-"Assign product to category","Atribuir categoria ao produto"
-"Assigned Products","Produtos AtribuÃdos"
-"Associated Products","Produtos Associados"
-"Attribute Set","Nome do conjunto de atributos"
-"Attribute ""%s"" is invalid.","O atributo ""%s"" não é válido."
-"Attribute ""%s"" is required.","O atributo ""%s"" é obrigatório."
-"Attribute Information","Informação do Atributo"
-"Attribute Model","Modelo de Atributo"
-"Attribute Name:","Nome do Atributo:"
-"Attribute Set","Conjunto de Atributos"
-"Attribute Sets","Conjuntos de atributos"
-"Attribute add","Adicionar atributo"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","O código do atributo não é válido. Utilize apenas letras (a-z), números (0-9) ou sublinhado (_) neste campo, o primeiro caractere deve ser uma letra."
-"Attribute group with the \/name/\ name already exists","O grupo de atributo com o nome \/name/\ já existe."
-"Attribute remove","Remover atributo"
-"Attribute with the same code already exists","Atributo com o mesmo código já existe"
-"Attributes","Atributos"
-"Attrribute names can be specified per store.","Os nomes dos atributos podem ser especificados por loja."
-"Autogenerate","Geração Automática"
-"Availability:","Disponibilidade:"
-"Back","Voltar"
-"Backend Model","Modelo de Backend"
-"Backend Table","Tabela de Backend"
-"Backend Table Title","TÃtulo da Tabela de Backend"
-"Backorders","Ordens em Atraso"
-"Based On","Baseado Em"
-"Before Order Confirmation","Antes de Confirmação de Ordem"
-"Block after Info Column","Bloco após Coluna de Informações"
-"Bottom Block Options Wrapper","Envoltório de Opções do Bloco de Fundo"
-"Bottom/Left","Fundo/Esquerdo"
-"Bottom/Right","Fundo/Direito"
-"Browse By","Procure Por"
-"Bundle Items","Empacotar itens"
-"Buy %1$s","Compre %1$s"
-"Buy %1$s for","Compre %1$s por"
-"Buy %1$s for %2$s","Compre %1$s por %2$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","Compre %1$s por %2$s (%3$s incl. imposto) cada"
-"Buy %1$s for %2$s each","Compre %1$s por %2$s cada"
-"Cache Lifetime (Seconds)","Tempo de Vida de Cache (Segundos)"
-"Cache refresh needed.","Necessária atualização de cache."
-"Can be Divided into Multiple Boxes for Shipping","Pode ser dividido em várias caixas para envio"
-"Can be used only with catalog input type Dropdown","Pode ser usado somente com o tipo de catálogo de entrada Dropdown"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","Pode ser usado somente com o tipo de catálogo de entrada Dropdown, Seleção Múltipla e Preço"
-"Can't create image.","Não é possÃvel criar imagem."
-"Cancel","Cancelar"
-"Cannot create image.","Não é possÃvel criar imagem."
-"Cannot create writeable directory '%s'.","Não é possÃvel criar diretório gravável ""%s"" ."
-"Cart Item Attribute","Atributo do Item do Carrinho"
-"Catalog","Catálogo"
-"Catalog Category (Anchor)","Categoria de Catálogo (Âncora)"
-"Catalog Category (Non-Anchor)","Categoria de Catálogo (Não-Âncora)"
-"Catalog Category Link","Link da Categoria de Catálogo"
-"Catalog New Products List","Lista de Novos Produtos de Catálogo"
-"Catalog Price Scope","Limite do Preço de Catálogo"
-"Catalog Product Compare List","Produto de Catálogo: Comparar Lista"
-"Catalog Product Email to a Friend","Produto de Catálogo: Mandar E-Mail para Amigo"
-"Catalog Product Image Gallery Popup","Produto de Catálogo: Pop-up da Galeria de Imagens"
-"Catalog Product Link","Link do Produto de Catálogo"
-"Catalog Product View (Any)","Visualizar Produto de Catálogo (Qualquer Um)"
-"Catalog Product View (Simple)","Visualizar Produto de Catálogo (Simples)"
-"Catalog Product View (Virtual)","Visualizar Produto de Catálogo (Virtual)"
-"Catalog Section","Seção de Catálogo"
-"Catalog Seo Popular Search Terms","Termos de Busca Otimizados para Catálogo"
-"Catalog Seo Sitemap (Category List)","Sitemap Otimizado para Catálogo (Lista de Categorias)"
-"Catalog Seo Sitemap (Category Tree)","Sitemap Otimizado para Catálogo (Ãrvore de Categorias)"
-"Catalog Seo Sitemap (Common)","Sitemap Otimizado para Catálogo (Comum)"
-"Catalog Seo Sitemap (Product List)","Sitemap Otimizado para Catálogo (Lista de Produtos)"
-"Catalog URL Rewrites","Reedições da URL de Catálogo"
-"Catalog product custom option values API","API de valores de opções personalizadas de produtos do catálogo"
-"Catalog product custom options API","API de opções personalizadas de produtos do catálogo"
-"Catalog, Search","Catálogo, Busca"
-"Categories","Categorias"
-"Categories Sitemap","Sitemap de Categorias"
-"Category","Categoria"
-"Category API","API de Categorias"
+Next,Próximo
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,Catálogo
+Images,Images
+"per page","por página"
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,OK
+Visibility,Visibilidade
+Position,Posição
+Fixed,Fixado
+"Use Default Value","Utilizar valor padrão"
+N/A,IndisponÃvel
+Percent,Percent
+"Option Title","Option Title"
+"Input Type","Tipo de entrada"
+"New Option","New Option"
+"Price Type","Tipo de preço"
+"* Required Fields","* Campos obrigatórios"
+Availability,Availability
+"In stock","Em estoque"
+"Out of stock","Fora de estoque"
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,Raiz
+"Save Category","Salvar Categoria"
+"Delete Category","Excluir categoria"
+"New Subcategory","Nova Subcategoria"
+"New Root Category","Nova Categoria de Raiz"
+"Set Root Category for Store","Definir Categoria RaÃz para Loja"
+"Use Config Settings","Utilizar opções de configuração"
+"Use All Available Attributes","Use All Available Attributes"
+"General Information","Informações gerais"
"Category Data","Dados da Categoria"
-"Category Flat Data","Dados da Categoria Base"
-"Category Link Block Template","Modelo de Categoria de Blocos de Ligação"
-"Category Link Inline Template","Modelo de Categoria de Ligação Em Linha"
"Category Products","Categoria de Produtos"
-"Category Top Navigation","Navegação de Melhores Categorias"
-"Category URL Suffix","Sufixo URL de Categoria"
-"Category attributes API","API Atributos de Categoria"
-"Category move error","Erro de movimentação de categorias"
-"Category move operation is not possible: parent category is equal to child category.","Operação de mudança de categoria não é possÃvel: categoria pai é igual a categoria infantil."
-"Category move operation is not possible: the current category was not found.","Operação de mudança de categoria não é possÃvel: a categoria atual não foi encontrada."
-"Category move operation is not possible: the new parent category was not found.","Operação de mudança de categoria não é possÃvel: a nova categoria pai não foi encontrada."
-"Category must be an instance of \Magento\Catalog\Model\Category.","Categoria deve ser uma instância de \Magento\Catalog\Model\Category."
-"Center","Centro"
-"Change","Mudar"
-"Change or Retrieve attribute store view","Alterar ou Recuperar vista atributo de loja"
-"Change status","Alterar status"
-"Check items to add to the cart or","Verificar itens a ser adicionados ao carrinho ou"
-"Choose an Option...","Escolha uma Opção..."
-"Clear All","Limpar Todos"
-"Clear Price","Limpar preço"
-"Click for price","Clique para o preço"
-"Close Window","Fechar Janela"
-"Collapse All","Fechar Tudo"
-"Comma-separated.","Separados por vÃrgula."
-"Comparable","Comparável"
-"Comparable on Front-end","Comparável no InÃcio do Processo"
-"Comparable on the Frontend","Comparável no InÃcio do Processo"
-"Compare","Comparar"
-"Compare Products","Comparar Produtos"
-"Conditions Combination","Combinação de condições"
-"Continue","Continue"
-"Country/State","PaÃs/Estado"
-"Create","Criar"
-"Create (Upload)","Criar (Carregar)"
-"Create Empty","Criar Vazio"
-"Create Permanent Redirect for URLs if URL Key Changed","Criar redirecionamento permanente para URLs em caso de alteração de chave de URL"
+"Add Subcategory","Adicionar Subcategoria"
+"Add Root Category","Adicionar Categoria Raiz"
"Create Permanent Redirect for old URL","Criar Redirecionamento Permanente para antiga URL"
-"Create Product Settings","Criar Configurações de Produto"
-"Create Simple Associated Product","Criar Produto Associado Simples"
-"Create attribute set based on another set","Criar conjunto de atributos baseado em outro conjunto"
-"Create new attribute","Criar novo atributo"
-"Create new category","Criar nova categoria"
-"Create new product","Criar novo produto"
-"Cross-sells","Vendas Cruzadas"
-"Currently Shopping by:","Atualmente Comprando por:"
-"Custom Design","Personalizar Design"
-"Custom Options","Personalizar Opções"
-"Custom options","Opções personalizadas"
-"Customer Group","Grupo de Clientes"
-"Customers Tagged Product","Produtos marcados pelos clientes"
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor","Editor WYSIWYG"
+"Add Product","Adicionar Produto"
+label,label
+"Product Attributes","Atributos do produto"
+"Add New Attribute","Adicionar Novo Atributo"
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute","Salvar atributo"
+"Delete Attribute","Apagar atributo"
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute","Novo Atributo de Produto"
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,Global
+Scope,Limite
+"Declare attribute value saving scope","Declarar escopo de economia do valor do atributo"
+"Frontend Properties","Propriedades de interface inicial"
+"Use in Quick Search","Use em Busca Rápida"
+"Use in Advanced Search","Use em Busca Avançada"
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions","Use para as Condições de Regras de Promoção"
+"Enable WYSIWYG","Habilitar WYSIWYG"
+"Allow HTML Tags on Frontend","Permitir Tags HTML no Frontend"
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing","Usado na Lista de Produtos"
+"Depends on design theme","Depende do tema do projeto (design)"
+"Used for Sorting in Product Listing","Usado ​​para Classificar na Lista de Produtos"
+"Media Image","Imagem de mÃdia"
+Gallery,Galeria
+"System Properties","Propriedades do Sistema"
"Data Type for Saving in Database","Tipo de dado para salvar na base de dados"
-"Date & Time Custom Options","Opções personalizadas de data e hora"
-"Date Fields Order","Ordem de campos de data"
+Text,Texto
+Varchar,Varchar
+Static,Estático
+Datetime,"Data e hora"
+Decimal,Decimal
+Integer,"Número Inteiro"
+"Globally Editable","Globalmente Editável"
+"Attribute Information","Informação do Atributo"
+Properties,Propriedades
+"Manage Labels","Manage Labels"
+Visible,VisÃvel
+Searchable,"PassÃvel de Busca"
+Comparable,Comparável
+"Delete Selected Group","Excluir grupo selecionado"
+"Delete Attribute Set","Excluir conjunto de atributos"
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set","Salvar Conjunto de Atributos"
+"New Set Name","Nome do Conjunto Novo"
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,Vazio
+"Add Attribute","Adicione Atributo"
+"Add New Group","Adicionar Novo Grupo"
+"Add Group","Adicionar Grupo"
+"Edit Set Name","Editar Nome de Conjunto"
+"For internal use","For internal use"
+"Based On","Baseado Em"
+"Add New Attribute Set","Adicionar Novo Conjunto de Atributos"
+"Add New Set","Adicionar Novo Conjunto"
+"Product Templates","Product Templates"
+"Close Window","Fechar Janela"
+"New Product","Novo Produto"
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,Atributos
+Change,Mudar
+"Advanced Inventory","Advanced Inventory"
+Websites,Sites
+"Products Information","Informações de Produtos"
+"Category Name","Category Name"
+"Parent Category","Categoria Pai"
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.","Não há clientes para este alerta."
"Subscribe Date","Data de inscrição"
-"Datetime","Data e hora"
-"Decimal","Decimal"
-"Declare attribute value saving scope","Declarar escopo de economia do valor do atributo"
-"Default ""What's This"" Text Message","Mensagem de texto padrão ""O que é isso"""
-"Default Popup Text Message","Mensagem de texto de popup padrão"
+"Last Notified","Última Notificação"
+"Send Count","Enviar Contagem"
+"New Attribute","New Attribute"
+"Attribute Set","Conjunto de Atributos"
+"Add New Option","Adicione Nova Opção"
+"Import Options","Import Options"
+Import,Import
+"Add New Row","Adicionar Nova Linha"
+"Delete Row","Excluir linha"
+"Tier Pricing","Preços por NÃvel"
"Default Price","Preço padrão"
-"Default Price Navigation Step","Preço padrão de passo de navegação"
-"Default Quantity","Quantidade padrão"
+"Add Group Price","Adicionar preço de grupo"
+"ALL GROUPS","TODOS OS GRUPOS"
+"Add Tier","Adicionar Camada"
"Default Values","Valores padrão"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Define o escopo de moeda base (""Configuração de moeda"" > ""Opções de moeda"" > ""Moeda base"")."
-"Delete","Excluir"
-"Delete Attribute","Apagar atributo"
-"Delete Attribute Set","Excluir conjunto de atributos"
-"Delete Category","Excluir categoria"
-"Delete Group Price","Excluir preço de grupo"
-"Delete Option","Excluir opção"
-"Delete Row","Excluir linha"
+"Related Products","Produtos Relacionados"
+Up-sells,"Vendas Extras"
+Cross-sells,"Vendas Cruzadas"
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS","Notificar RSS de Estoque Baixo"
+"Change status","Alterar status"
+"Update Attributes","Atualização de Atributos"
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images","Adicionar Novas Imagens"
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term","Adicionar Novo Termo de Busca"
+"Save Search","Salvar Busca"
"Delete Search","Excluir pesquisa"
-"Delete Selected Group","Excluir grupo selecionado"
-"Delete Tier","Excluir camada"
-"Delete attribute","Excluir atributo"
-"Delete category","Apagar categoria"
-"Delete product","Apagar produto"
-"Depends on design theme","Depende do tema do projeto (design)"
-"Design","Design"
-"Details","Detalhes"
-"Disabled","Desativado"
-"Disallowed file type.","Tipo de arquivo não permitido."
-"Display Actual Price","Mostrar Preço Real"
-"Display Price Interval as One Price","Exibir intervalo de preços como um preço"
-"Display Product Count","Exibir contagem de produtos"
-"Display in Suggested Terms","Exibir em Termos Sugeridos"
-"Double click on a group to rename it","Dê um duplo clique em um grupo para renomeá-lo"
-"Double click on above image to view full picture","Dê um duplo clique na imagem acima para ver imagem completa"
-"Downloadable Information","Informação TransferÃvel"
-"Duplicate","Duplicado"
-"Duplicate amount found.","Quantia duplicada encontrada."
-"Duplicate website group price customer group.","Duplicar preço de grupo do website grupo do cliente."
-"Duplicate website tier price customer group and quantity.","Preço nÃvel do sÃtio Web de grupo de clientes e quantidade duplicados."
-"Duplicate website, country and state tax found.","SÃtio Web, paÃs e taxa de estado encontrados duplicados."
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","Por exemplo, {{url mÃdia=""caminho/para/imagem.jpg""}} {{view url=""caminho/para/picture.gif""}}. Análise dinâmica de directivas afeta o desempenho do catálogo."
-"Edit","Editar"
-"Edit Attribute Set '%s'","Editar Conjunto de Atributos ""%s"""
-"Edit Product Attribute","Editar Atributo do Produto"
-"Edit Product Attribute ""%s""","Editar Atributo do Produto ""%s"""
-"Edit Search","Editar Pesquisa"
-"Edit Search '%s'","Editar Pesquisa ""%s"""
-"Edit Set Name","Editar Nome de Conjunto"
-"Email","E-mail"
-"Email to a Friend","Enviar por e-mail a um amigo"
-"Empty","Vazio"
-"Enable MAP","Habilitar MAP"
-"Enable Quantity Increments","Habilitar Incrementos na Qtde."
-"Enable WYSIWYG","Habilitar WYSIWYG"
-"Enabled","Ativado"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","Modelo de tipo de entidade deve ser uma instância de \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","Modelo de tipo de entidade deve ser uma instância de \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType"
-"Error during retrieval of option value: %s","Erro ao recuperar valor de opção: %s"
-"Exclude","Excluir"
-"Expand All","Expandir Todos"
-"Failed","Falha"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","Falha ao copiar arquivo %s. Favor apagar mÃdia com imagens inexistentes e tentar de novo."
-"Failed to move file: %s","Falha ao mover arquivo: %s"
-"Feature Products","Produtos em Oferta"
-"Field is not complete","O campo está incompleto."
-"File options format is not valid.","O formato das opções de arquivo é inválido."
-"File upload failed","Falha ao carregar arquivo"
-"Filter model name must be declared.","É preciso declarar o nome do modelo de filtro."
-"Filter must be an object. Please set correct filter.","O filtro tem de ser um objeto. Favor ajustar filtro correto."
-"Filterable (no results)","Filtrável (sem resultados)"
-"Filterable (with results)","Filtrável (com resultados)"
-"First Name","Primeiro nome"
-"Fixed","Fixado"
-"For internal use.","Para uso interno."
+"Edit Search '%1'","Edit Search '%1'"
+"New Search","Nova Busca"
+"Search Information","Buscar Informações"
+"Search Query","Palavras-Chave da Busca"
+"Number of results","Número de resultados"
+"Number of results (For the last time placed)","Número de resultados (Colocados pela última vez)"
"For the last time placed.","Colocado pela última vez."
-"Frontend","InÃcio do processo"
-"Frontend Model","Modelo para InÃcio de Processo"
-"Frontend Properties","Propriedades de interface inicial"
-"Gallery","Galeria"
-"General Information","Informações gerais"
-"Get full information about attribute with list of options","Obter informações completas sobre atributo com lista de opções"
-"Get full information about custom option in product","Obter informações completas sobre opção personalizada em produto"
-"Get list of available custom option types","Obter lista de tipos de opções personalizadas disponÃveis"
-"Get list of non-default attributes by product type and attributes set","Obter lista de atributos não-padrão por tipo de produto e atributos estabelecidos"
-"Get list of possible attribute types","Obter lista de tipos de atributos possÃveis"
-"Get special price","Obter preço especial"
-"Global","Global"
-"Globally Editable","Globalmente Editável"
+"Number of Uses","Number of Uses"
+"Synonym For","Sinónimo Para"
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL","Redirecionar URL"
+"ex. http://domain.com","ex. http://domÃnio.com"
+"Display in Suggested Terms","Exibir em Termos Sugeridos"
"Go to Home Page","Ir para Página Inicial"
-"Grid","Grade"
-"Group add","Adicionar em grupo"
-"Group remove","Remover grupo"
-"Groups","Grupos"
-"Home","InÃcio"
-"ID","Identidade"
-"ID: %s","ID: %s"
-"If empty, the Category Name will be used","Se deixado em branco, será usado o Nome da Categoria."
-"If empty, the Product will be used","Se deixado em branco, será usado o Nome do Produto."
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Se não for especificado um valor para opção de visualização de loja especÃfica, será usado o valor padrão (Admin)."
-"Image","Imagem"
-"Image content is not valid base64 data.","O conteúdo da imagem não é um dado base64 válido."
-"Image does not exist.","Imagem inexistente."
-"Image file was not found.","Arquivo de imagem não encontrado."
-"Image type and information need to be specified for each store view.","O tipo e as informações da imagem devem ser especificados para cada visualização de loja."
-"In Cart","No Carrinho"
-"In Stock","No Estoque"
-"In stock","Em estoque"
-"Incl. Tax","Incluir taxas"
-"Index product and categories URL rewrites","Produto do Ãndice e as URL reescritas de categorias"
-"Index product attributes for layered navigation building","Ãndice de atributos de produtos para construção em camadas de navegação"
-"Index product prices","Preços de produtos de Ãndice"
-"Indexed category/products association","Associação de categoria/produtos indexados"
-"Info","Informações"
-"Info Column Options Wrapper","Envoltório das Opções da Coluna de Informações"
-"Input Type","Tipo de entrada"
-"Integer","Número Inteiro"
-"Interval Division Limit","Limite Divisão Intervalo"
-"Invalid Tier Prices","Preços de NÃvel Inválidos"
-"Invalid attribute %s","Atributo %s inválido"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Opção de atributo inválida para atributo %s (%s). Saltando o registro."
-"Invalid attribute set specified, skipping the record.","Conjunto especificado de atributo inválido, ignorando o registro."
-"Invalid block: %s.","Bloco inválido: %s."
-"Invalid category IDs.","Identificações de categoria inválidas."
-"Invalid category.","Categoria inválida."
-"Invalid image file type.","Tipo de arquivo de imagem inválido."
-"Invalid image type.","Tipo inválido de imagem."
-"Invalid option ID specified for %s (%s), skipping the record.","ID especificado de opção inválido para %s (%s), ignorando o registro."
-"Invalid product type specified, skipping the record.","Tipo inválido de produto especificado, ignorando o registro."
-"Invalid store specified","Loja especificada inválida"
-"Invalid store specified, skipping the record.","Loja especificada inválida, ignorando o registro."
-"Invalid tier prices. The product is not associated to the requested website.","Faixas de preço inválidas. O produto não está associado ao website solicitado."
-"Inventory","Inventário"
-"Is Default","É padrão"
-"Is Required","É obrigatório"
-"Items %s to %s of %s total","Itens %s a %s de um total de %s"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Itens que você não quer mostrar no catálogo ou resultados da pesquisa devem ter status de ""Inválido"" na loja desejada."
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Itens que você não quer mostrar no catálogo ou resultados da pesquisa devem ter status de ""Inválido"" na loja desejada."
-"Keep your eyes open for our special Back to School items and save A LOT!","Fique atento a nossos itens da Volta às Aulas e economize BASTANTE!"
-"Label","Etiqueta"
-"Last Name","Último nome"
-"Last Notified","Última Notificação"
-"Layered Navigation","Navegação em Camadas"
-"Learn More","Saiba Mais"
-"Line %d, Email: %s","Linha %d, Email: %s"
-"Line %d, SKU: %s","Linha %d, Unid. Manut. Estoque: %s"
-"Link (Related, Up sell, Cross sell)","Link (Relacionados, Venda extra, Venda cruzada)"
-"Link product does not exist.","Não existe o produto do link."
-"Link to a Specified Category","Link para uma Categoria Especificada"
-"Link to a Specified Product","Link para um Produto Especificado"
-"List","Lista"
-"List Mode","Modo de Lista"
-"List of Products that are set as New","Lista de Produtos definidos como Novos"
-"List of types","Lista de tipos"
-"Manage Attribute Sets","Gerenciar Conjuntos de Atributos"
-"Manage Attributes","Gerenciar Atributos"
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List","Lista de Comparação de Produtos"
+AM,AM
+PM,PM
+Categories,Categorias
"Manage Catalog Categories","Gerenciar Categorias de Catálogo"
"Manage Categories","Gerenciar Categorias"
-"Manage Label / Options","Gerenciar etiqueta / opções"
-"Manage Options (values of your attribute)","Gerenciar Opções (valores de seu atributo)"
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.","Este produto não existe mais."
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).","Por favor selecione produto(s)."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
"Manage Product Attributes","Gerenciar Atributos do Produto"
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.","Este atributo não pode ser editado."
+"Edit Product Attribute","Editar Atributo do Produto"
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.","Este atributo não pode ser apagado."
+"The product attribute has been deleted.","O atributo do produto foi eliminado."
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.","Um grupo com o mesmo nome já existe."
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets","Gerenciar Conjuntos de Atributos"
+"New Set","New Set"
"Manage Product Sets","Gerenciar Conjuntos de Produtos"
-"Manage Products","Gerenciar Produtos"
-"Manage Stock","Gerenciar Estoque"
-"Manage Titles (Size, Color, etc.)","Gerenciar TÃtulos (Tamanho, Cor etc.)"
-"Max Characters","Máx. de Caracteres"
-"Maximal Depth","Altura máxima"
-"Maximum Image Size","Tamanho Máximo de Imagem"
-"Maximum Number of Price Intervals","Número máximo de intervalos de preços"
-"Maximum Quantity Allowed in Shopping Cart","Qtde. Máxima Permitida no Carrinho"
-"Maximum allowed image size for '%s' is %sx%s px.","Máximo tamanho de imagem permitido para '%s' é %sx%s px."
-"Maximum image height","Altura máxima da imagem"
-"Maximum image width","Largura máxima da imagem"
-"Maximum number of characters:","Número máximo de caracteres:"
-"Maximum number of price intervals is 100","O número máximo de intervalo de preços é 100"
-"Media Image","Imagem de mÃdia"
-"Minimum Advertised Price","Preço MÃnimo Anunciado"
-"Minimum Lines per Page","Número MÃnimo de Linhas por Página"
-"Minimum Quantity Allowed in Shopping Cart","Qtde MÃnima Permitida no Carrinho de Compras"
-"Minimum Quantity for Item's Status to be Out of Stock","Qtde. MÃnima de Itens para Estado Atual como Fora do Estoque"
-"Missing SKU, skipping the record.","Unid. Manut. Estoque ausente. Saltando o registro."
-"More Views","Mais Visualizações"
-"Move","Mover"
-"Move category in tree","Mover categoria na árvore"
-"Must be in the allowed values list.","Tem(Têm) de estar na lista de valores permitidos."
-"N/A","IndisponÃvel"
-"Name","Nome"
-"Name in %s","Nome em %s"
-"New Product","Novo Produto"
-"New Product Attribute","Novo Atributo de Produto"
-"New Products","Novos Produtos"
-"New Products Grid Template","Modelo de Nova Rede de Produtos"
-"New Products List Template","Modelo para Lista de Novos Produtos"
-"New Root Category","Nova Categoria de Raiz"
-"New Search","Nova Busca"
-"New Set Name","Nome do Conjunto Novo"
-"New Subcategory","Nova Subcategoria"
-"Next","Próximo"
-"No","Não"
-"No image","Nenhuma imagem"
+"This attribute set no longer exists.","Este conjunto de atributos não existe mais."
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.","Ocorreu um erro ao salvar o conjunto de atributos."
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.","Esta pesquisa não existe mais."
+"Edit Search","Editar Pesquisa"
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.","Para ver o preço do produto, adicione este item ao seu carrinho. Você pode sempre removê-lo mais tarde."
+"See price before order confirmation.","Ver preço antes de confirmar pedido."
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
+Grid,Grade
+List,Lista
+"Product is not loaded","O produto não está carregado"
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
"No layout updates","Nenhuma atualização de disposição (layout)"
-"No options of this product are available.","Nenhuma opção deste produto está disponÃvel."
-"No product collections found.","Nenhuma coleção de produtos encontrada."
-"None","Nenhum"
-"Not Visible Individually","Não VisÃvel Individualmente"
-"Notify Low Stock RSS","Notificar RSS de Estoque Baixo"
-"Notify for Quantity Below","Notificar em Caso de Quantidade Abaixo"
-"Number of Products to Display","Número de Produtos a Ser Exibidos"
-"Uses","Número de Usuários"
-"Number of results","Número de resultados"
-"Number of results (For the last time placed)","Número de resultados (Colocados pela última vez)"
-"OK","OK"
-"OR","OU"
-"Old Price:","Preço Antigo:"
+"Products only","Somente produtos"
+"Static block only","Só bloco estático"
+"Static block and products","Bloco estático e produtos"
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,Extensão
+Tile,Empilhar
+Top/Left,Topo/Esquerdo
+Top/Right,Topo/Direita
+Bottom/Left,Fundo/Esquerdo
+Bottom/Right,Fundo/Direito
+Center,Centro
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites","Reedições da URL de Catálogo"
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,Categoria
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price","Limpar preço"
+"The filters must be an array.","Os filtros devem estar por ordem."
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config","Use config"
+"In Cart","No Carrinho"
+"Before Order Confirmation","Antes de Confirmação de Ordem"
"On Gesture","Sobre Gesticulação"
-"Option validation failed to add product to cart.","Validação de opção falhou ao adicionar produto ao carrinho."
-"Option values","Valores de opção"
-"Option:","Opção:"
-"Options","Opções"
-"Options Control","Controle de Opções"
-"Options is required","Opções: obrigatório"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","Nosso SAC funciona 24h, 7 dias/semana. Fale conosco: (555) 555-0123."
-"Out of Stock","Esgotado"
-"Out of stock","Fora de estoque"
-"PM","PM"
-"Page Title Separator","Separador de TÃtulo de Página"
-"Parent Category","Categoria Pai"
-"Pending","Pendente"
-"Percentage","Percentagem"
-"Please add rows to option.","Por favor adicione linhas à opção."
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Por favor tome cuidado pois quando você clica na linha ela vai carregar os dados do formulário do pacote, o arquivo selecionado, e todos os dados não guardados do formulário serão perdidos."
-"Please click on the Close Window button if it is not closed automatically.","Por favor clique no botão Fechar Janela, se não for fechado automaticamente."
-"Please enter a new group name","Por favor insira um novo nome do grupo"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Por favor atualize ""URL de Catálogo Reescitos"" e ""Atributos de Produtos"" no Sistema -> <a href=""%s"">Administração Ãndice </a>"
-"Please select a static block ...","Por favor selecione um bloco estático..."
-"Please select items.","Favor selecionar itens."
-"Please select one or more attributes.","Por favor selecione um ou mais atributos."
-"Please select product(s).","Por favor selecione produto(s)."
-"Please select products for attributes update","Por favor selecione produtos para os atributos de atualização"
-"Please set up merge date/time","Por favor configure a fusão de data/hora"
-"Please set up merge date/time later then present date","Por favor configure a fusão de data/hora para mais tarde que a presente data"
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building","Ãndice de atributos de produtos para construção em camadas de navegação"
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.","Selecione as linhas de valores exigidas para opções de tipo."
"Please specify date required option(s).","Favor especificar opção(ões) obrigatória(s) para data."
-"Please specify the number of products, that will not be divided into subintervals.","Por favor especifique o número de produtos, que não será dividido em subintervalos."
-"Please specify the product required option(s)","Favor especificar opção(ões) obrigatória(s) do produto"
-"Please specify the product required option(s).","Favor especificar opção(ões) obrigatória(s) do produto."
-"Please specify the product's option(s).","Por favor especifique a(s) opção/opções do produto."
-"Please specify the product's required option(s).","Por favor especifique a(s) opção/opções necessária(s) do produto."
-"Please specify the quantity of product(s).","Favor especificar a quantidade de produto(s)."
"Please specify time required option(s).","Favor especificar opção(ões) obrigatória(s) para hora."
-"Please wait...","Por favor aguarde..."
-"Position","Posição"
-"Position in Layered Navigation","Posição na Navegação por Camadas"
-"Position of attribute in layered navigation block","Posição de atributo em bloco de navegação em camadas"
-"Prev","Prev"
-"Previous","Anterior"
-"Price","Preço"
-"Price Navigation Step Calculation","Cálculo do Preço do Passo de Navegação"
-"Price Type","Tipo de preço"
-"Price is not available","Preço não está disponÃvel"
-"Price values for options should be specified in system base currency.","Os preços das opções devem ser especificados na moeda-base do sistema."
-"Price:","Preço:"
-"Price: %s","Preço: %s"
-"Print This Page","Imprimir Esta Página"
-"Product","Produto"
-"Product API","API de Produto"
-"Product Alerts","Alertas de Produto"
-"Product Attribute","Atributo de Produto"
-"Product Attributes","Atributos do produto"
-"Product Categories","Categoria de Produtos"
-"Product Extra Info","Dados Extras de Produto"
-"Product Flat Data","Dados Base de Produto"
-"ID","ID do Produto"
-"Product Image Placeholders","Espaços Reservados a Imagem de Produto"
-"Product Image Watermarks","Imagem Marca d'Ãgua do Produto"
-"Product Images","Imagens do Produto"
-"Product Images API","API de Imagens de Produto"
+"Please specify the product's required option(s).","Por favor especifique a(s) opção/opções necessária(s) do produto."
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,px.
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually","Não VisÃvel Individualmente"
+"Catalog, Search","Catálogo, Busca"
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.","Um tipo de produto não está definido para o indexador."
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:","A partir de:"
+"Are you sure you want to delete this category?","Tem certeza de que quer apagar esta categoria?"
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All","Fechar Tudo"
+"Expand All","Expandir Todos"
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
+"Manage Titles (Size, Color, etc.)","Gerenciar TÃtulos (Tamanho, Cor etc.)"
+"Manage Options (values of your attribute)","Gerenciar Opções (valores de seu atributo)"
+"Is Default","É padrão"
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,Grupos
+"Double click on a group to rename it","Dê um duplo clique em um grupo para renomeá-lo"
+"Unassigned Attributes","Atributos Não AtribuÃdos"
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.","Este grupo contém atributos do sistema. Por favor mova atributos do sistema para outro grupo e tente novamente."
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options","Personalizar Opções"
+"This is a required option.","This is a required option."
+"Field is not complete","O campo está incompleto."
+"Allowed file extensions to upload","Extensões de arquivo permitidas para upload"
+"Maximum image width","Largura máxima da imagem"
+"Maximum image height","Altura máxima da imagem"
+"Maximum number of characters:","Número máximo de caracteres:"
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock","Gerenciar Estoque"
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,"Ordens em Atraso"
+"Notify for Quantity Below","Notificar em Caso de Quantidade Abaixo"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability","Disponibilidade de Estoque"
+"In Stock","No Estoque"
+"Out of Stock",Esgotado
+"Add Product To Websites","Adicionar Produto a Websites"
+"Remove Product From Websites","Remover Produto dos Websites"
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Itens que você não quer mostrar no catálogo ou resultados da pesquisa devem ter status de ""Inválido"" na loja desejada."
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions","Extensões de Arquivo Permitidas"
+"Maximum Image Size","Tamanho Máximo de Imagem"
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters","Máx. de Caracteres"
+"Customer Group","Grupo de Clientes"
+"Delete Group Price","Excluir preço de grupo"
+"Item Price","Item Price"
+"and above","e acima"
+"Delete Tier","Excluir camada"
"Product In Websites","Produto Em Websites"
-"Product Info Column","Coluna de Info do Produto"
-"Product Information","Informações de Produto"
-"Product Link Block Template","Modelo para Link de Produto: Bloco Autônomo"
-"Product Link Inline Template","Modelo para Link de Produto: Fluxo sem Quebra"
-"Product Listing Sort by","LIstagem de Produto Ordenada por"
-"Product","Nome do produto"
-"Product Prices","Preços de Produto"
-"Product Tags","Etiquetas de Produto"
-"Product Tier Price API","API para NÃveis de Preço do Produto"
-"Product Type","Tipo de Produto"
-"Product URL Suffix","Sufixo da URL de Produto"
-"Product View Extra Hint","Visualização de Produto: Pista Adicional"
-"Product attribute sets API","API para conjuntos de abributos do Produto"
-"Product attributes API","API de atributos do Produto"
-"Product collection expected.","Coleção de produtos esperada."
-"Product is not loaded","O produto não está carregado"
-"Product links API (related, cross sells, up sells)","API para links de produto (relacionados, vendas cruzadas, vendas extras)"
-"Product name","Nome do produto"
-"Product types API","API para tipos de produto"
-"Products","Produtos"
-"Products Comparison List","Lista de Comparação de Produtos"
-"Products Information","Informações de Produtos"
-"Products Sitemap","Sitemap de Produtos"
-"Products only","Somente produtos"
-"Products per Page on Grid Allowed Values","Produtos por Página nos Valores Permitidos na Grade"
-"Products per Page on Grid Default Value","Produtos por Página no Valor-Padrão da Grade"
-"Products per Page on List Allowed Values","Produtos por Página nos Valores Permitidos da Lista"
-"Products per Page on List Default Value","Produtos por Página no Valor-Padrão da Lista"
-"Properties","Propriedades"
-"Quantity","Quant."
-"Quantity Increments","Incrementos de Quantidade"
-"Quantity Uses Decimals","Qtde: Usa Decimais"
-"Quantity for Item's Status to Become Out of Stock","Quantidade para que o status do item se torne ""Fora de estoque"""
-"Quantity:","Quantidade:"
-"Quantity","Quantidade"
-"Quick Create","Criação Rápida"
-"Quick Overview","Panorama Rápido"
-"Quick simple product creation","Criação Rápida de Produto Simples"
-"Records for ""","Registros para """
-"Redirect","Redirecionar"
-"Redirect URL","Redirecionar URL"
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Itens que você não quer mostrar no catálogo ou resultados da pesquisa devem ter status de ""Inválido"" na loja desejada."
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
"Regular Price:","Preço Normal:"
-"Related Products","Produtos Relacionados"
-"Remove","Remover"
-"Remove Product From Websites","Remover Produto dos Websites"
-"Remove This Item","Remover Este Item"
-"Remove attribute from attribute set","Remover atributo do conjunto de atributos"
-"Remove attribute set","Remover atributo estabelecido"
-"Remove custom option","Remover opção customizada"
-"Remove group from attribute set","Remova o grupo do conjunto de atributos"
-"Remove option","Remover opção"
-"Remove product assignment","Remover designação do produto"
-"Remove product image","Remover Imagem de Produto"
-"Remove product link","Remover link de produto"
-"Remove value from custom option","Remover valor de opção personalizada"
-"Rename existing group","Remover grupo existente"
-"Rename group","Renomear grupo"
-"Reorganize EAV category structure to flat structure","Reorganizar estrutura de categorias EAV como estrutura simplificada"
-"Reorganize EAV product structure to flat structure","Reorganizar estrutura EAV de produto como estrutura simplificada"
-"Reset","Redefinir"
-"Results","Resultados"
-"Retrieve attribute data","Recuperar dados de atributo"
-"Retrieve attribute list","Recuperar lista de atributos"
-"Retrieve attribute options","Recuperar opções de atributo"
-"Retrieve categories tree","Recuperar árvore de categorias"
-"Retrieve category attributes","Recuperar atributos de categoria"
-"Retrieve category data","Recuperar dados de categoria"
-"Retrieve hierarchical tree","Recuperar árvore hierárquica"
-"Retrieve linked products","Recuperar produtos vinculados"
-"Retrieve list of assigned products","Recuperar lista de produtos designados"
-"Retrieve list of option values","Recuperar lista de valores de opções"
-"Retrieve list of product custom options","Recuperar lista de opções personalizadas de produtos"
-"Retrieve one level of categories by website/store view/parent category","Recuperar um nÃvel de categorias por website/visualização de loja/categoria-pai"
-"Retrieve option value info","Recuperar informações de valores de opções"
-"Retrieve product","Recuperar produto"
-"Retrieve product attribute sets","Recuperar conjuntos de atributos do produto"
-"Retrieve product image","Recuperar imagem de produto"
-"Retrieve product image list","Recuperar lista de imagens do produto"
-"Retrieve product image types","Recuperar tipos de imagem do produto"
-"Retrieve product link type attributes","Recuperar atributos do tipo de link do produto"
-"Retrieve product link types","Recuperar tipos de link do produto"
-"Retrieve product tier prices","Recuperar faixas de preço do produto"
-"Retrieve product types","Recuperar tipos de produto"
-"Retrieve products data","Recuperar dados de produtos"
-"Retrieve products list by filters","Recuperar lista de produtos com filtros"
-"Roll Over for preview","Passe o mouse para visualizar"
-"Root","Raiz"
-"SKU","Unidade de Manutenção de Estoque"
-"SKU length should be %s characters maximum.","A Unidade de Manutenção de Estoque deve ter no máximo %s caracteres."
-"Save","Salvar"
-"Save Attribute","Salvar atributo"
-"Save Attribute Set","Salvar Conjunto de Atributos"
-"Save Category","Salvar Categoria"
-"Save Search","Salvar Busca"
-"Save and Continue Edit","Salvar e continuar a editar"
-"Saved %d record(s)","%d registro(s) salvo(s)"
-"Scope","Limite"
-"Search","Pesquisa"
-"Search Engine Optimizations","Otimizações nos Mecanismos de Busca"
-"Search Information","Buscar Informações"
-"Search Query","Palavras-Chave da Busca"
-"Search Term with such search query already exists.","Já existe termo de busca baseado nesse critério."
-"Search Weight","Peso da Busca"
-"Searchable","PassÃvel de Busca"
-"See price before order confirmation.","Ver preço antes de confirmar pedido."
-"Select Category...","Seleciona Categoria..."
-"Select Product...","Selecionar Produto..."
-"Select type of option","Selecionar tipo de opção"
-"Select type options required values rows.","Selecione as linhas de valores exigidas para opções de tipo."
-"Selected Product Types","Tipos de Produto Selecionados"
-"Selected configuration is not available.","Configuração selecionada não está disponÃvel."
-"Send Count","Enviar Contagem"
-"Set Ascending Direction","Ajustar Direção como Crescente"
-"Set Descending Direction","Ajustar Direção como Decrescente"
-"Set","Ajustar Nome"
-"Set Root Category for Store","Definir Categoria RaÃz para Loja"
-"Set root category for this store in the <a href=""%s"">configuration</a>","Ajustar categoria de raiz para esta loja na <a href=""%s"">configuração</a>"
-"Set special price","Definir preço especial"
-"Set/Get current store view","Defina/Obtenha atual vista de armazenamento"
-"Settings","Configurações"
-"Shop By","Comprar Por"
-"Shopping Options","Opções de Compra"
-"Show","Mostrar"
-"Show Details","Mostrar Detalhes"
-"Show Tags","Mostrar Marcas"
-"Simple Product","Produto Simples"
-"Site Map","Mapa do Site"
-"Sitemap","Mapa do Site"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Ignorar linha de importação, ""%s"" não é um valor válido para campo ""%s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","Ignorar linha de importação, campo ""%s"" exigido não está definido para o novo cliente."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Ignorar linha de importação, o valor ""%s"" é inválido para o campo ""%s"""
-"Skipping import row, required field ""%s"" for new products is not defined.","Ignorando linha de importação. O campo obrigatório ""%s"" para novos produtos não foi definido."
-"Skipping import row, required field ""%s"" is not defined.","Ignorar linha de importação, campo ""%s"" exigido não está definido."
-"Skipping import row, store ""%s"" field does not exist.","Ignorando linha de importação, campo loja ""%s"" não existe."
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Pular linha de importação, o valor ""%s"" não é válido para o campo ""%s""."
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Alguns dos produtos processados ​​não têm valor SKU definido. Por favor preencha-o antes de executar operações sobre estes produtos."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Alguns dos produtos abaixo não têm todas as opções necessárias. Por favor edite-os e configure todas as opções necessárias."
-"Sort By","Classificar Por"
-"Sort Order","Classificar pedido"
-"Source Model","Modelo de Origem"
-"Special Expires On: %s","Especial Expira Em: %s"
"Special Price:","Preço Especial:"
-"Special Price: %s","Preço Especial: %s"
-"Starting at:","A partir de:"
-"Static","Estático"
-"Static block and products","Bloco estático e produtos"
-"Static block only","Só bloco estático"
-"Status","Status"
-"Stock Availability","Disponibilidade de Estoque"
-"Store","Loja"
-"Store View","Visualização da loja"
-"Stretch","Extensão"
-"Subscribe to RSS Feed","Subscrever RSS Feed"
-"Super product attributes configuration","Configuração de atributos de super produto"
-"Synonym For","Sinónimo Para"
-"System Properties","Propriedades do Sistema"
-"Tag","Nome de Marca"
-"Tax","Taxas"
-"Template","Modelo"
-"Text","Texto"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","O módulo de Catálogo Simples tem um limite de %2\$d atributos filtráveis ​​e/ou classificáveis. Atualmente existem %1\$d deles. Por favor reduza o número de atributos filtráveis​​/classificáveis​​ a fim de usar este módulo"
-"The attribute model is not defined","O modelo de atributo não está definido"
-"The attribute set has been saved.","O conjunto de atributos foi salvo."
-"The base directory to upload file is not specified.","O diretório base para fazer o carregamento do arquivo não está especificado."
-"The category has been deleted.","A categoria foi apagada."
-"The category has been saved.","A categoria foi salva."
-"The comparison list was cleared.","A lista de comparação foi limpa."
-"The file '%s' for '%s' has an invalid extension","O arquivo '%s' para '%s' possui uma extensão inválida"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","O arquivo '%s' que você carregou é maior que %s Megabites permitido pelo servidor"
-"The file you uploaded is larger than %s Megabytes allowed by server","O arquivo carregado é maior do que os %s Megabytes permitidos pelo servidor"
-"The filters must be an array.","Os filtros devem estar por ordem."
-"The image contents is not valid base64 data.","O conteúdo da imagem não é um dado de base64 válido."
-"The image is not specified.","A imagem não está especificada."
-"The model collection resource name is not defined.","O nome do modelo de coleção de recurso não está definido."
-"The product %s has been added to comparison list.","O produto %s foi adicionado à lista de comparação."
-"The product %s has been removed from comparison list.","O produto %s foi removido da lista de comparação."
-"The product attribute has been deleted.","O atributo do produto foi eliminado."
-"The product attribute has been saved.","O atributo do produto foi salvo."
-"The product has been created.","O produto foi criado."
-"The product has been deleted.","O produto foi eliminado."
-"The product has been duplicated.","O produto foi duplicado."
-"The product has been saved.","O produto foi salvo."
-"The product has required options","O produto requer opções"
-"The search was deleted.","A pesquisa foi apagada."
-"The text is too long","O texto é muito longo"
-"There are no %s available.","Não há %s disponÃveis."
-"There are no customers for this alert","Não há clientes para este alerta"
-"There are no customers for this alert.","Não há clientes para este alerta."
-"There are no products matching the selection.","Não há produtos que correspondam à seleção."
-"There was an error while request processing.","Houve um erro ao processar o pedido."
-"This Attribute no longer exists","Este atributo não existe mais"
-"This attribute cannot be deleted.","Este atributo não pode ser apagado."
-"This attribute cannot be edited.","Este atributo não pode ser editado."
-"This attribute cannot be updated.","Este atributo não pode ser atualizado."
-"This attribute no longer exists","Este atributo não existe mais"
-"This attribute set no longer exists.","Este conjunto de atributos não existe mais."
-"This group contains system attributes. Please move system attributes to another group and try again.","Este grupo contém atributos do sistema. Por favor mova atributos do sistema para outro grupo e tente novamente."
-"This is a required option","Esta é uma opção necessária"
-"This product no longer exists.","Este produto não existe mais."
-"This search no longer exists.","Esta pesquisa não existe mais."
-"This setting will be applied when all prices in the specific price interval are equal.","Essa configuração será aplicada quando todos os preços no intervalo de preços especÃfico forem iguais."
-"Tier Pricing","Preços por NÃvel"
-"Tile","Empilhar"
-"Time Format","Formato de Tempo"
-"Title","TÃtulo"
-"To reindex the enabled product(s), the store or product must be specified","Para reindexar o(s) produto(s) ativado(s), a loja ou o(s) produto(s) deve(m) ser especificado(s)"
-"To see product price, add this item to your cart. You can always remove it later.","Para ver o preço do produto, adicione este item ao seu carrinho. Você pode sempre removê-lo mais tarde."
-"Top/Left","Topo/Esquerdo"
-"Top/Right","Topo/Direita"
-"Total Quantity Base Items","Qtde Base Total de Itens"
-"Total incl. Tax: %1$s","Total incl. Taxas: %1$s"
-"Total of %d record(s) have been deleted.","No total %d registro(s) foi(foram) excluÃdo(s)."
-"Total of %d record(s) have been updated.","Total de %d registro(s) foram atualizados."
-"Total of %d record(s) were updated","Total de %d registro(s) foram atualizados"
-"Type","Tipo"
-"URL Rewrite Management","Gestão Reescrita de URL"
-"Unable to complete this request.","Não é possÃvel concluir este pedido."
-"Unable to find a search term to delete.","Não é possÃvel encontrar um termo de pesquisa para excluir."
-"Unable to find an attribute to delete.","Incapaz de encontrar um atributo a ser excluÃdo."
-"Unable to get the product ID.","Não é possÃvel obter o ID do produto."
-"Unassigned Attributes","Atributos Não AtribuÃdos"
-"Unknown EAV indexer type ""%s"".","Tipo de indexador EAV ""%s"" desconhecido."
-"Unknown attribute: %s.","Atributo desconhecido: %s."
-"Unsupported product type ""%s"".","Não há suporte para tipo de produto ""%s""."
-"Up-sells","Vendas Extras"
-"Update","Atualizar"
-"Update Attributes","Atualização de Atributos"
-"Update Tier Price","Atualização de Preço por NÃvel"
-"Update assigned product","Atualização do produto designado"
-"Update attribute","Atualizar atributo"
-"Update attributes","Atualizar atributos"
-"Update category","Atualizar categoria"
-"Update custom option of product","Atualizar opção customizada de produto"
-"Update product","Atualizar produto"
-"Update product image","Atualização da imagem do produto"
-"Update product link","Atualização do link do produto"
-"Update product tier prices","Atualização dos preços do nÃvel do produto"
-"Update value of custom option","Atualizar valor de opção personalizada"
-"Upload new product image ","Carregar nova imagem do produto"
-"Use Canonical Link Meta Tag For Categories","Use Meta Marca de Link Canônico Para as Categorias"
-"Use Canonical Link Meta Tag For Products","Use Meta Marca Link Canônico Para Produtos"
-"Use Categories Path for Product URLs","Use Caminho de Categorias para URLs de Produto"
-"Use Config Settings","Utilizar opções de configuração"
-"Use Default Value","Utilizar valor padrão"
-"Use Flat Catalog Category","Use Categoria de Catálogo Base"
-"Use Flat Catalog Product","Use Produto de Catálogo Base"
-"Use In Layered Navigation","Use em Navegação em Camadas"
-"Use In Search Results Layered Navigation","Use Em Resultados de Pesquisa de Navegação em Camadas"
-"Use JavaScript Calendar","Use Calendário JavaScript"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","Use URLs Estáticos para Conteúdo MÃdia em WYSIWYG para Catálogo"
-"Use Tree Like Category Sitemap","Use Categoria Mapa do Site Como Ãrvore"
-"Use config","Use config"
-"Use default","Use padrão"
-"Use for Promo Rule Conditions","Use para as Condições de Regras de Promoção"
-"Use four-digit year format.","Use formato de ano de quatro dÃgitos."
-"Use in Advanced Search","Use em Busca Avançada"
-"Use in Layered Navigation","Use em Navegação em Camadas"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","Use em Navegação em Camadas<br/>(Pode ser usado apenas com o tipo de catálogo de entrada ""Suspenso"", ""Dropdown"")"
-"Use in Quick Search","Use em Busca Rápida"
-"Used for Sorting in Product Listing","Usado ​​para Classificar na Lista de Produtos"
-"Used in Product Listing","Usado na Lista de Produtos"
-"Value for ""%s"" is invalid.","Valor para ""%s"" é inválido."
-"Value for ""%s"" is invalid: %s","Valor para ""%s"" é inválido: %s"
-"Varchar","Varchar"
-"View as","Ver como"
-"Virtual Product","Produto Virtual"
-"Visibility","Visibilidade"
-"Visible","VisÃvel"
-"Visible on Catalog Pages on Front-end","VisÃvel em Páginas de Catálogo em Front-end"
-"Visible on Product View Page on Front-end","VisÃvel na Página de Visão do Produto no Front-end"
-"WYSIWYG Editor","Editor WYSIWYG"
-"Watermark","Marca d'água"
-"Watermark Default Size","Tamanho Pedifinido de Marca D'Ãgua"
-"Watermark Opacity, Percent","Opacidade da Marca d'água, Percentagem"
-"Watermark Position","Posição da Marca d'água"
-"Website","Website"
-"Website Item Must be checked","Item do Site Deve ser Verificado"
-"Website Store Must be checked","Site da Loja Deve ser verificado"
-"Websites","Sites"
+"Product Alerts","Alertas de Produto"
+"Can be Divided into Multiple Boxes for Shipping","Pode ser dividido em várias caixas para envio"
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price","Clique para o preço"
"What's this?","O que é isso?"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Se é para mostrar a opção ""Todos"" na listagem ""Mostrar X Por Página""."
-"Will make search for the query above return results for this search.","Fará com que a pesquisa pela consulta acima gere resultados para esta pesquisa."
-"Wrong BuyRequest instance in options group.","Instância BuyRequest errada no grupo de opções."
-"Wrong configuration item instance in options group.","Instância de configuração errada de item no grupo de opções."
-"Wrong configuration item option instance in options group.","Instância de opção de configuração de item errada no grupo de opções."
-"Wrong option instance type in options group.","Tipo de instância de opção errada no grupo de opções."
-"Wrong option type to get group instance.","Tipo de opção errado para obter instância de grupo."
-"Wrong product instance type in options group.","Tipo de instância de produtos errada no grupo de opções."
-"Wrong product type filter specified","Tipo de filtro de produto especificado errado"
-"Year Range","Intervalo de Ano"
-"Yes","Sim"
-"You cannot remove system attribute from this set.","Você não pode remover atributo de sistema a partir deste conjunto."
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,cada
+and,e
+save,salvar
+"Actual Price","Preço Real"
+"Shop By","Comprar Por"
+"Shopping Options","Opções de Compra"
+"Compare Products","Comparar Produtos"
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page","Imprimir Esta Página"
+"Remove Product","Remove Product"
+"Add to Wishlist","Adicionar à Lista de Desejos"
"You have no items to compare.","Você não tem itens para comparar."
+"Are you sure you would like to remove this item from the compare products?","Tem certeza de que deseja remover este item dos produtos comparados?"
+"Are you sure you would like to remove all products from your comparison?","Tem certeza de que gostaria de remover todos os produtos de sua comparação?"
+"Remove This Item","Remover Este Item"
+Compare,Comparar
+"Clear All","Limpar Todos"
+Prev,Prev
+"There are no products matching the selection.","Não há produtos que correspondam à seleção."
+"Add to Compare","Adicionar para Comparar"
+"Learn More","Saiba Mais"
"You may also be interested in the following product(s)","Você também pode se interessar no(s) seguinte(s) produto(s)"
-"Zoom In","Aumentar"
-"Zoom Out","Diminuir o Zoom"
-"and","e"
-"and above","e acima"
-"categories","categorias"
-"each","cada"
-"ex. http://domain.com","ex. http://domÃnio.com"
-"leave blank if its not an image","deixe em branco se não for uma imagem"
-"per page","por página"
-"products","produtos"
-"px.","px."
-"save","salvar"
+"More Choices:","More Choices:"
+"New Products","Novos Produtos"
+"Check items to add to the cart or","Verificar itens a ser adicionados ao carrinho ou"
"select all","marcar todos"
+"View as","Ver como"
+"Sort By","Classificar Por"
+"Set Ascending Direction","Ajustar Direção como Crescente"
+"Set Descending Direction","Ajustar Direção como Decrescente"
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Mostrar
+"Additional Information","Informações Adicionais"
+"More Views","Mais Visualizações"
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend","Enviar por e-mail a um amigo"
+Details,Detalhes
+Template,Modelo
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Por favor adicione linhas à opção."
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
"unselect all","desmarcar todos"
-"x","x"
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text","Texto âncora personalizado"
+"Anchor Custom Title","TÃtulo âncora personalizado"
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
+"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
+"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
+"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
+"Products per Page on List Default Value","Products per Page on List Default Value"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
+"Search Engine Optimizations","Search Engine Optimizations"
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
+"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
+"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
+"Use JavaScript Calendar","Use JavaScript Calendar"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
+"Watermark Default Size","Watermark Default Size"
+"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
+"Watermark Position","Watermark Position"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data","Dados Base de Produto"
+"Reorganize EAV product structure to flat structure","Reorganizar estrutura EAV de produto como estrutura simplificada"
+"Category Flat Data","Dados da Categoria Base"
+"Reorganize EAV category structure to flat structure","Reorganizar estrutura de categorias EAV como estrutura simplificada"
+"Indexed category/products association","Associação de categoria/produtos indexados"
+"Product Categories","Categoria de Produtos"
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices","Preços de produtos de Ãndice"
+"Catalog New Products List","Lista de Novos Produtos de Catálogo"
+"List of Products that are set as New","Lista de Produtos definidos como Novos"
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display","Número de Produtos a Ser Exibidos"
+"New Products Grid Template","Modelo de Nova Rede de Produtos"
+"New Products List Template","Modelo para Lista de Novos Produtos"
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)","Tempo de Vida de Cache (Segundos)"
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link","Link do Produto de Catálogo"
+"Link to a Specified Product","Link para um Produto Especificado"
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template","Modelo para Link de Produto: Bloco Autônomo"
+"Product Link Inline Template","Modelo para Link de Produto: Fluxo sem Quebra"
+"Catalog Category Link","Link da Categoria de Catálogo"
+"Link to a Specified Category","Link para uma Categoria Especificada"
+"If empty, the Category Name will be used","Se deixado em branco, será usado o Nome da Categoria."
+"Category Link Block Template","Modelo de Categoria de Blocos de Ligação"
+"Category Link Inline Template","Modelo de Categoria de Ligação Em Linha"
+Set,"Ajustar Nome"
+none,none
+Overview,Overview
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
diff --git a/app/code/Magento/Catalog/i18n/zh_CN.csv b/app/code/Magento/Catalog/i18n/zh_CN.csv
index 02cb740b1d8..117d5863497 100644
--- a/app/code/Magento/Catalog/i18n/zh_CN.csv
+++ b/app/code/Magento/Catalog/i18n/zh_CN.csv
@@ -1,801 +1,639 @@
-"Uses","# 使用"
-"%1$s incl tax.","%1$s å«ç¨Žã€‚"
-"%s - %s","%s - %s"
-"%s Item(s)","%s 个项目"
-"%s and above","%s åŠä»¥ä¸Š"
-"(%d)","(%d)"
-"(Copy data from: %s)","（å¤åˆ¶æ•°æ®è‡ªï¼š%s）"
-"* Required Fields","*å¿…è¦å—段"
+All,全部
+None,æ—
+"Are you sure?",您是å¦ç¡®è®¤ï¼Ÿ
+Cancel,å–消
+Back,返回
+Product,产å“å
+Price,ä»·æ ¼
+Quantity,æ•°é‡
+Products,产å“
+ID,"äº§å“ ID"
+SKU,SKU
+No,å¦
+Qty,Qty
+Action,æ“作
+Reset,é‡ç½®çŠ¶æ€
+Edit,编辑
+"Add to Cart",æ·»åŠ åˆ°è´ç‰©è½¦
+"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
+"First Name",åå—
+"Last Name",姓æ°
+Email,电å邮件
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use Default","Use Default"
+Delete,åˆ é™¤
+Save,ä¿å˜
+Store,商店
"-- Please Select --","-- 请选择 --"
-"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","如果没有设置，则默认值为 86400。è¦ç«‹å³åˆ·æ–°ï¼Œè¯·æ¸…空å—状 HTML 输出缓å˜ã€‚"
-"<strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.","<strong style=""color:red"">è¦å‘Šï¼</strong> 默认应用 MAP 将在å‰ç«¯éšè—所有产å“çš„ä»·æ ¼ã€‚"
-"A group with the same name already exists.","以åŒæ ·å称命å的群组已å˜åœ¨ã€‚"
-"A name is required","需è¦è®¾ç½®å称"
-"A product type is not defined for the indexer.","索引器ä¸äº§å“类型未定义。"
-"ALL GROUPS","所有群组"
-"AM","AM"
-"Action","æ“作"
-"Actual Price","å®žé™…ä»·æ ¼"
-"Add","æ·»åŠ "
-"Add Attribute","æ·»åŠ å±žæ€§"
-"Add Design Change","æ·»åŠ è®¾è®¡å˜æ›´"
-"Add Group","æ·»åŠ ç¾¤ç»„"
-"Add Group Price","æ·»åŠ ç»„ä»·æ ¼"
-"Add New","æ·»åŠ æ–°å†…å®¹"
-"Add New Attribute","æ·»åŠ æ–°å±žæ€§"
-"Add New Attribute Set","æ·»åŠ æ–°å±žæ€§é›†"
-"Add New Group","æ·»åŠ æ–°ç¾¤ç»„"
-"Add New Images","æ·»åŠ æ–°å›¾åƒ"
-"Add New Option","æ·»åŠ æ–°é€‰é¡¹"
-"Add New Row","æ·»åŠ æ–°è¡Œ"
-"Add New Search Term","æ·»åŠ æ–°çš„æœç´¢æ¡ä»¶"
-"Add New Set","æ·»åŠ æ–°é›†"
-"Add Product","æ·»åŠ äº§å“"
-"Add Product To Websites","æ·»åŠ äº§å“到网站"
-"Add Root Category","æ·»åŠ æ ¹åˆ†ç±»"
-"Add Subcategory","æ·»åŠ å分类"
-"Add Tax","æ·»åŠ ç¨Žé‡‘"
-"Add Tier","æ·»åŠ å±‚"
-"Add attribute into attribute set","å°†å±žæ€§åŠ å…¥å±žæ€§é›†"
-"Add group into attribute set","å°†ç»„åŠ å…¥å±žæ€§é›†"
-"Add new custom option into product","æ·»åŠ æ–°è‡ªå®šä¹‰é€‰é¡¹åˆ°äº§å“"
-"Add new values into custom option","æ·»åŠ æ–°å€¼åˆ°è‡ªå®šä¹‰é€‰é¡¹"
-"Add option","æ·»åŠ é€‰é¡¹"
-"Add to Cart","æ·»åŠ åˆ°è´ç‰©è½¦"
-"Add to Compare","æ·»åŠ å¹¶æ¯”è¾ƒ"
-"Add to Wishlist","æ·»åŠ åˆ°æ”¶è—"
-"Additional Information","é¢å¤–ä¿¡æ¯"
-"Alert Urls","è¦æŠ¥URL"
-"All","全部"
-"All Product Types","所有产å“类型"
-"All Websites","所有网站"
-"All products of this set will be deleted! Are you sure you want to delete this attribute set?","该集åˆçš„所有产å“éƒ½å°†è¢«åˆ é™¤ï¼æ‚¨æ˜¯å¦ç¡®è®¤è¦åˆ 除该属性集？"
-"Allow All Products per Page","æ¯é¡µé¢å…许显示的所有产å“"
-"Allow Dynamic Media URLs in Products and Categories","在产å“和分类ä¸å…许使用动æ€åª’体URL"
-"Allow HTML Tags on Frontend","å…许在å‰ç«¯ä½¿ç”¨HTMLæ ‡ç¾"
-"Allowed File Extensions","å…许的文件扩展"
-"Allowed file extensions to upload","å…è®¸ä¸Šä¼ çš„æ–‡ä»¶æ‰©å±•"
-"Amount","æ•°é‡"
-"An error occurred while adding products to websites.","æ·»åŠ äº§å“到网站时å‘生错误。"
-"An error occurred while clearing comparison list.","清除对照表时å‘生错误。"
-"An error occurred while removing products from websites.","从网站移除产å“æ—¶å‘生错误。"
-"An error occurred while saving the URL rewrite","ä¿å˜é‡å†™çš„URLæ—¶å‘生错误。"
-"An error occurred while saving the attribute set.","ä¿å˜å±žæ€§é›†æ—¶å‘生错误。"
-"An error occurred while saving the collection, aborting. Error message: %s","ä¿å˜é›†åˆæ—¶å‡ºé”™ï¼Œæ£åœ¨å¿½ç•¥ã€‚错误信æ¯ï¼š%s"
-"An error occurred while saving the product. ","ä¿å˜äº§å“æ—¶å‘生错误。"
-"An error occurred while saving the search query.","ä¿å˜æœç´¢æŸ¥è¯¢æ—¶å‘生错误。"
-"An error occurred while saving this group.","ä¿å˜è¿™ä¸ªåˆ†ç»„æ—¶å‘生错误。"
-"An error occurred while trying to delete the category.","åˆ é™¤è¯¥ç±»åˆ«æ—¶å‘生错误。"
-"An error occurred while updating the product(s) attributes.","更新产å“属性时å‘生错误。"
-"An error occurred while updating the product(s) status.","更新产å“状æ€æ—¶å‘生错误。"
-"An invalid group ID is specified, skipping the record.","指定的组IDæ— æ•ˆï¼Œè·³è¿‡è®°å½•ã€‚"
-"An invalid option ID is specified for %s (%s), skipping the record.","%s (%s)ä¸ºæ— æ•ˆçš„é€‰é¡¹ID，跳过æ¤è®°å½•ã€‚"
-"An invalid store was specified.","æŒ‡å®šäº†ä¸€ä¸ªæ— æ•ˆçš„å˜å‚¨ã€‚"
-"Anchor Custom Text","自定义文本锚点"
-"Anchor Custom Title","è‡ªå®šä¹‰æ ‡é¢˜é”šç‚¹"
-"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","åªé€‚用于产å“目录和类别。任何媒体内容将被æ’入到一个é™æ€çš„URL编辑器。如果系统é…置基础的URL更改了，它也ä¸ä¼šéšä¹‹æ›´æ–°ã€‚"
-"Apply MAP (Default Value)","MAP应用（预设值）"
-"Apply To","应用给"
-"Approved","已批准"
-"Are you sure you want to delete this category?","ä½ ç¡®å®šè¦åˆ 除æ¤ç±»åˆ«ï¼Ÿ"
-"Are you sure you would like to remove all products from your comparison?","ä½ ç¡®å®šè¦æ˜¯åˆ 除所有对比的产å“？"
-"Are you sure you would like to remove this item from the compare products?","ä½ ç¡®å®šè¦ä»Žå¯¹æ¯”产å“ä¸åˆ 除这个项目？"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"As low as:","低至："
-"Assign","ã€åˆ†é…"
-"Assign product link","分é…的产å“链接"
-"Assign product to category","分é…产å“到分类"
-"Assigned Products","分é…的产å“"
-"Associated Products","相关的产å“"
-"Attribute Set","属性。 设置å称"
-"Attribute ""%s"" is invalid.","属性 “%sâ€ æ— æ•ˆã€‚"
-"Attribute ""%s"" is required.","属性 ""%s"" 是必须的。"
-"Attribute Information","属性信æ¯"
-"Attribute Model","属性模型"
-"Attribute Name:","属性å："
-"Attribute Set","属性集"
-"Attribute Sets","属性集"
-"Attribute add","æ·»åŠ çš„å±žæ€§"
-"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","属性代ç æ— æ•ˆã€‚åœ¨è¯¥å—段ä¸è¯·åªä½¿ç”¨å—æ¯ï¼ˆa-z）ã€æ•°å—（0-9），或下划线（_），第一个å—符必须是å—æ¯ã€‚"
-"Attribute group with the \/name/\ name already exists","使用该\/name/\ å称的属性组已ç»å˜åœ¨ã€‚"
-"Attribute remove","åˆ é™¤å±žæ€§"
-"Attribute with the same code already exists","使用相åŒä»£ç 的属性已å˜åœ¨"
-"Attributes","属性"
-"Attrribute names can be specified per store.","属性åå¯æ˜¯æ¯åº—铺专用的。"
-"Autogenerate","自动生æˆ"
-"Availability:","å¯ç”¨æ€§ï¼š"
-"Back","返回"
-"Backend Model","åŽç«¯æ¨¡å¼"
-"Backend Table","åŽç«¯è¡¨æ ¼"
-"Backend Table Title","åŽç«¯è¡¨æ ¼æ ‡é¢˜"
-"Backorders","缺货"
-"Based On","基于"
-"Before Order Confirmation","在订å•ç¡®è®¤ä¹‹å‰"
-"Block after Info Column","ä¿¡æ¯æ 之åŽé˜»æ¢"
-"Bottom Block Options Wrapper","底部阻æ¢é€‰é¡¹åŒ…装"
-"Bottom/Left","底部/左侧"
-"Bottom/Right","底部/å³ä¾§"
-"Browse By","æµè§ˆè€…："
-"Bundle Items","æ†ç»‘项"
-"Buy %1$s","è´ä¹° %1$s"
-"Buy %1$s for","è´ä¹° %1$s："
-"Buy %1$s for %2$s","为 %2$s è´ä¹° %1$s"
-"Buy %1$s for %2$s (%3$s incl. tax) each","ä¸ºæ¯ %2$s（%3$s å«ç¨Žï¼‰è´ä¹° %1$s"
-"Buy %1$s for %2$s each","ä¸ºæ¯ %2$s è´ä¹° %1$s"
-"Cache Lifetime (Seconds)","缓å˜ç”Ÿå˜æ—¶é—´ï¼ˆç§’）"
-"Cache refresh needed.","需è¦åˆ·æ–°ç¼“å˜ã€‚"
-"Can be Divided into Multiple Boxes for Shipping","å¯æ‹†åˆ†ä¸ºå¤šä¸ªç®±å‘è´§"
-"Can be used only with catalog input type Dropdown","ä»…å¯ç”¨äºŽç±»åˆ«è¾“入类型 下拉"
-"Can be used only with catalog input type Dropdown, Multiple Select and Price","ä»…å¯ç”¨äºŽç±»åˆ«è¾“入类型　下拉ã€å¤šé€‰å’Œä»·æ ¼"
-"Can't create image.","æ— æ³•åˆ›å»ºå›¾ç‰‡ã€‚"
-"Cancel","å–消"
-"Cannot create image.","æ— æ³•åˆ›å»ºå›¾ç‰‡ã€‚"
-"Cannot create writeable directory '%s'.","æ— æ³•åˆ›å»ºå¯å†™çš„目录 '%s'。"
-"Cart Item Attribute","è´ç‰©è½¦é¡¹ç›®å±žæ€§"
-"Catalog","分类"
-"Catalog Category (Anchor)","分类类别（固定）"
-"Catalog Category (Non-Anchor)","分类类别（ä¸å›ºå®šï¼‰"
-"Catalog Category Link","分类类别链接"
-"Catalog New Products List","分类新产å“列表"
-"Catalog Price Scope","åˆ†ç±»ä»·æ ¼èŒƒå›´"
-"Catalog Product Compare List","分类产å“比较列表"
-"Catalog Product Email to a Friend","将分类产å“用邮件å‘é€ç»™æœ‹å‹"
-"Catalog Product Image Gallery Popup","分类产å“图åƒåº“弹出窗å£"
-"Catalog Product Link","分类产å“链接"
-"Catalog Product View (Any)","分类产å“视图（任æ„）"
-"Catalog Product View (Simple)","分类产å“视图（简å•ï¼‰"
-"Catalog Product View (Virtual)","分类产å“视图（虚拟）"
-"Catalog Section","分类选择"
-"Catalog Seo Popular Search Terms","分类SEOæµè¡Œçš„æœç´¢æ¡ä»¶"
-"Catalog Seo Sitemap (Category List)","分类SEO站点结构图（分类列表）"
-"Catalog Seo Sitemap (Category Tree)","分类SEOç«™ç‚¹ç»“æž„å›¾ï¼ˆåˆ†ç±»æ ‘ï¼‰"
-"Catalog Seo Sitemap (Common)","分类SEO站点结构图（常用）"
-"Catalog Seo Sitemap (Product List)","分类SEO站点结构图（产å“列表）"
-"Catalog URL Rewrites","分类URLé‡å†™"
-"Catalog product custom option values API","编录产å“自定义选项值 API"
-"Catalog product custom options API","编录产å“自定义选项 API"
-"Catalog, Search","分类，æœç´¢"
-"Categories","分类"
-"Categories Sitemap","分类站点结构图"
-"Category","分类"
-"Category API","分类API"
-"Category Data","分类数æ®"
-"Category Flat Data","分类平å¦æ•°æ®"
-"Category Link Block Template","分类链接å—模æ¿"
-"Category Link Inline Template","分类链接内è”摸æ¿"
-"Category Products","分类产å“"
-"Category Top Navigation","分类顶部导航"
-"Category URL Suffix","分类 URL åŽç¼€"
-"Category attributes API","分类属性 API"
-"Category move error","分类移动错误"
-"Category move operation is not possible: parent category is equal to child category.","æ— æ³•è¿›è¡Œåˆ†ç±»ç§»åŠ¨æ“作：æ¯ç±»åˆ«ä¸Žå类别相åŒã€‚"
-"Category move operation is not possible: the current category was not found.","æ— æ³•è¿›è¡Œåˆ†ç±»ç§»åŠ¨æ“ä½œï¼šæ— æ³•æ‰¾åˆ°å½“å‰ç±»åˆ«ã€‚"
-"Category move operation is not possible: the new parent category was not found.","æ— æ³•è¿›è¡Œåˆ†ç±»ç§»åŠ¨æ“ä½œï¼šæ— æ³•æ‰¾åˆ°æ–°çš„æ¯ç±»åˆ«ã€‚"
-"Category must be an instance of \Magento\Catalog\Model\Category.","分类必须为 \Magento\Catalog\Model\Category 的一个实例。"
-"Center","ä¸å¿ƒ"
-"Change","更改"
-"Change or Retrieve attribute store view","更改或å–回属性商店视图"
-"Change status","更改状æ€"
-"Check items to add to the cart or","检查è¦åŠ å…¥è´ç‰©è½¦çš„内容"
-"Choose an Option...","选择选项..."
-"Clear All","清除全部"
-"Clear Price","æ¸…é™¤ä»·æ ¼"
-"Click for price","å•å‡»èŽ·å–ä»·æ ¼"
-"Close Window","å…³é—窗å£"
-"Collapse All","折å 全部"
-"Comma-separated.","逗å·åˆ†éš”。"
-"Comparable","å¯æ¯”较"
-"Comparable on Front-end","å‰ç«¯å¯æ¯”较"
-"Comparable on the Frontend","å‰ç«¯å¯æ¯”较"
-"Compare","比较"
-"Compare Products","比较产å“"
-"Conditions Combination","æ¡ä»¶ç»„åˆ"
-"Continue","继ç»"
-"Country/State","国家/州"
-"Create","创建"
-"Create (Upload)","åˆ›å»ºï¼ˆä¸Šä¼ ï¼‰"
-"Create Empty","创建空的"
-"Create Permanent Redirect for URLs if URL Key Changed","如果 URL 键有å˜åŠ¨ï¼Œä¸ºè¯¥ URL 创建永久é‡å®šå‘"
-"Create Permanent Redirect for old URL","为è€URL创建永久é‡å®šå‘"
-"Create Product Settings","创建产å“设置"
-"Create Simple Associated Product","创建简å•çš„å…³è”产å“"
-"Create attribute set based on another set","æ ¹æ®å¦ä¸€ä¸ªé›†åˆ›å»ºå±žæ€§é›†"
-"Create new attribute","创建新属性"
-"Create new category","创建新分类"
-"Create new product","创建新产å“"
-"Cross-sells","交å‰é”€å”®"
-"Currently Shopping by:","ç›®å‰çš„è´ç‰©è€…："
-"Custom Design","自定义设计"
-"Custom Options","自定义选项"
-"Custom options","自定义选项"
-"Customer Group","客户组"
-"Customers Tagged Product","å®¢æˆ·æ ‡è®°çš„äº§å“"
-"Data Type for Saving in Database","è¦ä¿å˜åœ¨æ•°æ®åº“ä¸çš„æ•°æ®ç±»åž‹"
-"Date & Time Custom Options","日期和时间自定义选项"
-"Date Fields Order","日期å—段顺åº"
-"Subscribe Date","订阅日期"
-"Datetime","日期时间"
-"Decimal","å进制"
-"Declare attribute value saving scope","声明属性值ä¿å˜èŒƒå›´"
-"Default ""What's This"" Text Message","默认“这是什么†文å—ä¿¡æ¯"
-"Default Popup Text Message","默认弹出窗å£æ–‡å—ä¿¡æ¯"
-"Default Price","é»˜è®¤ä»·æ ¼"
-"Default Price Navigation Step","é»˜è®¤ä»·æ ¼å¯¼èˆªæ¥éª¤"
-"Default Quantity","默认数é‡"
-"Default Values","默认值"
-"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","定义基准å¸ç§èŒƒå›´ (""å¸ç§è®¾ç½®"" > ""å¸ç§é€‰é¡¹"" > ""基准å¸ç§"")。"
-"Delete","åˆ é™¤"
-"Delete Attribute","åˆ é™¤å±žæ€§"
-"Delete Attribute Set","åˆ é™¤å±žæ€§é›†"
-"Delete Category","åˆ é™¤åˆ†ç±»"
-"Delete Group Price","åˆ é™¤ç»„ä»·æ ¼"
-"Delete Option","åˆ é™¤é€‰é¡¹"
-"Delete Row","åˆ é™¤è¡Œ"
-"Delete Search","åˆ é™¤æœç´¢"
-"Delete Selected Group","åˆ é™¤æ‰€é€‰ç»„"
-"Delete Tier","åˆ é™¤å±‚"
-"Delete attribute","åˆ é™¤å±žæ€§"
-"Delete category","åˆ é™¤åˆ†ç±»"
-"Delete product","åˆ é™¤äº§å“"
-"Depends on design theme","å–决于设计主题"
-"Design","设计"
-"Details","详情"
-"Disabled","å·²ç¦ç”¨"
-"Disallowed file type.","ä¸å…许的文件类型。"
-"Display Actual Price","æ˜¾ç¤ºå®žé™…ä»·æ ¼"
-"Display Price Interval as One Price","å°†ä»·æ ¼é—´éš”æ˜¾ç¤ºä¸ºä¸€ä¸ªä»·æ ¼"
-"Display Product Count","显示产å“æ•°é‡"
-"Display in Suggested Terms","显示建议的æœç´¢æ¡ä»¶"
-"Double click on a group to rename it","åŒå‡»ç»„å³å¯æ›´å"
-"Double click on above image to view full picture","åŒå‡»ä¸Šè¿°å›¾ç‰‡å³å¯æŸ¥çœ‹å®Œæ•´å¤§å°"
-"Downloadable Information","å¯ä¸‹è½½çš„ä¿¡æ¯"
-"Duplicate","副本"
-"Duplicate amount found.","找到的副本数é‡"
-"Duplicate website group price customer group.","é‡å¤ç½‘ç«™ 团体价 客户群。"
-"Duplicate website tier price customer group and quantity.","å‰¯æœ¬ç½‘ç«™å±‚ä»·æ ¼å®¢æˆ·åˆ†ç»„å’Œæ•°é‡ã€‚"
-"Duplicate website, country and state tax found.","找到副本网站ã€å›½å®¶ï¼Œä»¥åŠå·žç¨ŽçŽ‡ã€‚"
-"E.g. {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","例如， {{media url=""path/to/image.jpg""}} {{view url=""path/to/picture.gif""}}。动æ€æŒ‡ä»¤è§£æžå°†å½±å“到分类的性能。"
-"Edit","编辑"
-"Edit Attribute Set '%s'","编辑属性集 '%s'"
-"Edit Product Attribute","编辑产å“属性"
-"Edit Product Attribute ""%s""","编辑产å“属性 ""%s"""
-"Edit Search","编辑æœç´¢"
-"Edit Search '%s'","编辑æœç´¢ '%s'"
-"Edit Set Name","编辑集å称"
-"Email","电å邮件"
-"Email to a Friend","给朋å‹å‘邮件"
-"Empty","空"
-"Enable MAP","å¯ç”¨æ˜ å°„"
-"Enable Quantity Increments","å¯ç”¨æ•°é‡å¢žé‡"
-"Enable WYSIWYG","å¯ç”¨æ‰€è§å³æ‰€å¾—"
-"Enabled","å·²å¯ç”¨"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType","实体类型模å—必须为\Magento\CatalogImportExport\Model\ImportExport\Export\Product\Type\AbstractType的实例"
-"Entity type model must be an instance of \Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType","实体类型模å—必须为\Magento\CatalogImportExport\Model\ImportExport\Import\Product\Type\AbstractType的实例"
-"Error during retrieval of option value: %s","获å–选项值 %s的过程ä¸å‡ºé”™"
-"Exclude","排除"
-"Expand All","全部展开"
-"Failed","已失败"
-"Failed to copy file %s. Please, delete media with non-existing images and try again.","文件 %s å¤åˆ¶å¤±è´¥ã€‚è¯·åˆ é™¤ä¸Žä¸å˜åœ¨å›¾åƒæœ‰å…³çš„媒体，然åŽé‡è¯•ã€‚"
-"Failed to move file: %s","移动文件 %s 失败"
-"Feature Products","主è¦äº§å“"
-"Field is not complete","å—段ä¸å®Œæ•´"
-"File options format is not valid.","æ–‡ä»¶é€‰é¡¹æ ¼å¼æ— 效"
-"File upload failed","æ–‡ä»¶ä¸Šä¼ å¤±è´¥"
-"Filter model name must be declared.","ç›é€‰å™¨æ¨¡å¼å称必须声明。"
-"Filter must be an object. Please set correct filter.","ç›é€‰å™¨å¿…须是对象。请设置æ£ç¡®çš„ç›é€‰å™¨ã€‚"
-"Filterable (no results)","å¯ç›é€‰ï¼ˆæ— 结果）"
-"Filterable (with results)","å¯ç›é€‰ï¼ˆæœ‰ç»“果）"
-"First Name","åå—"
-"Fixed","固定"
-"For internal use.","é™å†…部使用。"
-"For the last time placed.","上次的置入"
-"Frontend","å‰ç«¯"
-"Frontend Model","å‰ç«¯æ¨¡å¼"
-"Frontend Properties","å‰ç«¯å±žæ€§"
-"Gallery","画廊"
-"General Information","常规信æ¯"
-"Get full information about attribute with list of options","通过选项列表, 获å–有关属性的完整信æ¯"
-"Get full information about custom option in product","获å–产å“ä¸è‡ªå®šä¹‰é€‰é¡¹çš„完整信æ¯"
-"Get list of available custom option types","获å–å¯ç”¨è‡ªå®šä¹‰é€‰é¡¹ç±»åž‹åˆ—表"
-"Get list of non-default attributes by product type and attributes set","按产å“类型和属性设置获å–éžé»˜è®¤å±žæ€§åˆ—表"
-"Get list of possible attribute types","获å–å¯èƒ½çš„属性类型列表"
-"Get special price","获å–ç‰¹æƒ ä»·æ ¼"
-"Global","å…¨çƒ"
-"Globally Editable","å…¨çƒèŒƒå›´å†…å¯ç¼–辑"
-"Go to Home Page","å‰å¾€ä¸»é¡µ"
-"Grid","ç½‘æ ¼"
-"Group add","ç»„æ·»åŠ "
-"Group remove","ç»„åˆ é™¤"
-"Groups","群组"
-"Home","主页"
-"ID","ID"
-"ID: %s","ID：%s"
-"If empty, the Category Name will be used","如果为空，则使用分类å称"
-"If empty, the Product will be used","如果为空，则使用产å“å称"
-"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","如果您ä¸ä¸ºç‰¹å®šå•†åº—视图指定一个选项值，则使用默认 (Admin) 值。"
-"Image","图案"
-"Image content is not valid base64 data.","å½±åƒå†…容ä¸æ˜¯æœ‰æ•ˆçš„ base64 æ•°æ®ã€‚"
-"Image does not exist.","图片ä¸å˜åœ¨ã€‚"
-"Image file was not found.","æ— æ³•æ‰¾åˆ°å›¾ç‰‡æ–‡ä»¶ã€‚"
-"Image type and information need to be specified for each store view.","需è¦ä¸ºæ¯ä¸ªå•†åº—视图指定图片类型和信æ¯ã€‚"
-"In Cart","è´ç‰©è½¦"
-"In Stock","有货"
-"In stock","现货"
-"Incl. Tax","å«ç¨Ž"
-"Index product and categories URL rewrites","索引产å“和类别 URL é‡å†™"
-"Index product attributes for layered navigation building","为分层导航建ç‘索引产å“属性"
-"Index product prices","索引产å“ä»·æ ¼"
-"Indexed category/products association","已索引的分类/产å“å…³è”"
-"Info","ä¿¡æ¯"
-"Info Column Options Wrapper","ä¿¡æ¯æ 选项包装"
-"Input Type","输入类型"
-"Integer","æ•´æ•°"
-"Interval Division Limit","区间划分é™åˆ¶"
-"Invalid Tier Prices","æ— æ•ˆçš„å±‚ä»·æ ¼"
-"Invalid attribute %s","æ— æ•ˆçš„å±žæ€§ %s"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","为属性 %s (%s) æŒ‡å®šçš„å±žæ€§é€‰é¡¹æ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid attribute set specified, skipping the record.","æŒ‡å®šçš„å±žæ€§é›†æ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid block: %s.","æ— æ•ˆçš„å—： %s。"
-"Invalid category IDs.","æ— æ•ˆåˆ†ç±»ID。"
-"Invalid category.","æ— æ•ˆçš„åˆ†ç±»ã€‚"
-"Invalid image file type.","æ— æ•ˆçš„å›¾åƒæ–‡ä»¶ç±»åž‹ã€‚"
-"Invalid image type.","æ— æ•ˆçš„å›¾åƒç±»åž‹ã€‚"
-"Invalid option ID specified for %s (%s), skipping the record.","为 %s (%s) 指定的选项IDæ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid product type specified, skipping the record.","指定的产å“ç±»åž‹æ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid store specified","æŒ‡å®šçš„åº—é“ºæ— æ•ˆ"
-"Invalid store specified, skipping the record.","æŒ‡å®šçš„åº—é“ºæ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid tier prices. The product is not associated to the requested website.","æ— æ•ˆå±‚ä»·æ ¼ã€‚è¯¥äº§å“ä¸Žæ‰€è¯·æ±‚çš„ç½‘ç«™æ— å…³è”。"
-"Inventory","盘点"
-"Is Default","为默认值"
-"Is Required","为必须"
-"Items %s to %s of %s total","项目 %s 到 %s 共 %s个"
-"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","您ä¸å¸Œæœ›æ˜¾ç¤ºåœ¨åˆ†ç±»æˆ–æœç´¢ç»“æžœä¸çš„å†…å®¹åº”åœ¨ç›®æ ‡åº—é“ºä¸è®¾ç½®'Disabled'状æ€ã€‚"
-"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","您ä¸å¸Œæœ›åœ¨åˆ†ç±»æˆ–æœç´¢ç»“æžœä¸æ˜¾ç¤ºçš„å†…å®¹åº”åœ¨ç›®æ ‡åº—é“ºä¸è®¾ç½®'Disabled'状æ€ã€‚"
-"Keep your eyes open for our special Back to School items and save A LOT!","ç大眼ç›æ‰¾åˆ°ç‰¹æ®Šçš„â€œè¿”æ ¡â€ é¡¹ç›®ï¼ŒèŽ·å¾—å¤§å®žæƒ ï¼"
-"Label","æ ‡ç¾"
-"Last Name","姓æ°"
-"Last Notified","最新通知"
-"Layered Navigation","分层导航"
-"Learn More","了解更多"
-"Line %d, Email: %s","第%行，邮箱：%"
-"Line %d, SKU: %s","行 %s， SKU：%s"
-"Link (Related, Up sell, Cross sell)","链接（相关，超售，交å‰é”€å”®ï¼‰"
-"Link product does not exist.","链接的产å“ä¸å˜åœ¨ã€‚"
-"Link to a Specified Category","链接到指定的分类"
-"Link to a Specified Product","链接到指定产å“"
-"List","列表"
-"List Mode","列表模å¼"
-"List of Products that are set as New","åå•è¢«å®šä¸ºæ–°äº§å“"
-"List of types","类型列表"
-"Manage Attribute Sets","管ç†å±žæ€§é›†"
-"Manage Attributes","管ç†å±žæ€§"
-"Manage Catalog Categories","管ç†åˆ†ç±»ç±»åˆ«"
-"Manage Categories","管ç†åˆ†ç±»"
-"Manage Label / Options","管ç†æ ‡ç¾/选项"
-"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
-"Manage Product Attributes","管ç†äº§å“属性"
-"Manage Product Sets","管ç†äº§å“设置"
-"Manage Products","管ç†äº§å“"
-"Manage Stock","库å˜ç®¡ç†"
-"Manage Titles (Size, Color, etc.)","管ç†å称（尺寸，颜色ç‰ï¼‰"
-"Max Characters","å—符数上é™"
-"Maximal Depth","最大深度"
-"Maximum Image Size","最大图åƒå¤§å°"
-"Maximum Number of Price Intervals","ä»·æ ¼é—´éš”æœ€å¤§æ•°é‡"
-"Maximum Quantity Allowed in Shopping Cart","è´ç‰©è½¦æ•°é‡ä¸Šé™"
-"Maximum allowed image size for '%s' is %sx%s px.","'%s' å…许的最大图åƒå°ºå¯¸ä¸º%sx%s åƒç´ 。"
-"Maximum image height","图片最大高度"
-"Maximum image width","图片最大宽度"
-"Maximum number of characters:","最大å—符数："
-"Maximum number of price intervals is 100","ä»·æ ¼é—´éš”çš„æœ€å¤§æ•°é‡ä¸º100"
-"Media Image","媒体图片"
-"Minimum Advertised Price","æœ€ä½Žå¹¿å‘Šä»·æ ¼"
-"Minimum Lines per Page","æ¯é¡µæœ€ä½Žè¡Œæ•°"
-"Minimum Quantity Allowed in Shopping Cart","è´ç‰©è½¦é‡Œå…许的最少数é‡"
-"Minimum Quantity for Item's Status to be Out of Stock","商å“状æ€çš„最å°æ•°é‡ä¸ºç¼ºè´§"
-"Missing SKU, skipping the record.","丢失SKU，æ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"More Views","更多视图"
-"Move","移动"
-"Move category in tree","åœ¨æ ‘ä¸ç§»åŠ¨åˆ†ç±»"
-"Must be in the allowed values list.","å¿…é¡»ä½äºŽå…许的值列表ä¸ã€‚"
-"N/A","N/A"
-"Name","姓å"
-"Name in %s","%sçš„å称"
-"New Product","新产å“"
-"New Product Attribute","新产å“属性"
-"New Products","新产å“"
-"New Products Grid Template","新产å“ç½‘æ ¼æ¨¡æ¿"
-"New Products List Template","新产å“列表模æ¿"
-"New Root Category","æ–°å»ºæ ¹ç±»åˆ«"
-"New Search","æ–°æœç´¢"
-"New Set Name","新集å称"
-"New Subcategory","新建å类别"
-"Next","下一个"
-"No","å¦"
-"No image","æ— å›¾ç‰‡"
-"No layout updates","æ— å¸ƒå±€æ›´æ–°"
-"No options of this product are available.","该产å“没有å¯ç”¨é€‰é¡¹ã€‚"
-"No product collections found.","未找到产å“集åˆã€‚"
-"None","æ— "
-"Not Visible Individually","æ— ç‹¬ç«‹å¯è§æ€§"
-"Notify Low Stock RSS","å˜è´§ä¸è¶³RSS通知"
-"Notify for Quantity Below","å˜é‡è¿‡ä½Žé€šçŸ¥"
-"Number of Products to Display","显示的产å“æ•°é‡"
-"Uses","用户数"
-"Number of results","结果的数é‡"
-"Number of results (For the last time placed)","结果的数é‡ï¼ˆä¸Šæ¬¡çš„置入）"
-"OK","确定"
-"OR","或"
-"Old Price:","原价："
-"On Gesture","手势"
-"Option validation failed to add product to cart.","æ·»åŠ äº§å“到è´ç‰©è½¦æ—¶é€‰é¡¹éªŒè¯å¤±è´¥ã€‚"
-"Option values","选项值"
-"Option:","选项："
-"Options","选项"
-"Options Control","选项控制"
-"Options is required","选项是必须的"
-"Our customer service is available 24/7. Call us at (555) 555-0123.","我们æ供全天候客户æœåŠ¡ã€‚请致电我们 (555) 555-0123。"
-"Out of Stock","æ— è´§"
-"Out of stock","缺货"
-"PM","PM"
-"Page Title Separator","页é¢æ ‡é¢˜åˆ†éš”器"
-"Parent Category","父分类"
-"Pending","挂起"
-"Percentage","百分率"
-"Please add rows to option.","è¯·æ·»åŠ é€‰é¡¹è¡Œã€‚"
-"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","请å°å¿ƒï¼Œä¸€æ—¦æ‚¨ç‚¹å‡»è¿™ä¸€è¡Œï¼Œå°±ä¼šä»Žæ‰€é€‰æ–‡ä»¶ä¸åŠ 载包裹数æ®ï¼Œæ‰€æœ‰æœªä¿å˜çš„æ•°æ®éƒ½å°†ä¸¢å¤±ã€‚"
-"Please click on the Close Window button if it is not closed automatically.","如果没有自动关é—，请点击关é—窗å£æŒ‰é’®ã€‚"
-"Please enter a new group name","请输入新组的å称"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","请在 系统 -> <a href=""%s"">索引管ç†</a>ä¸åˆ·æ–° ""类别 URL é‡å†™"" 与 ""产å“属性"""
-"Please select a static block ...","请选择一个é™æ€å—..."
-"Please select items.","请选择项目。"
-"Please select one or more attributes.","请选择一个或多个属性。"
-"Please select product(s).","请选择产å“。"
-"Please select products for attributes update","请选择è¦æ›´æ–°å±žæ€§çš„产å“"
-"Please set up merge date/time","请设置åˆå¹¶æ—¥æœŸ/时间"
-"Please set up merge date/time later then present date","请设置比当å‰æ—¶é—´æ™šçš„åˆå¹¶æ—¥æœŸ/时间"
-"Please specify date required option(s).","请指定日期需è¦çš„选项。"
-"Please specify the number of products, that will not be divided into subintervals.","请注明ä¸ä¼šè¢«åˆ’分æˆå区间的产å“çš„æ•°é‡ã€‚"
-"Please specify the product required option(s)","请指定产å“需è¦çš„选项"
-"Please specify the product required option(s).","请指定产å“需è¦çš„选项。"
-"Please specify the product's option(s).","请指定产å“的选项。"
-"Please specify the product's required option(s).","请指定产å“çš„å¿…è¦é€‰é¡¹ã€‚"
-"Please specify the quantity of product(s).","请指定产å“æ•°é‡ã€‚"
-"Please specify time required option(s).","请指定时间需è¦çš„选项。"
-"Please wait...","请ç¨å€™..."
-"Position","ä½ç½®"
-"Position in Layered Navigation","在层次å¼å¯¼èˆªä¸å®šä½"
-"Position of attribute in layered navigation block","分层导航区å—的属性ä½ç½®"
-"Prev","上一个"
-"Previous","上一个"
-"Price","ä»·æ ¼"
-"Price Navigation Step Calculation","ä»·æ ¼å¯¼èˆªæ¥éª¤è®¡ç®—"
-"Price Type","ä»·æ ¼ç±»åž‹"
-"Price is not available","ä»·æ ¼ä¸å¯ç”¨"
-"Price values for options should be specified in system base currency.","ä»·æ ¼æ•°å€¼é€‰é¡¹åº”å½“åœ¨ç³»ç»ŸåŸºç¡€æ±‡çŽ‡ä¸æŒ‡å®šã€‚"
-"Price:","ä»·æ ¼ï¼š"
-"Price: %s","ä»·æ ¼ï¼š%s"
-"Print This Page","打å°æœ¬é¡µé¢"
-"Product","产å“"
-"Product API","äº§å“ API"
-"Product Alerts","产å“è¦æŠ¥"
-"Product Attribute","产å“属性"
-"Product Attributes","产å“属性"
-"Product Categories","产å“分类"
-"Product Extra Info","产å“çš„é¢å¤–ä¿¡æ¯"
-"Product Flat Data","产å“å¹³å¦æ•°æ®"
-"ID","äº§å“ ID"
-"Product Image Placeholders","产å“图åƒå ä½ç¬¦"
-"Product Image Watermarks","产å“图åƒæ°´å°"
-"Product Images","产å“图åƒ"
-"Product Images API","产å“图片 API"
-"Product In Websites","网站ä¸çš„产å“"
-"Product Info Column","产å“ä¿¡æ¯æ "
-"Product Information","产å“ä¿¡æ¯"
-"Product Link Block Template","产å“链接区å—模æ¿"
-"Product Link Inline Template","产å“链接内è”模æ¿"
-"Product Listing Sort by","产å“列表排列顺åº"
-"Product","产å“å"
-"Product Prices","产å“ä»·æ ¼"
-"Product Tags","产å“æ ‡ç¾"
-"Product Tier Price API","产å“å±‚çº§ä»·æ ¼ API"
-"Product Type","产å“类型"
-"Product URL Suffix","产å“URLå‰ç¼€"
-"Product View Extra Hint","产å“视图é¢å¤–æ示"
-"Product attribute sets API","产å“属性集API"
-"Product attributes API","产å“属性 API"
-"Product collection expected.","预期的产å“集åˆã€‚"
-"Product is not loaded","产å“å°šæœªåŠ è½½"
-"Product links API (related, cross sells, up sells)","产å“链接API（相关ã€äº¤å‰é”€å”®ã€è¶…售）"
-"Product name","产å“å"
-"Product types API","产å“类型API"
-"Products","产å“"
-"Products Comparison List","产å“比较列表"
-"Products Information","产å“ä¿¡æ¯"
-"Products Sitemap","产å“网站地图"
-"Products only","仅产å“"
-"Products per Page on Grid Allowed Values","ç½‘æ ¼å…许的数值ä¸çš„æ¯é¡µäº§å“æ•°é‡"
-"Products per Page on Grid Default Value","ç½‘æ ¼é»˜è®¤å€¼æ¯é¡µäº§å“"
-"Products per Page on List Allowed Values","列表å…许值æ¯é¡µäº§å“"
-"Products per Page on List Default Value","列表默认数值ä¸çš„æ¯é¡µäº§å“æ•°é‡"
-"Properties","属性"
-"Quantity","æ•°é‡"
-"Quantity Increments","æ•°é‡å¢žé‡"
-"Quantity Uses Decimals","æ•°é‡ä½¿ç”¨å°æ•°"
-"Quantity for Item's Status to Become Out of Stock","项目的状æ€å˜ä¸ºæ— 货时的数é‡"
-"Quantity:","æ•°é‡ï¼š"
-"Quantity","æ•°é‡"
-"Quick Create","快速创建"
-"Quick Overview","快速概述"
-"Quick simple product creation","快速简å•äº§å“创建"
-"Records for ""","针对 "" 的记录"
-"Redirect","é‡å®šå‘"
-"Redirect URL","é‡å®šå‘URL"
-"Regular Price:","å¸¸è§„ä»·æ ¼ï¼š"
-"Related Products","相关产å“"
-"Remove","åˆ é™¤"
-"Remove Product From Websites","ä»Žç½‘ç«™åˆ é™¤äº§å“"
-"Remove This Item","åˆ é™¤è¯¥å†…å®¹"
-"Remove attribute from attribute set","从属性集移除属性"
-"Remove attribute set","移除属性集"
-"Remove custom option","åˆ é™¤è‡ªå®šä¹‰é€‰é¡¹"
-"Remove group from attribute set","从属性集ä¸åˆ 除组"
-"Remove option","åˆ é™¤é€‰é¡¹"
-"Remove product assignment","åˆ é™¤äº§å“的分é…"
-"Remove product image","åˆ é™¤äº§å“图片"
-"Remove product link","åˆ é™¤äº§å“链接"
-"Remove value from custom option","从自定义选项ä¸åˆ 除值"
-"Rename existing group","现有组改å"
-"Rename group","组改å"
-"Reorganize EAV category structure to flat structure","é‡æ–°è¯†åˆ«EAV分类结构为平å¦ç»“æž„"
-"Reorganize EAV product structure to flat structure","é‡æ–°æ•´ç†EAV产å“结构为平å¦ç»“æž„"
-"Reset","é‡ç½®çŠ¶æ€"
-"Results","结果"
-"Retrieve attribute data","获å–属性数æ®"
-"Retrieve attribute list","获å–属性列表"
-"Retrieve attribute options","获å–属性选项"
-"Retrieve categories tree","获å–åˆ†ç±»æ ‘"
-"Retrieve category attributes","获å–分类属性"
-"Retrieve category data","获å–分类数æ®"
-"Retrieve hierarchical tree","获å–å±‚æ¬¡ç»“æž„æ ‘"
-"Retrieve linked products","获å–链接的产å“"
-"Retrieve list of assigned products","获å–已分é…产å“列表"
-"Retrieve list of option values","获å–选项值列表"
-"Retrieve list of product custom options","获å–产å“自定义选项列表"
-"Retrieve one level of categories by website/store view/parent category","获å–网站/店铺视图/父分类的 一级分类"
-"Retrieve option value info","获å–选项值信æ¯"
-"Retrieve product","获å–产å“"
-"Retrieve product attribute sets","获å–产å“属性集"
-"Retrieve product image","获å–产å“图片"
-"Retrieve product image list","获å–产å“图片列表"
-"Retrieve product image types","获å–产å“图片类型"
-"Retrieve product link type attributes","获å–产å“链接类型属性"
-"Retrieve product link types","获å–产å“链接类型"
-"Retrieve product tier prices","获å–产å“å±‚ä»·æ ¼"
-"Retrieve product types","获å–产å“类型"
-"Retrieve products data","获å–产å“æ•°æ®"
-"Retrieve products list by filters","按照ç›é€‰å™¨èŽ·å–产å“列表"
-"Roll Over for preview","翻转预览"
-"Root","æ ¹"
-"SKU","SKU"
-"SKU length should be %s characters maximum.","SKU长度最多为 %s 个å—符。"
-"Save","ä¿å˜"
-"Save Attribute","ä¿å˜å±žæ€§"
-"Save Attribute Set","ä¿å˜å±žæ€§é›†"
-"Save Category","ä¿å˜åˆ†ç±»"
-"Save Search","ä¿å˜æœç´¢"
-"Save and Continue Edit","ä¿å˜å¹¶ç»§ç»ç¼–辑"
-"Saved %d record(s)","å·²ä¿å˜ %s æ¡è®°å½•"
-"Scope","范围"
-"Search","æœç´¢"
-"Search Engine Optimizations","æœç´¢å¼•æ“Žä¼˜åŒ–"
-"Search Information","æœç´¢ä¿¡æ¯"
-"Search Query","æœç´¢æŸ¥è¯¢"
-"Search Term with such search query already exists.","使用æ¤ç±»æŸ¥è¯¢çš„æœç´¢æ¡ä»¶å·²å˜åœ¨ã€‚"
-"Search Weight","æœç´¢é«˜åº¦"
-"Searchable","å¯æœç´¢"
-"See price before order confirmation.","确认订å•å‰æ˜¾ç¤ºä»·æ ¼ã€‚"
-"Select Category...","选择分类..."
-"Select Product...","选择产å“..."
-"Select type of option","选择选项类型"
-"Select type options required values rows.","选择需è¦å€¼çš„选项类型。"
-"Selected Product Types","选择产å“类型"
-"Selected configuration is not available.","所选的é…ç½®ä¸å¯ç”¨ã€‚"
-"Send Count","å‘é€æ•°é‡"
-"Set Ascending Direction","设置é™åºé¡ºåº"
-"Set Descending Direction","设置å‡åºé¡ºåº"
-"Set","设置å称"
-"Set Root Category for Store","ä¸ºåº—é“ºé€‰æ‹©æ ¹åˆ†ç±»"
-"Set root category for this store in the <a href=""%s"">configuration</a>","请在 <a href=""%s"">é…ç½®</a>ä¸ä¸ºæ¤åº—é“ºè®¾ç½®æ ¹ç›®å½•"
-"Set special price","è®¾ç½®ç‰¹æ®Šä»·æ ¼"
-"Set/Get current store view","设置/获å–当å‰åº—铺视图"
-"Settings","设置"
-"Shop By","è´ç‰©"
-"Shopping Options","è´ç‰©é€‰é¡¹"
-"Show","显示"
-"Show Details","显示详情"
-"Show Tags","æ˜¾ç¤ºæ ‡ç¾"
-"Simple Product","简å•äº§å“"
-"Site Map","站点结构图"
-"Sitemap","站点结构图"
-"Skip import row, is not valid value ""%s"" for field ""%s""","跳过导入行，该行ä¸æ˜¯""%s""å—段的有效值""%s"""
-"Skip import row, required field ""%s"" for the new customer is not defined.","立刻跳过导入，新顾客所需的 ""%s"" å—段未定义。"
-"Skip import row, the value ""%s"" is invalid for field ""%s""","跳过导入行，值 ""%s"" 对于 ""%s"" å—æ®µæ— æ•ˆ"
-"Skipping import row, required field ""%s"" for new products is not defined.","æ£åœ¨è·³è¿‡å¯¼å…¥çš„行，新产å“所需的å—段 ""%s"" 未定义。"
-"Skipping import row, required field ""%s"" is not defined.","跳过导入的行，必须的 ""%s"" å—段未定义。"
-"Skipping import row, store ""%s"" field does not exist.","æ£åœ¨è·³è¿‡å¯¼å…¥è¡Œï¼Œå˜å‚¨ ""%s"" å—段ä¸å˜åœ¨ã€‚"
-"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","跳过导入的行， ""%s"" å—段的值 ""%s"" æ— æ•ˆã€‚"
-"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","æŸäº›å·²ç»å¤„ç†çš„产å“æ— æœ‰æ•ˆSKU值。请在针对这些产å“执行æ“作å‰é¦–先填写。"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","下列æŸäº›äº§å“必须的选项ä¸å®Œæ•´ã€‚请修改并é…置所有必须的选项。"
-"Sort By","分类ä¾æ®"
-"Sort Order","排åºé¡ºåº"
-"Source Model","æºåž‹å·"
-"Special Expires On: %s","特殊过期于： %s"
-"Special Price:","ç‰¹æ®Šä»·æ ¼ï¼š"
-"Special Price: %s","ç‰¹æ®Šä»·æ ¼ï¼š %s"
-"Starting at:","开始于："
-"Static","é™æ€"
-"Static block and products","é™æ€åŒºå—和产å“"
-"Static block only","ä»…é™æ€åŒºå—"
-"Status","状æ€"
-"Stock Availability","库å˜çŠ¶å†µ"
-"Store","商店"
-"Store View","店铺视图"
-"Stretch","拉伸"
-"Subscribe to RSS Feed","订阅到 RSS æº"
-"Super product attributes configuration","超级产å“属性é…ç½®"
-"Synonym For","åŒä¹‰è¯"
-"System Properties","系统属性"
-"Tag","æ ‡ç¾å称"
-"Tax","ä¼ çœŸ"
-"Template","模æ¿"
-"Text","æ–‡å—"
-"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","å¹³å¦åˆ†ç±»æ¨¡å—被é™åˆ¶ä¸º %2\$d 个ç›é€‰å™¨å’Œ/或å¯æŽ’åºå±žæ€§ã€‚ç›®å‰å·²ç»ä½¿ç”¨äº† %1\$d 个。为了使用该模å—，请å‡å°‘所用ç›é€‰å™¨/排åºå±žæ€§çš„æ•°é‡"
-"The attribute model is not defined","属性型å·æœªå®šä¹‰"
-"The attribute set has been saved.","属性集已ä¿å˜ã€‚"
-"The base directory to upload file is not specified.","æ–‡ä»¶ä¸Šä¼ çš„åŸºæœ¬ç›®å½•å°šæœªæŒ‡å®šã€‚"
-"The category has been deleted.","分类已ä¿å˜ã€‚"
-"The category has been saved.","类别已ä¿å˜ã€‚"
-"The comparison list was cleared.","比较列表被清空。"
-"The file '%s' for '%s' has an invalid extension","'%s' 的文件 '%s' 扩展有误"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","æ‚¨ä¸Šä¼ çš„æ–‡ä»¶ 'ï¼…s' 大于æœåŠ¡å™¨å…许的 ï¼…s å…†"
-"The file you uploaded is larger than %s Megabytes allowed by server","æ‚¨ä¸Šä¼ çš„æ–‡ä»¶å¤§äºŽæœåŠ¡å™¨æ‰€å…许的 %s å…†å—节"
-"The filters must be an array.","过滤器必须为数组。"
-"The image contents is not valid base64 data.","图åƒå†…容ä¸æ˜¯æœ‰æ•ˆçš„ base64 æ•°æ®ã€‚"
-"The image is not specified.","图片未指定。"
-"The model collection resource name is not defined.","åž‹å·é›†åˆèµ„æºå称未定义。"
-"The product %s has been added to comparison list.","äº§å“ %s å·²è¢«æ·»åŠ è‡³æ¯”è¾ƒåˆ—è¡¨ã€‚"
-"The product %s has been removed from comparison list.","äº§å“ %s 已从比较列表ä¸åˆ 除。"
-"The product attribute has been deleted.","产å“å±žæ€§å·²è¢«åˆ é™¤ã€‚"
-"The product attribute has been saved.","产å“属性已ä¿å˜ã€‚"
-"The product has been created.","产å“已创建。"
-"The product has been deleted.","产å“å·²è¢«åˆ é™¤ã€‚"
-"The product has been duplicated.","产å“å·²å¤åˆ¶ã€‚"
-"The product has been saved.","产å“å·²ä¿å˜ã€‚"
-"The product has required options","产å“包å«å¿…需的选项"
-"The search was deleted.","æœç´¢è¢«åˆ 除。"
-"The text is too long","文本过长"
-"There are no %s available.","没有å¯ç”¨çš„ %s。"
-"There are no customers for this alert","没有客户适用于æ¤æ醒"
-"There are no customers for this alert.","没有客户适用于æ¤æ醒。"
-"There are no products matching the selection.","没有产å“匹é…该选择。"
-"There was an error while request processing.","处ç†è¯·æ±‚æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"This Attribute no longer exists","该属性已ä¸å˜åœ¨"
-"This attribute cannot be deleted.","è¯¥å±žæ€§æ— æ³•è¢«åˆ é™¤ã€‚"
-"This attribute cannot be edited.","è¯¥å±žæ€§æ— æ³•ç¼–è¾‘ã€‚"
-"This attribute cannot be updated.","è¯¥å±žæ€§æ— æ³•æ›´æ–°ã€‚"
-"This attribute no longer exists","该属性ä¸å˜åœ¨"
-"This attribute set no longer exists.","该属性已ä¸å˜åœ¨ã€‚"
-"This group contains system attributes. Please move system attributes to another group and try again.","该群组包å«ç³»ç»Ÿå±žæ€§ã€‚请移动系统属性到å¦ä¸€ç¾¤ç»„并é‡è¯•ã€‚"
-"This is a required option","这是必选的选项"
-"This product no longer exists.","该产å“å·²ä¸å˜åœ¨ã€‚"
-"This search no longer exists.","该æœç´¢å·²ä¸å˜åœ¨ã€‚"
-"This setting will be applied when all prices in the specific price interval are equal.","å¦‚æžœæŒ‡å®šä»·æ ¼é—´éš”çš„æ‰€æœ‰ä»·æ ¼éƒ½ç›¸ç‰ï¼Œå°†åº”用该设置。"
-"Tier Pricing","å±‚çº§ä»·æ ¼"
-"Tile","平铺"
-"Time Format","æ—¶é—´æ ¼å¼"
-"Title","æ ‡é¢˜"
-"To reindex the enabled product(s), the store or product must be specified","è¦å¯¹å·²å¯ç”¨çš„产å“é‡æ–°ç´¢å¼•ï¼Œå¿…须指定商店或产å“"
-"To see product price, add this item to your cart. You can always remove it later.","è¦æŸ¥çœ‹äº§å“ä»·æ ¼ï¼Œè¯·æ·»åŠ è¯¥é¡¹ç›®åˆ°æ‚¨çš„è´ç‰©è½¦ã€‚您总是å¯ä»¥ç¨åŽåˆ 除它。"
-"Top/Left","顶部/左侧"
-"Top/Right","顶部/å³ä¾§"
-"Total Quantity Base Items","æ€»æ•°é‡ åŸºç¡€é¡¹ç›®"
-"Total incl. Tax: %1$s","å«ç¨Žæ€»é¢ï¼š%1$s"
-"Total of %d record(s) have been deleted.","总共%dè®°å½•å·²è¢«åˆ é™¤ã€‚"
-"Total of %d record(s) have been updated.","总共%d记录已被更新。"
-"Total of %d record(s) were updated","共更新 %d æ¡è®°å½•"
-"Type","类型"
-"URL Rewrite Management","URLé‡å†™ç®¡ç†"
-"Unable to complete this request.","æ— æ³•å®Œæˆè¯¥è¯·æ±‚。"
-"Unable to find a search term to delete.","æ— æ³•æ‰¾åˆ°æœç´¢è¯æ¥åˆ 除。"
-"Unable to find an attribute to delete.","æ— æ³•æ‰¾åˆ°è¦åˆ 除的属性。"
-"Unable to get the product ID.","æ— æ³•èŽ·å¾—äº§å“ ID。"
-"Unassigned Attributes","未分é…的属性"
-"Unknown EAV indexer type ""%s"".","未知 EAV 索引类型 ""%s"" 。"
-"Unknown attribute: %s.","未知属性：%s。"
-"Unsupported product type ""%s"".","ä¸æ”¯æŒçš„产å“类型 ""%s""。"
-"Up-sells","超售"
-"Update","æ›´æ–°"
-"Update Attributes","更新属性"
-"Update Tier Price","æ›´æ–°å±‚çº§ä»·æ ¼"
-"Update assigned product","更新分é…的产å“"
-"Update attribute","更新属性"
-"Update attributes","更新属性"
-"Update category","更新类别"
-"Update custom option of product","更新产å“的自定义选项"
-"Update product","更新产å“"
-"Update product image","更新产å“图åƒ"
-"Update product link","更新产å“链接"
-"Update product tier prices","更新产å“å±‚ä»·æ ¼"
-"Update value of custom option","更新自定义选项的值"
-"Upload new product image ","ä¸Šä¼ æ–°äº§å“图片"
-"Use Canonical Link Meta Tag For Categories","类别使用规范链接 Meta æ ‡ç¾"
-"Use Canonical Link Meta Tag For Products","为产å“ä½¿ç”¨æ ‡å‡†çš„é“¾æŽ¥å…ƒæ•°æ®æ ‡ç¾"
-"Use Categories Path for Product URLs","äº§å“ URL 使用分类路径"
-"Use Config Settings","使用é…置设置"
-"Use Default Value","使用默认值"
-"Use Flat Catalog Category","使用平é¢ç›®å½•äº§å“分类"
-"Use Flat Catalog Product","使用平é¢ç›®å½•äº§å“"
-"Use In Layered Navigation","使用分层导航"
-"Use In Search Results Layered Navigation","使用æœç´¢ç»“果内层次导航"
-"Use JavaScript Calendar","使用 JavaScript 日历"
-"Use Static URLs for Media Content in WYSIWYG for Catalog","为分类的所è§å³æ‰€å¾—编辑ä¸çš„媒体内容使用é™æ€URL"
-"Use Tree Like Category Sitemap","ä½¿ç”¨æ ‘å½¢åˆ†ç±»ç«™ç‚¹åœ°å›¾"
-"Use config","用户é…ç½®"
-"Use default","使用默认"
-"Use for Promo Rule Conditions","使用促销规则æ¡ä»¶"
-"Use four-digit year format.","使用四ä½å¹´ä»½æ ¼å¼ã€‚"
-"Use in Advanced Search","使用高级æœç´¢"
-"Use in Layered Navigation","用在层次å¼å¯¼èˆªä¸"
-"Use in Layered Navigation<br/>(Can be used only with catalog input type 'Dropdown')","使用分层导航<br/>（仅在分类输入类型为“下拉â€æ—¶ä½¿ç”¨ï¼‰"
-"Use in Quick Search","使用快速æœç´¢"
-"Used for Sorting in Product Listing","在产å“列表ä¸ä½¿ç”¨æŽ’åº"
-"Used in Product Listing","用于产å“清å•"
-"Value for ""%s"" is invalid.","""%s"" çš„å€¼æ— æ•ˆã€‚"
-"Value for ""%s"" is invalid: %s","""%s"" çš„å€¼æ˜¯æ— æ•ˆçš„ï¼š %s"
-"Varchar","å¯å˜é•¿å—符串"
-"View as","查看为"
-"Virtual Product","虚拟产å“"
-"Visibility","å¯è§æ€§"
-"Visible","å¯è§"
-"Visible on Catalog Pages on Front-end","å‰ç«¯åˆ†ç±»é¡µé¢çš„å¯è§æ€§"
-"Visible on Product View Page on Front-end","在å‰ç«¯äº§å“视图页é¢å¯è§"
-"WYSIWYG Editor","所è§å³æ‰€å¾—编辑器"
-"Watermark","æ°´å°"
-"Watermark Default Size","æ°´å°é»˜è®¤å¤§å°"
-"Watermark Opacity, Percent","æ°´å°ä¸é€æ˜Žåº¦ï¼Œç™¾åˆ†æ¯”"
-"Watermark Position","æ°´å°ä½ç½®"
-"Website","网站"
-"Website Item Must be checked","网站项目必须检查"
-"Website Store Must be checked","网站店铺必须被选ä¸"
-"Websites","网站"
-"What's this?","这是什么？"
-"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","是å¦åœ¨â€œæ¯é¡µæ˜¾ç¤º X 个â€ä¸‹æ‹‰èœå•ä¸æ˜¾ç¤ºâ€œå…¨éƒ¨â€ 选项。"
-"Will make search for the query above return results for this search.","执行上述查询的æœç´¢æ˜¯å¦è¿”回该æœç´¢çš„结果。"
-"Wrong BuyRequest instance in options group.","选项组ä¸é”™è¯¯çš„è´ä¹°è¯·æ±‚实例。"
-"Wrong configuration item instance in options group.","选项组ä¸é”™è¯¯çš„é…置项目实例。"
-"Wrong configuration item option instance in options group.","选项组ä¸å˜åœ¨é”™è¯¯é…置项目选项的实例。"
-"Wrong option instance type in options group.","选项组ä¸é”™è¯¯çš„选项实例类型。"
-"Wrong option type to get group instance.","错误的选项类型æ¥èŽ·å¾—群组实例。"
-"Wrong product instance type in options group.","选项组ä¸é”™è¯¯çš„产å“实例类型。"
-"Wrong product type filter specified","错误的已指定产å“类型过滤器"
-"Year Range","年份范围"
-"Yes","是"
-"You cannot remove system attribute from this set.","æ‚¨æ— æ³•ä»Žæ¤é›†åˆä¸ç§»é™¤ç³»ç»Ÿå±žæ€§ã€‚"
-"You have no items to compare.","您没有å¯æ¯”较的项目。"
-"You may also be interested in the following product(s)","您还å¯èƒ½å¯¹ä¸‹åˆ—产å“感兴趣"
-"Zoom In","放大"
-"Zoom Out","缩å°"
-"and","和"
-"and above","åŠä»¥ä¸Š"
-"categories","类别"
-"each","æ¯ä¸ª"
+"Custom Design",自定义设计
+Yes,是
+"Web Site","Web Site"
+Name,姓å
+Status,状æ€
+Disabled,å·²ç¦ç”¨
+Enabled,å·²å¯ç”¨
+"Save and Continue Edit",ä¿å˜å¹¶ç»§ç»ç¼–辑
+Title,æ ‡é¢˜
+"Store View",店铺视图
+Type,类型
+Home,主页
+Search,æœç´¢
+"Select All","Select All"
+"Add New",æ·»åŠ æ–°å†…å®¹
+"Please select items.",请选择项目。
+Required,Required
+Website,网站
+"All Websites",所有网站
+Next,下一个
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+Catalog,分类
+Images,Images
+"per page",æ¯é¡µ
+"Mass Actions","Mass Actions"
+"Unselect All","Unselect All"
+"Select Visible","Select Visible"
+"Unselect Visible","Unselect Visible"
+"items selected","items selected"
+"The information in this tab has been changed.","The information in this tab has been changed."
+"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
+Loading...,Loading...
+OK,确定
+Visibility,å¯è§æ€§
+Position,ä½ç½®
+Fixed,固定
+"Use Default Value",使用默认值
+N/A,N/A
+Percent,Percent
+"Option Title","Option Title"
+"Input Type",输入类型
+"New Option","New Option"
+"Price Type",ä»·æ ¼ç±»åž‹
+"* Required Fields",*å¿…è¦å—段
+Availability,Availability
+"In stock",现货
+"Out of stock",缺货
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+Root,æ ¹
+"Save Category",ä¿å˜åˆ†ç±»
+"Delete Category",åˆ é™¤åˆ†ç±»
+"New Subcategory",新建å类别
+"New Root Category",æ–°å»ºæ ¹ç±»åˆ«
+"Set Root Category for Store",ä¸ºåº—é“ºé€‰æ‹©æ ¹åˆ†ç±»
+"Use Config Settings",使用é…置设置
+"Use All Available Attributes","Use All Available Attributes"
+"General Information",常规信æ¯
+"Category Data",分类数æ®
+"Category Products",分类产å“
+"Add Subcategory",æ·»åŠ å分类
+"Add Root Category",æ·»åŠ æ ¹åˆ†ç±»
+"Create Permanent Redirect for old URL",为è€URL创建永久é‡å®šå‘
+Day,Day
+Month,Month
+Year,Year
+"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
+"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+"WYSIWYG Editor",所è§å³æ‰€å¾—编辑器
+"Add Product",æ·»åŠ äº§å“
+label,label
+"Product Attributes",产å“属性
+"Add New Attribute",æ·»åŠ æ–°å±žæ€§
+"Save in New Attribute Set","Save in New Attribute Set"
+"Enter Name for New Attribute Set","Enter Name for New Attribute Set"
+"Save Attribute",ä¿å˜å±žæ€§
+"Delete Attribute",åˆ é™¤å±žæ€§
+"Edit Product Attribute ""%1""","Edit Product Attribute ""%1"""
+"New Product Attribute",新产å“属性
+"Advanced Attribute Properties","Advanced Attribute Properties"
+"Attribute Code","Attribute Code"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+Global,å…¨çƒ
+Scope,范围
+"Declare attribute value saving scope",声明属性值ä¿å˜èŒƒå›´
+"Frontend Properties",å‰ç«¯å±žæ€§
+"Use in Quick Search",使用快速æœç´¢
+"Use in Advanced Search",使用高级æœç´¢
+"Comparable on Frontend","Comparable on Frontend"
+"Use for Promo Rule Conditions",使用促销规则æ¡ä»¶
+"Enable WYSIWYG",å¯ç”¨æ‰€è§å³æ‰€å¾—
+"Allow HTML Tags on Frontend",å…许在å‰ç«¯ä½¿ç”¨HTMLæ ‡ç¾
+"Visible on Catalog Pages on Frontend","Visible on Catalog Pages on Frontend"
+"Used in Product Listing",用于产å“清å•
+"Depends on design theme",å–决于设计主题
+"Used for Sorting in Product Listing",在产å“列表ä¸ä½¿ç”¨æŽ’åº
+"Media Image",媒体图片
+Gallery,画廊
+"System Properties",系统属性
+"Data Type for Saving in Database",è¦ä¿å˜åœ¨æ•°æ®åº“ä¸çš„æ•°æ®ç±»åž‹
+Text,æ–‡å—
+Varchar,å¯å˜é•¿å—符串
+Static,é™æ€
+Datetime,日期时间
+Decimal,å进制
+Integer,æ•´æ•°
+"Globally Editable",å…¨çƒèŒƒå›´å†…å¯ç¼–辑
+"Attribute Information",属性信æ¯
+Properties,属性
+"Manage Labels","Manage Labels"
+Visible,å¯è§
+Searchable,å¯æœç´¢
+Comparable,å¯æ¯”较
+"Delete Selected Group",åˆ é™¤æ‰€é€‰ç»„
+"Delete Attribute Set",åˆ é™¤å±žæ€§é›†
+"You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?","You are about to delete all products in this set. ' 'Are you sure you want to delete this attribute set?"
+"Save Attribute Set",ä¿å˜å±žæ€§é›†
+"New Set Name",新集å称
+"Edit Attribute Set '%1'","Edit Attribute Set '%1'"
+Empty,空
+"Add Attribute",æ·»åŠ å±žæ€§
+"Add New Group",æ·»åŠ æ–°ç¾¤ç»„
+"Add Group",æ·»åŠ ç¾¤ç»„
+"Edit Set Name",编辑集å称
+"For internal use","For internal use"
+"Based On",基于
+"Add New Attribute Set",æ·»åŠ æ–°å±žæ€§é›†
+"Add New Set",æ·»åŠ æ–°é›†
+"Product Templates","Product Templates"
+"Close Window",å…³é—窗å£
+"New Product",新产å“
+"Save & Edit","Save & Edit"
+"Save & New","Save & New"
+"Save & Duplicate","Save & Duplicate"
+"Save & Close","Save & Close"
+Attributes,属性
+Change,更改
+"Advanced Inventory","Advanced Inventory"
+Websites,网站
+"Products Information",产å“ä¿¡æ¯
+"Category Name","Category Name"
+"Parent Category",父分类
+"If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' '<a href=""%1"" target=""_blank"">Products > Categories</a>."
+"We saved the price alert subscription.","We saved the price alert subscription."
+"We saved the stock notification.","We saved the stock notification."
+"There are no customers for this alert.",没有客户适用于æ¤æ醒。
+"Subscribe Date",订阅日期
+"Last Notified",最新通知
+"Send Count",å‘é€æ•°é‡
+"New Attribute","New Attribute"
+"Attribute Set",属性集
+"Add New Option",æ·»åŠ æ–°é€‰é¡¹
+"Import Options","Import Options"
+Import,Import
+"Add New Row",æ·»åŠ æ–°è¡Œ
+"Delete Row",åˆ é™¤è¡Œ
+"Tier Pricing",å±‚çº§ä»·æ ¼
+"Default Price",é»˜è®¤ä»·æ ¼
+"Add Group Price",æ·»åŠ ç»„ä»·æ ¼
+"ALL GROUPS",所有群组
+"Add Tier",æ·»åŠ å±‚
+"Default Values",默认值
+"Related Products",相关产å“
+Up-sells,超售
+Cross-sells,交å‰é”€å”®
+"Size for %1","Size for %1"
+"Watermark File for %1","Watermark File for %1"
+"Position of Watermark for %1","Position of Watermark for %1"
+"Name in %1","Name in %1"
+"Notify Low Stock RSS",å˜è´§ä¸è¶³RSS通知
+"Change status",更改状æ€
+"Update Attributes",更新属性
+"Click here or drag and drop to add images","Click here or drag and drop to add images"
+"Delete image","Delete image"
+"Make Base","Make Base"
+Hidden,Hidden
+"Image Management","Image Management"
+"start typing to search category","start typing to search category"
+"New Category","New Category"
+"Add New Images",æ·»åŠ æ–°å›¾åƒ
+"Inc. Tax","Inc. Tax"
+lbs,lbs
+"Add New Search Term",æ·»åŠ æ–°çš„æœç´¢æ¡ä»¶
+"Save Search",ä¿å˜æœç´¢
+"Delete Search",åˆ é™¤æœç´¢
+"Edit Search '%1'","Edit Search '%1'"
+"New Search",æ–°æœç´¢
+"Search Information",æœç´¢ä¿¡æ¯
+"Search Query",æœç´¢æŸ¥è¯¢
+"Number of results",结果的数é‡
+"Number of results (For the last time placed)",结果的数é‡ï¼ˆä¸Šæ¬¡çš„置入）
+"For the last time placed.",上次的置入
+"Number of Uses","Number of Uses"
+"Synonym For",åŒä¹‰è¯
+"Will make search for the query above return results for this search","Will make search for the query above return results for this search"
+"Redirect URL",é‡å®šå‘URL
"ex. http://domain.com","例如 http://domain.com"
-"leave blank if its not an image","如果éžå›¾ç‰‡è¯·ç•™ç©º"
-"per page","æ¯é¡µ"
-"products","产å“"
-"px.","åƒç´ "
-"save","ä¿å˜"
-"select all","全选"
-"unselect all","撤销全选"
-"x","x"
+"Display in Suggested Terms",显示建议的æœç´¢æ¡ä»¶
+"Go to Home Page",å‰å¾€ä¸»é¡µ
+"%1 RSS Feed","%1 RSS Feed"
+"Products Comparison List",产å“比较列表
+AM,AM
+PM,PM
+Categories,分类
+"Manage Catalog Categories",管ç†åˆ†ç±»ç±»åˆ«
+"Manage Categories",管ç†åˆ†ç±»
+"Attribute ""%1"" is required.","Attribute ""%1"" is required."
+"Unable to save the category","Unable to save the category"
+"You saved the category.","You saved the category."
+"There was a category move error.","There was a category move error."
+"There was a category move error %1","There was a category move error %1"
+"You deleted the category.","You deleted the category."
+"Something went wrong while trying to delete the category.","Something went wrong while trying to delete the category."
+"This product no longer exists.",该产å“å·²ä¸å˜åœ¨ã€‚
+"Unable to save product","Unable to save product"
+"You saved the product.","You saved the product."
+"SKU for product %1 has been changed to %2.","SKU for product %1 has been changed to %2."
+"You duplicated the product.","You duplicated the product."
+"Please select product(s).",请选择产å“。
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Something went wrong while updating the product(s) status.","Something went wrong while updating the product(s) status."
+"Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products."
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>.","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> ' '<a href=""%1"">Index Management</a>."
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Something went wrong while updating the product(s) attributes.","Something went wrong while updating the product(s) attributes."
+"Please select products for attributes update.","Please select products for attributes update."
+"Manage Product Attributes",管ç†äº§å“属性
+"This attribute no longer exists.","This attribute no longer exists."
+"This attribute cannot be edited.",è¯¥å±žæ€§æ— æ³•ç¼–è¾‘ã€‚
+"Edit Product Attribute",编辑产å“属性
+"An attribute with this code already exists.","An attribute with this code already exists."
+"Attribute with the same code (%1) already exists.","Attribute with the same code (%1) already exists."
+"Attribute Set with name '%1' already exists.","Attribute Set with name '%1' already exists."
+"Something went wrong saving the attribute.","Something went wrong saving the attribute."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), ' 'numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"You can't update your attribute.","You can't update your attribute."
+"You saved the product attribute.","You saved the product attribute."
+"This attribute cannot be deleted.",è¯¥å±žæ€§æ— æ³•è¢«åˆ é™¤ã€‚
+"The product attribute has been deleted.",产å“å±žæ€§å·²è¢«åˆ é™¤ã€‚
+"We can't find an attribute to delete.","We can't find an attribute to delete."
+"A group with the same name already exists.",以åŒæ ·å称命å的群组已å˜åœ¨ã€‚
+"Something went wrong while saving this group.","Something went wrong while saving this group."
+"Manage Attribute Sets",管ç†å±žæ€§é›†
+"New Set","New Set"
+"Manage Product Sets",管ç†äº§å“设置
+"This attribute set no longer exists.",该属性已ä¸å˜åœ¨ã€‚
+"You saved the attribute set.","You saved the attribute set."
+"An error occurred while saving the attribute set.",ä¿å˜å±žæ€§é›†æ—¶å‘生错误。
+"New Product Template","New Product Template"
+"The attribute set has been removed.","The attribute set has been removed."
+"An error occurred while deleting this set.","An error occurred while deleting this set."
+"Search Terms","Search Terms"
+"This search no longer exists.",该æœç´¢å·²ä¸å˜åœ¨ã€‚
+"Edit Search",编辑æœç´¢
+"You already have an identical search term query.","You already have an identical search term query."
+"Something went wrong while saving the search query.","Something went wrong while saving the search query."
+"You deleted the search.","You deleted the search."
+"We can't find a search term to delete.","We can't find a search term to delete."
+"Please select catalog searches.","Please select catalog searches."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+"You added product %1 to the comparison list.","You added product %1 to the comparison list."
+"You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
+"You cleared the comparison list.","You cleared the comparison list."
+"Something went wrong clearing the comparison list.","Something went wrong clearing the comparison list."
+"To see product price, add this item to your cart. You can always remove it later.",è¦æŸ¥çœ‹äº§å“ä»·æ ¼ï¼Œè¯·æ·»åŠ è¯¥é¡¹ç›®åˆ°æ‚¨çš„è´ç‰©è½¦ã€‚您总是å¯ä»¥ç¨åŽåˆ 除它。
+"See price before order confirmation.",确认订å•å‰æ˜¾ç¤ºä»·æ ¼ã€‚
+"The product is not loaded.","The product is not loaded."
+"Invalid attribute %1","Invalid attribute %1"
+"Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""."
+Grid,ç½‘æ ¼
+List,列表
+"Product is not loaded",产å“å°šæœªåŠ è½½
+"Bad controller interface for showing product","Bad controller interface for showing product"
+"Sorry, but we can't move the category because we can't find the new parent category you selected.","Sorry, but we can't move the category because we can't find the new parent category you selected."
+"Sorry, but we can't move the category because we can't find the new category you selected.","Sorry, but we can't move the category because we can't find the new category you selected."
+"We can't perform this category move operation because the parent category matches the child category.","We can't perform this category move operation because the parent category matches the child category."
+"The value of attribute ""%1"" must be unique.","The value of attribute ""%1"" must be unique."
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
+"No layout updates",æ— å¸ƒå±€æ›´æ–°
+"Products only",仅产å“
+"Static block only",ä»…é™æ€åŒºå—
+"Static block and products",é™æ€åŒºå—和产å“
+"Please select a static block.","Please select a static block."
+frontend_label,frontend_label
+"-- Please Select a Category --","-- Please Select a Category --"
+"Grid Only","Grid Only"
+"List Only","List Only"
+"Grid (default) / List","Grid (default) / List"
+"List (default) / Grid","List (default) / Grid"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
+Manual,Manual
+"-- Please select --","-- Please select --"
+"Product Thumbnail Itself","Product Thumbnail Itself"
+"Parent Product Thumbnail","Parent Product Thumbnail"
+"12h AM/PM","12h AM/PM"
+24h,24h
+Stretch,拉伸
+Tile,平铺
+Top/Left,顶部/左侧
+Top/Right,顶部/å³ä¾§
+Bottom/Left,底部/左侧
+Bottom/Right,底部/å³ä¾§
+Center,ä¸å¿ƒ
+"Could not rebuild index for undefined product","Could not rebuild index for undefined product"
+"Bad value was supplied.","Bad value was supplied."
+"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes."" ""Currently there are %1\$d of them."" ""Please reduce the number of filterable/sortable attributes in order to use this module"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Catalog URL Rewrites",分类URLé‡å†™
+"Index product and categories URL Redirects","Index product and categories URL Redirects"
+"The category must be an instance of \Magento\Catalog\Model\Category.","The category must be an instance of \Magento\Catalog\Model\Category."
+"Please correct the category.","Please correct the category."
+"The attribute model is not defined.","The attribute model is not defined."
+Category,分类
+"%1 - %2","%1 - %2"
+"The filter must be an object. Please set correct filter.","The filter must be an object. Please set correct filter."
+"%1 and above","%1 and above"
+"Clear Price",æ¸…é™¤ä»·æ ¼
+"The filters must be an array.",过滤器必须为数组。
+"We found a duplicate website group price customer group.","We found a duplicate website group price customer group."
+"Group price must be a number greater than 0.","Group price must be a number greater than 0."
+"The image does not exist.","The image does not exist."
+"Please correct the image file type.","Please correct the image file type."
+"We couldn't move this file: %1.","We couldn't move this file: %1."
+"We couldn't copy file %1. Please delete media with non-existing images and try again.","We couldn't copy file %1. Please delete media with non-existing images and try again."
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."
+"Use config",用户é…ç½®
+"In Cart",è´ç‰©è½¦
+"Before Order Confirmation",在订å•ç¡®è®¤ä¹‹å‰
+"On Gesture",手势
+"We can't find the image file.","We can't find the image file."
+"Index product attributes for layered navigation building",为分层导航建ç‘索引产å“属性
+"The option type to get group instance is incorrect.","The option type to get group instance is incorrect."
+"Select type options required values rows.",选择需è¦å€¼çš„选项类型。
+"Please specify date required option(s).",请指定日期需è¦çš„选项。
+"Please specify time required option(s).",请指定时间需è¦çš„选项。
+"Please specify the product's required option(s).",请指定产å“çš„å¿…è¦é€‰é¡¹ã€‚
+"The option instance type in options group is incorrect.","The option instance type in options group is incorrect."
+"The product instance type in options group is incorrect.","The product instance type in options group is incorrect."
+"The configuration item option instance in options group is incorrect.","The configuration item option instance in options group is incorrect."
+"The configuration item instance in options group is incorrect.","The configuration item instance in options group is incorrect."
+"The BuyRequest instance in options group is incorrect.","The BuyRequest instance in options group is incorrect."
+"We couldn't add the product to the cart because of an option validation issue.","We couldn't add the product to the cart because of an option validation issue."
+"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server"
+"The file '%1' for '%2' has an invalid extension.","The file '%1' for '%2' has an invalid extension."
+"Maximum allowed image size for '%1' is %2x%3 px.","Maximum allowed image size for '%1' is %2x%3 px."
+"The file '%1' you uploaded is larger than the %2 megabytes allowed by our server.","The file '%1' you uploaded is larger than the %2 megabytes allowed by our server."
+px.,åƒç´
+"The file options format is not valid.","The file options format is not valid."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
+"The text is too long.","The text is too long."
+"We can't create writeable directory ""%1"".","We can't create writeable directory ""%1""."
+"The file upload failed.","The file upload failed."
+"The product has required options.","The product has required options."
+"Something went wrong while processing the request.","Something went wrong while processing the request."
+"Not Visible Individually",æ— ç‹¬ç«‹å¯è§æ€§
+"Catalog, Search",分类，æœç´¢
+"Something went wrong removing products from the websites.","Something went wrong removing products from the websites."
+"Something went wrong adding products to websites.","Something went wrong adding products to websites."
+"Attribute '%1' is locked. ","Attribute '%1' is locked. "
+"Do not change the scope. ","Do not change the scope. "
+"We found an unknown EAV indexer type ""%1"".","We found an unknown EAV indexer type ""%1""."
+"A product type is not defined for the indexer.",索引器ä¸äº§å“类型未定义。
+"Something went wrong saving the URL rewite.","Something went wrong saving the URL rewite."
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
+"A category object is required for determining the product request path.","A category object is required for determining the product request path."
+"As low as:",低至：
+"Are you sure you want to delete this category?",ä½ ç¡®å®šè¦åˆ 除æ¤ç±»åˆ«ï¼Ÿ
+"ID: %1","ID: %1"
+"Set root category for this store in the <a href=""%1"">configuration</a>.","Set root category for this store in the <a href=""%1"">configuration</a>."
+"Collapse All",折å 全部
+"Expand All",全部展开
+"Please confirm site switching. All data that hasn't been saved will be lost.","Please confirm site switching. All data that hasn't been saved will be lost."
+"Manage Titles (Size, Color, etc.)",管ç†å称（尺寸，颜色ç‰ï¼‰
+"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
+"Is Default",为默认值
+"Add Option","Add Option"
+"Sort Option","Sort Option"
+Groups,群组
+"Double click on a group to rename it",åŒå‡»ç»„å³å¯æ›´å
+"Unassigned Attributes",未分é…的属性
+"A name is required.","A name is required."
+"This group contains system attributes. Please move system attributes to another group and try again.",该群组包å«ç³»ç»Ÿå±žæ€§ã€‚请移动系统属性到å¦ä¸€ç¾¤ç»„并é‡è¯•ã€‚
+"Please enter a new group name.","Please enter a new group name."
+"An attribute group named ""/name/"" already exists"".","An attribute group named ""/name/"" already exists""."
+"We're unable to complete this request.","We're unable to complete this request."
+"You cannot remove system attributes from this set.","You cannot remove system attributes from this set."
+"Custom Options",自定义选项
+"This is a required option.","This is a required option."
+"Field is not complete",å—段ä¸å®Œæ•´
+"Allowed file extensions to upload",å…è®¸ä¸Šä¼ çš„æ–‡ä»¶æ‰©å±•
+"Maximum image width",图片最大宽度
+"Maximum image height",图片最大高度
+"Maximum number of characters:",最大å—符数：
+"Product online","Product online"
+"Product offline","Product offline"
+"Product online status","Product online status"
+"Manage Stock",库å˜ç®¡ç†
+"Minimum Qty for Item's Status to be Out of Stock","Minimum Qty for Item's Status to be Out of Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Qty Uses Decimals","Qty Uses Decimals"
+Backorders,缺货
+"Notify for Quantity Below",å˜é‡è¿‡ä½Žé€šçŸ¥
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"Stock Availability",库å˜çŠ¶å†µ
+"In Stock",有货
+"Out of Stock",æ— è´§
+"Add Product To Websites",æ·»åŠ äº§å“到网站
+"Remove Product From Websites",ä»Žç½‘ç«™åˆ é™¤äº§å“
+"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.",您ä¸å¸Œæœ›æ˜¾ç¤ºåœ¨åˆ†ç±»æˆ–æœç´¢ç»“æžœä¸çš„å†…å®¹åº”åœ¨ç›®æ ‡åº—é“ºä¸è®¾ç½®'Disabled'状æ€ã€‚
+"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundle with dynamic pricing cannot include custom defined options. Options will not be saved."
+"Delete Custom Option","Delete Custom Option"
+"Sort Custom Options","Sort Custom Options"
+"Allowed File Extensions",å…许的文件扩展
+"Maximum Image Size",最大图åƒå¤§å°
+"%1 <span>x</span> %2 <span>px.</span>","%1 <span>x</span> %2 <span>px.</span>"
+"Please leave blank if it is not an image.","Please leave blank if it is not an image."
+"Sort Custom Option","Sort Custom Option"
+"Max Characters",å—符数上é™
+"Customer Group",客户组
+"Delete Group Price",åˆ é™¤ç»„ä»·æ ¼
+"Item Price","Item Price"
+"and above",åŠä»¥ä¸Š
+"Delete Tier",åˆ é™¤å±‚
+"Product In Websites",网站ä¸çš„产å“
+"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.",您ä¸å¸Œæœ›åœ¨åˆ†ç±»æˆ–æœç´¢ç»“æžœä¸æ˜¾ç¤ºçš„å†…å®¹åº”åœ¨ç›®æ ‡åº—é“ºä¸è®¾ç½®'Disabled'状æ€ã€‚
+"(Copy data from: %1)","(Copy data from: %1)"
+"Remove Image","Remove Image"
+"Alt Text","Alt Text"
+Role,Role
+"Hide from Product Page","Hide from Product Page"
+"Close panel","Close panel"
+"Regular Price:",å¸¸è§„ä»·æ ¼ï¼š
+"Special Price:",ç‰¹æ®Šä»·æ ¼ï¼š
+"Product Alerts",产å“è¦æŠ¥
+"Can be Divided into Multiple Boxes for Shipping",å¯æ‹†åˆ†ä¸ºå¤šä¸ªç®±å‘è´§
+"Basic Settings","Basic Settings"
+"Advanced Settings","Advanced Settings"
+"Select Product Actions","Select Product Actions"
+"Price as configured:","Price as configured:"
+"Click for price",å•å‡»èŽ·å–ä»·æ ¼
+"What's this?",这是什么？
+"Buy %1 for: ","Buy %1 for: "
+"Buy %1 for %2","Buy %1 for %2"
+each,æ¯ä¸ª
+and,和
+save,ä¿å˜
+"Actual Price",å®žé™…ä»·æ ¼
+"Shop By",è´ç‰©
+"Shopping Options",è´ç‰©é€‰é¡¹
+"Compare Products",比较产å“
+"1 item","1 item"
+"%1 items","%1 items"
+"Print This Page",打å°æœ¬é¡µé¢
+"Remove Product","Remove Product"
+"Add to Wishlist",æ·»åŠ åˆ°æ”¶è—
+"You have no items to compare.",您没有å¯æ¯”较的项目。
+"Are you sure you would like to remove this item from the compare products?",ä½ ç¡®å®šè¦ä»Žå¯¹æ¯”产å“ä¸åˆ 除这个项目？
+"Are you sure you would like to remove all products from your comparison?",ä½ ç¡®å®šè¦æ˜¯åˆ 除所有对比的产å“？
+"Remove This Item",åˆ é™¤è¯¥å†…å®¹
+Compare,比较
+"Clear All",清除全部
+Prev,上一个
+"There are no products matching the selection.",没有产å“匹é…该选择。
+"Add to Compare",æ·»åŠ å¹¶æ¯”è¾ƒ
+"Learn More",了解更多
+"You may also be interested in the following product(s)",您还å¯èƒ½å¯¹ä¸‹åˆ—产å“感兴趣
+"More Choices:","More Choices:"
+"New Products",新产å“
+"Check items to add to the cart or",检查è¦åŠ å…¥è´ç‰©è½¦çš„内容
+"select all",全选
+"View as",查看为
+"Sort By",分类ä¾æ®
+"Set Ascending Direction",设置é™åºé¡ºåº
+"Set Descending Direction",设置å‡åºé¡ºåº
+"Items %1-%2 of %3","Items %1-%2 of %3"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,显示
+"Additional Information",é¢å¤–ä¿¡æ¯
+"More Views",更多视图
+"Click on image to view it full sized","Click on image to view it full sized"
+"Click on image to zoom","Click on image to zoom"
+"Email to a Friend",给朋å‹å‘邮件
+Details,详情
+Template,模æ¿
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Select type of option.","Select type of option."
+"Please add rows to option.",è¯·æ·»åŠ é€‰é¡¹è¡Œã€‚
+"Select Product","Select Product"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"unselect all",撤销全选
+"Maximal Depth","Maximal Depth"
+"Anchor Custom Text",自定义文本锚点
+"Anchor Custom Title",è‡ªå®šä¹‰æ ‡é¢˜é”šç‚¹
+"Product Fields Auto-Generation","Product Fields Auto-Generation"
+"Mask for SKU","Mask for SKU"
+"Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
+"Mask for Meta Title","Mask for Meta Title"
+"Mask for Meta Keywords","Mask for Meta Keywords"
+"Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
+"Mask for Meta Description","Mask for Meta Description"
+"Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+Frontend,Frontend
+"List Mode","List Mode"
+"Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
+Comma-separated.,Comma-separated.
+"Products per Page on Grid Default Value","Products per Page on Grid Default Value"
+"Must be in the allowed values list","Must be in the allowed values list"
+"Products per Page on List Allowed Values","Products per Page on List Allowed Values"
+"Products per Page on List Default Value","Products per Page on List Default Value"
+"Use Flat Catalog Category","Use Flat Catalog Category"
+"Use Flat Catalog Product","Use Flat Catalog Product"
+"Product Listing Sort by","Product Listing Sort by"
+"Allow All Products per Page","Allow All Products per Page"
+"Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
+"Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
+"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
+"Product Image Placeholders","Product Image Placeholders"
+"Search Engine Optimizations","Search Engine Optimizations"
+"Category URL Suffix","Category URL Suffix"
+"You need to refresh the cache.","You need to refresh the cache."
+"Product URL Suffix","Product URL Suffix"
+"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
+"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
+"Page Title Separator","Page Title Separator"
+"Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
+"Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Catalog Price Scope","Catalog Price Scope"
+"This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
+"Category Top Navigation","Category Top Navigation"
+"Date & Time Custom Options","Date & Time Custom Options"
+"Use JavaScript Calendar","Use JavaScript Calendar"
+"Date Fields Order","Date Fields Order"
+"Time Format","Time Format"
+"Year Range","Year Range"
+"Please use a four-digit year format.","Please use a four-digit year format."
+"Product Image Watermarks","Product Image Watermarks"
+"Watermark Default Size","Watermark Default Size"
+"Watermark Opacity, Percent","Watermark Opacity, Percent"
+Watermark,Watermark
+"Watermark Position","Watermark Position"
+"Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
+"This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
+"Minimum Advertised Price","Minimum Advertised Price"
+"Enable MAP","Enable MAP"
+"Apply MAP (Default Value)","Apply MAP (Default Value)"
+"
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ ","
+ <strong style=""color:red"">Warning!</strong> Applying MAP by default will hide all product prices on the front end.
+ "
+"Display Actual Price","Display Actual Price"
+"Default Popup Text Message","Default Popup Text Message"
+"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
+"Product Flat Data",产å“å¹³å¦æ•°æ®
+"Reorganize EAV product structure to flat structure",é‡æ–°æ•´ç†EAV产å“结构为平å¦ç»“æž„
+"Category Flat Data",分类平å¦æ•°æ®
+"Reorganize EAV category structure to flat structure",é‡æ–°è¯†åˆ«EAV分类结构为平å¦ç»“æž„
+"Indexed category/products association",已索引的分类/产å“å…³è”
+"Product Categories",产å“分类
+"Indexed product/categories association","Indexed product/categories association"
+"Product Price","Product Price"
+"Index product prices",索引产å“ä»·æ ¼
+"Catalog New Products List",分类新产å“列表
+"List of Products that are set as New",åå•è¢«å®šä¸ºæ–°äº§å“
+"Display Type","Display Type"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
+"All products","All products"
+"New products","New products"
+"Display Page Control","Display Page Control"
+"Number of Products per Page","Number of Products per Page"
+"Number of Products to Display",显示的产å“æ•°é‡
+"New Products Grid Template",新产å“ç½‘æ ¼æ¨¡æ¿
+"New Products List Template",新产å“列表模æ¿
+"New Products Images and Names Template","New Products Images and Names Template"
+"New Products Names Only Template","New Products Names Only Template"
+"New Products Images Only Template","New Products Images Only Template"
+"Cache Lifetime (Seconds)",缓å˜ç”Ÿå˜æ—¶é—´ï¼ˆç§’）
+"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Catalog Product Link",分类产å“链接
+"Link to a Specified Product",链接到指定产å“
+"If empty, the Product Name will be used","If empty, the Product Name will be used"
+"Product Link Block Template",产å“链接区å—模æ¿
+"Product Link Inline Template",产å“链接内è”模æ¿
+"Catalog Category Link",分类类别链接
+"Link to a Specified Category",链接到指定的分类
+"If empty, the Category Name will be used",如果为空，则使用分类å称
+"Category Link Block Template",分类链接å—模æ¿
+"Category Link Inline Template",分类链接内è”摸æ¿
+Set,设置å称
+none,none
+Overview,Overview
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index ef4da6dd5d8..c1b8f640703 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -321,7 +321,7 @@ jQuery(function($) {
}
var $elementToMove = $('.fieldset>.field[data-attribute-code="' + elementId + '"]');
if ($elementToMove.length === 0) {
- $elementToMove = $element;
+ $elementToMove = $element.clone();
}
if (index === 0) {
$elementToMove.prependTo(fieldSet);
@@ -337,7 +337,7 @@ jQuery(function($) {
$newPage.find('#product_info_tabs .fieldset').each(updateFieldsetElements);
fieldsetContainer = $(fieldSet).parents('[data-ui-id*=-tab-content-]').first();
- var newFieldsetContainer = $newPage.find('[data-ui-id='+$(fieldsetContainer).data('uiId')+']');
+ var newFieldsetContainer = $newPage.find('[data-ui-id=' + $(fieldsetContainer).data('uiId') + ']');
if (newFieldsetContainer.length == 0) {
$(fieldsetContainer).find('fieldset .field')
.addClass('ignore-validate')
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
index a723dbbb185..7eed18fc0ec 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
@@ -100,7 +100,7 @@ $product = $this->getSaleableItem();
<?php if ($msrpShowOnGesture):?>
<script type="text/javascript">
(function($) {
- $('.product.info.main').mage('tierPrice', {
+ $('.product-info-main').mage('tierPrice', {
inputQty: '#qty',
productForm: '#product_addtocart_form'
});
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
index fbbd735c38a..b6106d65935 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
@@ -25,9 +25,18 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
<update handle="page_two_columns_left"/>
+ <referenceBlock name="root">
+ <action method="addBodyClass">
+ <argument name="class" xsi:type="string">page-products</argument>
+ </action>
+ </referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Catalog\Block\Category\View" name="category.products" template="category/view.phtml">
- <block class="Magento\Catalog\Block\Product\ListProduct" name="product_list" template="product/list.phtml">
+ <block class="Magento\Catalog\Block\Category\View" name="category.image" template="Magento_Catalog::category/image.phtml"/>
+ <block class="Magento\Catalog\Block\Category\View" name="category.description" template="Magento_Catalog::category/description.phtml"/>
+ <block class="Magento\Catalog\Block\Category\View" name="category.cms" template="Magento_Catalog::category/cms.phtml"/>
+ <block class="Magento\Catalog\Block\Category\View" name="category.products" template="Magento_Catalog::category/products.phtml">
+ <block class="Magento\Catalog\Block\Product\ListProduct" name="category.products.list" as="product_list" template="Magento_Catalog::product/list.phtml">
+ <container name="category.product.list.additional" as="additional" />
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
<block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager"/>
<!-- The following code shows how to set your own pager increments -->
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
index e88500ab2d2..a684f073d47 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <referenceContainer name="left">
+ <referenceContainer name="sidebar.main">
<block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index db01776bfed..9ca9601a397 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -53,7 +53,7 @@
</referenceBlock>
<update handle="page_calendar"/>
<referenceContainer name="content">
- <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product info main" before="-">
+ <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product-info-main" before="-">
<container name="product.info.type" label="invisible" before="-"/>
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml" after="product.info.type">
<arguments>
@@ -114,7 +114,7 @@
<argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
</arguments>
</block>
- <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="social links product" after="product.info.overview">
+ <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links" after="product.info.overview">
<block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/>
</container>
</container>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/default.xml b/app/code/Magento/Catalog/view/frontend/layout/default.xml
index 4cef193beb1..939fe64c122 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/default.xml
@@ -27,7 +27,7 @@
<referenceBlock name="top.links">
<block class="Magento\Catalog\Block\Product\Compare\Link" name="catalog.compare.link" before="-" template="Magento_Catalog::product/compare/link.phtml"/>
</referenceBlock>
- <referenceContainer name="right">
+ <referenceContainer name="sidebar.additional">
<block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
</referenceContainer>
<referenceBlock name="head">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
new file mode 100644
index 00000000000..5b94b93ffd3
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Category view template
+ *
+ * @var $this \Magento\Catalog\Block\Category\View
+ */
+?>
+<?php if($this->isContentMode() || $this->isMixedMode()): ?>
+ <div class="category-cms">
+ <?php echo $this->getCmsBlockHtml(); ?>
+ </div>
+<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
new file mode 100644
index 00000000000..9d7494c6438
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Category view template
+ *
+ * @var $this \Magento\Catalog\Block\Category\View
+ */
+?>
+<?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
+ <div class="category-description">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($this->getCurrentCategory(), $_description, 'description') ?>
+ </div>
+<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
new file mode 100644
index 00000000000..401e47dffce
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Category view template
+ *
+ * @var $this \Magento\Catalog\Block\Category\View
+ */
+?>
+<?php
+ $_helper = $this->helper('Magento\Catalog\Helper\Output');
+ $_category = $this->getCurrentCategory();
+ $_imgHtml = '';
+ if ($_imgUrl = $_category->getImageUrl()) {
+ $_imgHtml = '<div class="category-image"><img src="' . $_imgUrl . '" alt="' . $this->escapeHtml($_category->getName()) . '" title="' . $this->escapeHtml($_category->getName()) . '" class="image" /></div>';
+ $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
+ echo $_imgHtml;
+ }
+?>
diff --git a/app/code/Magento/Widget/Helper/Data.php b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
similarity index 57%
rename from app/code/Magento/Widget/Helper/Data.php
rename to app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
index aed9d501cb0..e8db58a18bd 100644
--- a/app/code/Magento/Widget/Helper/Data.php
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
@@ -4,10 +4,10 @@
*
* NOTICE OF LICENSE
*
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
* It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
+ * http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magentocommerce.com so we can send you a copy immediately.
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-
+?>
+<?php
/**
- * Widget Data helper
+ * Category view template
*
- * @author Magento Core Team <core@magentocommerce.com>
+ * @var $this \Magento\Catalog\Block\Category\View
*/
-namespace Magento\Widget\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
-{
-}
+?>
+<?php if(!$this->isContentMode() || $this->isMixedMode()): ?>
+ <?php echo $this->getProductListHtml() ?>
+<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/msrp/popup.phtml b/app/code/Magento/Catalog/view/frontend/templates/msrp/popup.phtml
index 616a0f68804..d74cdcd7c6c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/msrp/popup.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/msrp/popup.phtml
@@ -30,22 +30,11 @@
?>
<?php if ($this->helper('Magento\Catalog\Helper\Data')->isMsrpEnabled()): ?>
<div id="map-popup-click-for-price" class="map popup">
- <div class="popup header">
+ <div class="popup-header">
<strong class="title" id="map-popup-heading-price"></strong>
</div>
- <div class="popup content">
+ <div class="popup-content">
<div class="map add form" id="map-popup-content">
- <form action="" method="POST" id="product_addtocart_form_from_popup" class="form map checkout">
- <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
-
- <div class="additional-addtocart-box">
- <?php echo $this->getChildHtml(); ?>
- </div>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart"
- id="map-popup-button">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- </form>
<div class="price-box">
<div class="map msrp" id="map-popup-msrp-box">
<span class="label"><?php echo __('Price'); ?></span>
@@ -60,6 +49,17 @@
<div id="map-popup-price" class="actual price"></div>
</div>
</div>
+ <form action="" method="POST" id="product_addtocart_form_from_popup" class="form map checkout">
+ <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
+
+ <div class="additional-addtocart-box">
+ <?php echo $this->getChildHtml(); ?>
+ </div>
+ <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart"
+ id="map-popup-button">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ </form>
</div>
<div class="map text" id="map-popup-text">
<?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessage(); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index 1365e416196..23bce71cbcd 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -92,7 +92,7 @@
<?php endif; ?>
</div>
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<a href="#" data-post='<?php echo $this->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist">
<span><?php echo __('Add to Wishlist') ?></span>
</a>
@@ -111,7 +111,7 @@
<?php if($_i++==0): ?>
<th scope="row" class="cell label">
<span class="attribute label">
- <?php echo $_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel()) ?>
+ <?php echo $this->escapeHtml($_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel())) ?>
</span>
</th>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index 46711847805..28fa39d52db 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -60,7 +60,7 @@ $count = $_helper->getItemCount();
</li>
<?php endforeach; ?>
</ol>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<a href="<?php echo $_helper->getListUrl() ?>" class="action compare primary"><span><?php echo __('Compare') ?></span></a>
</div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 72c042b8282..bab62726933 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -22,21 +22,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Catalog\Block\Product\Image */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Product\Image */
-<span class="img photo container"
- style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
- height:<?php echo $this->getProductImageView()->getHeight()?>px;
- display: block; position: relative;
- overflow: hidden"><img class="photo image"
- style="display: block;
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- margin: auto;"
- <?php echo $this->getAddAttribute(); ?>
- src="<?php echo $this->getProductImageView()->getUrl() ?>"
- alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
+$ratio = $this->getProductImageView()->getHeight() / $this->getProductImageView()->getWidth() * 100;
+?>
+<span class="product-image-container"
+ style="width:<?php echo $this->getProductImageView()->getWidth()?>px;">
+ <span class="product-image-wrapper"
+ style="padding-bottom: <?php echo $ratio?>%;">
+ <img class="product-image-photo"
+ <?php echo $this->getAddAttribute(); ?>
+ src="<?php echo $this->getProductImageView()->getUrl() ?>"
+ alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/></span>
</span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 29414b29845..d8450ba684b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -60,28 +60,28 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
.'top:' . $this->getVar("{$image}:height") . 'px;"';
}
?>
- <div class="products wrapper <?php echo $viewMode; ?>">
+ <div class="products wrapper <?php echo $viewMode; ?> products-<?php echo $viewMode; ?>">
<?php $iterator = 1; ?>
- <ol class="products list items">
+ <ol class="products list items product-items">
<?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
<?php foreach ($_productCollection as $_product): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
+ <?php echo ($iterator++==1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+ <div class="product-item-info">
<?php // Product Image ?>
- <a href="<?php echo $_product->getProductUrl() ?>" class="product photo">
+ <a href="<?php echo $_product->getProductUrl() ?>" class="product photo product-item-photo">
<?php echo $imageBlock->init($_product, $image)->toHtml() ?>
</a>
- <div class="product details">
+ <div class="product details product-item-details">
<?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
- <strong class="product name">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped; ?>">
+ <strong class="product name product-item-name">
+ <a class="product-item-link" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped; ?>">
<?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
</a>
</strong>
<?php echo $this->getReviewsSummaryHtml($_product, $templateType); ?>
<?php echo $this->getProductPrice($_product) ?>
- <div class="product actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
- <div class="primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position: ''; ?>>
+ <div class="product actions product-item-actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
+ <div class="actions-primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position: ''; ?>>
<?php if ($_product->isSaleable()): ?>
<button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart primary"
data-post='<?php echo $this->getAddToCartPostParams($_product); ?>'>
@@ -95,7 +95,7 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
<?php endif; ?>
<?php endif; ?>
</div>
- <div data-role="add-to-links" class="secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
+ <div data-role="add-to-links" class="actions-secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()): ?>
<a href="#" title="<?php echo __('Add to Wishlist') ?>"
data-post='<?php echo $this->getAddToWishlistParams($_product); ?>'
@@ -113,7 +113,7 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
</div>
</div>
<?php if ($showDescription):?>
- <div class="product description">
+ <div class="product description product-item-description">
<?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
<a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
class="action more"><?php echo __('Learn More') ?></a>
@@ -125,7 +125,5 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
<?php endforeach; ?>
</ol>
</div>
- <div class="toolbar bottom">
- <?php echo $this->getToolbarHtml() ?>
- </div>
+ <?php echo $this->getToolbarHtml() ?>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index 20b2d9ac30e..173982fc6b1 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -174,6 +174,7 @@ switch($type = $this->getType()) {
?>
<?php if ($exist):?>
+
<?php if($type == 'related' || $type == 'upsell'): ?>
<?php if($type == 'related'): ?>
<div class="block <?php echo $class; ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?php echo $limit; ?>" data-shuffle="<?php echo $shuffle; ?>">
@@ -183,32 +184,38 @@ switch($type = $this->getType()) {
<?php else: ?>
<div class="block <?php echo $class; ?>">
<?php endif; ?>
- <div class="title">
+ <div class="block-title title">
<strong><?php echo $title; ?></strong>
</div>
- <div class="content">
+ <div class="block-content content">
<?php if($type == 'related'): ?>
- <div class="actions">
+ <div class="block-actions">
<?php echo __('Check items to add to the cart or') ?>
<button type="button" class="action select" role="select-all"><span><?php echo __('select all') ?></span></button>
</div>
<?php endif; ?>
- <div class="products wrapper grid">
- <ol class="products list items <?php echo $type; ?>">
+ <div class="products wrapper grid products-grid products-<?php echo $type; ?>">
+ <ol class="products list items product-items">
<?php $iterator = 1; ?>
<?php foreach($items as $_item): ?>
+ <?php $available = ''; ?>
+ <?php if(!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
+ <?php if (!$_item->getRequiredOptions()): ?>
+ <?php $available = 'related-available'; ?>
+ <?php endif; ?>
+ <?php endif; ?>
<?php if($type == 'related' || $type == 'upsell'): ?>
- <?php echo ($iterator++==1) ? '<li class="item product" style="display: none;">' : '</li><li class="item product" style="display: none;">' ?>
+ <?php echo ($iterator++==1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
<?php else: ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <?php echo ($iterator++==1) ? '<li class="item product product-item">' : '</li><li class="item product">' ?>
<?php endif; ?>
- <div class="product">
+ <div class="product-item-info <?php echo $available; ?>">
<?php echo '<!-- ' . $image . '-->' ?>
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo product-item-photo">
<?php echo $imageBlock->init($_item, $image)->toHtml() ?>
</a>
- <div class="product details">
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
+ <div class="product details product-item-details">
+ <strong class="product name product-item-name"><a class="product-item-link" title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
<?php echo $this->escapeHtml($_item->getName()) ?></a>
</strong>
@@ -228,9 +235,9 @@ switch($type = $this->getType()) {
<?php endif; ?>
<?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
+ <div class="product actions product-item-actions">
<?php if($showCart): ?>
- <div class="primary">
+ <div class="actions-primary">
<?php if($_item->isSaleable()): ?>
<?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
<button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?php echo $this->getAddToCartUrl($_item) ?>"}}' type="button" title="<?php echo __('Add to Cart') ?>">
@@ -257,7 +264,7 @@ switch($type = $this->getType()) {
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#" data-post='<?php echo $this->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
<span><?php echo __('Add to Wishlist') ?></span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
index d2f1e84490b..85a7526d962 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -34,80 +34,14 @@ use \Magento\Catalog\Model\Product\ProductList\Toolbar;
<div class="toolbar products" data-mage-init='<?php echo $this->getWidgetOptionsJson(); ?>'>
<?php if ($this->isExpanded()): ?>
<div class="settings">
- <?php if ($this->isEnabledViewSwitcher()): ?>
- <div class="modes">
- <?php $_modes = $this->getModes(); ?>
- <?php if ($_modes && count($_modes) > 1): ?>
- <strong class="label"><?php echo __('View as') ?></strong>
- <?php foreach ($this->getModes() as $_code => $_label): ?>
- <?php if ($this->isModeActive($_code)): ?>
- <strong title="<?php echo $_label ?>"
- class="mode active <?php echo strtolower($_code); ?>"
- data-value="<?php echo strtolower($_code); ?>">
- <span><?php echo $_label ?></span>
- </strong>
- <?php else: ?>
- <a class="mode <?php echo strtolower($_code); ?>"
- title="<?php echo $_label ?>"
- href="#"
- data-role="mode-switcher"
- data-value="<?php echo strtolower($_code); ?>">
- <span><?php echo $_label ?></span>
- </a>
- <?php endif; ?>
- <?php endforeach; ?>
-
- <?php endif; ?>
- </div>
- <?php endif; ?>
- <div class="sorter">
- <label class="label" for="sorter"><?php echo __('Sort By') ?></label>
- <select id="sorter" data-role="sorter">
- <?php foreach ($this->getAvailableOrders() as $_key => $_order): ?>
- <option value="<?php echo $_key; ?>"
- <?php if ($this->isOrderCurrent($_key)): ?>
- selected="selected"
- <?php endif; ?>
- >
- <?php echo __($_order) ?>
- </option>
- <?php endforeach; ?>
- </select>
- <?php if ($this->getCurrentDirection() == 'desc'): ?>
- <a title="<?php echo __('Set Ascending Direction') ?>" href="#" class="action sort desc" data-role="direction-switcher" data-value="asc">
- <span><?php echo __('Set Ascending Direction') ?></span>
- </a>
- <?php else: ?>
- <a title="<?php echo __('Set Descending Direction') ?>" href="#" class="action sort asc" data-role="direction-switcher" data-value="desc">
- <span><?php echo __('Set Descending Direction') ?></span>
- </a>
- <?php endif; ?>
- </div>
+ <?php include($this->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
+ <?php include($this->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
</div>
<?php endif; ?>
<?php echo $this->getPagerHtml() ?>
<div class="pager">
- <p class="amount">
- <?php if ($this->getLastPageNum() > 1): ?>
- <?php echo __('Items %1-%2 of %3', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
- <?php elseif ($this->getLastPageNum() == 1): ?>
- <?php echo __('%1 Item', $this->getTotalNum()) ?>
- <?php else: ?>
- <?php echo __('%1 Item(s)', $this->getTotalNum()) ?>
- <?php endif; ?>
- </p>
- <div class="limiter">
- <strong class="label"><?php echo __('Show') ?></strong>
- <select id="limiter" data-role="limiter">
- <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
- <option value="<?php echo $_key ?>"<?php if ($this->isLimitCurrent($_key)): ?>
- selected="selected"<?php endif ?>>
- <?php echo $_limit ?>
- </option>
- <?php endforeach; ?>
- </select>
- <span class="text"><?php echo __('per page') ?></span>
- </div>
+ <?php include($this->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
+ <?php include($this->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
</div>
</div>
<?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
new file mode 100644
index 00000000000..4f037760cd9
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Product list toolbar
+ *
+ * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
+ */
+use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+?>
+<p class="toolbar-amount">
+ <?php if ($this->getLastPageNum() > 1): ?>
+ <?php echo __('Items %1-%2 of %3',
+ '<span class="toolbar-number">' . $this->getFirstNum() . '</span>',
+ '<span class="toolbar-number">' . $this->getLastNum() . '</span>',
+ '<span class="toolbar-number">' . $this->getTotalNum() . '</span>') ?>
+ <?php elseif ($this->getTotalNum() == 1): ?>
+ <?php echo __('%1 Item',
+ '<span class="toolbar-number">' . $this->getTotalNum() . '</span>') ?>
+ <?php else: ?>
+ <?php echo __('%1 Items',
+ '<span class="toolbar-number">' . $this->getTotalNum() . '</span>') ?>
+ <?php endif; ?>
+</p>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
new file mode 100644
index 00000000000..520640d5011
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Product list toolbar
+ *
+ * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
+ */
+use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+?>
+<div class="limiter">
+ <strong class="limiter-label"><?php echo __('Show') ?></strong>
+ <select id="limiter" data-role="limiter" class="limiter-options">
+ <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
+ <option value="<?php echo $_key ?>"<?php if ($this->isLimitCurrent($_key)): ?>
+ selected="selected"<?php endif ?>>
+ <?php echo $_limit ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ <span class="limiter-text"><?php echo __('per page') ?></span>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
new file mode 100644
index 00000000000..117493dc437
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Product list toolbar
+ *
+ * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
+ */
+use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+?>
+<div class="toolbar-sorter sorter">
+ <label class="sorter-label" for="sorter"><?php echo __('Sort By') ?></label>
+ <select id="sorter" data-role="sorter" class="sorter-options">
+ <?php foreach ($this->getAvailableOrders() as $_key => $_order): ?>
+ <option value="<?php echo $_key; ?>"
+ <?php if ($this->isOrderCurrent($_key)): ?>
+ selected="selected"
+ <?php endif; ?>
+ >
+ <?php echo $this->escapeHtml(__($_order)) ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ <?php if ($this->getCurrentDirection() == 'desc'): ?>
+ <a title="<?php echo __('Set Ascending Direction') ?>" href="#" class="action sorter-action sort-desc" data-role="direction-switcher" data-value="asc">
+ <span><?php echo __('Set Ascending Direction') ?></span>
+ </a>
+ <?php else: ?>
+ <a title="<?php echo __('Set Descending Direction') ?>" href="#" class="action sorter-action sort-asc" data-role="direction-switcher" data-value="desc">
+ <span><?php echo __('Set Descending Direction') ?></span>
+ </a>
+ <?php endif; ?>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
new file mode 100644
index 00000000000..6eb31fe8aed
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Product list toolbar
+ *
+ * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
+ */
+use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+?>
+<?php if ($this->isEnabledViewSwitcher()): ?>
+<div class="modes">
+ <?php $_modes = $this->getModes(); ?>
+ <?php if ($_modes && count($_modes) > 1): ?>
+ <strong class="modes-label"><?php echo __('View as') ?></strong>
+ <?php foreach ($this->getModes() as $_code => $_label): ?>
+ <?php if ($this->isModeActive($_code)): ?>
+ <strong title="<?php echo $_label ?>"
+ class="modes-mode active mode-<?php echo strtolower($_code); ?>"
+ data-value="<?php echo strtolower($_code); ?>">
+ <span><?php echo $_label ?></span>
+ </strong>
+ <?php else: ?>
+ <a class="modes-mode mode-<?php echo strtolower($_code); ?>"
+ title="<?php echo $_label ?>"
+ href="#"
+ data-role="mode-switcher"
+ data-value="<?php echo strtolower($_code); ?>">
+ <span><?php echo $_label ?></span>
+ </a>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ <?php endif; ?>
+</div>
+<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
index 86467a5831c..ca2bf99f653 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -112,8 +112,6 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
<?php endforeach; ?>
</ol>
</div>
-<div class="toolbar-bottom">
- <?php echo $this->getToolbarHtml() ?>
-</div>
+<?php echo $this->getToolbarHtml() ?>
<?php endif; ?>
<?php echo $time_taken = microtime(true) - $start; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
index 8cc6550e075..44ed72e1282 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
@@ -29,7 +29,7 @@ $_wishlistSubmitParams = $this->helper('Magento\Wishlist\Helper\Data')->getAddPa
$compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
?>
-<div class="product addto links" data-role="add-to-links">
+<div class="product-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
<a href="#"
class="action towishlist"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index 562c3ac406f..54205c6c25e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -27,34 +27,36 @@
<?php $_product = $this->getProduct(); ?>
<?php $buttonTitle = __('Add to Cart'); ?>
<?php if ($_product->isSaleable()): ?>
-<div class="box tocart">
- <?php if ($this->shouldRenderQuantity()): ?>
- <div class="field qty">
- <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
- <div class="control">
- <input type="number"
- name="qty"
- id="qty"
- maxlength="12"
- value="<?php echo $this->getProductDefaultQty() * 1 ?>"
- title="<?php echo __('Qty') ?>" class="input-text qty"
- <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
- data-validate="{required:true, 'validate-greater-than-zero':true}"
- <?php else: ?>
- data-validate="{required:true, digits:true}"
- <?php endif; ?> />
+<div class="box-tocart">
+ <fieldset class="fieldset">
+ <?php if ($this->shouldRenderQuantity()): ?>
+ <div class="field qty">
+ <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
+ <div class="control">
+ <input type="number"
+ name="qty"
+ id="qty"
+ maxlength="12"
+ value="<?php echo $this->getProductDefaultQty() * 1 ?>"
+ title="<?php echo __('Qty') ?>" class="input-text qty"
+ <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
+ data-validate="{required:true, 'validate-greater-than-zero':true}"
+ <?php else: ?>
+ data-validate="{required:true, digits:true}"
+ <?php endif; ?> />
+ </div>
</div>
- </div>
- <?php endif; ?>
- <div class="actions">
- <button type="submit"
- title="<?php echo $buttonTitle ?>"
- class="action primary tocart"
- id="product-addtocart-button">
- <span><?php echo $buttonTitle ?></span>
- </button>
- <?php echo $this->getChildHtml('', true) ?>
- </div>
+ <?php endif; ?>
+ <div class="actions">
+ <button type="submit"
+ title="<?php echo $buttonTitle ?>"
+ class="action primary tocart"
+ id="product-addtocart-button">
+ <span><?php echo $buttonTitle ?></span>
+ </button>
+ <?php echo $this->getChildHtml('', true) ?>
+ </div>
+ </fieldset>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index d896dee7059..184773a2fc6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -38,7 +38,7 @@
});
})(jQuery);
</script>
-<div class="product add form">
+<div class="product-add-form">
<form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post"
id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
<input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
index 4c737149fbd..a1d9322ec2c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
@@ -25,8 +25,6 @@
<?php $_product = $this->getProduct() ?>
<?php if ($this->canEmailToFriend()): ?>
<a title="<?php echo __('Email to a Friend') ?>"
- class="action mailto friend"
- href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>">
- <span><?php echo __('Email to a Friend') ?></span>
- </a>
+ href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
+ class="action mailto friend"><span><?php echo __('Email to a Friend') ?></span></a>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
index ddc0178145f..306ebe2eddd 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
@@ -28,7 +28,7 @@ if ($this->hasRequiredOptions()) {
$required = ' data-hasrequired="' . __('* Required Fields') . '"';
}
?>
-<div class="product options wrapper" id="product-options-wrapper"<?php echo $required; ?>>
+<div class="product-options-wrapper" id="product-options-wrapper"<?php echo $required; ?>>
<fieldset class="fieldset">
<?php echo $this->getChildHtml('', true);?>
</fieldset>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml
index a64b0d45508..cb4ee065117 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="product options bottom">
+<div class="product-options-bottom">
<?php echo $this->getChildHtml('', true);?>
</div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index f41da988bd4..3189aa6e55c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -110,7 +110,7 @@ if ($exist = ($this->getProductCollection() && $this->getProductCollection()->ge
</div>
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
data-post='<?php echo $this->getAddToWishlistParams($_item); ?>'
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index 4ca56ee06f9..3c827400063 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -108,7 +108,7 @@ if ($exist = ($this->getProductCollection() && $this->getProductCollection()->ge
</div>
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
data-post='<?php echo $this->getAddToWishlistParams($_item); ?>'
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 5a63675b971..2b13d132629 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2017,7 +2017,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$rowNum,
!isset($this->_oldSku[$sku])
);
- if (!$rowAttributesValid && self::SCOPE_DEFAULT == $rowScope && !isset($this->_oldSku[$sku])) {
+ if (!$rowAttributesValid && self::SCOPE_DEFAULT == $rowScope) {
// mark SCOPE_DEFAULT row as invalid for future child rows if product not in DB already
$sku = false;
}
diff --git a/app/code/Magento/CatalogImportExport/i18n/de_DE.csv b/app/code/Magento/CatalogImportExport/i18n/de_DE.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/de_DE.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogImportExport/i18n/en_US.csv b/app/code/Magento/CatalogImportExport/i18n/en_US.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/en_US.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogImportExport/i18n/es_ES.csv b/app/code/Magento/CatalogImportExport/i18n/es_ES.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/es_ES.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogImportExport/i18n/fr_FR.csv b/app/code/Magento/CatalogImportExport/i18n/fr_FR.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/fr_FR.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogImportExport/i18n/nl_NL.csv b/app/code/Magento/CatalogImportExport/i18n/nl_NL.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/nl_NL.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogImportExport/i18n/pt_BR.csv b/app/code/Magento/CatalogImportExport/i18n/pt_BR.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/pt_BR.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogImportExport/i18n/zh_CN.csv b/app/code/Magento/CatalogImportExport/i18n/zh_CN.csv
new file mode 100644
index 00000000000..1dc4dab0230
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/i18n/zh_CN.csv
@@ -0,0 +1,16 @@
+"Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of' ' \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"
+"Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType","Entity type model must be an instance of ' 'Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType"
+"Invalid custom option store.","Invalid custom option store."
+"Invalid custom option type.","Invalid custom option type."
+"Empty custom option title.","Empty custom option title."
+"Invalid custom option price.","Invalid custom option price."
+"Invalid custom option maximum characters value.","Invalid custom option maximum characters value."
+"Invalid custom option sort order.","Invalid custom option sort order."
+"Invalid custom option value price.","Invalid custom option value price."
+"Invalid custom option value sort order.","Invalid custom option value sort order."
+"Custom option with such title already declared in source file.","Custom option with such title already declared in source file."
+"There are several existing custom options with such name.","There are several existing custom options with such name."
+"Custom options have different types.","Custom options have different types."
+"Option entity must have a parent product entity.","Option entity must have a parent product entity."
+"Please correct the parameters.","Please correct the parameters."
diff --git a/app/code/Magento/CatalogInventory/i18n/de_DE.csv b/app/code/Magento/CatalogInventory/i18n/de_DE.csv
index bb27d9d524e..27a18bc53d3 100644
--- a/app/code/Magento/CatalogInventory/i18n/de_DE.csv
+++ b/app/code/Magento/CatalogInventory/i18n/de_DE.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" ist nicht in der gewünschten Menge verfügbar. %s der Artikel werden nachbestellt."
-"%s is available for purchase in increments of %s only.","%s ist nur in Schritten von%s erhältlich."
-"%s is not a correct comparsion method.","%s ist keine korrekte Vergleichsmethode."
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>Beachten Sie</strong>, dass diese Einstellungen für Warenkorbartikel gelten und nicht für den gesamten Warenkorb."
-"Add Minimum Quantity","Mindestanzahl hinzufügen"
-"Allow Quantity Below 0","Anzahl unter 0 erlauben"
-"Allow Quantity Below 0 and Notify Customer","Anzahl unter 0 erlauben und Kunden benachrichtigen"
-"Automatically Return Credit Memo Item to Stock","Gutschriftartikel automatisch zum Lager retournieren"
-"Backorders","Lieferückstand"
-"By Fixed value","Nach festen Wert"
-"By Percentage","Nach Prozent"
-"Cannot specify product identifier for the order item.","Produktidentifier für den Artikel kann nicht spezifiziert werden."
-"Catalog Inventory","Kataloginventar"
-"Decrease Stock When Order is Placed","Lagerbestand verringern wenn Bestellung erfolgt ist"
-"Display Out of Stock Products","Ausverkaufte Produkte anzeigen"
-"Enable Quantity Increments","Anzahlzunahme aktivieren"
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Manage Stock","Manage Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
+"Notify for Quantity Below","Notify for Quantity Below"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
"In Stock","Auf Lager"
-"Index Product Stock Status","Index Produkt Lagerstatus"
-"Inventory","Inventar"
-"Inventory API","Inventar API"
-"Inventory Section","Invetarbereich"
-"Manage Stock","Lagerbestand verwalten"
-"Maximum Quantity Allowed in Shopping Cart","Maximal im Warenkorb erlaubte Anzahl"
-"Minimum Quantity","Mindestanzahl"
-"Minimum Quantity Allowed in Shopping Cart","Im Warenkorb erlaubte Mindestanzahl"
-"No Backorders","Kein Lieferrückstand"
-"Not all products are available in the requested quantity","Nicht alle Produkte sind in der gewünschten Menge verfügbar"
-"Notify for Quantity Below","Bei unterer Anzahl benachrichtigen."
-"Only X left Threshold","Nur X übrig Schwellenwert"
"Out of Stock","Nicht auf Lager"
-"Product Stock Options","Produktlageroptionen"
-"Quantity Increments","Mengenzunahme"
-"Quantity for Item's Status to Become Out of Stock","Menge für Artikel Status Ausverkauft"
-"Retrieve stock data","Lagerdaten abfragen."
-"Retrieve stock data by product ids","Lagerdaten nach ProduktID abfragen"
-"Rule price","Regeilpreis"
-"Set Items' Status to be In Stock When Order is Cancelled","Artikelstatus auf Lagernd Wenn Bestellung Storniert Wird setzen"
-"Some of the products are currently out of stock","Einige Produkte sind derzeit ausverkauft"
-"Some of the products cannot be ordered in requested quantity.","Einige Produkte können nicht in der gewünschten Menge bestellt werden."
-"Some of the products cannot be ordered in the requested quantity.","Einige der Produkte können nicht in der erwünschten Menge bestellt werden."
-"Stock Options","Lageroptionen"
-"Stock Status","Lagerstatus"
-"The maximum quantity allowed for purchase is %s.","Die Höchstmenge zum Kauf beträgt %s."
-"The minimum quantity allowed for purchase is %s.","Die Mindestmenge für den Kauf beträgt %s."
-"The requested quantity for ""%s"" is not available.","Die gewünschte Menge für ""%s"" ist nicht verfügbar."
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
+"Stock Status",Lagerstatus
+"Index Product Stock Status","Index Produkt Lagerstatus"
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
"The stock item for Product in option is not valid.","Der Lagerartikel für das Produkt in Option ist nicht gültig."
-"The stock item for Product is not valid.","Der Lagerartikel für das Produkt ist nicht gültig."
-"This product is available for purchase in increments of %s only.","Dieses Produkt ist nur in Erhöhungen von %s verfügbar."
-"This product is currently out of stock.","Dieses Produkt ist derzeit ausverkauft."
-"This product is not available in the requested quantity. %s of the items will be backordered.","Dieses Produkt ist nicht in der gewünschten Menge verfügbar. %s der Artikel werden nachbestellt."
-"To Fixed Value","Zu festen Wert"
-"To Percentage","Zu Prozent"
-"Undefined product type.","Undefinierter Produkttyp."
-"Update","Aktualisieren"
-"Update product stock data","Produkt Lagerdaten aktualisieren"
-"Update the Product","Produkt aktualisieren"
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders","Kein Lieferrückstand"
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv
index 1b66852f407..38f9b1d16b2 100644
--- a/app/code/Magento/CatalogInventory/i18n/en_US.csv
+++ b/app/code/Magento/CatalogInventory/i18n/en_US.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" is not available in the requested quantity. %s of the items will be backordered."
-"%s is available for purchase in increments of %s only.","%s is available for purchase in increments of %s only."
-"%s is not a correct comparsion method.","%s is not a correct comparsion method."
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart."
-"Add Minimum Quantity","Add Minimum Quantity"
-"Allow Quantity Below 0","Allow Quantity Below 0"
-"Allow Quantity Below 0 and Notify Customer","Allow Quantity Below 0 and Notify Customer"
-"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
-"Backorders","Backorders"
-"By Fixed value","By Fixed value"
-"By Percentage","By Percentage"
-"Cannot specify product identifier for the order item.","Cannot specify product identifier for the order item."
-"Catalog Inventory","Catalog Inventory"
-"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
-"Display Out of Stock Products","Display Out of Stock Products"
-"Enable Quantity Increments","Enable Quantity Increments"
-"In Stock","In Stock"
-"Index Product Stock Status","Index Product Stock Status"
-"Inventory","Inventory"
-"Inventory API","Inventory API"
-"Inventory Section","Inventory Section"
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
"Manage Stock","Manage Stock"
-"Maximum Quantity Allowed in Shopping Cart","Maximum Quantity Allowed in Shopping Cart"
-"Minimum Quantity","Minimum Quantity"
-"Minimum Quantity Allowed in Shopping Cart","Minimum Quantity Allowed in Shopping Cart"
-"No Backorders","No Backorders"
-"Not all products are available in the requested quantity","Not all products are available in the requested quantity"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
"Notify for Quantity Below","Notify for Quantity Below"
-"Only X left Threshold","Only X left Threshold"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"In Stock","In Stock"
"Out of Stock","Out of Stock"
-"Product Stock Options","Product Stock Options"
-"Quantity Increments","Quantity Increments"
-"Quantity for Item's Status to Become Out of Stock","Quantity for Item's Status to Become Out of Stock"
-"Retrieve stock data","Retrieve stock data"
-"Retrieve stock data by product ids","Retrieve stock data by product ids"
-"Rule price","Rule price"
-"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
-"Some of the products are currently out of stock","Some of the products are currently out of stock"
-"Some of the products cannot be ordered in requested quantity.","Some of the products cannot be ordered in requested quantity."
-"Some of the products cannot be ordered in the requested quantity.","Some of the products cannot be ordered in the requested quantity."
-"Stock Options","Stock Options"
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
"Stock Status","Stock Status"
-"The maximum quantity allowed for purchase is %s.","The maximum quantity allowed for purchase is %s."
-"The minimum quantity allowed for purchase is %s.","The minimum quantity allowed for purchase is %s."
-"The requested quantity for ""%s"" is not available.","The requested quantity for ""%s"" is not available."
+"Index Product Stock Status","Index Product Stock Status"
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
"The stock item for Product in option is not valid.","The stock item for Product in option is not valid."
-"The stock item for Product is not valid.","The stock item for Product is not valid."
-"This product is available for purchase in increments of %s only.","This product is available for purchase in increments of %s only."
-"This product is currently out of stock.","This product is currently out of stock."
-"This product is not available in the requested quantity. %s of the items will be backordered.","This product is not available in the requested quantity. %s of the items will be backordered."
-"To Fixed Value","To Fixed Value"
-"To Percentage","To Percentage"
-"Undefined product type.","Undefined product type."
-"Update","Update"
-"Update product stock data","Update product stock data"
-"Update the Product","Update the Product"
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders","No Backorders"
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogInventory/i18n/es_ES.csv b/app/code/Magento/CatalogInventory/i18n/es_ES.csv
index 92260ef8cd4..ae5832b22fb 100644
--- a/app/code/Magento/CatalogInventory/i18n/es_ES.csv
+++ b/app/code/Magento/CatalogInventory/i18n/es_ES.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" no está disponible en la cantidad solicitada. %s de los artÃculos han sido quitados del pedido."
-"%s is available for purchase in increments of %s only.","%s sólo se puede comprar en incrementos de %s."
-"%s is not a correct comparsion method.","%s no es un método de comparación correcto."
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>Tenga en cuenta</strong> que esta configuración es aplicable a los artÃculos de lÃnea del carro de la compra, no al carro en su totalidad."
-"Add Minimum Quantity","Añadir Cantidad MÃnima"
-"Allow Quantity Below 0","Permitir cantidad menor que 0"
-"Allow Quantity Below 0 and Notify Customer","Permitir Cantidad Menor que 0 y Notificar al Cliente"
-"Automatically Return Credit Memo Item to Stock","Devolver Automáticamente ArtÃculo de Factura de Abono a Existencias"
-"Backorders","Pedidos Pendientes"
-"By Fixed value","Por valor Fijo"
-"By Percentage","Por Porcentaje"
-"Cannot specify product identifier for the order item.","No se puede especificar el identificador del producto para el artÃculo del pedido."
-"Catalog Inventory","Inventario del Catálogo"
-"Decrease Stock When Order is Placed","Disminuir Existencias Cuando Se Realiza El Pedido"
-"Display Out of Stock Products","Visualizar los productos agotados"
-"Enable Quantity Increments","Posibilitar Incrementos de Cantidad"
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Manage Stock","Manage Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
+"Notify for Quantity Below","Notify for Quantity Below"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
"In Stock","En Existencia"
-"Index Product Stock Status","Estado de Existencias de Producto de Ãndice"
-"Inventory","Inventario"
-"Inventory API","API de Inventario"
-"Inventory Section","Sección del Inventario"
-"Manage Stock","Gestionar Existencias"
-"Maximum Quantity Allowed in Shopping Cart","Cantidad Máxima Permitida en el Carro de la Compra"
-"Minimum Quantity","Cantidad MÃnima"
-"Minimum Quantity Allowed in Shopping Cart","Cantidad MÃnima Permitida en el Carro de la Compra"
-"No Backorders","No Hay Pedidos Pendientes"
-"Not all products are available in the requested quantity","No todos los productos están disponibles en la cantidad solicitada."
-"Notify for Quantity Below","Notificar cuando la Cantidad sea Inferior a"
-"Only X left Threshold","Sólo X ha superado el Umbral"
"Out of Stock","Sin Existencias"
-"Product Stock Options","Opciones de Existencias de Producto"
-"Quantity Increments","Incrementos de Cantidad"
-"Quantity for Item's Status to Become Out of Stock","Cantidad de artÃculos disponibles antes de agotarse"
-"Retrieve stock data","Recuperar datos de existencias"
-"Retrieve stock data by product ids","Recuperar datos de existencias por identificadores de producto"
-"Rule price","Regla de precio"
-"Set Items' Status to be In Stock When Order is Cancelled","Establecer Estado de ArtÃculos en Existencias Cuando Se Cancela Un Pedido"
-"Some of the products are currently out of stock","Algunos de los productos están agotados en este momento"
-"Some of the products cannot be ordered in requested quantity.","Algunos de los productos no se pueden encargar en la cantidad solicitada."
-"Some of the products cannot be ordered in the requested quantity.","No se puede realizar el pedido de algunos productos en la cantidad solicitada."
-"Stock Options","Opciones de Existencias"
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
"Stock Status","Estado de Existencias"
-"The maximum quantity allowed for purchase is %s.","La cantidad máxima permitida para comprar es de %s."
-"The minimum quantity allowed for purchase is %s.","La cantidad mÃnima permitida para comprar es de %s."
-"The requested quantity for ""%s"" is not available.","La cantidad solicitada de ""%s"" no está disponible."
+"Index Product Stock Status","Estado de Existencias de Producto de Ãndice"
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
"The stock item for Product in option is not valid.","El artÃculo de existencias para el Producto en opción no es válido."
-"The stock item for Product is not valid.","El artÃculo de existencias para el Producto no es válido."
-"This product is available for purchase in increments of %s only.","Este producto esta disponible para la compra en incrementos de %s únicamente."
-"This product is currently out of stock.","Este producto está agotado en este momento."
-"This product is not available in the requested quantity. %s of the items will be backordered.","Este producto no está disponible en la cantidad solicitada. Se cancelará el pedido de %s de los artÃculos."
-"To Fixed Value","Para Valor Fijo"
-"To Percentage","Para Porcentaje"
-"Undefined product type.","Tipo de producto no definido."
-"Update","Actualización"
-"Update product stock data","Actualizar datos de existencias de producto"
-"Update the Product","Actualizar el Producto"
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders","No Hay Pedidos Pendientes"
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogInventory/i18n/fr_FR.csv b/app/code/Magento/CatalogInventory/i18n/fr_FR.csv
index 91afc66d3e9..9f26189b6bf 100644
--- a/app/code/Magento/CatalogInventory/i18n/fr_FR.csv
+++ b/app/code/Magento/CatalogInventory/i18n/fr_FR.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""% s"" n'est pas disponible dans la quantité demandée. %s des articles seront différés."
-"%s is available for purchase in increments of %s only.","%s est disponible pour achat par incréments de %s seulement."
-"%s is not a correct comparsion method.","%s n'est pas une méthode de comparaison correcte."
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>Notez</strong> que ces paramètres sont applicables aux articles de lignes du caddy, non pas au caddy tout entier."
-"Add Minimum Quantity","Ajoutez une Qté minimum"
-"Allow Quantity Below 0","Permettre une quantité inférieure à 0"
-"Allow Quantity Below 0 and Notify Customer","Ajouter Qté inférieure à 0 et avertir le client"
-"Automatically Return Credit Memo Item to Stock","Retournez automatiquement un article d'Avoir dans le stock"
-"Backorders","Commandes en rupture de stock"
-"By Fixed value","Par valeur fixée"
-"By Percentage","Par pourcentage"
-"Cannot specify product identifier for the order item.","Ne peut spécifier l'identifiant du produit pour l'article de la commande."
-"Catalog Inventory","Inventaire de catalogue"
-"Decrease Stock When Order is Placed","Diminuer le stock quand la commande est passée"
-"Display Out of Stock Products","Afficher les produits en rupture de stock"
-"Enable Quantity Increments","Activer incréments de la Qté"
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Manage Stock","Manage Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
+"Notify for Quantity Below","Notify for Quantity Below"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
"In Stock","En stock"
-"Index Product Stock Status","Indexe état du stock de produit"
-"Inventory","Inventaire"
-"Inventory API","Inventaire API"
-"Inventory Section","Section de l'inventaire"
-"Manage Stock","Gérer le stock"
-"Maximum Quantity Allowed in Shopping Cart","Qté maximum permise dans le caddy"
-"Minimum Quantity","Qté minimum"
-"Minimum Quantity Allowed in Shopping Cart","Qté minimum permise dans le caddy"
-"No Backorders","Pas de commande en rupture de stock"
-"Not all products are available in the requested quantity","Tous les produits ne sont pas disponibles dans la quantité requise"
-"Notify for Quantity Below","Avertir pour quantité ci-dessous"
-"Only X left Threshold","Seul X a quitté le seuil"
"Out of Stock","Pas en stock"
-"Product Stock Options","Options du stock de produit"
-"Quantity Increments","Incréments de quantité"
-"Quantity for Item's Status to Become Out of Stock","Qté pour que le statut de l'article devienne épuisé"
-"Retrieve stock data","Extrait données de stock"
-"Retrieve stock data by product ids","Extrait données de stock par identifiants produit"
-"Rule price","Dirige prix"
-"Set Items' Status to be In Stock When Order is Cancelled","Met l'état de l'article comme étant en stock lorsque la commande est annulée"
-"Some of the products are currently out of stock","Certains des produits sont actuellement épuisés."
-"Some of the products cannot be ordered in requested quantity.","Certains des produits ne peuvent pas être commandés dans la quantité souhaitée."
-"Some of the products cannot be ordered in the requested quantity.","Certains des produits ne peuvent être commandés dans la quantité requise."
-"Stock Options","Options de stock"
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
"Stock Status","État de stock"
-"The maximum quantity allowed for purchase is %s.","La quantité maximale autorisée pour la commande est %s."
-"The minimum quantity allowed for purchase is %s.","La quantité minimale autorisée pour la commande est %s."
-"The requested quantity for ""%s"" is not available.","La quantité demandée pour « % s » n'est pas disponible."
+"Index Product Stock Status","Indexe état du stock de produit"
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
"The stock item for Product in option is not valid.","L'article de stock pour produit en option n'est pas valide."
-"The stock item for Product is not valid.","L'article de stock pour produit n'est pas valide."
-"This product is available for purchase in increments of %s only.","Le produit est disponible pour achat seulement en incréments de %s."
-"This product is currently out of stock.","Ce produit est actuellement épuisé."
-"This product is not available in the requested quantity. %s of the items will be backordered.","Ce produit n'est pas disponible dans la quantité demandée. %s des articles seront livrés ultérieurement"
-"To Fixed Value","A valeur fixée"
-"To Percentage","Au pourcentage"
-"Undefined product type.","Type de produit indéfini."
-"Update","Mise à jour"
-"Update product stock data","Mise à jour des données du stock de produit"
-"Update the Product","Mise à jour produit"
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders","Pas de commande en rupture de stock"
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogInventory/i18n/nl_NL.csv b/app/code/Magento/CatalogInventory/i18n/nl_NL.csv
index 2fd36e937a3..94787f375cc 100644
--- a/app/code/Magento/CatalogInventory/i18n/nl_NL.csv
+++ b/app/code/Magento/CatalogInventory/i18n/nl_NL.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" is niet beschikbaar in gevraagde hoeveelheid. %s van de artikelen zullen terugbesteld worden."
-"%s is available for purchase in increments of %s only.","%s is beschikbaar voor verkoop, doch enkel in groeitoename van %s."
-"%s is not a correct comparsion method.","%s is geen correcte vergelijkingsmethode."
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>Let op</strong> dat deze instellingen alleen van toepassing zijn op winkelwagen lijn producten, niet op de hele winkelwagen."
-"Add Minimum Quantity","Voeg minimumhoeveelheid toe"
-"Allow Quantity Below 0","Sta hoeveelheid minder dan 0 toe"
-"Allow Quantity Below 0 and Notify Customer","Sta hoeveelheid minder dan 0 toe en waarschuw klant"
-"Automatically Return Credit Memo Item to Stock","Retourneer automatisch het krediet memo product aan de vooraad"
-"Backorders","Nabestellingen"
-"By Fixed value","Bij gefixeerde waarde"
-"By Percentage","Bij percentage"
-"Cannot specify product identifier for the order item.","Kan geen product identificeerder specificeren voor te bestellen product"
-"Catalog Inventory","Catalogus voorraad"
-"Decrease Stock When Order is Placed","Verminder voorraad wanneer bestelling is geplaatst"
-"Display Out of Stock Products","Toon Producten die Niet op Voorraad Zijn"
-"Enable Quantity Increments","Sta groeitoename in hoeveelheid toe"
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Manage Stock","Manage Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
+"Notify for Quantity Below","Notify for Quantity Below"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
"In Stock","Op voorraad"
-"Index Product Stock Status","Index product voorraad status"
-"Inventory","Voorraad"
-"Inventory API","Voorraad API"
-"Inventory Section","Voorraad sectie"
-"Manage Stock","Beheer voorraad"
-"Maximum Quantity Allowed in Shopping Cart","Maximale hoeveelheid toegestaan in winkelwagen"
-"Minimum Quantity","Minimale hoeveelheid"
-"Minimum Quantity Allowed in Shopping Cart","Minimale hoeveelheid toegestaan in winkelwagen"
-"No Backorders","Geen nabestellingen"
-"Not all products are available in the requested quantity","Niet alle producten zijn beschikbaar in de aangevraagde hoeveelheid"
-"Notify for Quantity Below","Bericht bij hoeveelheid minder dan"
-"Only X left Threshold","Slechts X over drempel"
"Out of Stock","Niet op voorraad"
-"Product Stock Options","Product voorraad opties"
-"Quantity Increments","Hoeveelheid groeitoename"
-"Quantity for Item's Status to Become Out of Stock","Aantal voor Artikelstatus wordt Niet op voorraad"
-"Retrieve stock data","Verkrijg voorraad data"
-"Retrieve stock data by product ids","Verkrijg voorraad data, gesorteerd op product IDs"
-"Rule price","Regelprijs"
-"Set Items' Status to be In Stock When Order is Cancelled","Stel product status in op 'op voorraad' wanneer bestelling is geannuleerd"
-"Some of the products are currently out of stock","Een aantal van de producten is op dit moment niet op voorraad"
-"Some of the products cannot be ordered in requested quantity.","Een aantal van de producten kan niet in de gevraagde hoeveelheid besteld worden"
-"Some of the products cannot be ordered in the requested quantity.","Enkelen van de producten kunnen niet besteld worden in de aangevraagde hoeveelheid"
-"Stock Options","Voorraadopties"
-"Stock Status","Voorraadstatus"
-"The maximum quantity allowed for purchase is %s.","Het maximale aantal dat kan worden gekocht is %s."
-"The minimum quantity allowed for purchase is %s.","Het minimale aantal dat kan worden gekocht is %s."
-"The requested quantity for ""%s"" is not available.","De gevraagde hoeveelheid voor ""%s"" is niet beschikbaar."
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
+"Stock Status",Voorraadstatus
+"Index Product Stock Status","Index product voorraad status"
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
"The stock item for Product in option is not valid.","Het voorraadproduct voor product in opties is niet geldig."
-"The stock item for Product is not valid.","Het voorraadproduct voor product is niet geldig."
-"This product is available for purchase in increments of %s only.","Dit product is beschikbaar voor verkoop, doch enkel in groeitoenames van %s."
-"This product is currently out of stock.","Dit product is op dit moment niet op voorraad."
-"This product is not available in the requested quantity. %s of the items will be backordered.","Dit product is niet in de gevraagde hoeveelheid beschikbaar. % s van de artikelen worden nabesteld."
-"To Fixed Value","Naar gefixeerde waarde"
-"To Percentage","Naar percentage"
-"Undefined product type.","Niet-gedefinieerd producttype"
-"Update","wijziging"
-"Update product stock data","Vernieuw product voorraad data"
-"Update the Product","Vernieuw het product"
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders","Geen nabestellingen"
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogInventory/i18n/pt_BR.csv b/app/code/Magento/CatalogInventory/i18n/pt_BR.csv
index a44543201a6..7b0d5f0ea27 100644
--- a/app/code/Magento/CatalogInventory/i18n/pt_BR.csv
+++ b/app/code/Magento/CatalogInventory/i18n/pt_BR.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" não está disponÃvel na quantidade solicitada. %s dos itens será encomendado."
-"%s is available for purchase in increments of %s only.","%s está disponÃvel para compra apenas em incrementos de %s."
-"%s is not a correct comparsion method.","%s não é um método correto de comparação."
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>Note</strong> que essas configurações são aplicáveis ​​aos itens de linha do carrinho, não o carrinho inteiro."
-"Add Minimum Quantity","Adicionar Qtde mÃnima"
-"Allow Quantity Below 0","Permitir Qtde Abaixo de 0"
-"Allow Quantity Below 0 and Notify Customer","Permitir Qtde Abaixo de 0 e Notificar o Cliente"
-"Automatically Return Credit Memo Item to Stock","Retornar Automaticamente a Nota de Crédito do Item para o Estoque"
-"Backorders","Ordens em Atraso"
-"By Fixed value","Por Valor Fixo"
-"By Percentage","Por Percentagem"
-"Cannot specify product identifier for the order item.","Não é possÃvel especificar identificador do produto para o item da ordem."
-"Catalog Inventory","Inventário de Catálogo"
-"Decrease Stock When Order is Placed","Reduzir Estoque Quando Colocada a Ordem"
-"Display Out of Stock Products","Mostra Produtos Fora de Estoque"
-"Enable Quantity Increments","Habilitar Incrementos na Qtde."
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Manage Stock","Manage Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
+"Notify for Quantity Below","Notify for Quantity Below"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
"In Stock","No Estoque"
-"Index Product Stock Status","Ãndice de Estado de Estoque do Produto"
-"Inventory","Inventário"
-"Inventory API","API Inventório"
-"Inventory Section","Seção de Inventório"
-"Manage Stock","Gerenciar Estoque"
-"Maximum Quantity Allowed in Shopping Cart","Qtde. Máxima Permitida no Carrinho"
-"Minimum Quantity","Qtde MÃnima"
-"Minimum Quantity Allowed in Shopping Cart","Qtde MÃnima Permitida no Carrinho de Compras"
-"No Backorders","Sem Pedidos Retroativos"
-"Not all products are available in the requested quantity","Nem todos os produtos estão disponÃveis na quantidade solicitada"
-"Notify for Quantity Below","Notificar para Quantidade Abaixo"
-"Only X left Threshold","Apenas X restantes até o Limite"
-"Out of Stock","Esgotado"
-"Product Stock Options","Opções de Estoque do Produto"
-"Quantity Increments","Incrementos de Quantidade"
-"Quantity for Item's Status to Become Out of Stock","Quant. para Status do Item mudar para Fora de Estoque"
-"Retrieve stock data","Recuperar dados de estoque"
-"Retrieve stock data by product ids","Recuperar dados de estoque pelos IDs dos produtos"
-"Rule price","Preço Regra"
-"Set Items' Status to be In Stock When Order is Cancelled","Definir Estado dos Itens para ser Em Estoque Quando a Ordem é Cancelada"
-"Some of the products are currently out of stock","Alguns dos produtos estão atualmente fora de estoque"
-"Some of the products cannot be ordered in requested quantity.","Alguns dos produtos não podem ser pedidos na quantidade solicitada."
-"Some of the products cannot be ordered in the requested quantity.","Alguns dos produtos não podem ser encomendados na quantidade solicitada."
-"Stock Options","Opções de Estoque"
+"Out of Stock",Esgotado
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
"Stock Status","Estado de Estoque"
-"The maximum quantity allowed for purchase is %s.","A quantidade máxima permitida para compra é %s."
-"The minimum quantity allowed for purchase is %s.","A quantidade mÃnima permitida para compra é %s."
-"The requested quantity for ""%s"" is not available.","A quantidade solicitada para ""%s"" não está disponÃvel."
+"Index Product Stock Status","Ãndice de Estado de Estoque do Produto"
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
"The stock item for Product in option is not valid.","O item de estoque para o produto em opção não é válido."
-"The stock item for Product is not valid.","O item de estoque para o produto não é válido."
-"This product is available for purchase in increments of %s only.","Este produto está disponÃvel para compra apenas em incrementos de %s."
-"This product is currently out of stock.","Este produto está atualmente fora de estoque."
-"This product is not available in the requested quantity. %s of the items will be backordered.","Este produto não está disponÃvel na quantidade solicitada. %s dos itens será encomendado."
-"To Fixed Value","Para Valor Fixo"
-"To Percentage","Para Percentagem"
-"Undefined product type.","Tipo de produto indefinido"
-"Update","Atualizar"
-"Update product stock data","Atualizar dados de produtos em estoque"
-"Update the Product","Atualizar o Produto"
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders","Sem Pedidos Retroativos"
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogInventory/i18n/zh_CN.csv b/app/code/Magento/CatalogInventory/i18n/zh_CN.csv
index caa9597260b..1d2fdac53d0 100644
--- a/app/code/Magento/CatalogInventory/i18n/zh_CN.csv
+++ b/app/code/Magento/CatalogInventory/i18n/zh_CN.csv
@@ -1,56 +1,54 @@
-"""%s"" is not available in the requested quantity. %s of the items will be backordered.","所请求数é‡çš„""%s""ä¸å¯ç”¨ã€‚该项目有 %s 个处于缺货状æ€ã€‚"
-"%s is available for purchase in increments of %s only.","%s 仅在增é‡è´ä¹° %s æ—¶å¯ç”¨ã€‚"
-"%s is not a correct comparsion method.","%s ä¸æ˜¯æ£ç¡®çš„比较方法。"
-"<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.","<strong>请注æ„</strong>这些设置适用于è´ç‰©è½¦å•ä¸ªé¡¹ç›®ï¼Œè€Œéžæ•´ä¸ªè´ç‰©è½¦ã€‚"
-"Add Minimum Quantity","æ·»åŠ æœ€å°æ•°é‡"
-"Allow Quantity Below 0","å…许数é‡å°äºŽ 0"
-"Allow Quantity Below 0 and Notify Customer","å…许数é‡å°äºŽ 0 并通知客户"
-"Automatically Return Credit Memo Item to Stock","自动返回信用备忘项目到库å˜"
-"Backorders","缺货"
-"By Fixed value","由固定值"
-"By Percentage","按百分比"
-"Cannot specify product identifier for the order item.","æ— æ³•ä¸ºè®¢å•é¡¹ç›®æŒ‡å®šäº§å“æ ‡è¯†ç¬¦ã€‚"
-"Catalog Inventory","分类清å•"
-"Decrease Stock When Order is Placed","当下订å•æ—¶ï¼Œå‡å°‘库å˜"
-"Display Out of Stock Products","显示缺货产å“"
-"Enable Quantity Increments","å¯ç”¨æ•°é‡å¢žé‡"
-"In Stock","有货"
-"Index Product Stock Status","索引产å“库å˜çŠ¶æ€"
-"Inventory","盘点"
-"Inventory API","åº“å˜ API"
-"Inventory Section","库å˜åŒºåŸŸ"
-"Manage Stock","库å˜ç®¡ç†"
-"Maximum Quantity Allowed in Shopping Cart","è´ç‰©è½¦æ•°é‡ä¸Šé™"
-"Minimum Quantity","最å°æ•°é‡"
-"Minimum Quantity Allowed in Shopping Cart","è´ç‰©è½¦é‡Œå…许的最少数é‡"
-"No Backorders","æ— å»¶æœŸäº¤è´§"
-"Not all products are available in the requested quantity","在已请求的数é‡ä¸å¹¶éžæ‰€æœ‰äº§å“å‡æœ‰åº“å˜"
-"Notify for Quantity Below","å˜é‡è¿‡ä½Žé€šçŸ¥"
-"Only X left Threshold","仅 X左侧阈值"
-"Out of Stock","æ— è´§"
-"Product Stock Options","产å“库å˜é€‰é¡¹"
-"Quantity Increments","æ•°é‡å¢žé‡"
-"Quantity for Item's Status to Become Out of Stock","产å“状æ€å˜ä¸ºç¼ºè´§æ—¶çš„æ•°é‡"
-"Retrieve stock data","获å–库å˜æ•°æ®"
-"Retrieve stock data by product ids","按照产å“ç¼–å·èŽ·å–库å˜æ•°æ®"
-"Rule price","è§„åˆ™ä»·æ ¼"
-"Set Items' Status to be In Stock When Order is Cancelled","如果订å•è¢«å–消，设置商å“的状æ€ä¸ºæœ‰è´§"
-"Some of the products are currently out of stock","æŸäº›äº§å“ç›®å‰ç¼ºè´§"
-"Some of the products cannot be ordered in requested quantity.","æŸäº›äº§å“的订è´æ•°é‡å˜è´§ä¸è¶³ã€‚"
-"Some of the products cannot be ordered in the requested quantity.","æŸäº›äº§å“æ— æ³•æŒ‰ç…§æ‰€éœ€æ•°é‡ä¸‹å•ã€‚"
-"Stock Options","库å˜é€‰é¡¹"
-"Stock Status","库å˜çŠ¶æ€"
-"The maximum quantity allowed for purchase is %s.","å…许è´ä¹°çš„最大数é‡ä¸º %s。"
-"The minimum quantity allowed for purchase is %s.","å…许è´ä¹°çš„最å°æ•°é‡ä¸º %s。"
-"The requested quantity for ""%s"" is not available.","""%s"" 所è¦è´ä¹°çš„æ•°é‡ä¸å¯ç”¨ã€‚"
-"The stock item for Product in option is not valid.","产å“的库å˜é€‰é¡¹æ— 效。"
-"The stock item for Product is not valid.","产å“的库å˜é¡¹æ— 效。"
-"This product is available for purchase in increments of %s only.","该产å“åªèƒ½ä»¥ %s 的增é‡é‡‡è´ã€‚"
-"This product is currently out of stock.","该产å“ç›®å‰ç¼ºè´§ã€‚"
-"This product is not available in the requested quantity. %s of the items will be backordered.","该产å“所è¦è´ä¹°çš„æ•°é‡ä¸è¶³ã€‚ %s 个产å“处于缺货状æ€ã€‚"
-"To Fixed Value","为固定值"
-"To Percentage","为百分率"
-"Undefined product type.","未定义的产å“类型。"
-"Update","æ›´æ–°"
-"Update product stock data","更新产å“库å˜æ•°æ®"
-"Update the Product","更新产å“"
+Qty,Qty
+"ALL GROUPS","ALL GROUPS"
+"Unsupported product type ""%1"".","Unsupported product type ""%1""."
+"Manage Stock","Manage Stock"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+Backorders,Backorders
+"Notify for Quantity Below","Notify for Quantity Below"
+"Enable Qty Increments","Enable Qty Increments"
+"Qty Increments","Qty Increments"
+"In Stock",有货
+"Out of Stock",æ— è´§
+"Customer Group","Customer Group"
+"Minimum Qty","Minimum Qty"
+"Add Minimum Qty","Add Minimum Qty"
+"Stock Status",库å˜çŠ¶æ€
+"Index Product Stock Status",索引产å“库å˜çŠ¶æ€
+"This product is out of stock.","This product is out of stock."
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
+"The stock item for Product in option is not valid.",产å“的库å˜é€‰é¡¹æ— 效。
+"Undefined product type","Undefined product type"
+"%1 is not a correct comparison method.","%1 is not a correct comparison method."
+"No Backorders",æ— å»¶æœŸäº¤è´§
+"Allow Qty Below 0","Allow Qty Below 0"
+"Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer"
+"Not all of your products are available in the requested quantity.","Not all of your products are available in the requested quantity."
+"We cannot specify a product identifier for the order item.","We cannot specify a product identifier for the order item."
+"The fewest you may purchase is %1.","The fewest you may purchase is %1."
+"Please correct the quantity for some products.","Please correct the quantity for some products."
+"The most you may purchase is %1.","The most you may purchase is %1."
+"We don't have as many ""%1"" as you requested.","We don't have as many ""%1"" as you requested."
+"We don't have as many ""%1"" as you requested, but we'll back order the remaining %2.","We don't have as many ""%1"" as you requested, but we'll back order the remaining %2."
+"We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2.","We don't have ""%1"" in the requested quantity, so we'll back order the remaining %2."
+"You can buy %1 only in increments of %2.","You can buy %1 only in increments of %2."
+"You can buy this product only in increments of %1.","You can buy this product only in increments of %1."
+"%1 is available for purchase in increments of %2","%1 is available for purchase in increments of %2"
+"Only %1 left","Only %1 left"
+"Product Name","Product Name"
+Inventory,Inventory
+"Stock Options","Stock Options"
+"Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
+"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
+"Display Out of Stock Products","Display Out of Stock Products"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
+"Only X left Threshold","Only X left Threshold"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
+"Product Stock Options","Product Stock Options"
+"
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ ","
+ Please note that these settings apply to individual items in the cart, not to the entire cart.
+ "
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index 31277cac299..182beb86d10 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -242,9 +242,12 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
$rows = array();
try {
- foreach ($productIds as $productId) {
+ foreach ($productIds as $productId => $validationByWebsite) {
foreach ($websiteIds as $websiteId) {
foreach ($customerGroupIds as $customerGroupId) {
+ if (empty($validationByWebsite[$websiteId])) {
+ continue;
+ }
$rows[] = array(
'rule_id' => $ruleId,
'from_time' => $fromTime,
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index aa10d263f65..952c709389a 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -336,9 +336,29 @@ class Rule extends \Magento\Rule\Model\AbstractModel
$product = clone $args['product'];
$product->setData($args['row']);
- if ($this->getConditions()->validate($product)) {
- $this->_productIds[] = $product->getId();
+ $websites = $this->_getWebsitesMap();
+ $results = array();
+
+ foreach ($websites as $websiteId => $defaultStoreId) {
+ $product->setStoreId($defaultStoreId);
+ $results[$websiteId] = $this->getConditions()->validate($product);
+ }
+ $this->_productIds[$product->getId()] = $results;
+ }
+
+ /**
+ * Prepare website map
+ *
+ * @return array
+ */
+ protected function _getWebsitesMap()
+ {
+ $map = array();
+ $websites = $this->_storeManager->getWebsites(true);
+ foreach ($websites as $website) {
+ $map[$website->getId()] = $website->getDefaultStore()->getId();
}
+ return $map;
}
/**
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
index 418dc171818..afa60f872fb 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
@@ -30,4 +30,105 @@ namespace Magento\CatalogRule\Model\Rule\Condition;
class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
{
+
+ /**
+ * Validate product attribute value for condition
+ *
+ * @param \Magento\Framework\Object $object
+ * @return bool
+ */
+ public function validate(\Magento\Framework\Object $object)
+ {
+ $attrCode = $this->getAttribute();
+ if ('category_ids' == $attrCode) {
+ return $this->validateAttribute($object->getAvailableInCategories());
+ }
+
+ $oldAttrValue = $object->hasData($attrCode) ? $object->getData($attrCode) : null;
+ $this->_setAttributeValue($object);
+
+ $result = $this->validateAttribute($object->getData($this->getAttribute()));
+ $this->_restoreOldAttrValue($object, $oldAttrValue);
+
+ return (bool)$result;
+ }
+
+ /**
+ * Restore old attribute value
+ *
+ * @param \Magento\Framework\Object $object
+ * @param mixed $oldAttrValue
+ * @return void
+ */
+ protected function _restoreOldAttrValue($object, $oldAttrValue)
+ {
+ $attrCode = $this->getAttribute();
+ if (is_null($oldAttrValue)) {
+ $object->unsetData($attrCode);
+ } else {
+ $object->setData($attrCode, $oldAttrValue);
+ }
+ }
+
+ /**
+ * Set attribute value
+ *
+ * @param \Magento\Framework\Object $object
+ * @return $this
+ */
+ protected function _setAttributeValue($object)
+ {
+ $storeId = $object->getStoreId();
+ $defaultStoreId = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
+
+ if (!isset($this->_entityAttributeValues[$object->getId()])) {
+ return $this;
+ }
+
+ $productValues = $this->_entityAttributeValues[$object->getId()];
+
+ if (!isset($productValues[$storeId]) && !isset($productValues[$defaultStoreId])) {
+ return $this;
+ }
+
+ $value = isset($productValues[$storeId]) ? $productValues[$storeId] : $productValues[$defaultStoreId];
+
+ $value = $this->_prepareDatetimeValue($value, $object);
+ $value = $this->_prepareMultiselectValue($value, $object);
+
+ $object->setData($this->getAttribute(), $value);
+ return $this;
+ }
+
+ /**
+ * Prepare datetime attribute value
+ *
+ * @param mixed $value
+ * @param \Magento\Framework\Object $object
+ * @return mixed
+ */
+ protected function _prepareDatetimeValue($value, $object)
+ {
+ $attribute = $object->getResource()->getAttribute($this->getAttribute());
+ if ($attribute && $attribute->getBackendType() == 'datetime') {
+ $value = strtotime($value);
+ }
+ return $value;
+ }
+
+ /**
+ * Prepare multiselect attribute value
+ *
+ * @param mixed $value
+ * @param \Magento\Framework\Object $object
+ * @return mixed
+ */
+ protected function _prepareMultiselectValue($value, $object)
+ {
+ $attribute = $object->getResource()->getAttribute($this->getAttribute());
+ if ($attribute && $attribute->getFrontendInput() == 'multiselect') {
+ $value = strlen($value) ? explode(',', $value) : array();
+ }
+ return $value;
+ }
}
diff --git a/app/code/Magento/CatalogRule/i18n/de_DE.csv b/app/code/Magento/CatalogRule/i18n/de_DE.csv
index 4096fc50ab3..e5ac9c2fcde 100644
--- a/app/code/Magento/CatalogRule/i18n/de_DE.csv
+++ b/app/code/Magento/CatalogRule/i18n/de_DE.csv
@@ -1,64 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","Auf Attribut ""%s"" basierende %d-Katalogpreisregeln wurden deaktiviert."
-"Actions","Aktionen"
-"Active","Aktiv"
-"Add New Rule","Neue Regel hinzufügen"
-"An error occurred while deleting the rule. Please review the log and try again.","Beim Löschen der Regel trat ein Fehler auf. Bitte überprüfen Sie das Log und versuchen Sie es erneut."
-"An error occurred while saving the rule data. Please review the log and try again.","Beim Speichern der Regeldaten trat ein Fehler auf. Bitte überprüfen Sie das Log und versuchen Sie es erneut."
-"Apply","Anwenden"
+Product,Product
+ID,ID
+SKU,SKU
+Apply,Anwenden
+No,Nein
+Yes,Ja
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
+Type,Typ
+Description,Beschreibung
+From,From
+To,To
+Catalog,Katalog
+Actions,Aktionen
+Rule,Regelname
+"Start on",Startdatum
+"End on",Verfalldatum
+Active,Aktiv
+"This rule no longer exists.","Diese Regel existiert nicht mehr."
+"General Information","Allgemeine Information"
+Websites,Webseiten
+"Attribute Set",Attributset
"Apply Rules","Regeln anwenden"
-"Attribute Set","Attributset"
-"By Fixed Amount","Durch festen Betrag"
-"By Percentage of the Original Price","Durch Prozentsatz des Orginalpreises"
-"Catalog","Katalog"
-"Catalog Price Rule","Katalogpreis Regel"
"Catalog Price Rules","Katalogpreis Regeln"
-"Category","Kategorie"
-"Conditions","Bedingungen"
-"Conditions (leave blank for all products)","Bedingungen (leer lassen für Alle Produkte)"
-"Conditions Combination","Bedingungenkombination"
-"Customer Groups","Kundengruppen"
-"End on","Verfalldatum"
-"Date From","Datum ab"
-"Start on","Startdatum"
-"Date To","Datum bis"
-"Description","Beschreibung"
-"Discount","Rabattsumme"
-"Edit Rule","Regel ändern"
-"Edit Rule '%s'","Regel '%s' ändern"
-"Enable Discount to Subproducts","Rabatt für Unterprodukte aktivieren"
-"Expiration Date","Ablaufdatum"
-"From Date","Von Datum"
-"General Information","Allgemeine Information"
-"ID","ID"
-"Inactive","Nicht aktiv"
-"New Rule","Neue Regel"
-"No","Nein"
-"Options","Optionen"
-"Priority","Priorität"
-"Product Attribute","Produktattribut"
-"Promotions","Promotionen"
-"Rule Information","Regelinformation"
-"Rule","Regelname"
+"Add New Rule","Neue Regel hinzufügen"
"Save and Apply","Speichern und anwenden"
-"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
-"Start Date","Startdatum"
-"Status","Status"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","Neue Regel"
+"Rule Information",Regelinformation
+"Update Prices Using the Following Information","Preise mit folgenden Informationen aktualisieren"
+"By Percentage of the Original Price","Durch Prozentsatz des Orginalpreises"
+"By Fixed Amount","Durch festen Betrag"
+"To Percentage of the Original Price","Zu Prozentsatz des Originalpreises"
+"To Fixed Amount","Zu festem Betrag"
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts","Rabatt für Unterprodukte aktivieren"
"Stop Further Rules Processing","Weitere Regelbearbeitung abbrechen"
-"The rule has been deleted.","Die Regel wurde gelöscht."
-"The rule has been saved.","Die Regel wurde gespeichert."
-"The rules have been applied.","Die Regeln wurden angewendet."
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Dies sind Regeln, welche geändert aber noch nicht eingesetzt wurden. Nur Benutzer mit exklusiven Zugang können diese Regeln anwenden."
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Einige Regeln wurden geändert, aber nicht angewendet. Bitte klicken Sie „Regeln anwenden“ um sofortige Anwendung im Katalog zu erhalten."
-"This rule no longer exists.","Diese Regel existiert nicht mehr."
+Conditions,Bedingungen
+"Conditions (leave blank for all products)","Bedingungen (leer lassen für Alle Produkte)"
+"Rule Name","Rule Name"
+Inactive,"Nicht aktiv"
+"Customer Groups",Kundengruppen
+"From Date","Von Datum"
"To Date","Bis Datum"
-"To Fixed Amount","Zu festem Betrag"
-"To Percentage of the Original Price","Zu Prozentsatz des Originalpreises"
-"Type","Typ"
-"Unable to apply rules.","Regeln können nicht angewendet werden."
-"Unable to find a rule to delete.","Keine Regel zum Löschen gefunden."
-"Update Prices Using the Following Information","Preise mit folgenden Informationen aktualisieren"
-"Update product's %s %s: %s","%s %s: %s von Produkt aktualisieren"
-"Website","Webseite"
-"Websites","Webseiten"
+Priority,Priorität
+"Catalog Price Rule","Katalogpreis Regel"
+Promotions,Promotionen
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule","Regel ändern"
"Wrong rule specified.","Falsche Regel angegeben."
-"Yes","Ja"
+"The rule has been saved.","Die Regel wurde gespeichert."
+"An error occurred while saving the rule data. Please review the log and try again.","Beim Speichern der Regeldaten trat ein Fehler auf. Bitte überprüfen Sie das Log und versuchen Sie es erneut."
+"The rule has been deleted.","Die Regel wurde gelöscht."
+"An error occurred while deleting the rule. Please review the log and try again.","Beim Löschen der Regel trat ein Fehler auf. Bitte überprüfen Sie das Log und versuchen Sie es erneut."
+"Unable to find a rule to delete.","Keine Regel zum Löschen gefunden."
+"Unable to apply rules.","Regeln können nicht angewendet werden."
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Einige Regeln wurden geändert, aber nicht angewendet. Bitte klicken Sie „Regeln anwenden“ um sofortige Anwendung im Katalog zu erhalten."
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination",Bedingungenkombination
+"Product Attribute",Produktattribut
+"The rules have been applied.","Die Regeln wurden angewendet."
diff --git a/app/code/Magento/CatalogRule/i18n/en_US.csv b/app/code/Magento/CatalogRule/i18n/en_US.csv
index bff86722a08..aab29051ead 100644
--- a/app/code/Magento/CatalogRule/i18n/en_US.csv
+++ b/app/code/Magento/CatalogRule/i18n/en_US.csv
@@ -1,64 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","%d Catalog Price Rules based on ""%s"" attribute have been disabled."
-"Actions","Actions"
-"Active","Active"
-"Add New Rule","Add New Rule"
-"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
-"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
-"Apply","Apply"
-"Apply Rules","Apply Rules"
-"Attribute Set","Attribute Set"
-"By Fixed Amount","By Fixed Amount"
-"By Percentage of the Original Price","By Percentage of the Original Price"
-"Catalog","Catalog"
-"Catalog Price Rule","Catalog Price Rule"
-"Catalog Price Rules","Catalog Price Rules"
-"Category","Category"
-"Conditions","Conditions"
-"Conditions (leave blank for all products)","Conditions (leave blank for all products)"
-"Conditions Combination","Conditions Combination"
-"Customer Groups","Customer Groups"
-"End on","End on"
-"Date From","Date From"
+Product,Product
+ID,ID
+SKU,SKU
+Apply,Apply
+No,No
+Yes,Yes
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Save and Continue Edit"
+Type,Type
+Description,Description
+From,From
+To,To
+Catalog,Catalog
+Actions,Actions
+Rule,Rule
"Start on","Start on"
-"Date To","Date To"
-"Description","Description"
-"Discount","Discount"
-"Edit Rule","Edit Rule"
-"Edit Rule '%s'","Edit Rule '%s'"
-"Enable Discount to Subproducts","Enable Discount to Subproducts"
-"Expiration Date","Expiration Date"
-"From Date","From Date"
+"End on","End on"
+Active,Active
+"This rule no longer exists.","This rule no longer exists."
"General Information","General Information"
-"ID","ID"
-"Inactive","Inactive"
+Websites,Websites
+"Attribute Set","Attribute Set"
+"Apply Rules","Apply Rules"
+"Catalog Price Rules","Catalog Price Rules"
+"Add New Rule","Add New Rule"
+"Save and Apply","Save and Apply"
+"Edit Rule '%1'","Edit Rule '%1'"
"New Rule","New Rule"
-"No","No"
-"Options","Options"
-"Priority","Priority"
-"Product Attribute","Product Attribute"
-"Promotions","Promotions"
"Rule Information","Rule Information"
-"Rule","Rule"
-"Save and Apply","Save and Apply"
-"Save and Continue Edit","Save and Continue Edit"
-"Start Date","Start Date"
-"Status","Status"
+"Update Prices Using the Following Information","Update Prices Using the Following Information"
+"By Percentage of the Original Price","By Percentage of the Original Price"
+"By Fixed Amount","By Fixed Amount"
+"To Percentage of the Original Price","To Percentage of the Original Price"
+"To Fixed Amount","To Fixed Amount"
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts","Enable Discount to Subproducts"
"Stop Further Rules Processing","Stop Further Rules Processing"
-"The rule has been deleted.","The rule has been deleted."
-"The rule has been saved.","The rule has been saved."
-"The rules have been applied.","The rules have been applied."
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","There are rules that have been changed but were not applied. Only users with exclusive access can apply rules."
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog."
-"This rule no longer exists.","This rule no longer exists."
+Conditions,Conditions
+"Conditions (leave blank for all products)","Conditions (leave blank for all products)"
+"Rule Name","Rule Name"
+Inactive,Inactive
+"Customer Groups","Customer Groups"
+"From Date","From Date"
"To Date","To Date"
-"To Fixed Amount","To Fixed Amount"
-"To Percentage of the Original Price","To Percentage of the Original Price"
-"Type","Type"
-"Unable to apply rules.","Unable to apply rules."
-"Unable to find a rule to delete.","Unable to find a rule to delete."
-"Update Prices Using the Following Information","Update Prices Using the Following Information"
-"Update product's %s %s: %s","Update product's %s %s: %s"
-"Website","Website"
-"Websites","Websites"
+Priority,Priority
+"Catalog Price Rule","Catalog Price Rule"
+Promotions,Promotions
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule","Edit Rule"
"Wrong rule specified.","Wrong rule specified."
-"Yes","Yes"
+"The rule has been saved.","The rule has been saved."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","The rule has been deleted."
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Unable to find a rule to delete.","Unable to find a rule to delete."
+"Unable to apply rules.","Unable to apply rules."
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog."
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"The rules have been applied.","The rules have been applied."
diff --git a/app/code/Magento/CatalogRule/i18n/es_ES.csv b/app/code/Magento/CatalogRule/i18n/es_ES.csv
index 094f48ae53a..f49ec6eddb9 100644
--- a/app/code/Magento/CatalogRule/i18n/es_ES.csv
+++ b/app/code/Magento/CatalogRule/i18n/es_ES.csv
@@ -1,64 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","%d Las reglas del precio de catálogo basadas en el atributo ""%s"" se han desactivado."
-"Actions","Acciones"
-"Active","Activo"
-"Add New Rule","Añadir nueva regla"
-"An error occurred while deleting the rule. Please review the log and try again.","Un error ocurrió mientras se eliminaba la regla. Por favor, revise el registro e inténtelo de nuevo."
-"An error occurred while saving the rule data. Please review the log and try again.","Un error ocurrió mientras se guardaban los datos de la regla. Por favor, revise el registro e inténtelo de nuevo."
-"Apply","Confirmar"
-"Apply Rules","Aplicar reglas"
-"Attribute Set","Conjunto de atributos"
-"By Fixed Amount","Por importe fijo"
-"By Percentage of the Original Price","Por porcentaje del precio original"
-"Catalog","Catálogo"
-"Catalog Price Rule","Regla de Precios"
-"Catalog Price Rules","Catálogo de Normas sobre Precios"
-"Category","CategorÃa"
-"Conditions","Condiciones"
-"Conditions (leave blank for all products)","Condiciones (para todos los productos déjelo en blanco)"
-"Conditions Combination","Combinación de condiciones"
-"Customer Groups","Grupos de Cliente"
-"End on","Fecha de caducidad"
-"Date From","Fecha a partir de"
+Product,Product
+ID,ID
+SKU,SKU
+Apply,Confirmar
+No,No
+Yes,SÃ
+"Web Site","Web Site"
+Status,Estado
+"Save and Continue Edit","Guardar y continuar editando"
+Type,Tipo
+Description,Descripción
+From,From
+To,To
+Catalog,Catálogo
+Actions,Acciones
+Rule,"Nombre de la Regla"
"Start on","Fecha de inicio"
-"Date To","Fecha"
-"Description","Descripción"
-"Discount","Cantidad de descuento"
-"Edit Rule","Editar Regla"
-"Edit Rule '%s'","Editar Regla '%s'"
-"Enable Discount to Subproducts","Habilitar descuento para subproductos"
-"Expiration Date","Fecha de Caducidad"
-"From Date","A partir de la fecha"
+"End on","Fecha de caducidad"
+Active,Activo
+"This rule no longer exists.","Esta regla ya no existe."
"General Information","Información general"
-"ID","ID"
-"Inactive","Inactivo"
+Websites,"Páginas web"
+"Attribute Set","Conjunto de atributos"
+"Apply Rules","Aplicar reglas"
+"Catalog Price Rules","Catálogo de Normas sobre Precios"
+"Add New Rule","Añadir nueva regla"
+"Save and Apply","Guardar y Aplicar"
+"Edit Rule '%1'","Edit Rule '%1'"
"New Rule","Nueva Regla"
-"No","No"
-"Options","Opciones"
-"Priority","Prioridad"
-"Product Attribute","Atributos del producto"
-"Promotions","Promociones"
"Rule Information","Información sobre la Regla"
-"Rule","Nombre de la Regla"
-"Save and Apply","Guardar y Aplicar"
-"Save and Continue Edit","Guardar y continuar editando"
-"Start Date","Fecha de Inicio"
-"Status","Estado"
+"Update Prices Using the Following Information","Actualizar los precios según las siguiente información"
+"By Percentage of the Original Price","Por porcentaje del precio original"
+"By Fixed Amount","Por importe fijo"
+"To Percentage of the Original Price","A porcentaje del precio original"
+"To Fixed Amount","A cantidad fija"
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts","Habilitar descuento para subproductos"
"Stop Further Rules Processing","Detener el Procesamiento de Reglas adicionales"
-"The rule has been deleted.","La regla ha sido eliminada."
-"The rule has been saved.","La regla ha sido guardada."
-"The rules have been applied.","Las reglas han sido aplicadas."
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Hay reglas que han cambiado pero no se aplican. Solo los usuarios con acceso exclusivo pueden aplicar estas reglas."
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Hay reglas que han sido modificadas pero no aplicadas. Por favor, haga clic en Aplicar Reglas con el fin de ver el efecto inmediato en el catálogo."
-"This rule no longer exists.","Esta regla ya no existe."
+Conditions,Condiciones
+"Conditions (leave blank for all products)","Condiciones (para todos los productos déjelo en blanco)"
+"Rule Name","Rule Name"
+Inactive,Inactivo
+"Customer Groups","Grupos de Cliente"
+"From Date","A partir de la fecha"
"To Date","Hasta la fecha"
-"To Fixed Amount","A cantidad fija"
-"To Percentage of the Original Price","A porcentaje del precio original"
-"Type","Tipo"
-"Unable to apply rules.","No se pueden aplicar las reglas."
-"Unable to find a rule to delete.","No se puede encontrar una regla para eliminar."
-"Update Prices Using the Following Information","Actualizar los precios según las siguiente información"
-"Update product's %s %s: %s","Actualizar los productos de %s %s: %s"
-"Website","Página web"
-"Websites","Páginas web"
+Priority,Prioridad
+"Catalog Price Rule","Regla de Precios"
+Promotions,Promociones
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule","Editar Regla"
"Wrong rule specified.","Regla especificada incorrecta."
-"Yes","SÃ"
+"The rule has been saved.","La regla ha sido guardada."
+"An error occurred while saving the rule data. Please review the log and try again.","Un error ocurrió mientras se guardaban los datos de la regla. Por favor, revise el registro e inténtelo de nuevo."
+"The rule has been deleted.","La regla ha sido eliminada."
+"An error occurred while deleting the rule. Please review the log and try again.","Un error ocurrió mientras se eliminaba la regla. Por favor, revise el registro e inténtelo de nuevo."
+"Unable to find a rule to delete.","No se puede encontrar una regla para eliminar."
+"Unable to apply rules.","No se pueden aplicar las reglas."
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Hay reglas que han sido modificadas pero no aplicadas. Por favor, haga clic en Aplicar Reglas con el fin de ver el efecto inmediato en el catálogo."
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Combinación de condiciones"
+"Product Attribute","Atributos del producto"
+"The rules have been applied.","Las reglas han sido aplicadas."
diff --git a/app/code/Magento/CatalogRule/i18n/fr_FR.csv b/app/code/Magento/CatalogRule/i18n/fr_FR.csv
index cd2134d247f..f003629331b 100644
--- a/app/code/Magento/CatalogRule/i18n/fr_FR.csv
+++ b/app/code/Magento/CatalogRule/i18n/fr_FR.csv
@@ -1,65 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","Les règles des prix du catalogue %d basées sur l'attribut ""%s"" ont été désactivées.
-"
-"Actions","Action"
-"Active","Actif"
-"Add New Rule","Ajouter nouvelle règle"
-"An error occurred while deleting the rule. Please review the log and try again.","Une erreur s'est produite à la suppression de la règle. Réessayez après avoir lu le message d'erreur."
-"An error occurred while saving the rule data. Please review the log and try again.","Une erreur s'est produite à la sauvegarde des données de la règle. Réessayez après avoir lu le message d'erreur."
-"Apply","Appliquer"
-"Apply Rules","Appliquer les règles"
-"Attribute Set","Ensemble d'attributs"
-"By Fixed Amount","Par quantité fixée"
-"By Percentage of the Original Price","Par pourcentage du prix d'origine"
-"Catalog","Catalogue"
-"Catalog Price Rule","Règle de prix du catalogue"
-"Catalog Price Rules","Règles de prix du catalogue"
-"Category","Catégorie"
-"Conditions","Conditions"
-"Conditions (leave blank for all products)","Conditions (laisser vide pour tous les produits)"
-"Conditions Combination","Combinaison de conditions"
-"Customer Groups","Groupes de clients"
-"End on","Date d'expiration"
-"Date From","Date de création"
+Product,Product
+ID,ID
+SKU,SKU
+Apply,Appliquer
+No,Non
+Yes,oui
+"Web Site","Web Site"
+Status,Statut
+"Save and Continue Edit","Sauvegarder et continuer l'édition"
+Type,Type
+Description,Description
+From,From
+To,To
+Catalog,Catalogue
+Actions,Action
+Rule,"Nom de règle"
"Start on","Date de début"
-"Date To","Date de fin"
-"Description","Description"
-"Discount","Montant de réduction"
-"Edit Rule","Éditer la règle"
-"Edit Rule '%s'","Éditer la règle '%s'"
-"Enable Discount to Subproducts","Autoriser les réductions sur les sous-produits"
-"Expiration Date","Date d'expiration"
-"From Date","Depuis"
+"End on","Date d'expiration"
+Active,Actif
+"This rule no longer exists.","Cette règle n'existe plus."
"General Information","Informations générales"
-"ID","ID"
-"Inactive","Inactif"
+Websites,"Site web"
+"Attribute Set","Ensemble d'attributs"
+"Apply Rules","Appliquer les règles"
+"Catalog Price Rules","Règles de prix du catalogue"
+"Add New Rule","Ajouter nouvelle règle"
+"Save and Apply","Enregistrer et appliquer"
+"Edit Rule '%1'","Edit Rule '%1'"
"New Rule","Nouvelle règle"
-"No","Non"
-"Options","Options"
-"Priority","Priorité"
-"Product Attribute","Attribut de produit"
-"Promotions","Promotions"
"Rule Information","Information de règle"
-"Rule","Nom de règle"
-"Save and Apply","Enregistrer et appliquer"
-"Save and Continue Edit","Sauvegarder et continuer l'édition"
-"Start Date","Date de début"
-"Status","Statut"
+"Update Prices Using the Following Information","Mettre à jour les prix à l'aide des informations suivantes"
+"By Percentage of the Original Price","Par pourcentage du prix d'origine"
+"By Fixed Amount","Par quantité fixée"
+"To Percentage of the Original Price","Sur pourcentage du prix d'origine"
+"To Fixed Amount","Sur montant fixé"
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts","Autoriser les réductions sur les sous-produits"
"Stop Further Rules Processing","Ne pas aller plus loin dans le traitement des règles"
-"The rule has been deleted.","La règle a été supprimée."
-"The rule has been saved.","La règle a été sauvée."
-"The rules have been applied.","Les règles ont été appliquées."
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Certaines règles ont été modifiées sans être appliquées. Seuls les utilisateurs bénéficiant d'un accès exclusif peuvent appliquer les règles."
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Il y a des règles qui ont été changées mais pas appliquées. Cliquez sur ""Appliquer les règles"" pour un effet immédiat sur le catalogue."
-"This rule no longer exists.","Cette règle n'existe plus."
+Conditions,Conditions
+"Conditions (leave blank for all products)","Conditions (laisser vide pour tous les produits)"
+"Rule Name","Rule Name"
+Inactive,Inactif
+"Customer Groups","Groupes de clients"
+"From Date",Depuis
"To Date","Date de fin"
-"To Fixed Amount","Sur montant fixé"
-"To Percentage of the Original Price","Sur pourcentage du prix d'origine"
-"Type","Type"
-"Unable to apply rules.","Impossible d'appliquer les règles"
-"Unable to find a rule to delete.","Aucune règle à supprimer"
-"Update Prices Using the Following Information","Mettre à jour les prix à l'aide des informations suivantes"
-"Update product's %s %s: %s","Mettre à jour le %s %s du produit: %s"
-"Website","Site web"
-"Websites","Site web"
+Priority,Priorité
+"Catalog Price Rule","Règle de prix du catalogue"
+Promotions,Promotions
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule","Éditer la règle"
"Wrong rule specified.","Une mauvaise règle a été spécifiée."
-"Yes","oui"
+"The rule has been saved.","La règle a été sauvée."
+"An error occurred while saving the rule data. Please review the log and try again.","Une erreur s'est produite à la sauvegarde des données de la règle. Réessayez après avoir lu le message d'erreur."
+"The rule has been deleted.","La règle a été supprimée."
+"An error occurred while deleting the rule. Please review the log and try again.","Une erreur s'est produite à la suppression de la règle. Réessayez après avoir lu le message d'erreur."
+"Unable to find a rule to delete.","Aucune règle à supprimer"
+"Unable to apply rules.","Impossible d'appliquer les règles"
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Il y a des règles qui ont été changées mais pas appliquées. Cliquez sur ""Appliquer les règles"" pour un effet immédiat sur le catalogue."
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Combinaison de conditions"
+"Product Attribute","Attribut de produit"
+"The rules have been applied.","Les règles ont été appliquées."
diff --git a/app/code/Magento/CatalogRule/i18n/nl_NL.csv b/app/code/Magento/CatalogRule/i18n/nl_NL.csv
index 5a7a3a23d51..5c21f95f6ea 100644
--- a/app/code/Magento/CatalogRule/i18n/nl_NL.csv
+++ b/app/code/Magento/CatalogRule/i18n/nl_NL.csv
@@ -1,64 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","%d catalogus prijs regels gebaseerd op ""%s"" attribuut zijn uitgeschakeld."
-"Actions","Acties"
-"Active","actief"
-"Add New Rule","voeg nieuwe regel toe"
-"An error occurred while deleting the rule. Please review the log and try again.","Er is een fout opgetreden tijdens het verwijderen van de regel. Herzie a.u.b. de log en probeer opnieuw."
-"An error occurred while saving the rule data. Please review the log and try again.","Er is een fout opgetreden tijdens het opslaan van de regeldata. Herzie a.u.b. het log en probeer opnieuw."
-"Apply","Toepassen"
+Product,Product
+ID,ID
+SKU,SKU
+Apply,Toepassen
+No,Nee
+Yes,ja
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Bewaar en Ga Door met Bewerking"
+Type,type
+Description,Omschrijving
+From,From
+To,To
+Catalog,Catalogus
+Actions,Acties
+Rule,"Regel naam"
+"Start on",Startdatum
+"End on",Vervaldatum
+Active,actief
+"This rule no longer exists.","Deze regel bestaat niet langer"
+"General Information","Algemene informatie"
+Websites,Websites
+"Attribute Set",Attributenset
"Apply Rules","Stel regels in"
-"Attribute Set","Attributenset"
-"By Fixed Amount","Door Vaste Hoeveelheid"
-"By Percentage of the Original Price","Door Percentage van de Oorspronkelijke Prijs"
-"Catalog","Catalogus"
-"Catalog Price Rule","Catalogus prijs regel"
"Catalog Price Rules","Catalogus prijs regels"
-"Category","Categorie"
-"Conditions","Voorwaarden"
-"Conditions (leave blank for all products)","Voorwaarden (laat leeg voor alle producten)"
-"Conditions Combination","Voorwaardencombinaties"
-"Customer Groups","Klantgroepen"
-"End on","Vervaldatum"
-"Date From","Datum vanaf"
-"Start on","Startdatum"
-"Date To","Datum tot"
-"Description","Omschrijving"
-"Discount","Hoeveelheid Korting"
-"Edit Rule","Bewerk regel"
-"Edit Rule '%s'","Bewerk regel '%s'"
-"Enable Discount to Subproducts","Schakel Korting op Deelproducten in"
-"Expiration Date","vervaldatum"
-"From Date","Vanaf datum"
-"General Information","Algemene informatie"
-"ID","ID"
-"Inactive","Inactief"
+"Add New Rule","voeg nieuwe regel toe"
+"Save and Apply","Sla op en stel in"
+"Edit Rule '%1'","Edit Rule '%1'"
"New Rule","Nieuwe regel"
-"No","Nee"
-"Options","Opties"
-"Priority","Prioriteit"
-"Product Attribute","Product attribuut"
-"Promotions","Promoties"
"Rule Information","Regel informatie"
-"Rule","Regel naam"
-"Save and Apply","Sla op en stel in"
-"Save and Continue Edit","Bewaar en Ga Door met Bewerking"
-"Start Date","Startdatum"
-"Status","Status"
+"Update Prices Using the Following Information","Update Prijzen Met behulp van de Volgende Informatie"
+"By Percentage of the Original Price","Door Percentage van de Oorspronkelijke Prijs"
+"By Fixed Amount","Door Vaste Hoeveelheid"
+"To Percentage of the Original Price","Naar Percentage van de Oorspronkelijke Prijs"
+"To Fixed Amount","Naar Vaste Hoeveelheid"
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts","Schakel Korting op Deelproducten in"
"Stop Further Rules Processing","Stop verdere verwerking van regels"
-"The rule has been deleted.","De regel is verwijderd"
-"The rule has been saved.","De regel is opgeslagen."
-"The rules have been applied.","De regels zijn ingesteld."
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Er zijn regels die zijn veranderd, maar niet werden toegepast. Alleen gebruikers met exclusieve toegang kunnen regels toepassen."
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Er zijn regels welke veranderd zijn, maar niet ingesteld. Klik op 'stel regels in' om direct effect te zien in de catalogus."
-"This rule no longer exists.","Deze regel bestaat niet langer"
+Conditions,Voorwaarden
+"Conditions (leave blank for all products)","Voorwaarden (laat leeg voor alle producten)"
+"Rule Name","Rule Name"
+Inactive,Inactief
+"Customer Groups",Klantgroepen
+"From Date","Vanaf datum"
"To Date","Naar datum"
-"To Fixed Amount","Naar Vaste Hoeveelheid"
-"To Percentage of the Original Price","Naar Percentage van de Oorspronkelijke Prijs"
-"Type","type"
-"Unable to apply rules.","Niet in staat om regels in te stellen"
-"Unable to find a rule to delete.","Niet in staat om een regel te vinden om te verwijderen"
-"Update Prices Using the Following Information","Update Prijzen Met behulp van de Volgende Informatie"
-"Update product's %s %s: %s","Update producten %s %s: %s"
-"Website","Website"
-"Websites","Websites"
+Priority,Prioriteit
+"Catalog Price Rule","Catalogus prijs regel"
+Promotions,Promoties
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule","Bewerk regel"
"Wrong rule specified.","Verkeerde regel gespecificeerd"
-"Yes","ja"
+"The rule has been saved.","De regel is opgeslagen."
+"An error occurred while saving the rule data. Please review the log and try again.","Er is een fout opgetreden tijdens het opslaan van de regeldata. Herzie a.u.b. het log en probeer opnieuw."
+"The rule has been deleted.","De regel is verwijderd"
+"An error occurred while deleting the rule. Please review the log and try again.","Er is een fout opgetreden tijdens het verwijderen van de regel. Herzie a.u.b. de log en probeer opnieuw."
+"Unable to find a rule to delete.","Niet in staat om een regel te vinden om te verwijderen"
+"Unable to apply rules.","Niet in staat om regels in te stellen"
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Er zijn regels welke veranderd zijn, maar niet ingesteld. Klik op 'stel regels in' om direct effect te zien in de catalogus."
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination",Voorwaardencombinaties
+"Product Attribute","Product attribuut"
+"The rules have been applied.","De regels zijn ingesteld."
diff --git a/app/code/Magento/CatalogRule/i18n/pt_BR.csv b/app/code/Magento/CatalogRule/i18n/pt_BR.csv
index c0d58acebe1..39db9b3f737 100644
--- a/app/code/Magento/CatalogRule/i18n/pt_BR.csv
+++ b/app/code/Magento/CatalogRule/i18n/pt_BR.csv
@@ -1,64 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","Foram desativadas as Regras de Preço do Catálogo %d baseadas no atributo ""%s""."
-"Actions","Ações"
-"Active","Ativo"
-"Add New Rule","Adicionar nova regra"
-"An error occurred while deleting the rule. Please review the log and try again.","Ocorreu um erro ao apagar a regra. Reveja o relatório e tente novamente."
-"An error occurred while saving the rule data. Please review the log and try again.","Ocorreu um erro ao salvar os dados da regra. Reveja o relatório e tente novamente."
-"Apply","Solicitar"
-"Apply Rules","Aplicar Regras"
-"Attribute Set","Conjunto de Atributos"
-"By Fixed Amount","Por Quantia Fixa"
-"By Percentage of the Original Price","Por Percentagem do Preço Original"
-"Catalog","Catálogo"
-"Catalog Price Rule","Regra de Preço de Catálogo"
-"Catalog Price Rules","Regras de Preço do Catálogo"
-"Category","Categoria"
-"Conditions","Condições"
-"Conditions (leave blank for all products)","Condições (deixar em branco para todos os produtos)"
-"Conditions Combination","Combinação de condições"
-"Customer Groups","Grupos do cliente"
-"End on","Vencimento"
-"Date From","Data Inicial"
+Product,Product
+ID,Identidade
+SKU,SKU
+Apply,Solicitar
+No,Não
+Yes,Sim
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Salvar e continuar a editar"
+Type,Tipo
+Description,Descrição
+From,From
+To,To
+Catalog,Catálogo
+Actions,Ações
+Rule,"Nome da Regra"
"Start on","Data Inicial"
-"Date To","Data Final"
-"Description","Descrição"
-"Discount","Quantia de Desconto"
-"Edit Rule","Editar regra"
-"Edit Rule '%s'","Editar regra ""s%"""
-"Enable Discount to Subproducts","Habilitar Desconto para Subprodutos"
-"Expiration Date","Data de Validade"
-"From Date","A Partir da Data"
+"End on",Vencimento
+Active,Ativo
+"This rule no longer exists.","Essa regra não existe mais."
"General Information","Informações gerais"
-"ID","Identidade"
-"Inactive","Inativo"
+Websites,Sites
+"Attribute Set","Conjunto de Atributos"
+"Apply Rules","Aplicar Regras"
+"Catalog Price Rules","Regras de Preço do Catálogo"
+"Add New Rule","Adicionar nova regra"
+"Save and Apply","Salvar e Aplicar"
+"Edit Rule '%1'","Edit Rule '%1'"
"New Rule","Nova Regra"
-"No","Não"
-"Options","Opções"
-"Priority","Prioridade"
-"Product Attribute","Atributo de Produto"
-"Promotions","Promoções"
"Rule Information","Informação da Regra"
-"Rule","Nome da Regra"
-"Save and Apply","Salvar e Aplicar"
-"Save and Continue Edit","Salvar e continuar a editar"
-"Start Date","Data de inÃcio"
-"Status","Status"
+"Update Prices Using the Following Information","Atualizar preços usando as seguintes informações"
+"By Percentage of the Original Price","Por Percentagem do Preço Original"
+"By Fixed Amount","Por Quantia Fixa"
+"To Percentage of the Original Price","Para uma Porcentagem do Preço Original"
+"To Fixed Amount","Para um Valor Fixo"
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts","Habilitar Desconto para Subprodutos"
"Stop Further Rules Processing","Parar Outras Regras de Processamento"
-"The rule has been deleted.","A regra foi apagada."
-"The rule has been saved.","A regra foi salva."
-"The rules have been applied.","As regras foram aplicadas."
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Existem regras que foram alteradas, mas não aplicadas. Somente usuários com acesso exclusivo podem aplicar as regras."
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Existem regras que foram alteradas mas não foram aplicadas. Por favor, clique em Aplicar Regras para ver o efeito imediato no catálogo."
-"This rule no longer exists.","Essa regra não existe mais."
+Conditions,Condições
+"Conditions (leave blank for all products)","Condições (deixar em branco para todos os produtos)"
+"Rule Name","Rule Name"
+Inactive,Inativo
+"Customer Groups","Grupos do cliente"
+"From Date","A Partir da Data"
"To Date","Até a Data Atual"
-"To Fixed Amount","Para um Valor Fixo"
-"To Percentage of the Original Price","Para uma Porcentagem do Preço Original"
-"Type","Tipo"
-"Unable to apply rules.","Incapaz de aplicar as regras."
-"Unable to find a rule to delete.","Incapaz de encontrar uma regra para excluir."
-"Update Prices Using the Following Information","Atualizar preços usando as seguintes informações"
-"Update product's %s %s: %s","Atualização dos produtos %s %s: %s"
-"Website","Website"
-"Websites","Sites"
+Priority,Prioridade
+"Catalog Price Rule","Regra de Preço de Catálogo"
+Promotions,Promoções
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule","Editar regra"
"Wrong rule specified.","Especificação de regra incorreta."
-"Yes","Sim"
+"The rule has been saved.","A regra foi salva."
+"An error occurred while saving the rule data. Please review the log and try again.","Ocorreu um erro ao salvar os dados da regra. Reveja o relatório e tente novamente."
+"The rule has been deleted.","A regra foi apagada."
+"An error occurred while deleting the rule. Please review the log and try again.","Ocorreu um erro ao apagar a regra. Reveja o relatório e tente novamente."
+"Unable to find a rule to delete.","Incapaz de encontrar uma regra para excluir."
+"Unable to apply rules.","Incapaz de aplicar as regras."
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Existem regras que foram alteradas mas não foram aplicadas. Por favor, clique em Aplicar Regras para ver o efeito imediato no catálogo."
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Combinação de condições"
+"Product Attribute","Atributo de Produto"
+"The rules have been applied.","As regras foram aplicadas."
diff --git a/app/code/Magento/CatalogRule/i18n/zh_CN.csv b/app/code/Magento/CatalogRule/i18n/zh_CN.csv
index 490a818919e..4d291b895c1 100644
--- a/app/code/Magento/CatalogRule/i18n/zh_CN.csv
+++ b/app/code/Magento/CatalogRule/i18n/zh_CN.csv
@@ -1,64 +1,70 @@
-"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","基于“%sâ€å±žæ€§çš„ %d ç›®å½•ä»·æ ¼è§„åˆ™å·²è¢«ç¦ç”¨ã€‚"
-"Actions","æ“作"
-"Active","活动"
-"Add New Rule","æ·»åŠ æ–°è§„åˆ™"
-"An error occurred while deleting the rule. Please review the log and try again.","å½“åˆ é™¤è§„åˆ™æ—¶å‘生错误。请检查日志并é‡è¯•ã€‚"
-"An error occurred while saving the rule data. Please review the log and try again.","当ä¿å˜è§„则数æ®æ—¶å‘生错误。请查看日志并é‡è¯•ã€‚"
-"Apply","应用"
-"Apply Rules","应用规则"
-"Attribute Set","属性集"
-"By Fixed Amount","固定é¢åº¦"
-"By Percentage of the Original Price","åŽŸå§‹ä»·æ ¼çš„ç™¾åˆ†çŽ‡"
-"Catalog","分类"
-"Catalog Price Rule","ç›®å½•ä»·æ ¼è§„åˆ™"
-"Catalog Price Rules","åˆ†ç±»ä»·æ ¼è§„åˆ™"
-"Category","分类"
-"Conditions","æ¡ä»¶"
-"Conditions (leave blank for all products)","æ¡ä»¶ï¼ˆç”¨äºŽå…¨éƒ¨äº§å“时留空）"
-"Conditions Combination","æ¡ä»¶ç»„åˆ"
-"Customer Groups","客户组"
-"End on","过期日"
-"Date From","日期自"
-"Start on","开始日"
-"Date To","日期至"
-"Description","æè¿°"
-"Discount","折扣å¸æˆ·"
-"Edit Rule","修改规则"
-"Edit Rule '%s'","修改规则'%s'"
-"Enable Discount to Subproducts","为附属产å“å¯ç”¨æŠ˜æ‰£"
-"Expiration Date","过期日期"
-"From Date","æ¥è‡ªæ—¥æœŸ"
-"General Information","常规信æ¯"
-"ID","ID"
-"Inactive","未激活"
-"New Rule","新规则"
-"No","å¦"
-"Options","选项"
-"Priority","优先级"
-"Product Attribute","产å“属性"
-"Promotions","促销"
-"Rule Information","规则信æ¯"
-"Rule","规则å称"
-"Save and Apply","ä¿å˜å¹¶åº”用"
-"Save and Continue Edit","ä¿å˜å¹¶ç»§ç»ç¼–辑"
-"Start Date","开始日期"
-"Status","状æ€"
-"Stop Further Rules Processing","åœæ¢è¿›ä¸€æ¥çš„规则处ç†"
-"The rule has been deleted.","è§„åˆ™å·²åˆ é™¤ã€‚"
-"The rule has been saved.","规则已ä¿å˜ã€‚"
-"The rules have been applied.","规则已应用。"
-"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","有规则已被更改，但尚未应用。åªæœ‰èƒ½ç‹¬å 访问的用户æ‰èƒ½åº”用规则。"
-"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","å˜åœ¨å·²æ›´æ”¹ä½†æœªåº”用的规则。请å•å‡»â€œåº”用规则â€ä»¥ç«‹å³æŸ¥çœ‹ç›®å½•ä¸åº”用的效果。"
-"This rule no longer exists.","该规则已ä¸å˜åœ¨ã€‚"
-"To Date","截æ¢æ—¥æœŸ"
-"To Fixed Amount","固定é¢åº¦"
-"To Percentage of the Original Price","åˆ°åŽŸå§‹ä»·æ ¼çš„ç™¾åˆ†çŽ‡"
-"Type","类型"
-"Unable to apply rules.","æ— æ³•åº”ç”¨è§„åˆ™ã€‚"
-"Unable to find a rule to delete.","æ— æ³•æŸ¥æ‰¾è¦åˆ 除的规则。"
-"Update Prices Using the Following Information","使用下列信æ¯æ›´æ–°ä»·æ ¼"
-"Update product's %s %s: %s","更新产å“çš„ %s %s：%s"
-"Website","网站"
-"Websites","网站"
-"Wrong rule specified.","所指定规则有误。"
-"Yes","是"
+Product,Product
+ID,ID
+SKU,SKU
+Apply,应用
+No,å¦
+Yes,是
+"Web Site","Web Site"
+Status,状æ€
+"Save and Continue Edit",ä¿å˜å¹¶ç»§ç»ç¼–辑
+Type,类型
+Description,æè¿°
+From,From
+To,To
+Catalog,分类
+Actions,æ“作
+Rule,规则å称
+"Start on",开始日
+"End on",过期日
+Active,活动
+"This rule no longer exists.",该规则已ä¸å˜åœ¨ã€‚
+"General Information",常规信æ¯
+Websites,网站
+"Attribute Set",属性集
+"Apply Rules",应用规则
+"Catalog Price Rules",åˆ†ç±»ä»·æ ¼è§„åˆ™
+"Add New Rule",æ·»åŠ æ–°è§„åˆ™
+"Save and Apply",ä¿å˜å¹¶åº”用
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule",新规则
+"Rule Information",规则信æ¯
+"Update Prices Using the Following Information",使用下列信æ¯æ›´æ–°ä»·æ ¼
+"By Percentage of the Original Price",åŽŸå§‹ä»·æ ¼çš„ç™¾åˆ†çŽ‡
+"By Fixed Amount",固定é¢åº¦
+"To Percentage of the Original Price",åˆ°åŽŸå§‹ä»·æ ¼çš„ç™¾åˆ†çŽ‡
+"To Fixed Amount",固定é¢åº¦
+"Discount Amount","Discount Amount"
+"Enable Discount to Subproducts",为附属产å“å¯ç”¨æŠ˜æ‰£
+"Stop Further Rules Processing",åœæ¢è¿›ä¸€æ¥çš„规则处ç†
+Conditions,æ¡ä»¶
+"Conditions (leave blank for all products)",æ¡ä»¶ï¼ˆç”¨äºŽå…¨éƒ¨äº§å“时留空）
+"Rule Name","Rule Name"
+Inactive,未激活
+"Customer Groups",客户组
+"From Date",æ¥è‡ªæ—¥æœŸ
+"To Date",截æ¢æ—¥æœŸ
+Priority,优先级
+"Catalog Price Rule",ç›®å½•ä»·æ ¼è§„åˆ™
+Promotions,促销
+Promo,Promo
+"New Catalog Price Rule","New Catalog Price Rule"
+"Edit Rule",修改规则
+"Wrong rule specified.",所指定规则有误。
+"The rule has been saved.",规则已ä¿å˜ã€‚
+"An error occurred while saving the rule data. Please review the log and try again.",当ä¿å˜è§„则数æ®æ—¶å‘生错误。请查看日志并é‡è¯•ã€‚
+"The rule has been deleted.",è§„åˆ™å·²åˆ é™¤ã€‚
+"An error occurred while deleting the rule. Please review the log and try again.",å½“åˆ é™¤è§„åˆ™æ—¶å‘生错误。请检查日志并é‡è¯•ã€‚
+"Unable to find a rule to delete.",æ— æ³•æŸ¥æ‰¾è¦åˆ 除的规则。
+"Unable to apply rules.",æ— æ³•åº”ç”¨è§„åˆ™ã€‚
+"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.",å˜åœ¨å·²æ›´æ”¹ä½†æœªåº”用的规则。请å•å‡»â€œåº”用规则â€ä»¥ç«‹å³æŸ¥çœ‹ç›®å½•ä¸åº”用的效果。
+"%1 Catalog Price Rules based on ""%2"" attribute have been disabled.","%1 Catalog Price Rules based on ""%2"" attribute have been disabled."
+"Update the Product","Update the Product"
+"Rule price","Rule price"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
+"By Fixed value","By Fixed value"
+"By Percentage","By Percentage"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination",æ¡ä»¶ç»„åˆ
+"Product Attribute",产å“属性
+"The rules have been applied.",规则已应用。
diff --git a/app/code/Magento/CatalogSearch/i18n/de_DE.csv b/app/code/Magento/CatalogSearch/i18n/de_DE.csv
index 24faf701170..5129c5cc30c 100644
--- a/app/code/Magento/CatalogSearch/i18n/de_DE.csv
+++ b/app/code/Magento/CatalogSearch/i18n/de_DE.csv
@@ -1,48 +1,53 @@
-"%s and greater","%s und darüber"
-"<strong>%d item(s)</strong> were found using the following search criteria","<strong>%d Artikel</strong> wurden unter Verwendung der folgenden Suchkriterien gefunden"
-"Advanced Search","Erweiterte Suche"
-"Advanced Search Form","Formular Erweiterte Suche"
-"Advanced Search Result","Erweiterte Suche Ergebnisse"
-"All","Alle"
-"Applies for ""Like"" search type only.","Gilt nur für ""Like""-Suchtyp."
-"Apply Layered Navigation if Search Results are Less Than","Geschichtete Navigation verwenden falls weniger Suchergebnisse als"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","Attribut-Einstellungsänderung mit Bezug auf Suchindex. Bitte <a href=""%s"">Rebuild-Suchindex</a>-Prozess starten."
-"Autogenerated Site Map","Automatisch generierte Site Map"
-"Catalog Advanced Search","Katalog Erweiterte Suche"
-"Catalog Search","Katalog Suche"
-"Catalog Search Index","Katalog Suchindex"
-"Don't see what you're looking for?","Nicht gefunden, was Sie suchen?"
-"Enter ""0"" to enable layered navigation for any number of results.","Um Ebenennavigation für eine beliebige Anzahl von Ergebnissen zu aktivieren bitte ""0"" eingeben."
+All,Alle
+"Are you sure?","Are you sure?"
+No,Nein
+Action,Action
+Edit,Edit
+Results,Ergebnisse
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,Ja
+Home,Startseite
+Search,Suche
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
"Go to Home Page","Zur Startseite gehen"
-"Grid","Raster"
-"Home","Startseite"
-"List","Liste"
-"Maximum Query Length","Maximale Abfragenlänge"
-"Maximum Query Words Count","Maximale Wortanzahl für Abfragen"
-"Maximum Search query length is %s. Your query was cut.","Maximale Länge für Suchabfragen ist %s. Ihre Abfrage wurde abgeschnitten."
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Die maximale Zahl an Wörtern beträgt %1$s. Ihre Suchanfrage wurde bei %2$s abgeschnitten."
-"Minimal Query Length","Mindestlänge für Abfragen"
-"Minimum Search query length is %s","Mindestlänge für Suchabfrage ist %s."
-"Modify your search","Verändern Sie Ihre Suche"
-"No","Nein"
-"No items were found using the following search criteria.","Es wurden keine Artikel mit den folgenden Suchkriterien gefunden."
+Grid,Raster
+List,Liste
+"Catalog Advanced Search","Katalog Erweiterte Suche"
+Relevance,Relevanz
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
"Please specify at least one search term.","Bitte geben Sie zumindest einen Suchbegriff ein."
-"Popular Search Terms","Beliebte Suchbegriffe"
-"Quick Search Form","Formular Schnellsuche"
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search","Katalog Suche"
"Rebuild Catalog product fulltext search index","Katalog Produktvolltext Suchindex neu generieren."
-"Relevance","Relevanz"
-"Results","Ergebnisse"
-"Search","Suche"
-"Search Settings","Sucheinstellungen"
-"Search Terms","Suchbegriffe"
-"Search Type","Suchtyp"
+"Please specify correct data.","Please specify correct data."
+"Search Settings",Sucheinstellungen
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.","Es wurden keine Artikel mit den folgenden Suchkriterien gefunden."
+"Modify your search","Verändern Sie Ihre Suche"
+name,name
+"Don't see what you're looking for?","Nicht gefunden, was Sie suchen?"
"Search entire store here...","Den gesamten Shop durchsuchen..."
-"Search results for '%s'","Suchergebnisse für '%s'"
-"Search results for: '%s'","Suchergebnisse für: '%s'"
-"Search:","Suche:"
-"Specified date is invalid.","Angegebene Daten sind ungültig."
-"Subscribe to Feed","Feed abonnieren"
-"There are no search terms available.","Es sind keine Suchbegriffe verfügbar."
-"Yes","Ja"
+"Advanced Search","Erweiterte Suche"
"Your search returns no results.","Ihre Suche ergab keine Ergebnisse."
-"up to %s","bis zu %s."
+"There are no search terms available.","Es sind keine Suchbegriffe verfügbar."
+"Popular Search Terms","Beliebte Suchbegriffe"
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv
index 9149c0114e7..d701c5b14a7 100644
--- a/app/code/Magento/CatalogSearch/i18n/en_US.csv
+++ b/app/code/Magento/CatalogSearch/i18n/en_US.csv
@@ -1,49 +1,53 @@
-"%s and greater","%s and greater"
-"<strong>%d item(s)</strong> were found using the following search criteria","<strong>%d item(s)</strong> were found using the following search criteria"
-"Advanced Search","Advanced Search"
-"Advanced Search Form","Advanced Search Form"
-"Advanced Search Result","Advanced Search Result"
-"All","All"
-"Applies for ""Like"" search type only.","Applies for ""Like"" search type only."
-"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process."
-"Autogenerated Site Map","Autogenerated Site Map"
-"Catalog Advanced Search","Catalog Advanced Search"
-"Catalog Search","Catalog Search"
-"Catalog Search Index","Catalog Search Index"
-"Don't see what you're looking for?","Don't see what you're looking for?"
-"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
-"Go","Go"
+All,All
+"Are you sure?","Are you sure?"
+No,No
+Action,Action
+Edit,Edit
+Results,Results
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,Yes
+Home,Home
+Search,Search
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
"Go to Home Page","Go to Home Page"
-"Grid","Grid"
-"Home","Home"
-"List","List"
-"Maximum Query Length","Maximum Query Length"
-"Maximum Query Words Count","Maximum Query Words Count"
-"Maximum Search query length is %s. Your query was cut.","Maximum Search query length is %s. Your query was cut."
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Maximum words count is %1$s. In your search query was cut next part: %2$s."
-"Minimal Query Length","Minimal Query Length"
-"Minimum Search query length is %s","Minimum Search query length is %s"
-"Modify your search","Modify your search"
-"No","No"
-"No items were found using the following search criteria.","No items were found using the following search criteria."
+Grid,Grid
+List,List
+"Catalog Advanced Search","Catalog Advanced Search"
+Relevance,Relevance
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
"Please specify at least one search term.","Please specify at least one search term."
-"Popular Search Terms","Popular Search Terms"
-"Quick Search Form","Quick Search Form"
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search","Catalog Search"
"Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
-"Relevance","Relevance"
-"Results","Results"
-"Search","Search"
+"Please specify correct data.","Please specify correct data."
"Search Settings","Search Settings"
-"Search Terms","Search Terms"
-"Search Type","Search Type"
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.","No items were found using the following search criteria."
+"Modify your search","Modify your search"
+name,name
+"Don't see what you're looking for?","Don't see what you're looking for?"
"Search entire store here...","Search entire store here..."
-"Search results for '%s'","Search results for '%s'"
-"Search results for: '%s'","Search results for: '%s'"
-"Search:","Search:"
-"Specified date is invalid.","Specified date is invalid."
-"Subscribe to Feed","Subscribe to Feed"
-"There are no search terms available.","There are no search terms available."
-"Yes","Yes"
+"Advanced Search","Advanced Search"
"Your search returns no results.","Your search returns no results."
-"up to %s","up to %s"
+"There are no search terms available.","There are no search terms available."
+"Popular Search Terms","Popular Search Terms"
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/i18n/es_ES.csv b/app/code/Magento/CatalogSearch/i18n/es_ES.csv
index b50b01af5c2..c9c8f60cd75 100644
--- a/app/code/Magento/CatalogSearch/i18n/es_ES.csv
+++ b/app/code/Magento/CatalogSearch/i18n/es_ES.csv
@@ -1,48 +1,53 @@
-"%s and greater","%s y mayor"
-"<strong>%d item(s)</strong> were found using the following search criteria","<strong>%d artÃculo(s)</strong> fueron encontrados siguiendo los criterios de búsqueda"
-"Advanced Search","Búsqueda avanzada"
-"Advanced Search Form","Formulario de búsqueda avanzada"
-"Advanced Search Result","Resultados de búsqueda avanzada"
-"All","Todo"
-"Applies for ""Like"" search type only.","Se aplica sólo a tipo de búsqueda ""Como""."
-"Apply Layered Navigation if Search Results are Less Than","Aplicar navegación por capas si los resultados de búsqueda son menos que"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","Cambio de configuración del atributo relacionado con el Ãndice de búsqueda. Inicie el proceso <a href=""%s"">Reconstruir Ãndice de búsqueda</a>"
-"Autogenerated Site Map","Mapa del sitio autogenerado"
-"Catalog Advanced Search","Búsqueda de catálogo avanzada"
-"Catalog Search","Catálogo de búsquedas"
-"Catalog Search Index","Ãndice de búsqueda del catálogo"
-"Don't see what you're looking for?","¿No encuentra lo que busca?"
-"Enter ""0"" to enable layered navigation for any number of results.","Escriba ""0"" para permitir navegación en capas para cualquier número de resultados."
+All,Todo
+"Are you sure?","Are you sure?"
+No,No
+Action,Action
+Edit,Edit
+Results,Resultados
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,SÃ
+Home,Inicio
+Search,Buscar
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
"Go to Home Page","Ir a la página de inicio"
-"Grid","Parrilla"
-"Home","Inicio"
-"List","Lista"
-"Maximum Query Length","Longitud máxima de consulta"
-"Maximum Query Words Count","Contador de palabras máximas de consulta"
-"Maximum Search query length is %s. Your query was cut.","La longitud máxima de consultas de búsqueda es %s. Tu consulta fue reducida."
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","El recuento máximo de palabras es de %1$s. En tu petición de búsqueda se redujo a lo siguiente: %2$s."
-"Minimal Query Length","Longitud mÃnima de búsqueda"
-"Minimum Search query length is %s","La longitud mÃnima de consultas de búsqueda es %s"
-"Modify your search","Modificar la búsqueda"
-"No","No"
-"No items were found using the following search criteria.","No se encontraron productos usando estos criterios de búsqueda"
+Grid,Parrilla
+List,Lista
+"Catalog Advanced Search","Búsqueda de catálogo avanzada"
+Relevance,Relevancia
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
"Please specify at least one search term.","Por favor especifica al menos un término de búsqueda."
-"Popular Search Terms","Términos de búsqueda populares"
-"Quick Search Form","Formulario de búsquda rápida"
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search","Catálogo de búsquedas"
"Rebuild Catalog product fulltext search index","Reconstruir Catálogo producto todoeltexto búsqueda Ãndice"
-"Relevance","Relevancia"
-"Results","Resultados"
-"Search","Buscar"
+"Please specify correct data.","Please specify correct data."
"Search Settings","Ajustes de búsqueda"
-"Search Terms","Términos de búsqueda"
-"Search Type","Tipo de búsqueda"
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.","No se encontraron productos usando estos criterios de búsqueda"
+"Modify your search","Modificar la búsqueda"
+name,name
+"Don't see what you're looking for?","¿No encuentra lo que busca?"
"Search entire store here...","Buscar en toda la tienda..."
-"Search results for '%s'","Resultados de búsqueda para '%s'"
-"Search results for: '%s'","Resultados de búsqueda para: '%s'"
-"Search:","Buscar:"
-"Specified date is invalid.","La fecha especificada no es válida"
-"Subscribe to Feed","Suscribirse al Feed"
-"There are no search terms available.","No hay términos de búsqueda disponibles."
-"Yes","SÃ"
+"Advanced Search","Búsqueda avanzada"
"Your search returns no results.","La búsqueda no da ningún resultado."
-"up to %s","hasta %s"
+"There are no search terms available.","No hay términos de búsqueda disponibles."
+"Popular Search Terms","Términos de búsqueda populares"
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/i18n/fr_FR.csv b/app/code/Magento/CatalogSearch/i18n/fr_FR.csv
index 20dee66aa5a..ae1e24c38c0 100644
--- a/app/code/Magento/CatalogSearch/i18n/fr_FR.csv
+++ b/app/code/Magento/CatalogSearch/i18n/fr_FR.csv
@@ -1,48 +1,53 @@
-"%s and greater","%s et supérieur"
-"<strong>%d item(s)</strong> were found using the following search criteria","<strong>%d objet(s)</strong> ont été trouvés en utilisant les critères de recherche suivants"
-"Advanced Search","Recherche avancée"
-"Advanced Search Form","Formulaire de recherche avancée"
-"Advanced Search Result","Résultats de recherche avancée"
-"All","Tous"
-"Applies for ""Like"" search type only.","S'applique uniquement aux recherches de type ""Like""."
-"Apply Layered Navigation if Search Results are Less Than","Appliquer la navigation par couches si les résultats sont moins de"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","Options d'attribut lié à la recherche de l'index. Veuillez lancer le processus <a href=""%s"">de récréation de l'index de recherche</a> process."
-"Autogenerated Site Map","Carte du site générée automatiquement"
-"Catalog Advanced Search","Recherche avancée du catalogue"
-"Catalog Search","Index du catalogue"
-"Catalog Search Index","Recherche de l'index du catalogue"
-"Don't see what you're looking for?","Vous ne trouvez pas ce que vous cherchez ?"
-"Enter ""0"" to enable layered navigation for any number of results.","Entrez ""0"" pour activer la navigation par couche quel que soit le nombre de résultats."
+All,Tous
+"Are you sure?","Are you sure?"
+No,Non
+Action,Action
+Edit,Edit
+Results,Résultats
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,oui
+Home,Accueil
+Search,Rechercher
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
"Go to Home Page","Aller à la page d'accueil"
-"Grid","Grille"
-"Home","Accueil"
-"List","Liste"
-"Maximum Query Length","Longueur maximale de la recherche"
-"Maximum Query Words Count","Nombre maximal de mots dans la recherche"
-"Maximum Search query length is %s. Your query was cut.","La longueur maximale d'une recherche est %s. Votre recherche a été coupée."
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Le nombre maximum de mots est %1$s. La partie suivante de votre recherche a été coupée : %2$s."
-"Minimal Query Length","Longueur minimale de la recherche"
-"Minimum Search query length is %s","La longueur minimale de la recherche est %s"
-"Modify your search","Modifier votre recherche"
-"No","Non"
-"No items were found using the following search criteria.","Aucun objet n'a été trouvé en utilisant les critères de recherche suivants."
+Grid,Grille
+List,Liste
+"Catalog Advanced Search","Recherche avancée du catalogue"
+Relevance,Pertinence
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
"Please specify at least one search term.","Veuillez spécifier au moins un terme de recherche."
-"Popular Search Terms","Termes souvent recherchés"
-"Quick Search Form","Formulaire de recherche rapide"
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search","Index du catalogue"
"Rebuild Catalog product fulltext search index","Reconstruire le catalogue à partir de l'index de recherche"
-"Relevance","Pertinence"
-"Results","Résultats"
-"Search","Rechercher"
+"Please specify correct data.","Please specify correct data."
"Search Settings","Options de recherche"
-"Search Terms","Termes de recherche"
-"Search Type","Type de recherche"
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.","Aucun objet n'a été trouvé en utilisant les critères de recherche suivants."
+"Modify your search","Modifier votre recherche"
+name,name
+"Don't see what you're looking for?","Vous ne trouvez pas ce que vous cherchez ?"
"Search entire store here...","Rechercher la boutique entière"
-"Search results for '%s'","Résultats de recherche pour '%s'"
-"Search results for: '%s'","Résultats de recherche pour : '%s'"
-"Search:","Recherche :"
-"Specified date is invalid.","La date spécifiée est invalide."
-"Subscribe to Feed","Souscrire au feed"
-"There are no search terms available.","Il n'y a pas de termes de recherche disponibles."
-"Yes","oui"
+"Advanced Search","Recherche avancée"
"Your search returns no results.","Votre recherche ne renvoie aucun résultat."
-"up to %s","jusqu'Ã %s"
+"There are no search terms available.","Il n'y a pas de termes de recherche disponibles."
+"Popular Search Terms","Termes souvent recherchés"
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/i18n/nl_NL.csv b/app/code/Magento/CatalogSearch/i18n/nl_NL.csv
index e2d6b9d76b7..ea1d9b82799 100644
--- a/app/code/Magento/CatalogSearch/i18n/nl_NL.csv
+++ b/app/code/Magento/CatalogSearch/i18n/nl_NL.csv
@@ -1,48 +1,53 @@
-"%s and greater","%s en groter"
-"<strong>%d item(s)</strong> were found using the following search criteria","<strong>%d product(en)</strong> zijn gevonden door de volgende zoekcriteria te gebruiken"
-"Advanced Search","Geavanceerde zoekopdracht"
-"Advanced Search Form","Geavanceerd zoekformulier"
-"Advanced Search Result","Geavanceerde zoekrerultaten"
-"All","Alle"
-"Applies for ""Like"" search type only.","Geldt alleen voor ""vergelijkbare"" zoektypes."
-"Apply Layered Navigation if Search Results are Less Than","Breng gelaagde navigatie aan als de zoekresultaten minder zijn dan"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","Attribuut instelling verandert met zoekindex. Start a.u.b. het <a href=""%s"">Herstel zoekindex</a> proces."
-"Autogenerated Site Map","Automatisch aangemaakte sitemap."
-"Catalog Advanced Search","Geavanceerde catalogus zoekopdracht"
-"Catalog Search","Catalogus zoekopdracht"
-"Catalog Search Index","Catalogus zoekopdracht index"
-"Don't see what you're looking for?","Ziet u niet wat u zoekt?"
-"Enter ""0"" to enable layered navigation for any number of results.","Voer ""0"" in om gelaagde navigatie in te stellen voor elk aantal resultaten"
+All,Alle
+"Are you sure?","Are you sure?"
+No,Nee
+Action,Action
+Edit,Edit
+Results,Resultaten
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,ja
+Home,Thuis
+Search,Zoekopdracht
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
"Go to Home Page","Ga naar homepage"
-"Grid","Stramien"
-"Home","Thuis"
-"List","Lijst"
-"Maximum Query Length","Maximum vraag lengte"
-"Maximum Query Words Count","Maximum aantal vraagwoorden"
-"Maximum Search query length is %s. Your query was cut.","Maximum lengte zoek vraag is %s. Uw vraag is ingekort."
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Maximum aantal woorden is %1$s. In uw zoekterm was het volgende deel verwijderd: %2$s."
-"Minimal Query Length","Minimale vraag lengte"
-"Minimum Search query length is %s","Minimale lengte voor zoek vraag is %s."
-"Modify your search","Bewerk uw zoekopdracht"
-"No","Nee"
-"No items were found using the following search criteria.","Er zijn geen producten gevonden toen de volgende zoekcriteria werden gebruikt"
+Grid,Stramien
+List,Lijst
+"Catalog Advanced Search","Geavanceerde catalogus zoekopdracht"
+Relevance,Relevantie
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
"Please specify at least one search term.","Specificeer a.u.b. ten minste één zoekterm"
-"Popular Search Terms","Populaire zoektermen"
-"Quick Search Form","Snel zoekformulier"
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search","Catalogus zoekopdracht"
"Rebuild Catalog product fulltext search index","Bouw catalogus product volledige tekst zoek index opnieuw"
-"Relevance","Relevantie"
-"Results","Resultaten"
-"Search","Zoekopdracht"
+"Please specify correct data.","Please specify correct data."
"Search Settings","Zoek in instellingen"
-"Search Terms","Zoek in voorwaarden"
-"Search Type","Zoek in type"
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.","Er zijn geen producten gevonden toen de volgende zoekcriteria werden gebruikt"
+"Modify your search","Bewerk uw zoekopdracht"
+name,name
+"Don't see what you're looking for?","Ziet u niet wat u zoekt?"
"Search entire store here...","Zoek in de gehele winkel hier..."
-"Search results for '%s'","Zoekresultaten voor '%s'"
-"Search results for: '%s'","Zoekresultaten voor: '%s'"
-"Search:","Zoek:"
-"Specified date is invalid.","Gespecificeerde datum is ongeldig."
-"Subscribe to Feed","Abonneer op Feed"
-"There are no search terms available.","Er zijn geen zoektermen beschikbaar"
-"Yes","ja"
+"Advanced Search","Geavanceerde zoekopdracht"
"Your search returns no results.","Uw zoekopdracht heeft geen resultaten opgeleverd."
-"up to %s","Tot aan %s"
+"There are no search terms available.","Er zijn geen zoektermen beschikbaar"
+"Popular Search Terms","Populaire zoektermen"
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/i18n/pt_BR.csv b/app/code/Magento/CatalogSearch/i18n/pt_BR.csv
index 41c58c73fed..d0e1f0759eb 100644
--- a/app/code/Magento/CatalogSearch/i18n/pt_BR.csv
+++ b/app/code/Magento/CatalogSearch/i18n/pt_BR.csv
@@ -1,48 +1,53 @@
-"%s and greater","%s e maior"
-"<strong>%d item(s)</strong> were found using the following search criteria","<strong>%d item(s)</strong> foram encontrados utilizando os seguintes critérios de pesquisa"
-"Advanced Search","Pesquisa Avançada"
-"Advanced Search Form","Formulário de Pesquisa Avançada"
-"Advanced Search Result","Resultado de Pesquisa Avançada"
-"All","Todos"
-"Applies for ""Like"" search type only.","Aplica-se apenas para o tipo de pesquisa ""Como""."
-"Apply Layered Navigation if Search Results are Less Than","Aplicar Navegação em Camada se Resultados da Pesquisa são Menos Que"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","Alterar a definição de atributos relacionados com o Ãndice de Pesquisa. Por favor execute o processo <a href=""%s"">Reconstruir Ãndice de Pesquisa</a>."
-"Autogenerated Site Map","Mapa do Site Autogerado"
-"Catalog Advanced Search","Pesquisa Avançada do Catálogo"
-"Catalog Search","Busca de Catálogo"
-"Catalog Search Index","Ãndice de Pesquisa do Catálogo"
-"Don't see what you're looking for?","Não vê o que você está procurando?"
-"Enter ""0"" to enable layered navigation for any number of results.","Insira ""0"" para permitir a navegação em camadas para qualquer número de resultados."
+All,Todos
+"Are you sure?","Are you sure?"
+No,Não
+Action,Action
+Edit,Edit
+Results,Resultados
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,Sim
+Home,InÃcio
+Search,Pesquisa
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
"Go to Home Page","Ir para Página Inicial"
-"Grid","Grade"
-"Home","InÃcio"
-"List","Lista"
-"Maximum Query Length","Comprimento Máximo de Consulta"
-"Maximum Query Words Count","Contagem Máxima de Palavras de Consulta"
-"Maximum Search query length is %s. Your query was cut.","Comprimento máximo de Pesquisa de consulta é %s. Sua consulta foi cortada."
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","A contagem máxima de palavras é %1$s. Na sua busca a próxima parte foi cortada: %2$s."
-"Minimal Query Length","Comprimento MinÃmo de Consulta"
-"Minimum Search query length is %s","Comprimento minÃmo de Pesquisa de consulta é %s."
-"Modify your search","Modifique sua pesquisa"
-"No","Não"
-"No items were found using the following search criteria.","Nenhum item foi encontrado utilizando o seguinte critério de pesquisa."
+Grid,Grade
+List,Lista
+"Catalog Advanced Search","Pesquisa Avançada do Catálogo"
+Relevance,Relevância
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
"Please specify at least one search term.","Especifique ao menos um termo de pesquisa."
-"Popular Search Terms","Termos populares de pesquisa"
-"Quick Search Form","Formulário de pesquisa rápida"
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search","Busca de Catálogo"
"Rebuild Catalog product fulltext search index","Reconstruir Ãndice de pesquisa de texto completo de produto do catálogo"
-"Relevance","Relevância"
-"Results","Resultados"
-"Search","Pesquisa"
+"Please specify correct data.","Please specify correct data."
"Search Settings","Opções de pesquisa"
-"Search Terms","Buscar Termos"
-"Search Type","Tipo de pesquisa"
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.","Nenhum item foi encontrado utilizando o seguinte critério de pesquisa."
+"Modify your search","Modifique sua pesquisa"
+name,name
+"Don't see what you're looking for?","Não vê o que você está procurando?"
"Search entire store here...","Pesquise toda a loja aqui..."
-"Search results for '%s'","Pesquisar resultados para ""%s"""
-"Search results for: '%s'","Pesquisar resultados para: ""%s"""
-"Search:","Pesquisa:"
-"Specified date is invalid.","A data especificada é inválida."
-"Subscribe to Feed","Endossar Feed"
-"There are no search terms available.","Não há termos de pesquisa disponÃveis."
-"Yes","Sim"
+"Advanced Search","Pesquisa Avançada"
"Your search returns no results.","Sua busca não retornou resultados."
-"up to %s","até %s"
+"There are no search terms available.","Não há termos de pesquisa disponÃveis."
+"Popular Search Terms","Termos populares de pesquisa"
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/i18n/zh_CN.csv b/app/code/Magento/CatalogSearch/i18n/zh_CN.csv
index 47c3a1dbec7..42437a533bc 100644
--- a/app/code/Magento/CatalogSearch/i18n/zh_CN.csv
+++ b/app/code/Magento/CatalogSearch/i18n/zh_CN.csv
@@ -1,48 +1,53 @@
-"%s and greater","%s 并且更多"
-"<strong>%d item(s)</strong> were found using the following search criteria","使用下列æœç´¢æ¡ä»¶æ‰¾åˆ°äº†<strong>%d 个商å“</strong>"
-"Advanced Search","高级æœç´¢"
-"Advanced Search Form","高级æœç´¢è¡¨å•"
-"Advanced Search Result","高级æœç´¢ç»“æžœ"
-"All","全部"
-"Applies for ""Like"" search type only.","åªåº”用“喜欢â€çš„æœç´¢ç±»åž‹ã€‚"
-"Apply Layered Navigation if Search Results are Less Than","如果æœç´¢ç»“果少于该数é‡ï¼Œåº”用层次å¼å¯¼èˆª"
-"Attribute setting change related with Search Index. Please run <a href=""%s"">Rebuild Search Index</a> process.","与æœç´¢ç´¢å¼•æœ‰å…³çš„属性设置有改动。请è¿è¡Œ<a href=""%s"">é‡å»ºæœç´¢ç´¢å¼•</a> æ“作。"
-"Autogenerated Site Map","自动生æˆçš„站点结构图"
-"Catalog Advanced Search","分类高级æœç´¢"
-"Catalog Search","分类æœç´¢"
-"Catalog Search Index","分类æœç´¢ç´¢å¼•"
-"Don't see what you're looking for?","没看到您è¦æ‰¾çš„东西？"
-"Enter ""0"" to enable layered navigation for any number of results.","输入“0â€å³å¯ä¸ºä»»ä½•æ•°é‡çš„结果å¯ç”¨å±‚次å¼å¯¼èˆªã€‚"
-"Go to Home Page","å‰å¾€ä¸»é¡µ"
-"Grid","ç½‘æ ¼"
-"Home","主页"
-"List","列表"
-"Maximum Query Length","最大查询长度"
-"Maximum Query Words Count","最大查询è¯è¯æ•°é‡"
-"Maximum Search query length is %s. Your query was cut.","最大æœç´¢æŸ¥è¯¢é•¿åº¦ä¸º %s。您的查询被缩çŸäº†ã€‚"
-"Maximum words count is %1$s. In your search query was cut next part: %2$s.","最大å—数为 %1$s。在您的æœç´¢æŸ¥è¯¢ä¸æˆ‘们将åŽç»éƒ¨åˆ†åŽ»æŽ‰äº†ï¼š %2$s。"
-"Minimal Query Length","最å°æŸ¥è¯¢é•¿åº¦"
-"Minimum Search query length is %s","最å°æœç´¢æŸ¥è¯¢é•¿åº¦ä¸º %s"
-"Modify your search","修改您的æœç´¢"
-"No","å¦"
-"No items were found using the following search criteria.","没有找到使用下列æœç´¢æ¡ä»¶çš„项目。"
-"Please specify at least one search term.","请至少指定一个æœç´¢è¯ã€‚"
-"Popular Search Terms","çƒé—¨æœç´¢è¯"
-"Quick Search Form","快速æœç´¢è¡¨å•"
-"Rebuild Catalog product fulltext search index","é‡å»ºç›®å½•äº§å“全文æœç´¢ç´¢å¼•"
-"Relevance","å…³è”"
-"Results","结果"
-"Search","æœç´¢"
-"Search Settings","æœç´¢è®¾ç½®"
-"Search Terms","æœç´¢æ¡ä»¶"
-"Search Type","æœç´¢ç±»åž‹"
-"Search entire store here...","在这里æœç´¢æ•´ä¸ªå•†åº—..."
-"Search results for '%s'","“%sâ€çš„æœç´¢ç»“æžœ"
-"Search results for: '%s'","æœç´¢ç»“果：“%sâ€"
-"Search:","æœç´¢ï¼š"
-"Specified date is invalid.","æŒ‡å®šçš„æ—¥æœŸæ— æ•ˆã€‚"
-"Subscribe to Feed","订阅到æºè®¢é˜…"
-"There are no search terms available.","没有å¯ç”¨çš„æœç´¢è¯"
-"Yes","是"
-"Your search returns no results.","您的æœç´¢æœªæ‰¾åˆ°ç»“果。"
-"up to %s","至多 %s"
+All,全部
+"Are you sure?","Are you sure?"
+No,å¦
+Action,Action
+Edit,Edit
+Results,结果
+Uses,Uses
+Delete,Delete
+Store,Store
+Yes,是
+Home,主页
+Search,æœç´¢
+"Search Query","Search Query"
+"Redirect URL","Redirect URL"
+"Go to Home Page",å‰å¾€ä¸»é¡µ
+Grid,ç½‘æ ¼
+List,列表
+"Catalog Advanced Search",分类高级æœç´¢
+Relevance,å…³è”
+"Search results for: '%1'","Search results for: '%1'"
+"Minimum Search query length is %1","Minimum Search query length is %1"
+"Your search query can't be longer than %1, so we had to shorten your query.","Your search query can't be longer than %1, so we had to shorten your query."
+"Sorry, but the maximum word count is %1. We left out this part of your search: %2.","Sorry, but the maximum word count is %1. We left out this part of your search: %2."
+"Please specify at least one search term.",请至少指定一个æœç´¢è¯ã€‚
+"%1 and greater","%1 and greater"
+"up to %1","up to %1"
+"Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process."
+"Catalog Search",分类æœç´¢
+"Rebuild Catalog product fulltext search index",é‡å»ºç›®å½•äº§å“全文æœç´¢ç´¢å¼•
+"Please specify correct data.","Please specify correct data."
+"Search Settings",æœç´¢è®¾ç½®
+"<strong>%1 item</strong> were found using the following search criteria","<strong>%1 item</strong> were found using the following search criteria"
+"<strong>%1 items</strong> were found using the following search criteria","<strong>%1 items</strong> were found using the following search criteria"
+"No items were found using the following search criteria.",没有找到使用下列æœç´¢æ¡ä»¶çš„项目。
+"Modify your search",修改您的æœç´¢
+name,name
+"Don't see what you're looking for?",没看到您è¦æ‰¾çš„东西？
+"Search entire store here...",在这里æœç´¢æ•´ä¸ªå•†åº—...
+"Advanced Search",高级æœç´¢
+"Your search returns no results.",您的æœç´¢æœªæ‰¾åˆ°ç»“果。
+"There are no search terms available.",没有å¯ç”¨çš„æœç´¢è¯
+"Popular Search Terms",çƒé—¨æœç´¢è¯
+"Minimal Query Length","Minimal Query Length"
+"Maximum Query Length","Maximum Query Length"
+"Maximum Query Words Count","Maximum Query Words Count"
+"Applies for ""Like"" search type only","Applies for ""Like"" search type only"
+"Search Type","Search Type"
+"Apply Layered Navigation if Search Results are Less Than","Apply Layered Navigation if Search Results are Less Than"
+"Enter ""0"" to enable layered navigation for any number of results.","Enter ""0"" to enable layered navigation for any number of results."
+Synonym,Synonym
+"Suggested Terms","Suggested Terms"
+yes,yes
+no,no
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
index 1993109bb15..7d74b44e6df 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
@@ -30,6 +30,11 @@
<argument translate="true" name="title" xsi:type="string">Catalog Advanced Search</argument>
</action>
</referenceBlock>
+ <referenceBlock name="root">
+ <action method="addBodyClass">
+ <argument name="class" xsi:type="string">page-products</argument>
+ </action>
+ </referenceBlock>
<referenceContainer name="content">
<block class="Magento\CatalogSearch\Block\Advanced\Result" name="catalogsearch_advanced_result" template="advanced/result.phtml">
<block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="product/list.phtml">
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
index c4884b31ddc..9f1a39a4d35 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
@@ -25,6 +25,11 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
<update handle="page_two_columns_left"/>
+ <referenceBlock name="root">
+ <action method="addBodyClass">
+ <argument name="class" xsi:type="string">page-products</argument>
+ </action>
+ </referenceBlock>
<referenceContainer name="content">
<block class="Magento\CatalogSearch\Block\Result" name="search.result" template="result.phtml" cacheable="false">
<block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="product/list.phtml" cacheable="false">
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 247fc89e335..0b74e49da9d 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -37,7 +37,7 @@
<?php $_code = $_attribute->getAttributeCode() ?>
<div class="field <?php echo $_code ?>">
<label class="label" for="<?php echo $_code ?>">
- <span><?php echo $this->getAttributeLabel($_attribute) ?></span>
+ <span><?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?></span>
</label>
<div class="control">
<?php switch($this->getAttributeInputType($_attribute)):
@@ -136,7 +136,7 @@
</div>
<?php endforeach; ?>
</fieldset>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="primary">
<button type="submit"
class="action search primary"
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/term.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/term.phtml
index a1e3597fd2b..d52710461b6 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/term.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/term.phtml
@@ -23,7 +23,7 @@
*/
?>
<?php if( sizeof($this->getTerms()) > 0 ): ?>
- <ul class="search terms">
+ <ul class="search-terms">
<?php foreach ($this->getTerms() as $_term): ?>
<li class="item">
<a href="<?php echo $this->getSearchUrl($_term) ?>"
diff --git a/app/code/Magento/Centinel/i18n/de_DE.csv b/app/code/Magento/Centinel/i18n/de_DE.csv
index 853c2dabf94..01df77c497b 100644
--- a/app/code/Magento/Centinel/i18n/de_DE.csv
+++ b/app/code/Magento/Centinel/i18n/de_DE.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","3D Secure CAVV"
"3D Secure Card Validation","3D Secure Kartenvalidierung"
+"Validation failed.","Validierung ist fehlgeschlagen."
+"3D Secure Verification Result","3D Secure Verifizierungsergebnis"
"3D Secure Cardholder Validation","3D Secure Karteninhabervalidierung"
"3D Secure Electronic Commerce Indicator","3D Secure Electronic Commerce Indicator"
-"3D Secure Verification Result","3D Secure Verifizierungsergebnis"
+"3D Secure CAVV","3D Secure CAVV"
"3D Secure XID","3D Secure XD"
+"Merchant Liability","Haftung für Händler"
"Card Issuer Liability","Haftung für Kartenausteller"
-"Card Verification","Kartenverifizierung"
-"Enrolled","Eingeschrieben"
+Enrolled,Eingeschrieben
"Enrolled but Authentication Unavailable","Eingeschrieben, aber Authentifizierung nicht verfügbar"
-"Failed","Fehlgeschlagen"
-"MasterCard SecureCode","MasterCard SecureCode"
-"Merchant Liability","Haftung für Händler"
"Not Enrolled","Nicht eingeschrieben"
-"Order cannot be placed.","Bestellung kann nicht durchgeführt werden."
+Successful,Erfolgreich
+Failed,Fehlgeschlagen
+"Unable to complete","Fertigstellung nicht möglich"
+"Successful attempt","Erfolgreicher Versuch"
+"Unsupported currency code: %1.","Unsupported currency code: %1."
"Payment information error. Please start over.","Fehler bei Zahlungsinformation. Bitte versuchen Sie es erneut."
-"Please continue with placing order.","Bitte fahren Sie mit der Bestellung fort."
"Please verify the card with the issuer bank before placing the order.","Bitte verifizieren Sie die Karte mit der Ausstellerbank bevor Sie die Bestellung durchführen."
-"Please verify the card with the issuer bank:","Bitte verifizieren Sie die Karte mit der Ausstellerbank:"
-"Start/Reset Validation...","Validierung starten/zurücksetzen..."
-"Successful","Erfolgreich"
-"Successful attempt","Erfolgreicher Versuch"
-"The card has failed verification with the issuer bank.","Die Karte konnte nicht mit der Ausstellerbank verifiziert werden."
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Es wurden falsche Zahlungsinformationen abgeschickt, oder das Zeitlimit ist abgelaufen. Bitte versuchen Sie es erneut."
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","Es wurden falsche Zahlungsinformationen abgeschickt, oder Zeitlimit ist abgelaufen. Bitte versuchen Sie es erneut."
"This card has failed validation and cannot be used.","Diese Karte konnte nicht validiert werden und kann nicht benützt werden."
-"To ensure the security of your transactions","Um die Sicherheit ihrer Transaktionen zu gewährleisten"
-"Unable to complete","Fertigstellung nicht möglich"
-"Validation failed.","Validierung ist fehlgeschlagen."
-"Verification Failed","Verifizierung fehlgeschlagen"
"Verification Successful","Verifizierung erfolgreich"
+"Please continue with placing order.","Bitte fahren Sie mit der Bestellung fort."
+"Verification Failed","Verifizierung fehlgeschlagen"
+"The card has failed verification with the issuer bank.","Die Karte konnte nicht mit der Ausstellerbank verifiziert werden."
+"Order cannot be placed.","Bestellung kann nicht durchgeführt werden."
"Verification cannot be processed","Verifizierung kann nicht verarbeitet werden"
+"There has been wrong payment information submitted or time limit has expired. Please, try again.","Es wurden falsche Zahlungsinformationen abgeschickt, oder Zeitlimit ist abgelaufen. Bitte versuchen Sie es erneut."
+"Card Verification",Kartenverifizierung
+"Start/Reset Validation...","Validierung starten/zurücksetzen..."
+"Please verify the card with the issuer bank:","Bitte verifizieren Sie die Karte mit der Ausstellerbank:"
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Es wurden falsche Zahlungsinformationen abgeschickt, oder das Zeitlimit ist abgelaufen. Bitte versuchen Sie es erneut."
+"To ensure the security of your transactions","Um die Sicherheit ihrer Transaktionen zu gewährleisten"
"Verified by Visa","Verified by Visa"
+"MasterCard SecureCode","MasterCard SecureCode"
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Centinel/i18n/en_US.csv b/app/code/Magento/Centinel/i18n/en_US.csv
index 5864bac1d87..98e02de6752 100644
--- a/app/code/Magento/Centinel/i18n/en_US.csv
+++ b/app/code/Magento/Centinel/i18n/en_US.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","3D Secure CAVV"
"3D Secure Card Validation","3D Secure Card Validation"
+"Validation failed.","Validation failed."
+"3D Secure Verification Result","3D Secure Verification Result"
"3D Secure Cardholder Validation","3D Secure Cardholder Validation"
"3D Secure Electronic Commerce Indicator","3D Secure Electronic Commerce Indicator"
-"3D Secure Verification Result","3D Secure Verification Result"
+"3D Secure CAVV","3D Secure CAVV"
"3D Secure XID","3D Secure XID"
+"Merchant Liability","Merchant Liability"
"Card Issuer Liability","Card Issuer Liability"
-"Card Verification","Card Verification"
-"Enrolled","Enrolled"
+Enrolled,Enrolled
"Enrolled but Authentication Unavailable","Enrolled but Authentication Unavailable"
-"Failed","Failed"
-"MasterCard SecureCode","MasterCard SecureCode"
-"Merchant Liability","Merchant Liability"
"Not Enrolled","Not Enrolled"
-"Order cannot be placed.","Order cannot be placed."
+Successful,Successful
+Failed,Failed
+"Unable to complete","Unable to complete"
+"Successful attempt","Successful attempt"
+"Unsupported currency code: %1.","Unsupported currency code: %1."
"Payment information error. Please start over.","Payment information error. Please start over."
-"Please continue with placing order.","Please continue with placing order."
"Please verify the card with the issuer bank before placing the order.","Please verify the card with the issuer bank before placing the order."
-"Please verify the card with the issuer bank:","Please verify the card with the issuer bank:"
-"Start/Reset Validation...","Start/Reset Validation..."
-"Successful","Successful"
-"Successful attempt","Successful attempt"
-"The card has failed verification with the issuer bank.","The card has failed verification with the issuer bank."
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","There has been wrong payment information submitted or the time limit has expired. Please, try again."
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","There has been wrong payment information submitted or time limit has expired. Please, try again."
"This card has failed validation and cannot be used.","This card has failed validation and cannot be used."
-"To ensure the security of your transactions","To ensure the security of your transactions"
-"Unable to complete","Unable to complete"
-"Validation failed.","Validation failed."
-"Verification Failed","Verification Failed"
"Verification Successful","Verification Successful"
+"Please continue with placing order.","Please continue with placing order."
+"Verification Failed","Verification Failed"
+"The card has failed verification with the issuer bank.","The card has failed verification with the issuer bank."
+"Order cannot be placed.","Order cannot be placed."
"Verification cannot be processed","Verification cannot be processed"
+"There has been wrong payment information submitted or time limit has expired. Please, try again.","There has been wrong payment information submitted or time limit has expired. Please, try again."
+"Card Verification","Card Verification"
+"Start/Reset Validation...","Start/Reset Validation..."
+"Please verify the card with the issuer bank:","Please verify the card with the issuer bank:"
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.","There has been wrong payment information submitted or the time limit has expired. Please, try again."
+"To ensure the security of your transactions","To ensure the security of your transactions"
"Verified by Visa","Verified by Visa"
+"MasterCard SecureCode","MasterCard SecureCode"
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Centinel/i18n/es_ES.csv b/app/code/Magento/Centinel/i18n/es_ES.csv
index 4d3280945da..d4b4792979a 100644
--- a/app/code/Magento/Centinel/i18n/es_ES.csv
+++ b/app/code/Magento/Centinel/i18n/es_ES.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","CAVV Seguro 3D"
"3D Secure Card Validation","Validación segura 3D de tarjeta"
+"Validation failed.","Validación errónea."
+"3D Secure Verification Result","Resultados de la verificación segura 3D"
"3D Secure Cardholder Validation","Validación segura 3D del tÃtular de la tarjeta"
"3D Secure Electronic Commerce Indicator","Indicador comercio electrónico seguro 3D"
-"3D Secure Verification Result","Resultados de la verificación segura 3D"
+"3D Secure CAVV","CAVV Seguro 3D"
"3D Secure XID","XID Seguro 3D"
+"Merchant Liability","Responsabilidad del comerciante"
"Card Issuer Liability","Responsabilidad del emisor de la tarjeta"
-"Card Verification","Verificación de tarjeta"
-"Enrolled","Inscrito"
+Enrolled,Inscrito
"Enrolled but Authentication Unavailable","Inscrito pero autentificación no disponible"
-"Failed","Ha fallado"
-"MasterCard SecureCode","MasterCard Código Seguro"
-"Merchant Liability","Responsabilidad del comerciante"
"Not Enrolled","No inscrito"
-"Order cannot be placed.","El pedido no puede ser realizado."
+Successful,Exitoso
+Failed,"Ha fallado"
+"Unable to complete","No se ha podido completar"
+"Successful attempt","Intento exitoso"
+"Unsupported currency code: %1.","Unsupported currency code: %1."
"Payment information error. Please start over.","Error de información de pago. Por favor, comience de nuevo."
-"Please continue with placing order.","Por favor continue con su pedido."
"Please verify the card with the issuer bank before placing the order.","Por favor verifique la tarjeta con el banco emisor antes de realizar el pedido."
-"Please verify the card with the issuer bank:","Por favor verifique la tarjeta con el banco emisor:"
-"Start/Reset Validation...","Comenzar/Resetear validación..."
-"Successful","Exitoso"
-"Successful attempt","Intento exitoso"
-"The card has failed verification with the issuer bank.","La tarjeta ha fallado la verificación con el banco emisor."
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Se ha enviado información errónea o el lÃmite de tiempo ha expirado. Por favor, inténtelo de nuevo."
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","Se ha enviado información errónea o el lÃmite de tiempo ha expirado. Por favor, inténtelo de nuevo."
"This card has failed validation and cannot be used.","Esta tarjeta ha fallado su validación y no puede ser usada."
-"To ensure the security of your transactions","Para asegurar la seguridad de sus transacciones"
-"Unable to complete","No se ha podido completar"
-"Validation failed.","Validación errónea."
-"Verification Failed","Verificación errónea"
"Verification Successful","Verificación exitosa"
+"Please continue with placing order.","Por favor continue con su pedido."
+"Verification Failed","Verificación errónea"
+"The card has failed verification with the issuer bank.","La tarjeta ha fallado la verificación con el banco emisor."
+"Order cannot be placed.","El pedido no puede ser realizado."
"Verification cannot be processed","La verificación no puede ser procesada"
+"There has been wrong payment information submitted or time limit has expired. Please, try again.","Se ha enviado información errónea o el lÃmite de tiempo ha expirado. Por favor, inténtelo de nuevo."
+"Card Verification","Verificación de tarjeta"
+"Start/Reset Validation...","Comenzar/Resetear validación..."
+"Please verify the card with the issuer bank:","Por favor verifique la tarjeta con el banco emisor:"
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Se ha enviado información errónea o el lÃmite de tiempo ha expirado. Por favor, inténtelo de nuevo."
+"To ensure the security of your transactions","Para asegurar la seguridad de sus transacciones"
"Verified by Visa","Verificado por Visa"
+"MasterCard SecureCode","MasterCard Código Seguro"
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Centinel/i18n/fr_FR.csv b/app/code/Magento/Centinel/i18n/fr_FR.csv
index 343d17e2102..c4679155db4 100644
--- a/app/code/Magento/Centinel/i18n/fr_FR.csv
+++ b/app/code/Magento/Centinel/i18n/fr_FR.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","CAVV 3D sécurisé"
"3D Secure Card Validation","Validation carte 3D sécurisée"
+"Validation failed.","Validation a échouée."
+"3D Secure Verification Result","Résultat vérification 3D sécurisé"
"3D Secure Cardholder Validation","Validation porteur de carte 3D sécurisée"
"3D Secure Electronic Commerce Indicator","Indicateur commerce électronique 3D sécurisé"
-"3D Secure Verification Result","Résultat vérification 3D sécurisé"
+"3D Secure CAVV","CAVV 3D sécurisé"
"3D Secure XID","XID 3D sécurisé"
+"Merchant Liability","Responsabilité du commerçant"
"Card Issuer Liability","Responsabilité de l'émetteur de la carte"
-"Card Verification","Vérification carte"
-"Enrolled","Enrôlé"
+Enrolled,Enrôlé
"Enrolled but Authentication Unavailable","Enrôlé mais authentification non disponible"
-"Failed","Échec"
-"MasterCard SecureCode","Code sûr MasterCard"
-"Merchant Liability","Responsabilité du commerçant"
"Not Enrolled","Non enrôlé"
-"Order cannot be placed.","Commande ne peut être placée."
+Successful,Réussi
+Failed,Échec
+"Unable to complete","Ne peut compléter"
+"Successful attempt","Tentative réussie"
+"Unsupported currency code: %1.","Unsupported currency code: %1."
"Payment information error. Please start over.","Erreur d'infos de paiement. Veuillez recommencer."
-"Please continue with placing order.","Veuillez continuer à faire la commande."
"Please verify the card with the issuer bank before placing the order.","Veuillez vérifier la carte avec la banque émettrice avant de passer la commande."
-"Please verify the card with the issuer bank:","Veuillez vérifier la carte avec la banque émettrice"
-"Start/Reset Validation...","Démarrer/réinitialiser validation..."
-"Successful","Réussi"
-"Successful attempt","Tentative réussie"
-"The card has failed verification with the issuer bank.","La carte n'a pas réussie sa vérification avec la banque émettrice."
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Une mauvaise information de paiement a été soumise ou le temps imparti s'est achevé. Veuillez réessayer."
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","Une mauvaise information de paiement a été soumise ou temps imparti est achevé. Veuillez réessayer."
"This card has failed validation and cannot be used.","La carte n'a pu être validée et ne peut être utilisée."
-"To ensure the security of your transactions","Pour assurer la sécurité de vos transactions"
-"Unable to complete","Ne peut compléter"
-"Validation failed.","Validation a échouée."
-"Verification Failed","Vérification a échouée"
"Verification Successful","Vérification réussie"
+"Please continue with placing order.","Veuillez continuer à faire la commande."
+"Verification Failed","Vérification a échouée"
+"The card has failed verification with the issuer bank.","La carte n'a pas réussie sa vérification avec la banque émettrice."
+"Order cannot be placed.","Commande ne peut être placée."
"Verification cannot be processed","Vérification ne peut être traitée"
+"There has been wrong payment information submitted or time limit has expired. Please, try again.","Une mauvaise information de paiement a été soumise ou temps imparti est achevé. Veuillez réessayer."
+"Card Verification","Vérification carte"
+"Start/Reset Validation...","Démarrer/réinitialiser validation..."
+"Please verify the card with the issuer bank:","Veuillez vérifier la carte avec la banque émettrice"
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Une mauvaise information de paiement a été soumise ou le temps imparti s'est achevé. Veuillez réessayer."
+"To ensure the security of your transactions","Pour assurer la sécurité de vos transactions"
"Verified by Visa","Vérifié par Visa"
+"MasterCard SecureCode","Code sûr MasterCard"
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Centinel/i18n/nl_NL.csv b/app/code/Magento/Centinel/i18n/nl_NL.csv
index 0ec255a7f12..9cc11c4a104 100644
--- a/app/code/Magento/Centinel/i18n/nl_NL.csv
+++ b/app/code/Magento/Centinel/i18n/nl_NL.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","3D Veilige CAVV"
"3D Secure Card Validation","3D Secure Card Validation"
+"Validation failed.","Validatie mislukt."
+"3D Secure Verification Result","3D Veilig Verificatie Resultaat"
"3D Secure Cardholder Validation","3D Veilige Kaarthouder Verificatie"
"3D Secure Electronic Commerce Indicator","3D Veilige Electronische Commerce Indicator"
-"3D Secure Verification Result","3D Veilig Verificatie Resultaat"
+"3D Secure CAVV","3D Veilige CAVV"
"3D Secure XID","3D Veilige XID"
+"Merchant Liability","Winkelier Aansprakelijkheid"
"Card Issuer Liability","Kaart Uitgever Verplichting"
-"Card Verification","Kaart Verificatie"
-"Enrolled","Ingeschreven"
+Enrolled,Ingeschreven
"Enrolled but Authentication Unavailable","Ingeschreven maar Authenticatie niet Beschikbaar"
-"Failed","Mislukt"
-"MasterCard SecureCode","MasterCard SecureCode"
-"Merchant Liability","Winkelier Aansprakelijkheid"
"Not Enrolled","Niet Ingeschreven"
-"Order cannot be placed.","Order kan niet geplaatst worden."
+Successful,Succesvol
+Failed,Mislukt
+"Unable to complete","Niet afgemaakt"
+"Successful attempt","Succesvolle poging"
+"Unsupported currency code: %1.","Unsupported currency code: %1."
"Payment information error. Please start over.","Betalingsinformatie fout. Start a.u.b. overnieuw."
-"Please continue with placing order.","Ga aub verder met plaatsen order."
"Please verify the card with the issuer bank before placing the order.","Verifieer de kaart a.u.b. met de uitgevende bank, voordat u de order plaatst."
-"Please verify the card with the issuer bank:","Verifieer de kaart a.u.b. met de uitgevende bank:"
-"Start/Reset Validation...","Begin/Herstel Validatie..."
-"Successful","Succesvol"
-"Successful attempt","Succesvolle poging"
-"The card has failed verification with the issuer bank.","De kaart verificatie met de uitgevende bank is mislukt."
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Er is verkeerde betalingsinformatie verzonden of de tijdslimiet is verlopen. Probeer het a.u.b. opnieuw."
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","Er is verkeerde betalingsinformatie verzonden of tijdslimiet is verlopen. Probeer a.u.b. opnieuw."
"This card has failed validation and cannot be used.","Deze kaart kon niet worden gevalideerd en is onbruikbaar."
-"To ensure the security of your transactions","Om de veiligheid van uw transacties te verzekeren"
-"Unable to complete","Niet afgemaakt"
-"Validation failed.","Validatie mislukt."
-"Verification Failed","Verificatie mislukt"
"Verification Successful","Verificatie geslaagd"
+"Please continue with placing order.","Ga aub verder met plaatsen order."
+"Verification Failed","Verificatie mislukt"
+"The card has failed verification with the issuer bank.","De kaart verificatie met de uitgevende bank is mislukt."
+"Order cannot be placed.","Order kan niet geplaatst worden."
"Verification cannot be processed","Verificatie kan niet worden verwerkt"
+"There has been wrong payment information submitted or time limit has expired. Please, try again.","Er is verkeerde betalingsinformatie verzonden of tijdslimiet is verlopen. Probeer a.u.b. opnieuw."
+"Card Verification","Kaart Verificatie"
+"Start/Reset Validation...","Begin/Herstel Validatie..."
+"Please verify the card with the issuer bank:","Verifieer de kaart a.u.b. met de uitgevende bank:"
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Er is verkeerde betalingsinformatie verzonden of de tijdslimiet is verlopen. Probeer het a.u.b. opnieuw."
+"To ensure the security of your transactions","Om de veiligheid van uw transacties te verzekeren"
"Verified by Visa","Geverifieerd door Visa"
+"MasterCard SecureCode","MasterCard SecureCode"
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Centinel/i18n/pt_BR.csv b/app/code/Magento/Centinel/i18n/pt_BR.csv
index f1188e45d5d..c72f80d7a94 100644
--- a/app/code/Magento/Centinel/i18n/pt_BR.csv
+++ b/app/code/Magento/Centinel/i18n/pt_BR.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","3D Secure CAVV"
"3D Secure Card Validation","Validação de Cartão 3D Secure"
+"Validation failed.","Falha de validação."
+"3D Secure Verification Result","Resultado de Verificação 3D Secure"
"3D Secure Cardholder Validation","Validação de Portador de Cartão 3D Secure"
"3D Secure Electronic Commerce Indicator","Indicador de Comércio Eletrônico 3D Secure"
-"3D Secure Verification Result","Resultado de Verificação 3D Secure"
+"3D Secure CAVV","3D Secure CAVV"
"3D Secure XID","3D Secure XID"
+"Merchant Liability","Responsabilidade do Comerciante"
"Card Issuer Liability","Responsabilidade do Emissor do Cartão"
-"Card Verification","Verificação de Cartão"
-"Enrolled","Inscritos"
+Enrolled,Inscritos
"Enrolled but Authentication Unavailable","Inscritos mas Autenticação Não DisponÃvel"
-"Failed","Falha"
-"MasterCard SecureCode","MasterCard SecureCode"
-"Merchant Liability","Responsabilidade do Comerciante"
"Not Enrolled","Não Inscrito"
-"Order cannot be placed.","Pedido não pode ser realizado."
+Successful,"Bem sucedido"
+Failed,Falha
+"Unable to complete","Incapaz de completar"
+"Successful attempt","Tentativa bem sucedida"
+"Unsupported currency code: %1.","Unsupported currency code: %1."
"Payment information error. Please start over.","Erro de informações de pagamento. Por favor comece de novo."
-"Please continue with placing order.","Por favor continuem com a colocação da ordem."
"Please verify the card with the issuer bank before placing the order.","Por favor verifique o cartão com o banco emissor antes de colocar a ordem."
-"Please verify the card with the issuer bank:","Por favor verifique o cartão com o banco emissor:"
-"Start/Reset Validation...","Iniciar/Reiniciar Validação..."
-"Successful","Bem sucedido"
-"Successful attempt","Tentativa bem sucedida"
-"The card has failed verification with the issuer bank.","O cartão falhou a verificação com o banco emissor."
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Houve informações de pagamento erradas apresentadas ou o prazo expirou. Por favor tente novamente."
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","Houve apresentação de informações erradas de pagamento ou prazo expirou. Por favor, tente novamente."
"This card has failed validation and cannot be used.","A validação do cartão falhou e ele não pode ser utilizado."
-"To ensure the security of your transactions","Para garantir a segurança da sua transação"
-"Unable to complete","Incapaz de completar"
-"Validation failed.","Falha de validação."
-"Verification Failed","Falha de Verificação"
"Verification Successful","Sucesso na Verificação"
+"Please continue with placing order.","Por favor continuem com a colocação da ordem."
+"Verification Failed","Falha de Verificação"
+"The card has failed verification with the issuer bank.","O cartão falhou a verificação com o banco emissor."
+"Order cannot be placed.","Pedido não pode ser realizado."
"Verification cannot be processed","A verificação não pode ser processada"
+"There has been wrong payment information submitted or time limit has expired. Please, try again.","Houve apresentação de informações erradas de pagamento ou prazo expirou. Por favor, tente novamente."
+"Card Verification","Verificação de Cartão"
+"Start/Reset Validation...","Iniciar/Reiniciar Validação..."
+"Please verify the card with the issuer bank:","Por favor verifique o cartão com o banco emissor:"
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Houve informações de pagamento erradas apresentadas ou o prazo expirou. Por favor tente novamente."
+"To ensure the security of your transactions","Para garantir a segurança da sua transação"
"Verified by Visa","Verificado pela Visa"
+"MasterCard SecureCode","MasterCard SecureCode"
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Centinel/i18n/zh_CN.csv b/app/code/Magento/Centinel/i18n/zh_CN.csv
index f3374232c1c..225cea16dee 100644
--- a/app/code/Magento/Centinel/i18n/zh_CN.csv
+++ b/app/code/Magento/Centinel/i18n/zh_CN.csv
@@ -1,33 +1,42 @@
-"3D Secure CAVV","3D 安全 CAVV"
"3D Secure Card Validation","3D 安全信用å¡éªŒè¯"
+"Validation failed.",验è¯å¤±è´¥ã€‚
+"3D Secure Verification Result","3D 安全验è¯ç»“æžœ"
"3D Secure Cardholder Validation","3D 安全æŒå¡äººéªŒè¯"
"3D Secure Electronic Commerce Indicator","3D 安全电åå•†åŠ¡æŒ‡æ ‡"
-"3D Secure Verification Result","3D 安全验è¯ç»“æžœ"
+"3D Secure CAVV","3D 安全 CAVV"
"3D Secure XID","3D 安全 XID"
-"Card Issuer Liability","å‘å¡æœºæž„法律责任"
-"Card Verification","信用å¡éªŒè¯"
-"Enrolled","登记"
-"Enrolled but Authentication Unavailable","已登记但验è¯ä¸å¯ç”¨"
-"Failed","已失败"
-"MasterCard SecureCode","MasterCard 安全代ç "
-"Merchant Liability","商家责任"
-"Not Enrolled","未登记"
-"Order cannot be placed.","æ— æ³•ä¸‹è®¢å•ã€‚"
-"Payment information error. Please start over.","支付信æ¯é”™è¯¯ã€‚请é‡æ–°å¼€å§‹ã€‚"
-"Please continue with placing order.","请继ç»ä¸‹è®¢å•ã€‚"
-"Please verify the card with the issuer bank before placing the order.","在下订å•å‰ï¼Œè¯·ä¸Žå‘å¡è¡ŒéªŒè¯ä¿¡ç”¨å¡ã€‚"
-"Please verify the card with the issuer bank:","请与å‘å¡è¡ŒéªŒè¯ä¿¡ç”¨å¡ï¼š"
-"Start/Reset Validation...","开始/é‡è®¾éªŒè¯..."
-"Successful","æˆåŠŸ"
-"Successful attempt","æˆåŠŸå°è¯•"
-"The card has failed verification with the issuer bank.","å¡ç‰‡ä¸Žå‘å¡è¡Œçš„验è¯å¤±è´¥ã€‚"
-"There has been wrong payment information submitted or the time limit has expired. Please, try again.","å·²æ交错误的支付信æ¯ï¼Œæˆ–时间é™åˆ¶å·²è¿‡ã€‚请é‡è¯•ã€‚"
-"There has been wrong payment information submitted or time limit has expired. Please, try again.","æ交的支付信æ¯é”™è¯¯ï¼Œæˆ–时间é™åˆ¶å·²åˆ°ã€‚请é‡è¯•ã€‚"
-"This card has failed validation and cannot be used.","信用å¡éªŒè¯å¤±è´¥ï¼Œæ— 法使用。"
-"To ensure the security of your transactions","è¦ç¡®ä¿æ‚¨çš„交易安全"
-"Unable to complete","æ— æ³•å®Œæˆ"
-"Validation failed.","验è¯å¤±è´¥ã€‚"
-"Verification Failed","验è¯å¤±è´¥"
-"Verification Successful","验è¯æˆåŠŸ"
-"Verification cannot be processed","验è¯å·¥ä½œæ— 法处ç†"
+"Merchant Liability",商家责任
+"Card Issuer Liability",å‘å¡æœºæž„法律责任
+Enrolled,登记
+"Enrolled but Authentication Unavailable",已登记但验è¯ä¸å¯ç”¨
+"Not Enrolled",未登记
+Successful,æˆåŠŸ
+Failed,已失败
+"Unable to complete",æ— æ³•å®Œæˆ
+"Successful attempt",æˆåŠŸå°è¯•
+"Unsupported currency code: %1.","Unsupported currency code: %1."
+"Payment information error. Please start over.",支付信æ¯é”™è¯¯ã€‚请é‡æ–°å¼€å§‹ã€‚
+"Please verify the card with the issuer bank before placing the order.",在下订å•å‰ï¼Œè¯·ä¸Žå‘å¡è¡ŒéªŒè¯ä¿¡ç”¨å¡ã€‚
+"This card has failed validation and cannot be used.",信用å¡éªŒè¯å¤±è´¥ï¼Œæ— 法使用。
+"Verification Successful",验è¯æˆåŠŸ
+"Please continue with placing order.",请继ç»ä¸‹è®¢å•ã€‚
+"Verification Failed",验è¯å¤±è´¥
+"The card has failed verification with the issuer bank.",å¡ç‰‡ä¸Žå‘å¡è¡Œçš„验è¯å¤±è´¥ã€‚
+"Order cannot be placed.",æ— æ³•ä¸‹è®¢å•ã€‚
+"Verification cannot be processed",验è¯å·¥ä½œæ— 法处ç†
+"There has been wrong payment information submitted or time limit has expired. Please, try again.",æ交的支付信æ¯é”™è¯¯ï¼Œæˆ–时间é™åˆ¶å·²åˆ°ã€‚请é‡è¯•ã€‚
+"Card Verification",信用å¡éªŒè¯
+"Start/Reset Validation...",开始/é‡è®¾éªŒè¯...
+"Please verify the card with the issuer bank:",请与å‘å¡è¡ŒéªŒè¯ä¿¡ç”¨å¡ï¼š
+"There has been wrong payment information submitted or the time limit has expired. Please, try again.",å·²æ交错误的支付信æ¯ï¼Œæˆ–时间é™åˆ¶å·²è¿‡ã€‚请é‡è¯•ã€‚
+"To ensure the security of your transactions",è¦ç¡®ä¿æ‚¨çš„交易安全
"Verified by Visa","Visa 已验è¯"
+"MasterCard SecureCode","MasterCard 安全代ç "
+Password,Password
+"Test Mode","Test Mode"
+"Payment Services","Payment Services"
+"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
+"Processor ID","Processor ID"
+"Merchant ID","Merchant ID"
+"This overrides any API URL that may be specified by a payment method.","This overrides any API URL that may be specified by a payment method."
+"Debug Mode","Debug Mode"
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index 3c15f513a27..c28297f672c 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -826,34 +826,39 @@ class Onepage
$shipping = $quote->isVirtual() ? null : $quote->getShippingAddress();
$customer = $this->_customerAccountService->getCustomer($this->getCustomerSession()->getCustomerId());
- if (!$billing->getCustomerId() || $billing->getSaveInAddressBook()) {
- $billingAddress = $billing->exportCustomerAddressData();
- $billing->setCustomerAddressData($billingAddress);
- }
- if ($shipping && !$shipping->getSameAsBilling() && (!$shipping->getCustomerId() ||
- $shipping->getSaveInAddressBook())
+ $hasDefaultBilling = (bool) $customer->getDefaultBilling();
+ $hasDefaultShipping = (bool) $customer->getDefaultShipping();
+
+ if ($shipping && !$shipping->getSameAsBilling() &&
+ (!$shipping->getCustomerId() || $shipping->getSaveInAddressBook())
) {
$shippingAddress = $shipping->exportCustomerAddressData();
+ if (!$hasDefaultShipping) {
+ //Make provided address as default shipping address
+ $shippingAddress = $this->_addressBuilder
+ ->populate($shippingAddress)
+ ->setDefaultShipping(true)
+ ->create();
+ $hasDefaultShipping = true;
+ }
+ $quote->addCustomerAddressData($shippingAddress);
$shipping->setCustomerAddressData($shippingAddress);
}
- if (isset($billingAddress)) {
- if (!$customer->getDefaultBilling() || !$customer->getDefaultShipping()) {
- $billingAddress = $this->_addressBuilder->populate(
- $billingAddress
- )->setDefaultBilling(
- !$customer->getDefaultBilling()
- )->setDefaultShipping(
- !$customer->getDefaultShipping()
- )->create();
+ if (!$billing->getCustomerId() || $billing->getSaveInAddressBook()) {
+ $billingAddress = $billing->exportCustomerAddressData();
+ if (!$hasDefaultBilling) {
+ //Make provided address as default shipping address
+ $this->_addressBuilder->populate($billingAddress);
+ if (!$hasDefaultShipping) {
+ //Make provided address as default shipping address
+ $this->_addressBuilder->setDefaultShipping(true);
+ }
+ $this->_addressBuilder->setDefaultBilling(true);
+ $billingAddress = $this->_addressBuilder->create();
}
-
$quote->addCustomerAddressData($billingAddress);
- }
-
- if ($shipping && isset($shippingAddress) && !$customer->getDefaultShipping()) {
- $shippingAddress = $this->_addressBuilder->populate($shippingAddress)->setDefaultShipping(true)->create();
- $quote->addCustomerAddressData($shippingAddress);
+ $billing->setCustomerAddressData($billingAddress);
}
}
diff --git a/app/code/Magento/Checkout/i18n/de_DE.csv b/app/code/Magento/Checkout/i18n/de_DE.csv
index 25dc0b1fd56..6a5ca89aa0a 100644
--- a/app/code/Magento/Checkout/i18n/de_DE.csv
+++ b/app/code/Magento/Checkout/i18n/de_DE.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s wurde zu Ihrem Warenkorb hinzugefügt."
-"%s was updated in your shopping cart.","%s wurde in ihren Einkaufswagen gelegt"
-"* Required Fields","* Notwendige Felder"
-"Add New Address","Neue Adresse hinzufügen"
-"Add New Condition","Neue Kondition hinzufügen"
-"Add coupon code for shopping cart","Gutscheincode für Einkaufswagen eingeben"
-"Add gift messages to shopping cart","Grußmitteilungen für Einkaufswagen eingeben"
-"Add product to shopping cart","Weiteren Artikel in den Einkaufswagen legen"
-"Add product(s) to shopping cart","Weitere Artikel in den Einkaufswagen legen"
-"Add to Cart","Zum Warenkobrn hinzufügen"
-"Add to Compare","Hinzufügen um zu vergleichen"
-"Add to Wishlist","Zum Wunschzettel hinzufügen"
-"Additional Product Info","Zusätzliche Angaben zum Produkt"
-"Address","Adresse"
-"Address %s of %s","Adresse %s von %s"
-"After Adding a Product Redirect to Shopping Cart","Nach Hinzufügen eines Produktes zum Warenkorb weiterleiten"
-"Allow Guest Checkout","Gast Checkout erlauben"
-"Already registered?","Schon registriert?"
-"An error occurred in the process of payment","Beim Prozessieren der Zahlung ist ein Fehler aufgetreten."
-"An error occurred while deleting this condition.","Beim Löschen dieser Kondition ist ein Fehler aufgetreten."
-"An error occurred while saving this condition.","Beim Speichern dieser Kondition ist ein Fehler aufgetreten."
-"Apply Coupon","Coupon anwenden"
-"Are you sure you would like to remove this item from the shopping cart?","Sind Sie sicher, dass sie diesen Artikel aus Ihrem Warenkorb entfernen wollen?"
-"Back","Zurück"
-"Back to Billing Information","Zurück zur Rechnungsinformation"
-"Back to Select Addresses","Zurück zur Adressenauswahl"
-"Back to Shipping Information","Zurück zur Versandinformation"
-"Back to Shopping Cart","Zurück zum Warenkorb"
-"Based on your selection, you may be interested in the following items:","Ihrer Auswahl zufolge könnten Sie möglicherweise an folgenden Artikeln interessiert sein:"
-"Billing Address","Rechnungsadresse"
-"Billing Information","Rechnungsinformation"
-"Billing Information - %s","Rechnungsinformation - %s"
-"Cancel Coupon","Coupon abbrechen"
-"Cannot add item to the shopping cart.","Artikel kann nicht zum Warenkorb hinzugefügt werden."
-"Cannot add the item to shopping cart","Artikel kann nicht zu Warenkorb hinzugefügt werden"
-"Cannot add the item to shopping cart.","Kann das Objekt nicht zum Warenkorb hinzufügen."
-"Cannot apply the coupon code.","Coupon Code kann nicht angewendet werden."
-"Cannot configure product.","Produkt kann nicht konfiguriert werden."
-"Cannot open the overview page","Überblickseite kann nicht geöffnet werden."
-"Cannot process the item.","Artikel kann nicht verarbeitet werden."
-"Cannot remove the item.","Artikel kann nicht entfernt werden."
-"Cannot update shopping cart.","Warenkorb kann nicht aktualisiert werden."
-"Cannot update the item.","Artikel kann nicht aktualisiert werden."
-"Card Verification Number Visual Reference","Kartenprüfnummer Visueller Hinweis"
-"Cart Product API","Einkaufswagen Produkt-API"
-"Cart Subtotal:","Warenkorb Zwischensumme:"
-"Change","Ändern"
-"Change Billing Address","Rechnungsadresse ändern"
-"Checkbox Text","Checkbox Text"
-"Checkout","Checkout"
-"Checkout Conditions","Checkout Konditionen"
-"Checkout Method","Checkout Methode"
-"Checkout Options","Checkout Optionen"
-"Checkout Progress Wrapper","Kasse Fortschrittsanzeige"
-"Checkout Section","Checkout Bereich"
-"Checkout Terms and Conditions","Checkout allgemeine Geschäftsbedingungen"
-"Checkout as Guest","Checkout als Gast"
-"Checkout as a Guest or Register","Checkout als Gast oder registrieren"
-"Checkout with Multiple Addresses","Checkout mit mutiplen Adressen"
-"City","Stadt"
-"Clear Shopping Cart","Einkaufswagen leeren"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Klicken sie <a href=""%s"">hier um ihre Bestellbestätigung auszudrucken </a>."
-"Click <a href=""%s"">here</a> to continue shopping.","<a href=""%s"">Hier</a> klicken, um das Einkaufen fortzusetzen."
-"Close","Schließen"
-"Company","Firma"
-"Condition Name","Konditionsname"
-"Configure Cart Item","Artikel im Korb konfigurieren"
-"Confirm Password","Passwort bestätigen"
-"Content","Inhalt"
-"Content Height","Inhalthöhe"
-"Content Height (css)","Inhalthöhe (css)"
-"Continue","Fortsetzen"
-"Continue Shopping","Einkauf fortfahren"
-"Continue to Billing Information","Weiter zur Rechnungsinformation"
-"Continue to Review Your Order","Weiter zur Bestellungsüberprüfung"
-"Continue to Shipping Information","Weiter zur Versandinformation"
-"Country","Land"
-"Coupon code ""%s"" is not valid.","Der Gutscheincode ""%s"" ist nicht mehr gültig."
-"Coupon code ""%s"" was applied.","Der Gutscheincode ""%s"" wurde eingelöst."
-"Coupon code was canceled.","Coupon Code """"%s"""" wurde abgebrochen."
-"Create Billing Address","Rechnungsadresse erstellen"
-"Create Shipping Address","Versandadresse erstellen"
-"Create an order from shopping cart","Geben sie eine Bestellung aus ihrem Einkaufswagen auf."
-"Create shopping cart","Ihr Einkaufswagen"
-"Customer Address is not valid.","Die Kundenadresse ist nicht gültig."
-"Customer Information","Kundeninformation"
-"Customer's information","Kundeninformation"
-"Data saving problem","Problem beim Speichern der Daten"
-"Default Billing","Standard Rechnung"
-"Default Shipping","Standard Versand"
-"Delete Condition","Kondition löschen"
-"Details","Details"
-"Disabled","Deaktiviert"
-"Discount Codes","Rabattcodes"
-"Display Cart Summary","Warenkorb Zusammenfassung anzeigen"
-"Display Shopping Cart Sidebar","Warenkorb Sidebar anzeigen"
-"Display item quantities","Artikelmengen anzeigen"
-"Display number of items in cart","Anzahl der Artikel im Warenkorb anzeigen"
-"Display number of items in wishlist","Zeige die Menge der Artikel auf der Wunschliste an."
-"Easy access to your order history and status","Schneller Zugriff auf Ihre Bestellungshistorie und Status"
-"Edit","Bearbeiten"
-"Edit Address","Adresse bearbeiten"
-"Edit Billing Address","Rechnungsadresse bearbeiten"
-"Edit Condition","Konditionen bearbeiten"
-"Edit Items","Artikel bearbeiten"
-"Edit Shipping Address","Versandadresse bearbeiten"
-"Edit Terms and Conditions","Allgemeine Geschäftsbedingungen bearbeiten"
-"Edit Your Cart","Ihren Warenkorb bearbeiten"
-"Edit item","Artikel ändern"
-"Edit item parameters","Artikelangaben ändern"
-"Email Address","E-Mail-Adresse"
-"Enable Onepage Checkout","Onepage Checkout aktivieren"
-"Enable Terms and Conditions","Allgemeine Geschäftsbedingungen aktivieren"
-"Enabled","Aktiviert"
-"Enter a New Address","Neue Adresse eingeben"
-"Enter your coupon code if you have one.","Geben Sie Ihren Coupon Code ein, falls Sie einen haben."
-"Enter your destination to get a shipping estimate.","Geben Sie Ihren Standort an, um die geschätzten Versandkosten/dauer zu ermitteln."
-"Estimate Shipping and Tax","Geschätzte Versandkosten und Steuern"
+Remove,Remove
+Back,Zurück
+Price,Preis
+"Shopping Cart",Einkaufswagen
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,Qty
+Subtotal,Zwischensumme
"Excl. Tax","Steuer weglassen"
-"Fast and easy check out","Schnell und einfaches Checkout"
-"Fax","Fax"
-"Forgot an Item?","Sie haben einen Artikel vergessen?"
-"Forgot your password?","Sie haben Ihr Passwort vergessen?"
-"Get a Quote","Eine Preisangabe bekommen"
-"Get list of available payment methods","Liste der verfügbaren Zahlungsarten"
-"Get list of available shipping methods","Liste der verfügbaren Versandarten"
-"Get list of products in shopping cart","Liste der Produkte im Warenkorb anzeigen"
-"Get terms and conditions","Allgemeine Geschäftsbedingungen anzeigen"
-"Get total prices for shopping cart","Gesamtpreis für Warenkorb anzeigen"
-"Gift Message","Grußnachricht"
-"Grand Total:","Gesamtbetrag:"
-"HTML","HTML"
-"ID","ID"
+Total,Gesamtbetrag
"Incl. Tax","Steuer inkludieren"
-"Invalid checkout type.","Ungültiger Kassenbereich-Typ"
-"Invalid data.","Ungültige Daten."
-"Invalid email address ""%s""","Ungültige E-Mail-Adresse ""%s"""
-"Invalid method: %s","Ungültige Methode: %s"
-"Invalid shipping method.","Ungültige Versandart."
-"Item not found or already ordered","Artikel nicht gefunden oder schon bestellt"
-"Items","Artikel"
-"Items After","Artikel danach"
-"Items Before","Artikel davor"
-"Load customer quote error","Fehler bei Kundenpreisangabe laden"
-"Loading next step...","Nächster Schritt wird geladen ..."
-"Login","Einloggen"
-"Login/Registration Before","Anmeldung/ Registrierung davor"
-"Manage Terms and Conditions","Allgemeine Geschäftsbedingungen verwalten"
-"Maximum Display Recently Added Item(s)","Maximalanzeige kürzlich hinzugefügter Artikel"
-"Maximum qty allowed for Shipping to multiple addresses is %s","Maximale Menge für Lieferung an mehrfache Adressen ist %s"
-"Minimum order amount is %s","Mindestbestellwert ist %s"
-"Move","Verschieben"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","Auf Wunschzettel schreiben"
-"Multishipping Checkout","Mehrfachlieferung Kasse"
-"Multishipping Checkout Address (Any) Form","Mehrfachlieferung Kasse Adresse (Beliebiges) Formular"
-"Multishipping Checkout Billing Address Creation","Mehrfachlieferung Kasse Rechnungsadresse Erstellung"
-"Multishipping Checkout Billing Address Edit Form","Mehrfachlieferung Kasse Rechnungsadresse Formular bearbeiten"
-"Multishipping Checkout Billing Address Selection","Mehrfachlieferung Kasse Rechnungsadresse Auswahl"
-"Multishipping Checkout Billing Information Step","Mehrfachlieferung Kasse Rechnungsinformation Schritt"
-"Multishipping Checkout Customer Address Edit Form","Mehrfachlieferung Kasse Kundenadresse Formular bearbeiten"
-"Multishipping Checkout Overview","Mehrfachlieferung Kasse Ãœbesicht"
-"Multishipping Checkout Shipping Address Creation","Mehrfachlieferung Kasse Rechnungsadresse Erstellung"
-"Multishipping Checkout Shipping Address Edit Form","Mehrfachlieferung Kasse Lieferadresse Formular bearbeiten"
-"Multishipping Checkout Shipping Address Selection","Mehrfachlieferung Kasse Lieferadresse Auswahl"
-"Multishipping Checkout Shipping Information Step","Mehrfachlieferung Kasse Lieferinformation Schritt"
-"Multishipping Checkout Success","Mehrfachlieferung Kasse Erfolg"
+"Edit item parameters","Artikelangaben ändern"
+Edit,Bearbeiten
+"Remove item","Artikel löschen"
+Item,Item
+"Unit Price",Einheitspreis
+Loading...,Loading...
+"* Required Fields","* Notwendige Felder"
+Change,Ändern
+"See price before order confirmation.","Preis vor Bestellbestätigung ansehen."
+"What's this?","Was ist das?"
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name","Product Name"
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
"My Cart","Mein Einkaufswagen"
-"My Cart (%s item)","Mein Einkaufswagen (%s Artikel)"
-"My Cart (%s items)","Mein Einkaufswagen (%s Artikel)"
-"My Cart Link","Link zu meinem Einkaufswagen"
"New Address","Neue Adresse"
-"New Condition","Neuer Bedingung"
-"New Terms and Conditions","Neue allgemeine Geschäftsbedingungen"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","GESAMTSUMME WIRD VOR ABSENDEN DER BESTELLUNG ANGEZEIGT"
-"One Page Checkout","Eine Seite Kasse"
-"One Page Checkout Failure","Eine Seite Fehler bei Kassenausgang"
-"One Page Checkout Overview","Checkout-Ãœbersicht auf einer Seite"
-"One Page Checkout Success","Eine Seite Erfolg bei Kassenausgang"
-"One item of products do not have identifier or sku","Ein Artikel Ihrer Produkte hat keine Kennung oder keine SKU-Nummer"
-"One item of products is not belong any of quote item","Ein Artikel Ihrer Produkte gehört nicht zu den angebotenen Artikeln"
-"Order","Bestellung #"
-"Order Review","Bestellungsübersicht"
-"Order Success","Bestellung mit Erfolg"
-"Order place error.","Falscher Bestellungsort."
-"Other Items in Your Order","Andere Artikel in Ihrer Bestellung"
-"Overview Items After","Ãœberblick Artikel danach"
-"Password","Passwort"
-"Payment Failed Email Receiver","E-Mail-Adresse für fehlgeschlagene Bezahlung"
-"Payment Failed Email Sender","Zahlung fehlgeschlagen E-Mail-Sender"
-"Payment Failed Emails","Zahlung fehlgeschlagen E-Mails"
-"Payment Failed Template","Zahlung fehlgeschlagen Vorlage"
+Country,Land
+State/Province,Staat/Provinz
+"Billing Information",Rechnungsinformation
+"Checkout Method","Checkout Methode"
"Payment Information","Information zur Zahlung"
-"Payment Method","Zahlungsart"
-"Payment Methods After Checkout Button","Zahlungsmethoden nach Schaltfläche Kasse"
-"Payment Methods Before Checkout Button","Zahlungsarten vor Schalter Kasse"
-"Payment method information","Informationen zur Zahlungsmethode"
-"Payment method is not defined","Zahlungsmethode ist nicht definiert"
-"Payment methods in shopping cart","Zahlungsmethoden im Warenkorb"
-"Payment profile # %s: ""%s"".","Zahlungsprofil # %s: ""%s""."
-"Place Order","Bestellung aufgeben"
-"Please agree to all Terms and Conditions before placing the order.","Bitte stimmen Sie allen Geschäftsbedingungen vor der Auftragserteilung zu."
-"Please agree to all Terms and Conditions before placing the orders.","Bitte stimmen Sie allen Geschäftsbedingungen vor Erteilung der Aufträge zu."
+"Order Review",Bestellungsübersicht
+"Shipping Information",Lieferungsinformation
+"Shipping Method",Lieferungsart
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.","Der Bezahlvorgang mit nur einer Seite ist deaktiviert."
+Checkout,Checkout
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
"Please agree to all the terms and conditions before placing the order.","Bitte Stimmen Sie allen Geschäftsbedingungen vor Auftragserteilung zu."
-"Please check billing address information.","Bitte prüfen Sie die Informationen zur Rechnungsadresse."
-"Please check shipping address information.","Bitte prüfen Sie die Informationen zur Lieferadresse."
-"Please check shipping addresses information.","Bitte prüfen Sie die Informationen zur Lieferadresse."
-"Please choose to register or to checkout as a guest","Bitte registrieren Sie sich oder gehen Sie als Gast zum Checkout"
-"Please log in below:","Bitte loggen Sie sich unten ein:"
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.","Das Produkt existiert nicht."
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart","Anzahl der Artikel im Warenkorb anzeigen"
+"Display item quantities","Artikelmengen anzeigen"
+"Load customer quote error","Fehler bei Kundenpreisangabe laden"
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes",Rabattcodes
+"Enter your code","Enter your code"
+"Apply Coupon","Coupon anwenden"
+"Cancel Coupon","Coupon abbrechen"
+"Continue Shopping","Einkauf fortfahren"
+"Update Shopping Cart","Einkaufswagen aktualisieren"
+"Clear Shopping Cart","Einkaufswagen leeren"
+"Update Cart","Einkaufswagen aktualisieren"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)","Kürzlich hinzugefügte Position(en)"
+"You have no items in your shopping cart.","Sie haben keine Artikel in Ihrem Einkaufswagen."
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?","Sind Sie sicher, dass sie diesen Artikel aus Ihrem Warenkorb entfernen wollen?"
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax","Geschätzte Versandkosten und Steuern"
+"Enter your destination to get a shipping estimate.","Geben Sie Ihren Standort an, um die geschätzten Versandkosten/dauer zu ermitteln."
"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen"
-"Please select shipping address for applicable items","Bitte wählen Sie die Versandadresse für zutreffende Positionen aus"
-"Please select shipping methods for all addresses","Bitte wählen Sie die Versandmethoden für alle Adressen"
-"Please select valid payment method.","Wählen Sie bitte eine gültige Zahlungsmethode aus."
-"Please specify payment method.","Bitte geben Sie die Zahlungsmethode an."
-"Please specify shipping method.","Bitte die Versandmethode spezifizieren."
-"Please specify shipping methods for all addresses.","Bitte spezifizieren Sie die Versandmethoden für alle Adressen."
-"Price","Preis"
+City,Stadt
+"Zip/Postal Code",Postleitzahl
+"Get a Quote","Eine Preisangabe bekommen"
+"Update Total","Gesamtsumme aktualisieren"
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item","Artikel ändern"
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...","Nächster Schritt wird geladen ..."
+"Select a billing address from your address book or enter a new address.","Wählen Sie eine Rechnungsadresse aus ihrem Adressbuch oder geben Sie eine neue Adresse ein."
+"Email Address",E-Mail-Adresse
+Company,Firma
+"VAT Number",MwSt.-Nummer
+Address,Adresse
+"Street Address",Adresse
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Passwort
+"Confirm Password","Passwort bestätigen"
+"Save in address book","Speichern im Adressbuch"
+"Ship to this address","Versand an diese Adresse"
+"Ship to different address","Versand an andere Adresse"
+Continue,Fortsetzen
+"Order #","Order #"
"Proceed to Checkout","Bestellung aufgeben"
-"Product","Produkt"
-"Product","Produktbezeichnung"
-"Products","Produkte"
-"Quantity","Menge"
-"Quantity:","Menge:"
-"Quantity was recalculated from %d to %d","Menge wurde von %d auf %d neu berechnet"
-"Quote Lifetime (days)","Lebensdauer angeben (Tage)"
-"Quote item does not exist.","Der angegebene Artikel existiert nicht."
-"Quote item is not found.","Der angegebene Artikel wurde nicht gefunden."
-"Recently added item(s)","Kürzlich hinzugefügte Position(en)"
-"Register","Registrieren"
-"Register and save time!","Melden Sie sich an und sparen Sie Zeit!"
+Login,Einloggen
+"Already registered?","Schon registriert?"
+"Please log in below:","Bitte loggen Sie sich unten ein:"
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register","Checkout als Gast oder registrieren"
+"Checkout as a Guest","Checkout as a Guest"
"Register to Create an Account","Registrieren, um ein Konto zu erstellen"
+"Register and save time!","Melden Sie sich an und sparen Sie Zeit!"
"Register with us for future convenience:","Melden Sie sich bei uns an für zukünftigen Komfort:"
-"Remove Item","Objekt entfernen"
-"Remove This Item","Dieses Objekt entfernen"
-"Remove coupon code from shopping cart","Couponcode aus Warenkorb entfernen"
-"Remove item","Artikel löschen"
-"Remove product from shopping cart","Produkt aus Warenkorb entfernen"
-"Remove product(s) from shopping cart","Produkt(e) aus Warenkorb entfernen"
-"Require Customer To Be Logged In To Checkout","Kunde muss angemeldet sein, um zur Kasse gehen zu können"
-"Retrieve information about shopping cart","Informationen zum Warenkorb abrufen"
-"Review Order","Auftrag überprüfen"
-"Review Order - %s","Auftrag überprüfen - %s"
-"Sales","Verkäufe"
-"Save Condition","Bedingung speichern"
-"Save in address book","Speichern im Adressbuch"
-"See price before order confirmation.","Preis vor Bestellbestätigung ansehen."
-"Select Address","Adresse auswählen"
-"Select Addresses","Adressen auswählen"
-"Select Shipping Method","Versandmethode auswählen"
-"Select State/Province...","Land/Provinz auswählen"
-"Select a billing address from your address book or enter a new address.","Wählen Sie eine Rechnungsadresse aus ihrem Adressbuch oder geben Sie eine neue Adresse ein."
-"Select a shipping address from your address book or enter a new address.","Wählen Sie eine Versandadresse aus ihrem Adressbuch oder geben sie eine neue Adresse ein."
-"Send Payment Failed Email Copy Method","Zahlung-fehlgeschlagen-E-Mail-Kopie-Methode"
-"Send Payment Failed Email Copy To","Zahlung-fehlgeschlagen-E-Mail-Kopie senden an"
-"Send To","Senden an"
-"Separate by "","".","Getrennt nach "", ""."
-"Set customer for shopping cart","Kunden für Warenkorb festlegen"
-"Set customer's addresses in shopping cart","Kundenadressen im Einkaufswagen einstellen"
-"Set payment method","Bezahlungsmethode festlegen"
-"Set shipping method","Versandart festlegen"
-"Ship to Multiple Addresses","An mehrere Adressen senden"
-"Ship to different address","Versand an andere Adresse"
-"Ship to this address","Versand an diese Adresse"
-"Shipping Address","Lieferungsadresse"
-"Shipping Information","Lieferungsinformation"
-"Shipping Method","Lieferungsart"
-"Shipping Methods","Versandarten"
-"Shipping To","Versendet an"
-"Shipping information","Versandinformation"
+"Fast and easy check out","Schnell und einfaches Checkout"
+"Easy access to your order history and status","Schneller Zugriff auf Ihre Bestellungshistorie und Status"
+"Checkout as Guest","Checkout als Gast"
+Register,Registrieren
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress","Ihr Abmeldeverlauf"
+"Billing Address",Rechnungsadresse
+"Shipping Address",Lieferungsadresse
"Shipping method has not been selected yet","Versandart wurde noch nicht ausgewählt"
-"Shipping methods in shopping cart","Versandarten im Einkaufswagen"
-"Shipping selection is not applicable.","Versandauswahl ist nicht anwendbar"
-"Shopping Cart","Einkaufswagen"
-"Shopping Cart Form Before","Einkaufswagen Formular vor"
-"Shopping Cart Sidebar","Einkaufswagen Seitenleiste"
-"Shopping Cart Sidebar Extra Actions","Zusätzliche Aktionen in der Einkaufswagen-Sidebar"
-"Shopping Cart is Empty","Einkaufswagen ist leer"
-"Shopping cart ability to set coupon code","Möglichkeit, im Einkaufwagen einen Couponcode einzustellen"
-"Show Content as","Inhalt anzeigen als"
-"Some of the requested products are not available in the desired quantity.","Einige der angefragten Produkte sind nicht in der gewünschten Anzahl verfügbar."
-"Some of the requested products are unavailable.","Einige der gewünschten Produkte sind nicht verfügbar."
-"Some products quantities were recalculated because of quantity increment mismatch","Einige Produktmengen wurden neu berechnet aufgrund einer Zuwachsdifferenz."
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Entschuldigung, Gäste-Checkout ist nicht aktiviert. Versuchen Sie es erneut oder kontaktieren Sie den Shopbesitzer."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Entschuldigung, Bezahlung durch Gäste ist nicht aktiviert. Bitte versuchen Sie es erneut oder kontaktieren Sie den Besitzer."
+"Payment Method",Zahlungsart
+"Place Order","Bestellung aufgeben"
+"Forgot an Item?","Sie haben einen Artikel vergessen?"
+"Edit Your Cart","Ihren Warenkorb bearbeiten"
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.","Wählen Sie eine Versandadresse aus ihrem Adressbuch oder geben sie eine neue Adresse ein."
+"Use Billing Address","Rechnungsadresse verwenden"
"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung."
-"State/Province","Staat/Provinz"
-"Status","Status"
-"Store View","Store-Ansicht"
-"Street Address","Adresse"
-"Street Address %s","Hausanschrift %s"
-"Submitting order information...","Bestellung wird versandt..."
-"Subtotal","Zwischensumme"
-"Subtotal must exceed minimum order amount","Zwischensumme muss den Mindestbestellwert überschreiten"
-"Phone","Telefon"
-"Terms and Conditions","Allgemeine Geschäftsbedingungen"
-"Terms and Conditions Information","Informatiuon zu den Allgemeine Geschäftsbedingungen"
-"Terms and conditions","Allgemeine Geschäftsbedingungen"
-"Text","Text"
"Thank you for your purchase!","Danke für Ihren Einkauf!"
-"The condition has been deleted","Die Kondition wurde gelöscht"
-"The condition has been saved.","Die Kondition wurde gespeichert."
-"The onepage checkout is disabled.","Der Bezahlvorgang mit nur einer Seite ist deaktiviert."
-"The product could not be found.","Das Produkt konnte nicht gefunden werden."
-"The product does not exist.","Das Produkt existiert nicht."
-"There are <a href=""%s"">%s items</a> in your cart.","<a href=""%s"">%s Artikel</a> sind derzeit in Ihrem Einkaufswagen."
-"There is <a href=""%s"">1 item</a> in your cart.","<a href=""%s"">1 Artikel</a> ist derzeit in Ihrem Einkaufswagen."
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Es ist bereits ein Kunde mit dieser E-Mail-Adresse registriert. Bitte loggen Sie sich mit dieser E-Mail-Adresse ein oder geben Sie eine andere E-Mail-Adresse ein, um ein Konto zu eröffnen."
-"There was an error processing your order. Please contact us or try again later.","Bei der Bearbeitung Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie und oder versuchen Sie es später noch einmal."
-"This condition no longer exists.","Diese Kondition existiert nicht mehr,"
-"Total","Gesamtbetrag"
-"Total for this address","Gesamtsumme für diese Adresse"
-"Unable to set Payment Method.","Zahlungsart kann nicht eingestellt werden."
-"Unit Price","Einheitspreis"
-"Update Cart","Einkaufswagen aktualisieren"
-"Update Quantity & Addresses","Anzahl & Adressen aktualisieren"
-"Update Shopping Cart","Einkaufswagen aktualisieren"
-"Update Total","Gesamtsumme aktualisieren"
-"Update product quantities in shopping cart","Produktanzahl im Einkaufswagen aktualisieren"
-"Update product(s) quantities in shopping cart","Produktanzahl im Einkaufswagen aktualisieren"
-"Use Billing Address","Rechnungsadresse verwenden"
-"VAT Number","MwSt.-Nummer"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Wir bearbeiten Ihre Bestellung und Sie werden in Kürze eine eMail mit den Details der Bestellung erhalten. Sobald die Bestellung versendet wurde, erhalten Sie eine weitere eMail mit einem Link, um deren Verlauf verfolgen zu können."
-"What's this?","Was ist das?"
-"You have no items in your shopping cart.","Sie haben keine Artikel in Ihrem Einkaufswagen."
+"Your order # is: %1.","Your order # is: %1."
"You will receive an order confirmation email with details of your order and a link to track its progress.","Sie erhalten eine eMail mit der Bestätigung Ihrer Bestellung und einem Link, um deren Verlauf verfolgen zu können."
-"Your Checkout Progress","Ihr Abmeldeverlauf"
-"Your order # is: %s.","Die Nummer Ihrer Bestellung lautet: %s."
-"Your order cannot be completed at this time as there is no payment methods available for it.","Ihre Bestellung kann momentan nicht abgeschlossen werden, da keine Zahlungsmethode zur Verfügung steht."
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Ihre Bestellung kann derzeit nicht abgeschlossen werden, da keine Versandart hierfür verfügbar ist. Bitte führen Sie die notwendigen Veränderungen bei Ihrer Lieferadresse durch."
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.","Bitte geben Sie die Zahlungsmethode an."
+"Please agree to all Terms and Conditions before placing the orders.","Bitte stimmen Sie allen Geschäftsbedingungen vor Erteilung der Aufträge zu."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"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."
-"Your order number is ","Ihre Bestellnummer ist"
-"Your recurring payments:","Ihre Profile für wiederkehrende Zahlungen:"
-"Zip/Postal Code","Postleitzahl"
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index f6c572090d2..9cb4953b000 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s was added to your shopping cart."
-"%s was updated in your shopping cart.","%s was updated in your shopping cart."
-"* Required Fields","* Required Fields"
-"Add New Address","Add New Address"
-"Add New Condition","Add New Condition"
-"Add coupon code for shopping cart","Add coupon code for shopping cart"
-"Add gift messages to shopping cart","Add gift messages to shopping cart"
-"Add product to shopping cart","Add product to shopping cart"
-"Add product(s) to shopping cart","Add product(s) to shopping cart"
-"Add to Cart","Add to Cart"
-"Add to Compare","Add to Compare"
-"Add to Wishlist","Add to Wishlist"
-"Additional Product Info","Additional Product Info"
-"Address","Address"
-"Address %s of %s","Address %s of %s"
-"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
-"Allow Guest Checkout","Allow Guest Checkout"
-"Already registered?","Already registered?"
-"An error occurred in the process of payment","An error occurred in the process of payment"
-"An error occurred while deleting this condition.","An error occurred while deleting this condition."
-"An error occurred while saving this condition.","An error occurred while saving this condition."
-"Apply Coupon","Apply Coupon"
-"Are you sure you would like to remove this item from the shopping cart?","Are you sure you would like to remove this item from the shopping cart?"
-"Back","Back"
-"Back to Billing Information","Back to Billing Information"
-"Back to Select Addresses","Back to Select Addresses"
-"Back to Shipping Information","Back to Shipping Information"
-"Back to Shopping Cart","Back to Shopping Cart"
-"Based on your selection, you may be interested in the following items:","Based on your selection, you may be interested in the following items:"
-"Billing Address","Billing Address"
-"Billing Information","Billing Information"
-"Billing Information - %s","Billing Information - %s"
-"Cancel Coupon","Cancel Coupon"
-"Cannot add item to the shopping cart.","Cannot add item to the shopping cart."
-"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
-"Cannot add the item to shopping cart.","Cannot add the item to shopping cart."
-"Cannot apply the coupon code.","Cannot apply the coupon code."
-"Cannot configure product.","Cannot configure product."
-"Cannot open the overview page","Cannot open the overview page"
-"Cannot process the item.","Cannot process the item."
-"Cannot remove the item.","Cannot remove the item."
-"Cannot update shopping cart.","Cannot update shopping cart."
-"Cannot update the item.","Cannot update the item."
-"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
-"Cart Product API","Cart Product API"
-"Cart Subtotal:","Cart Subtotal:"
-"Change","Change"
-"Change Billing Address","Change Billing Address"
-"Checkbox Text","Checkbox Text"
-"Checkout","Checkout"
-"Checkout Conditions","Checkout Conditions"
-"Checkout Method","Checkout Method"
-"Checkout Options","Checkout Options"
-"Checkout Progress Wrapper","Checkout Progress Wrapper"
-"Checkout Section","Checkout Section"
-"Checkout Terms and Conditions","Checkout Terms and Conditions"
-"Checkout as Guest","Checkout as Guest"
-"Checkout as a Guest or Register","Checkout as a Guest or Register"
-"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
-"City","City"
-"Clear Shopping Cart","Clear Shopping Cart"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
-"Click <a href=""%s"">here</a> to continue shopping.","Click <a href=""%s"">here</a> to continue shopping."
-"Close","Close"
-"Company","Company"
-"Condition Name","Condition Name"
-"Configure Cart Item","Configure Cart Item"
-"Confirm Password","Confirm Password"
-"Content","Content"
-"Content Height","Content Height"
-"Content Height (css)","Content Height (css)"
-"Continue","Continue"
-"Continue Shopping","Continue Shopping"
-"Continue to Billing Information","Continue to Billing Information"
-"Continue to Review Your Order","Continue to Review Your Order"
-"Continue to Shipping Information","Continue to Shipping Information"
-"Country","Country"
-"Coupon code ""%s"" is not valid.","Coupon code ""%s"" is not valid."
-"Coupon code ""%s"" was applied.","Coupon code ""%s"" was applied."
-"Coupon code was canceled.","Coupon code was canceled."
-"Create Billing Address","Create Billing Address"
-"Create Shipping Address","Create Shipping Address"
-"Create an order from shopping cart","Create an order from shopping cart"
-"Create shopping cart","Create shopping cart"
-"Customer Address is not valid.","Customer Address is not valid."
-"Customer Information","Customer Information"
-"Customer's information","Customer's information"
-"Data saving problem","Data saving problem"
-"Default Billing","Default Billing"
-"Default Shipping","Default Shipping"
-"Delete Condition","Delete Condition"
-"Details","Details"
-"Disabled","Disabled"
-"Discount Codes","Discount Codes"
-"Display Cart Summary","Display Cart Summary"
-"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
-"Display item quantities","Display item quantities"
-"Display number of items in cart","Display number of items in cart"
-"Display number of items in wishlist","Display number of items in wishlist"
-"Easy access to your order history and status","Easy access to your order history and status"
-"Edit","Edit"
-"Edit Address","Edit Address"
-"Edit Billing Address","Edit Billing Address"
-"Edit Condition","Edit Condition"
-"Edit Items","Edit Items"
-"Edit Shipping Address","Edit Shipping Address"
-"Edit Terms and Conditions","Edit Terms and Conditions"
-"Edit Your Cart","Edit Your Cart"
-"Edit item","Edit item"
-"Edit item parameters","Edit item parameters"
-"Email Address","Email Address"
-"Enable Onepage Checkout","Enable Onepage Checkout"
-"Enable Terms and Conditions","Enable Terms and Conditions"
-"Enabled","Enabled"
-"Enter a New Address","Enter a New Address"
-"Enter your coupon code if you have one.","Enter your coupon code if you have one."
-"Enter your destination to get a shipping estimate.","Enter your destination to get a shipping estimate."
-"Estimate Shipping and Tax","Estimate Shipping and Tax"
+Remove,Remove
+Back,Back
+Price,Price
+"Shopping Cart","Shopping Cart"
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,Qty
+Subtotal,Subtotal
"Excl. Tax","Excl. Tax"
-"Fast and easy check out","Fast and easy check out"
-"Fax","Fax"
-"Forgot an Item?","Forgot an Item?"
-"Forgot your password?","Forgot your password?"
-"Get a Quote","Get a Quote"
-"Get list of available payment methods","Get list of available payment methods"
-"Get list of available shipping methods","Get list of available shipping methods"
-"Get list of products in shopping cart","Get list of products in shopping cart"
-"Get terms and conditions","Get terms and conditions"
-"Get total prices for shopping cart","Get total prices for shopping cart"
-"Gift Message","Gift Message"
-"Grand Total:","Grand Total:"
-"HTML","HTML"
-"ID","ID"
+Total,Total
"Incl. Tax","Incl. Tax"
-"Invalid checkout type.","Invalid checkout type."
-"Invalid data.","Invalid data."
-"Invalid email address ""%s""","Invalid email address ""%s"""
-"Invalid method: %s","Invalid method: %s"
-"Invalid shipping method.","Invalid shipping method."
-"Item not found or already ordered","Item not found or already ordered"
-"Items","Items"
-"Items After","Items After"
-"Items Before","Items Before"
-"Load customer quote error","Load customer quote error"
-"Loading next step...","Loading next step..."
-"Login","Login"
-"Login/Registration Before","Login/Registration Before"
-"Manage Terms and Conditions","Manage Terms and Conditions"
-"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
-"Maximum qty allowed for Shipping to multiple addresses is %s","Maximum qty allowed for Shipping to multiple addresses is %s"
-"Minimum order amount is %s","Minimum order amount is %s"
-"Move","Move"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","Move to Wishlist"
-"Multishipping Checkout","Multishipping Checkout"
-"Multishipping Checkout Address (Any) Form","Multishipping Checkout Address (Any) Form"
-"Multishipping Checkout Billing Address Creation","Multishipping Checkout Billing Address Creation"
-"Multishipping Checkout Billing Address Edit Form","Multishipping Checkout Billing Address Edit Form"
-"Multishipping Checkout Billing Address Selection","Multishipping Checkout Billing Address Selection"
-"Multishipping Checkout Billing Information Step","Multishipping Checkout Billing Information Step"
-"Multishipping Checkout Customer Address Edit Form","Multishipping Checkout Customer Address Edit Form"
-"Multishipping Checkout Overview","Multishipping Checkout Overview"
-"Multishipping Checkout Shipping Address Creation","Multishipping Checkout Shipping Address Creation"
-"Multishipping Checkout Shipping Address Edit Form","Multishipping Checkout Shipping Address Edit Form"
-"Multishipping Checkout Shipping Address Selection","Multishipping Checkout Shipping Address Selection"
-"Multishipping Checkout Shipping Information Step","Multishipping Checkout Shipping Information Step"
-"Multishipping Checkout Success","Multishipping Checkout Success"
+"Edit item parameters","Edit item parameters"
+Edit,Edit
+"Remove item","Remove item"
+Item,Item
+"Unit Price","Unit Price"
+Loading...,Loading...
+"* Required Fields","* Required Fields"
+Change,Change
+"See price before order confirmation.","See price before order confirmation."
+"What's this?","What's this?"
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name","Product Name"
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
"My Cart","My Cart"
-"My Cart (%s item)","My Cart (%s item)"
-"My Cart (%s items)","My Cart (%s items)"
-"My Cart Link","My Cart Link"
"New Address","New Address"
-"New Condition","New Condition"
-"New Terms and Conditions","New Terms and Conditions"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER"
-"One Page Checkout","One Page Checkout"
-"One Page Checkout Failure","One Page Checkout Failure"
-"One Page Checkout Overview","One Page Checkout Overview"
-"One Page Checkout Success","One Page Checkout Success"
-"One item of products do not have identifier or sku","One item of products do not have identifier or sku"
-"One item of products is not belong any of quote item","One item of products is not belong any of quote item"
-"Order","Order"
-"Order Review","Order Review"
-"Order Success","Order Success"
-"Order place error.","Order place error."
-"Other Items in Your Order","Other Items in Your Order"
-"Overview Items After","Overview Items After"
-"Password","Password"
-"Payment Failed Email Receiver","Payment Failed Email Receiver"
-"Payment Failed Email Sender","Payment Failed Email Sender"
-"Payment Failed Emails","Payment Failed Emails"
-"Payment Failed Template","Payment Failed Template"
+Country,Country
+State/Province,State/Province
+"Billing Information","Billing Information"
+"Checkout Method","Checkout Method"
"Payment Information","Payment Information"
-"Payment Method","Payment Method"
-"Payment Methods After Checkout Button","Payment Methods After Checkout Button"
-"Payment Methods Before Checkout Button","Payment Methods Before Checkout Button"
-"Payment method information","Payment method information"
-"Payment method is not defined","Payment method is not defined"
-"Payment methods in shopping cart","Payment methods in shopping cart"
-"Payment profile # %s: ""%s"".","Payment profile # %s: ""%s""."
-"Place Order","Place Order"
-"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
-"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Order Review","Order Review"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.","The onepage checkout is disabled."
+Checkout,Checkout
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
-"Please check billing address information.","Please check billing address information."
-"Please check shipping address information.","Please check shipping address information."
-"Please check shipping addresses information.","Please check shipping addresses information."
-"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
-"Please log in below:","Please log in below:"
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.","The product does not exist."
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart","Display number of items in cart"
+"Display item quantities","Display item quantities"
+"Load customer quote error","Load customer quote error"
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes","Discount Codes"
+"Enter your code","Enter your code"
+"Apply Coupon","Apply Coupon"
+"Cancel Coupon","Cancel Coupon"
+"Continue Shopping","Continue Shopping"
+"Update Shopping Cart","Update Shopping Cart"
+"Clear Shopping Cart","Clear Shopping Cart"
+"Update Cart","Update Cart"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)","Recently added item(s)"
+"You have no items in your shopping cart.","You have no items in your shopping cart."
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?","Are you sure you would like to remove this item from the shopping cart?"
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax","Estimate Shipping and Tax"
+"Enter your destination to get a shipping estimate.","Enter your destination to get a shipping estimate."
"Please select region, state or province","Please select region, state or province"
-"Please select shipping address for applicable items","Please select shipping address for applicable items"
-"Please select shipping methods for all addresses","Please select shipping methods for all addresses"
-"Please select valid payment method.","Please select valid payment method."
-"Please specify payment method.","Please specify payment method."
-"Please specify shipping method.","Please specify shipping method."
-"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
-"Price","Price"
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+"Get a Quote","Get a Quote"
+"Update Total","Update Total"
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item","Edit item"
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...","Loading next step..."
+"Select a billing address from your address book or enter a new address.","Select a billing address from your address book or enter a new address."
+"Email Address","Email Address"
+Company,Company
+"VAT Number","VAT Number"
+Address,Address
+"Street Address","Street Address"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Password
+"Confirm Password","Confirm Password"
+"Save in address book","Save in address book"
+"Ship to this address","Ship to this address"
+"Ship to different address","Ship to different address"
+Continue,Continue
+"Order #","Order #"
"Proceed to Checkout","Proceed to Checkout"
-"Product","Product"
-"Product","Product"
-"Products","Products"
-"Quantity","Quantity"
-"Quantity:","Quantity:"
-"Quantity was recalculated from %d to %d","Quantity was recalculated from %d to %d"
-"Quote Lifetime (days)","Quote Lifetime (days)"
-"Quote item does not exist.","Quote item does not exist."
-"Quote item is not found.","Quote item is not found."
-"Recently added item(s)","Recently added item(s)"
-"Register","Register"
-"Register and save time!","Register and save time!"
+Login,Login
+"Already registered?","Already registered?"
+"Please log in below:","Please log in below:"
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register","Checkout as a Guest or Register"
+"Checkout as a Guest","Checkout as a Guest"
"Register to Create an Account","Register to Create an Account"
+"Register and save time!","Register and save time!"
"Register with us for future convenience:","Register with us for future convenience:"
-"Remove Item","Remove Item"
-"Remove This Item","Remove This Item"
-"Remove coupon code from shopping cart","Remove coupon code from shopping cart"
-"Remove item","Remove item"
-"Remove product from shopping cart","Remove product from shopping cart"
-"Remove product(s) from shopping cart","Remove product(s) from shopping cart"
-"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
-"Retrieve information about shopping cart","Retrieve information about shopping cart"
-"Review Order","Review Order"
-"Review Order - %s","Review Order - %s"
-"Sales","Sales"
-"Save Condition","Save Condition"
-"Save in address book","Save in address book"
-"See price before order confirmation.","See price before order confirmation."
-"Select Address","Select Address"
-"Select Addresses","Select Addresses"
-"Select Shipping Method","Select Shipping Method"
-"Select State/Province...","Select State/Province..."
-"Select a billing address from your address book or enter a new address.","Select a billing address from your address book or enter a new address."
-"Select a shipping address from your address book or enter a new address.","Select a shipping address from your address book or enter a new address."
-"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
-"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
-"Send To","Send To"
-"Separate by "","".","Separate by "",""."
-"Set customer for shopping cart","Set customer for shopping cart"
-"Set customer's addresses in shopping cart","Set customer's addresses in shopping cart"
-"Set payment method","Set payment method"
-"Set shipping method","Set shipping method"
-"Ship to Multiple Addresses","Ship to Multiple Addresses"
-"Ship to different address","Ship to different address"
-"Ship to this address","Ship to this address"
+"Fast and easy check out","Fast and easy check out"
+"Easy access to your order history and status","Easy access to your order history and status"
+"Checkout as Guest","Checkout as Guest"
+Register,Register
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress","Your Checkout Progress"
+"Billing Address","Billing Address"
"Shipping Address","Shipping Address"
-"Shipping Information","Shipping Information"
-"Shipping Method","Shipping Method"
-"Shipping Methods","Shipping Methods"
-"Shipping To","Shipping To"
-"Shipping information","Shipping information"
"Shipping method has not been selected yet","Shipping method has not been selected yet"
-"Shipping methods in shopping cart","Shipping methods in shopping cart"
-"Shipping selection is not applicable.","Shipping selection is not applicable."
-"Shopping Cart","Shopping Cart"
-"Shopping Cart Form Before","Shopping Cart Form Before"
-"Shopping Cart Sidebar","Shopping Cart Sidebar"
-"Shopping Cart Sidebar Extra Actions","Shopping Cart Sidebar Extra Actions"
-"Shopping Cart is Empty","Shopping Cart is Empty"
-"Shopping cart ability to set coupon code","Shopping cart ability to set coupon code"
-"Show Content as","Show Content as"
-"Some of the requested products are not available in the desired quantity.","Some of the requested products are not available in the desired quantity."
-"Some of the requested products are unavailable.","Some of the requested products are unavailable."
-"Some products quantities were recalculated because of quantity increment mismatch","Some products quantities were recalculated because of quantity increment mismatch"
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Sorry, guest checkout is not enabled. Please try again or contact store owner."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Sorry, guest checkout is not enabled. Please try again or contact the store owner."
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Forgot an Item?","Forgot an Item?"
+"Edit Your Cart","Edit Your Cart"
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.","Select a shipping address from your address book or enter a new address."
+"Use Billing Address","Use Billing Address"
"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
-"State/Province","State/Province"
-"Status","Status"
-"Store View","Store View"
-"Street Address","Street Address"
-"Street Address %s","Street Address %s"
-"Submitting order information...","Submitting order information..."
-"Subtotal","Subtotal"
-"Subtotal must exceed minimum order amount","Subtotal must exceed minimum order amount"
-"Phone","Phone"
-"Terms and Conditions","Terms and Conditions"
-"Terms and Conditions Information","Terms and Conditions Information"
-"Terms and conditions","Terms and conditions"
-"Text","Text"
"Thank you for your purchase!","Thank you for your purchase!"
-"The condition has been deleted","The condition has been deleted"
-"The condition has been saved.","The condition has been saved."
-"The onepage checkout is disabled.","The onepage checkout is disabled."
-"The product could not be found.","The product could not be found."
-"The product does not exist.","The product does not exist."
-"There are <a href=""%s"">%s items</a> in your cart.","There are <a href=""%s"">%s items</a> in your cart."
-"There is <a href=""%s"">1 item</a> in your cart.","There is <a href=""%s"">1 item</a> in your cart."
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account."
-"There was an error processing your order. Please contact us or try again later.","There was an error processing your order. Please contact us or try again later."
-"This condition no longer exists.","This condition no longer exists."
-"Total","Total"
-"Total for this address","Total for this address"
-"Unable to set Payment Method.","Unable to set Payment Method."
-"Unit Price","Unit Price"
-"Update Cart","Update Cart"
-"Update Quantity & Addresses","Update Quantity & Addresses"
-"Update Shopping Cart","Update Shopping Cart"
-"Update Total","Update Total"
-"Update product quantities in shopping cart","Update product quantities in shopping cart"
-"Update product(s) quantities in shopping cart","Update product(s) quantities in shopping cart"
-"Use Billing Address","Use Billing Address"
-"VAT Number","VAT Number"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress."
-"What's this?","What's this?"
-"You have no items in your shopping cart.","You have no items in your shopping cart."
+"Your order # is: %1.","Your order # is: %1."
"You will receive an order confirmation email with details of your order and a link to track its progress.","You will receive an order confirmation email with details of your order and a link to track its progress."
-"Your Checkout Progress","Your Checkout Progress"
-"Your order # is: %s.","Your order # is: %s."
-"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.","Please specify payment method."
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"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."
-"Your order number is ","Your order number is "
-"Your recurring payments:","Your recurring payments:"
-"Zip/Postal Code","Zip/Postal Code"
diff --git a/app/code/Magento/Checkout/i18n/es_ES.csv b/app/code/Magento/Checkout/i18n/es_ES.csv
index fb281d311cd..2f14185a1f2 100644
--- a/app/code/Magento/Checkout/i18n/es_ES.csv
+++ b/app/code/Magento/Checkout/i18n/es_ES.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s se ha añadido a su cesta"
-"%s was updated in your shopping cart.","Se actualizó %s en su cesta de la compra."
-"* Required Fields","* Campos Requeridos"
-"Add New Address","Añadir Nueva Dirección"
-"Add New Condition","Añadir nueva condición"
-"Add coupon code for shopping cart","Agregar código promocional a la cesta de la compra"
-"Add gift messages to shopping cart","Agregar mensajes de regalo a la cesta de la compra"
-"Add product to shopping cart","Agregar producto a la cesta de la compra"
-"Add product(s) to shopping cart","Agregar producto(s) a la cesta de la compra"
-"Add to Cart","Añadir al Carrito"
-"Add to Compare","Añadir para comparar."
-"Add to Wishlist","Añadir a lista que quieres."
-"Additional Product Info","Información adicional del producto"
-"Address","Dirección"
-"Address %s of %s","Dirección %s de %s"
-"After Adding a Product Redirect to Shopping Cart","Después de añadir un producto volver a la cesta de compra"
-"Allow Guest Checkout","Permitir salir al cliente"
-"Already registered?","¿Ya está registrado?"
-"An error occurred in the process of payment","Se produjo un error durante el proceso de pago"
-"An error occurred while deleting this condition.","Se produjo un error al eliminar esta condición."
-"An error occurred while saving this condition.","Se produjo un error al guardar esta condición."
-"Apply Coupon","Aplicar cupón"
-"Are you sure you would like to remove this item from the shopping cart?","¿Está seguro de que desea eliminar este artÃculo de la cesta de la compra?"
-"Back","Volver"
-"Back to Billing Information","Volver a la información de la factura"
-"Back to Select Addresses","Volver a la selección de la dirección"
-"Back to Shipping Information","Volver a la información de envÃo"
-"Back to Shopping Cart","Volver a la cesta de la compra"
-"Based on your selection, you may be interested in the following items:","Basándonos en tu selección, puede que estés interesado(a) en los siguientes artÃculos."
-"Billing Address","Dirección de facturación"
-"Billing Information","Detalles de facturación"
-"Billing Information - %s","Detalles de facturación - %s"
-"Cancel Coupon","Cancelar cupón"
-"Cannot add item to the shopping cart.","No se puede añadir el artÃculo a la cesta de la compra"
-"Cannot add the item to shopping cart","No se puede añadir el artÃculo a la cesta de la compra"
-"Cannot add the item to shopping cart.","Imposible añadir el artÃculo a la cesta de la compra."
-"Cannot apply the coupon code.","Imposible aplicar el código del cupón"
-"Cannot configure product.","No se puede configurar el producto."
-"Cannot open the overview page","Imposible abrir la vista preliminar"
-"Cannot process the item.","No se puede procesar el artÃculo."
-"Cannot remove the item.","Imposible eliminar el artÃculo."
-"Cannot update shopping cart.","Imposible actualizar la cesta de la compra."
-"Cannot update the item.","No se puede actualizar el artÃculo."
-"Card Verification Number Visual Reference","Verificación de la tarjeta Número de Referencia Visual"
-"Cart Product API","API del producto de la cesta"
-"Cart Subtotal:","Subtotal de la cesta:"
-"Change","Cambio"
-"Change Billing Address","Cambiar la Dirección de Facturación"
-"Checkbox Text","Casilla de verificación de texto"
-"Checkout","Pedido"
-"Checkout Conditions","Condiciones de pedido"
-"Checkout Method","Método de pedido"
-"Checkout Options","Opciones de pedido"
-"Checkout Progress Wrapper","Plataforma del progreso de pago"
-"Checkout Section","Sección de pedido"
-"Checkout Terms and Conditions","Verificar términos y condiciones"
-"Checkout as Guest","Pedido como invitado"
-"Checkout as a Guest or Register","Pedido como invitado o registro"
-"Checkout with Multiple Addresses","Pedido con varias direcciones"
-"City","Ciudad"
-"Clear Shopping Cart","Vaciar carro de la compra"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Pulse <a href=""%s"">aquà para imprimir</a> una copia de la confirmación del pedido."
-"Click <a href=""%s"">here</a> to continue shopping.","Click <a href=""%s"">aquÃ</a> para continuar comprando."
-"Close","Cerrar"
-"Company","CompañÃa"
-"Condition Name","Nombre de condición"
-"Configure Cart Item","Configurar artÃculo de la cesta"
-"Confirm Password","Confirma Contraseña"
-"Content","Contenido"
-"Content Height","Altura del contenido"
-"Content Height (css)","Altura del contenido (css)"
-"Continue","Continuar"
-"Continue Shopping","Continuar comprando"
-"Continue to Billing Information","Continuar a información de facturación"
-"Continue to Review Your Order","Continuar a revisión de pedido"
-"Continue to Shipping Information","Continuar a información de envÃo"
-"Country","PaÃs"
-"Coupon code ""%s"" is not valid.","El código promocional ""%s"" no es válido."
-"Coupon code ""%s"" was applied.","Se aplicó el código ""%s""."
-"Coupon code was canceled.","El código de cupón se ha cancelado."
-"Create Billing Address","Crear dirección de facturación"
-"Create Shipping Address","Crear dirección de envÃo"
-"Create an order from shopping cart","Crear un pedido a partir de su cesta de la compra"
-"Create shopping cart","Crear cesta de la compra"
-"Customer Address is not valid.","La dirección del cliente no es válida."
-"Customer Information","Información del cliente"
-"Customer's information","Información del cliente"
-"Data saving problem","Error al guardar los datos."
-"Default Billing","Facturación por defecto"
-"Default Shipping","EnvÃo por defecto"
-"Delete Condition","Eliminar condición"
-"Details","Detalles"
-"Disabled","Deshabilitado"
-"Discount Codes","Códigos de descuento"
-"Display Cart Summary","Mostrar el resumen del carro"
-"Display Shopping Cart Sidebar","Mostrar el carro en la barra lateral"
-"Display item quantities","Mostrar cantidades de artÃculos"
-"Display number of items in cart","Mostrar número de artÃculos en el carro"
-"Display number of items in wishlist","Mostrar número de artÃculos en la lista de la compra"
-"Easy access to your order history and status","Acceso rápido a su historial de pedidos y estado"
-"Edit","Editar"
-"Edit Address","Cambiar la dirección"
-"Edit Billing Address","Editar la dirección de facturación"
-"Edit Condition","Editar condición"
-"Edit Items","Editar artÃculos"
-"Edit Shipping Address","Editar la dirección de envÃo"
-"Edit Terms and Conditions","Editar claúsulas y condiciones"
-"Edit Your Cart","Editar carro"
-"Edit item","Editar artÃculo"
-"Edit item parameters","Editar parámetros del artÃculo"
-"Email Address","Dirección de email"
-"Enable Onepage Checkout","Habilitar página de pago única"
-"Enable Terms and Conditions","Habilitar claúsulas y condiciones"
-"Enabled","Habilitado"
-"Enter a New Address","Introducir una dirección nueva"
-"Enter your coupon code if you have one.","Introducir un código de cupón, si tiene."
-"Enter your destination to get a shipping estimate.","Introduzca un destino para obtener una estimación de los gastos de envÃo."
-"Estimate Shipping and Tax","Estimación de los costes de envÃo y tasas"
+Remove,Remove
+Back,Volver
+Price,Precio
+"Shopping Cart","Carro de la compra"
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,Qty
+Subtotal,Subtotal
"Excl. Tax","Impuestos no incluidos"
-"Fast and easy check out","Pago sencillo"
-"Fax","Fax"
-"Forgot an Item?","¿Olvidó un artÃculo?"
-"Forgot your password?","¿Olvidó su contraseña?"
-"Get a Quote","Obtener una cotización"
-"Get list of available payment methods","Obtener la lista de métodos de pago disponibles"
-"Get list of available shipping methods","Obtener la lista de tipos de envÃo disponibles"
-"Get list of products in shopping cart","Obtenga la lista de productos en el carro de la compra"
-"Get terms and conditions","Obtener los términos y condiciones"
-"Get total prices for shopping cart","Obtener los precios totales del carro de la compra"
-"Gift Message","Mensaje regalo"
-"Grand Total:","Total final:"
-"HTML","HTML"
-"ID","Identificación"
+Total,Total
"Incl. Tax","Impuestos incluidos"
-"Invalid checkout type.","Página no válida."
-"Invalid data.","Datos no válidos."
-"Invalid email address ""%s""","Dirección de correo electrónico no válida ""%s"""
-"Invalid method: %s","Método no válido: %s"
-"Invalid shipping method.","Método de compra no válido."
-"Item not found or already ordered","No se encontró el artÃculo, o ya fue pedido"
-"Items","ArtÃculos."
-"Items After","ArtÃculos Después"
-"Items Before","ArtÃculos Antes"
-"Load customer quote error","Error en la carga de cotización del cliente"
-"Loading next step...","Cargando próximo paso..."
-"Login","Entrar"
-"Login/Registration Before","Iniciar sesión/Registrarse antes"
-"Manage Terms and Conditions","Gestión de términos y condiciones"
-"Maximum Display Recently Added Item(s)","Cantidad máxima de artÃculos agregados recientemente que se muestran"
-"Maximum qty allowed for Shipping to multiple addresses is %s","La cantidad máxima permitida para el envÃo a varias direcciones es de %s"
-"Minimum order amount is %s","El importe mÃnimo del pedido es %s"
-"Move","Mover"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","Trasladar a la Lista de Deseos"
-"Multishipping Checkout","Compra con envÃo a varias direcciones"
-"Multishipping Checkout Address (Any) Form","Formulario de dirección (cualquiera) de compra con envÃo a varias direcciones"
-"Multishipping Checkout Billing Address Creation","Creación de dirección de facturación para compra con envÃo a varias direcciones"
-"Multishipping Checkout Billing Address Edit Form","Formulario de edición de dirección de facturación para compra con envÃo a varias direcciones"
-"Multishipping Checkout Billing Address Selection","Selección de dirección de facturación para compra con envÃo a varias direcciones"
-"Multishipping Checkout Billing Information Step","Paso de información de facturación para compra con envÃo a varias direcciones"
-"Multishipping Checkout Customer Address Edit Form","Formulario de edición de dirección del cliente para compra con envÃo a varias direcciones"
-"Multishipping Checkout Overview","Descripción general de la compra con envÃo a varias direcciones"
-"Multishipping Checkout Shipping Address Creation","Creación de dirección de envÃo para compra con envÃo a varias direcciones"
-"Multishipping Checkout Shipping Address Edit Form","Formulario de edición de dirección de envÃo para compra con envÃo a varias direcciones"
-"Multishipping Checkout Shipping Address Selection","Selección de dirección de envÃo para compra con envÃo a varias direcciones"
-"Multishipping Checkout Shipping Information Step","Paso de información de envÃo para compra con envÃo a varias direcciones"
-"Multishipping Checkout Success","La compra con envÃo a varias direcciones se realizó correctamente"
+"Edit item parameters","Editar parámetros del artÃculo"
+Edit,Editar
+"Remove item","Eliminar artÃculo"
+Item,Item
+"Unit Price","Precio por unidad"
+Loading...,Loading...
+"* Required Fields","* Campos Requeridos"
+Change,Cambio
+"See price before order confirmation.","Ver precio antes de la confirmación del pedido."
+"What's this?","¿Qué es esto?"
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name","Product Name"
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
"My Cart","Mi carrito"
-"My Cart (%s item)","Mi carrito (% artÃculos)"
-"My Cart (%s items)","Mi carrito (% artÃculos)"
-"My Cart Link","Enlace a mi carrito"
"New Address","Nueva dirección"
-"New Condition","Nueva condición"
-"New Terms and Conditions","Nuevos términos y condiciones"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","EL TOTAL DEL PEDIDO SE MOSTRARÃ ANTES DE QUE ENVÃE EL PEDIDO"
-"One Page Checkout","Cobro de una página"
-"One Page Checkout Failure","Error en la compra en una página"
-"One Page Checkout Overview","Resumen en un página de la caja"
-"One Page Checkout Success","La compra en una página se realizó correctamente"
-"One item of products do not have identifier or sku","Un artÃculo de productos no tiene identificador o número de referencia"
-"One item of products is not belong any of quote item","Un artÃculo de productos no pertenece a ningún artÃculo citado"
-"Order","Número de pedido"
-"Order Review","Comentario del pedido"
-"Order Success","El pedido se realizó correctamente"
-"Order place error.","Error en el pedido"
-"Other Items in Your Order","Otros artÃculos de su pedido"
-"Overview Items After","Resumen de artÃculos después"
-"Password","Contraseña"
-"Payment Failed Email Reciever","Correo electrónico del receptor del pago fallido"
-"Payment Failed Email Sender","Remitente del mensaje de correo electrónico de error en el pago"
-"Payment Failed Emails","Mensajes de correo electrónico de error en el pago"
-"Payment Failed Template","Plantilla de error en el pago"
+Country,PaÃs
+State/Province,Estado/Provincia
+"Billing Information","Detalles de facturación"
+"Checkout Method","Método de pedido"
"Payment Information","Información de pago"
-"Payment Method","Método de pago"
-"Payment Methods After Checkout Button","Métodos de pago después de presionar el botón de compra"
-"Payment Methods Before Checkout Button","Métodos de pago antes del botón de cobro"
-"Payment method information","Información de las formas de pago"
-"Payment method is not defined","El método de pago no está definido"
-"Payment methods in shopping cart","Formas de pago del carro de la compra"
-"Payment profile # %s: ""%s"".","Perfil de pago # %s: ""%s""."
-"Place Order","Hacer un pedido"
-"Please agree to all Terms and Conditions before placing the order.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer el pedido."
-"Please agree to all Terms and Conditions before placing the orders.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer los pedidos."
+"Order Review","Comentario del pedido"
+"Shipping Information","Dirección de envÃo"
+"Shipping Method","Método de envÃo"
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.","El pago por página está deshabilitado."
+Checkout,Pedido
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
"Please agree to all the terms and conditions before placing the order.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer el pedido."
-"Please check billing address information.","Por favor, verifique la dirección de facturación."
-"Please check shipping address information.","Por favor, verifique la dirección de envÃo."
-"Please check shipping addresses information.","Por favor, verifique las direcciones de envÃo"
-"Please choose to register or to checkout as a guest","Por favor, seleccione la opción de registrarse o la de tramitar el pedido como invitado"
-"Please log in below:","Inicie sesión a continuación:"
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.","El producto no existe."
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart","Mostrar número de artÃculos en el carro"
+"Display item quantities","Mostrar cantidades de artÃculos"
+"Load customer quote error","Error en la carga de cotización del cliente"
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes","Códigos de descuento"
+"Enter your code","Enter your code"
+"Apply Coupon","Aplicar cupón"
+"Cancel Coupon","Cancelar cupón"
+"Continue Shopping","Continuar comprando"
+"Update Shopping Cart","Actualizar carrito de compras"
+"Clear Shopping Cart","Vaciar carro de la compra"
+"Update Cart","Actualizar carrito"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)","Elementos agregados recientemente"
+"You have no items in your shopping cart.","No tiene artÃculos en su carrito de compras."
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?","¿Está seguro de que desea eliminar este artÃculo de la cesta de la compra?"
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax","Estimación de los costes de envÃo y tasas"
+"Enter your destination to get a shipping estimate.","Introduzca un destino para obtener una estimación de los gastos de envÃo."
"Please select region, state or province","Por favor, seleccionar región, estado o provincia"
-"Please select shipping address for applicable items","Seleccione la dirección de envÃo para los artÃculos correspondientes"
-"Please select shipping methods for all addresses","Seleccione los métodos de envÃo para todas las direcciones"
-"Please select valid payment method.","Por favor, seleccione un método de pago válido."
-"Please specify payment method.","Especifique el método de pago."
-"Please specify shipping method.","Por favor, especifique el modo de envÃo."
-"Please specify shipping methods for all addresses.","Por favor, especifique los modos de envÃo en todas las direcciones."
-"Price","Precio"
+City,Ciudad
+"Zip/Postal Code","Código Postal"
+"Get a Quote","Obtener una cotización"
+"Update Total","Actualizar total"
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item","Editar artÃculo"
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...","Cargando próximo paso..."
+"Select a billing address from your address book or enter a new address.","Seleccione una dirección de facturación de su libreta de direcciones o ingrese una nueva."
+"Email Address","Dirección de email"
+Company,CompañÃa
+"VAT Number","Número de IVA"
+Address,Dirección
+"Street Address",Calle
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Contraseña
+"Confirm Password","Confirma Contraseña"
+"Save in address book","Guardar en libreta de direcciones"
+"Ship to this address","Enviar a esta dirección"
+"Ship to different address","Enviar a distintas direcciones"
+Continue,Continuar
+"Order #","Order #"
"Proceed to Checkout","Continuar con la compra"
-"Product","Producto"
-"Product","Nombre de Producto"
-"Products","Productos"
-"Quantity","Cant."
-"Quantity:","Cant.:"
-"Quantity was recalculated from %d to %d","La cantidad ha sido recalculada a partir de %d a %d"
-"Quote Lifetime (days)","PerÃodo de validez de la cotización (dÃas)"
-"Quote item does not exist.","El artÃculo mencionado no existe."
-"Quote item is not found.","El artÃculo mencionado no se ha encontrado"
-"Recently added item(s)","Elementos agregados recientemente"
-"Register","Registrarse"
-"Register and save time!","RegÃstrese y ahorre tiempo."
+Login,Entrar
+"Already registered?","¿Ya está registrado?"
+"Please log in below:","Inicie sesión a continuación:"
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register","Pedido como invitado o registro"
+"Checkout as a Guest","Checkout as a Guest"
"Register to Create an Account","Registrarse para crear una cuenta"
+"Register and save time!","RegÃstrese y ahorre tiempo."
"Register with us for future convenience:","RegÃstrese con nosotros para que sus futuras transacciones sean más cómodas:"
-"Remove Item","Eliminar elemento"
-"Remove This Item","Eliminar Este ArtÃculo"
-"Remove coupon code from shopping cart","Quite el código del cupón del carro de la compra"
-"Remove item","Eliminar artÃculo"
-"Remove product from shopping cart","Quite el producto del carro de la compra"
-"Remove product(s) from shopping cart","Quite el producto(s) del carro de la compra"
-"Require Customer To Be Logged In To Checkout","El cliente debe estar conectado para realizar el pedido"
-"Retrieve information about shopping cart","Recupere la información de carro de la compra"
-"Review Order","Revise su pedido"
-"Review Order - %s","Revise su pedido - %s"
-"Sales","Ventas"
-"Save Condition","Guardar cambio"
-"Save in address book","Guardar en libreta de direcciones"
-"See price before order confirmation.","Ver precio antes de la confirmación del pedido."
-"Select Address","Seleccionar dirección"
-"Select Addresses","Seleccionar direcciones"
-"Select Shipping Method","Seleccionar método de envÃo"
-"Select State/Province...","Seleccionar estado/provincia..."
-"Select a billing address from your address book or enter a new address.","Seleccione una dirección de facturación de su libreta de direcciones o ingrese una nueva."
-"Select a shipping address from your address book or enter a new address.","Seleccione una dirección de envÃo desde su libreta de direcciones o introduzca una nueva dirección."
-"Send Payment Failed Email Copy Method","Método de envÃo de correo electrónico de error en el pago"
-"Send Payment Failed Email Copy To","Destinatario de correo electrónico de error en el pago"
-"Send To","Enviar a"
-"Separate by "","".","Separado por "",""."
-"Set customer for shopping cart","Ajuste del cliente para el carro de la compra"
-"Set customer's addresses in shopping cart","Indique dirección del cliente en el carrito de la compra"
-"Set payment method","Seleccione método de pago"
-"Set shipping method","Seleccione método de envÃo"
-"Ship to Multiple Addresses","Enviar a varias direcciones"
-"Ship to different address","Enviar a distintas direcciones"
-"Ship to this address","Enviar a esta dirección"
+"Fast and easy check out","Pago sencillo"
+"Easy access to your order history and status","Acceso rápido a su historial de pedidos y estado"
+"Checkout as Guest","Pedido como invitado"
+Register,Registrarse
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress","Progreso de su compra"
+"Billing Address","Dirección de facturación"
"Shipping Address","Dirección de EnvÃo"
-"Shipping Information","Dirección de envÃo"
-"Shipping Method","Método de envÃo"
-"Shipping Methods","Métodos de envÃo"
-"Shipping To","EnvÃo a"
-"Shipping information","Información de envÃo"
"Shipping method has not been selected yet","Aun no se ha seleccionado un método de envÃo"
-"Shipping methods in shopping cart","Métodos de envÃo en el carrito de la compra"
-"Shipping selection is not applicable.","No se aplica la selección de envÃo."
-"Shopping Cart","Carro de la compra"
-"Shopping Cart Form Before","Formulario previo al carrito de compras"
-"Shopping Cart Sidebar","Barra lateral del carrito de compras"
-"Shopping Cart Sidebar Extra Actions","Opciones extra en la barra lateral del carrito de la compra"
-"Shopping Cart is Empty","El carrito de compras está vacÃo"
-"Shopping cart ability to set coupon code","Posibilidad de aplicar código de descuento en el carrito de la compra"
-"Show Content as","Mostrar contenido como"
-"Some of the requested products are not available in the desired quantity.","Algunos de los productos solicitados no están disponibles en la cantidad deseada."
-"Some of the requested products are unavailable.","Alguno de los productos solicitados no está disponible."
-"Some products quantities were recalculated because of quantity increment mismatch","Las cantidades de algunos productos se han recalculado debido a desajustes en el incremento de cantidades"
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Lo sentimos, la opción de pago como invitado no está habilitada. Por favor, inténtelo de nuevo o contacte con el dueño de la tienda."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Lo sentimos, no puede realizar pedidos como invitado. Vuelva a intentarlo o contacte con el dueño de la tienda."
+"Payment Method","Método de pago"
+"Place Order","Hacer un pedido"
+"Forgot an Item?","¿Olvidó un artÃculo?"
+"Edit Your Cart","Editar carro"
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.","Seleccione una dirección de envÃo desde su libreta de direcciones o introduzca una nueva dirección."
+"Use Billing Address","Utilizar dirección de facturación"
"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido."
-"State/Province","Estado/Provincia"
-"Status","Progreso"
-"Store View","Ver Tienda"
-"Street Address","Calle"
-"Street Address %s","Calle %s"
-"Submitting order information...","Enviando información del pedido..."
-"Subtotal","Subtotal"
-"Subtotal must exceed minimum order amount","El subtotal debe superar el importe mÃnimo del pedido"
-"Phone","Teléfono"
-"Terms and Conditions","Términos y condiciones"
-"Terms and Conditions Information","Información sobre los términos y condiciones"
-"Terms and conditions","Términos y condiciones"
-"Text","Texto"
"Thank you for your purchase!","Gracias por su compra."
-"The condition has been deleted","Se eliminó la condición"
-"The condition has been saved.","Se guardó la condición."
-"The onepage checkout is disabled.","El pago por página está deshabilitado."
-"The product could not be found.","No se encontró el producto."
-"The product does not exist.","El producto no existe."
-"There are <a href=""%s"">%s items</a> in your cart.","Hay <a href=""%s"">%s productos</a> en su carrito."
-"There is <a href=""%s"">1 item</a> in your cart.","Hay <a href=""%s"">1 producto</a> en su carrito."
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Ya hay un cliente registrado con esta dirección de correo electrónico. Por favor, conéctese utilizando esta dirección o introduzca una dirección de correo electrónico diferente para crear su cuenta."
-"There was an error processing your order. Please contact us or try again later.","Se produjo un error al procesar su pedido. Póngase en contacto con nosotros o vuelva a intentarlo más tarde."
-"This condition no longer exists.","Esta condición ya no existe."
-"Total","Total"
-"Total for this address","Total para esta dirección"
-"Unable to set Payment Method.","No se puede establecer método de pago."
-"Unit Price","Precio por unidad"
-"Update Cart","Actualizar carrito"
-"Update Quantity & Addresses","Actualizar cantidad y direcciones"
-"Update Shopping Cart","Actualizar carrito de compras"
-"Update Total","Actualizar total"
-"Update product quantities in shopping cart","Actualizar cantidades del producto en el carrito de la compra"
-"Update product(s) quantities in shopping cart","Actualizar cantidades de (los) producto(s) en el carrito de la compra"
-"Use Billing Address","Utilizar dirección de facturación"
-"VAT Number","Número de IVA"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Estamos procesando su pedido y pronto recibirá un mensaje de correo electrónico con los detalles de éste. Cuando se envÃe su pedido, recibirá otro correo electrónico con un enlace para hacer un seguimiento de su progreso."
-"What's this?","¿Qué es esto?"
-"You have no items in your shopping cart.","No tiene artÃculos en su carrito de compras."
+"Your order # is: %1.","Your order # is: %1."
"You will receive an order confirmation email with details of your order and a link to track its progress.","Recibirá un mensaje de correo electrónico con los detalles de su pedido y un enlace para hacer un seguimiento de su progreso."
-"Your Checkout Progress","Progreso de su compra"
-"Your order # is: %s.","Su número de pedido es: %s."
-"Your order cannot be completed at this time as there is no payment methods available for it.","Su pedido no se ha podido completar porque no hay ningún método de pago disponible."
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Su pedido no puede completarse en este momento ya que no hay métodos de envÃo disponibles. Realice los cambios necesarios en su dirección de envÃo."
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.","Especifique el método de pago."
+"Please agree to all Terms and Conditions before placing the orders.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer los pedidos."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"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."
-"Your order number is ","Su número de pedido es"
-"Your recurring payments:","Su perfil de pago periódico:"
-"Zip/Postal Code","Código Postal"
diff --git a/app/code/Magento/Checkout/i18n/fr_FR.csv b/app/code/Magento/Checkout/i18n/fr_FR.csv
index cf612a5711f..034a262eb42 100644
--- a/app/code/Magento/Checkout/i18n/fr_FR.csv
+++ b/app/code/Magento/Checkout/i18n/fr_FR.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s a été ajouté à votre panier."
-"%s was updated in your shopping cart.","%s a été ajouté à votre panier."
-"* Required Fields","* Champs obligatoires"
-"Add New Address","Ajouter une nouvelle adresse"
-"Add New Condition","Ajouter nouvelle condition"
-"Add coupon code for shopping cart","Ajouter un code de réduction pour le panier"
-"Add gift messages to shopping cart","Ajouter des messages cadeaux au panier"
-"Add product to shopping cart","Ajouter un produit au panier"
-"Add product(s) to shopping cart","Ajouter des produits au panier"
-"Add to Cart","Ajouter au panier"
-"Add to Compare","Ajouter au comparateur"
-"Add to Wishlist","Ajouter à la liste de cadeaux"
-"Additional Product Info","Informations supplémentaires sur le produit"
-"Address","Adresse"
-"Address %s of %s","Adresse %s de %s"
-"After Adding a Product Redirect to Shopping Cart","Après l'ajout d'un produit, rediriger vers le panier"
-"Allow Guest Checkout","Autoriser le paiement invité"
-"Already registered?","Déjà enregistré ?"
-"An error occurred in the process of payment","Une erreur est survenue lors du paiement"
-"An error occurred while deleting this condition.","Une erreur est survenue lors de la suppression de la condition."
-"An error occurred while saving this condition.","Une erreur est survenue lors de l'enregistrement de la condition."
-"Apply Coupon","Utiliser le coupon"
-"Are you sure you would like to remove this item from the shopping cart?","Etes-vous sûr de vouloir supprimer cet objet de votre panier ?"
-"Back","Retour"
-"Back to Billing Information","Retour vers les informations de facturation"
-"Back to Select Addresses","Retour à la sélection des adresses"
-"Back to Shipping Information","Retour aux informations d'expédition"
-"Back to Shopping Cart","Retour au panier"
-"Based on your selection, you may be interested in the following items:","D'après votre sélection, vous serez probablement intéressé par :"
-"Billing Address","Adresse de facturation"
-"Billing Information","Informations de facturation"
-"Billing Information - %s","Informations de facturation - %s"
-"Cancel Coupon","Annuler le coupon"
-"Cannot add item to the shopping cart.","Ne peut pas ajouter d'objets au panier."
-"Cannot add the item to shopping cart","Ne peut pas ajouter cet objet au panier."
-"Cannot add the item to shopping cart.","Ne peut pas ajouter cet objet au panier."
-"Cannot apply the coupon code.","Ne peut pas utiliser le code de réduction."
-"Cannot configure product.","N'a pas pu configurer le produit"
-"Cannot open the overview page","Ne peut pas ouvrir la page de vue d'ensemble."
-"Cannot process the item.","Ne peut pas continuer avec l'objet"
-"Cannot remove the item.","Ne peut pas supprimer l'objet."
-"Cannot update shopping cart.","Ne peut pas mettre à jour le panier."
-"Cannot update the item.","N'a pas pu mettre à jour l'objet"
-"Card Verification Number Visual Reference","Numéro de vérification de la carte"
-"Cart Product API","API produit"
-"Cart Subtotal:","Sous-total du panier"
-"Change","Changer"
-"Change Billing Address","Changer l'adresse de facturation"
-"Checkbox Text","Texte de vérification"
-"Checkout","Paiement"
-"Checkout Conditions","Conditions de paiement"
-"Checkout Method","Méthode de paiement"
-"Checkout Options","Options de paiement"
-"Checkout Progress Wrapper","Processus de paiement"
-"Checkout Section","Section de paiement"
-"Checkout Terms and Conditions","Termes et conditions du paiement"
-"Checkout as Guest","Payer en tant qu'invité"
-"Checkout as a Guest or Register","Payer en tant qu'invité ou s'enregistrer"
-"Checkout with Multiple Addresses","Paiement avec des adresses multiples"
-"City","Ville"
-"Clear Shopping Cart","Vider le panier"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Cliquez <a href=""%s"">ici pour imprimer</a> une copie de votre confirmation de commande."
-"Click <a href=""%s"">here</a> to continue shopping.","Cliquez <a href=""%s"">ici</a> pour continuer vos achats"
-"Close","Fermer"
-"Company","Société"
-"Condition Name","Nom de la condition"
-"Configure Cart Item","Configurer les objets du panier"
-"Confirm Password","Confirmez le mot de passe"
-"Content","Contenu"
-"Content Height","Hauteur du contenu"
-"Content Height (css)","Hauteur du contenu (css)"
-"Continue","Continuer"
-"Continue Shopping","Continuer les achats"
-"Continue to Billing Information","Continuer vers les informations de facturation"
-"Continue to Review Your Order","Continuer vers la vérification de la commande"
-"Continue to Shipping Information","Continuer vers les informations d'expédition"
-"Country","Pays"
-"Coupon code ""%s"" is not valid.","Le code de réduction ""%s"" n'est pas valide."
-"Coupon code ""%s"" was applied.","Le code de réduction ""%s"" a été appliqué."
-"Coupon code was canceled.","Le code de réduction a été annulé."
-"Create Billing Address","Créer une adresse de facturation"
-"Create Shipping Address","Créer une adresse d'expédition"
-"Create an order from shopping cart","Créez une commande depuis le panier."
-"Create shopping cart","Créer un panier"
-"Customer Address is not valid.","L'adresse client n'est pas valide."
-"Customer Information","Informations du client"
-"Customer's information","Informations du client"
-"Data saving problem","Problème d'enregistrement de données"
-"Default Billing","Facturation par défaut"
-"Default Shipping","Expédition par défaut"
-"Delete Condition","Supprimer condition"
-"Details","Détails"
-"Disabled","Désactivé"
-"Discount Codes","Codes de réduction"
-"Display Cart Summary","Afficher le résumé du panier"
-"Display Shopping Cart Sidebar","Afficher la barre d'outils du panier"
-"Display item quantities","Afficher les quantités d'objets"
-"Display number of items in cart","Afficher le nombre d'objets dans le panier"
-"Display number of items in wishlist","Affiche le nombre d'objets dans la liste des souhaits"
-"Easy access to your order history and status","Accès facile à votre historique de commandes et statut"
-"Edit","Modifier"
-"Edit Address","Éditer l'adresse"
-"Edit Billing Address","Modifier l'adresse de facturation"
-"Edit Condition","Conditions de modification"
-"Edit Items","Modifier l'adresse d'expédition"
-"Edit Shipping Address","Modifier l'adresse d'expédition"
-"Edit Terms and Conditions","Modifier termes et conditions"
-"Edit Your Cart","Modifier votre panier"
-"Edit item","Modifier l'objet"
-"Edit item parameters","Modifier les paramètres de l'objet"
-"Email Address","Adresse email"
-"Enable Onepage Checkout","Activer le paiement en une seule page"
-"Enable Terms and Conditions","Activer les termes et conditions"
-"Enabled","Activé"
-"Enter a New Address","Entrer une nouvelle adresse"
-"Enter your coupon code if you have one.","Entrez votre code de réduction si vous en avez un."
-"Enter your destination to get a shipping estimate.","Entrez votre destination pour obtenir une estimation des frais de port."
-"Estimate Shipping and Tax","Estimation du port et des taxes."
+Remove,Remove
+Back,Retour
+Price,Prix
+"Shopping Cart",Panier
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,Qty
+Subtotal,Sous-total
"Excl. Tax","Taxe non comprise"
-"Fast and easy check out","Paiement rapide et facile."
-"Fax","Fax"
-"Forgot an Item?","Oublié un objet ?"
-"Forgot your password?","Oublié votre mot de passe ?"
-"Get a Quote","Obtenir une estimation"
-"Get list of available payment methods","Obtenir une liste des méthodes de paiement disponibles"
-"Get list of available shipping methods","Obtenir une liste des méthodes d'expédition disponibles"
-"Get list of products in shopping cart","Obtenir la liste des produits dans le panier"
-"Get terms and conditions","Obtenir les conditions"
-"Get total prices for shopping cart","Obtenir le prix total du panier"
-"Gift Message","Message du cadeau"
-"Grand Total:","Total :"
-"HTML","HTML"
-"ID","ID"
+Total,Total
"Incl. Tax","Taxe comprise"
-"Invalid checkout type.","Type de paiement invalide"
-"Invalid data.","Données invalides."
-"Invalid email address ""%s""","Adresse mail ""%s"" invalide"
-"Invalid method: %s","Méthode invalide : %s"
-"Invalid shipping method.","Méthode d'expédition invalide."
-"Item not found or already ordered","Objets non trouvés ou déjà commandés"
-"Items","Articles"
-"Items After","Articles après"
-"Items Before","Articles avant"
-"Load customer quote error","Charger erreur devis client"
-"Loading next step...","Chargement étape suivante..."
-"Login","Identifiant"
-"Login/Registration Before","Connexion/Inscription avant"
-"Manage Terms and Conditions","Gérer les conditions générales"
-"Maximum Display Recently Added Item(s)","Affichage maximum article(s) récemment ajouté(s)"
-"Maximum qty allowed for Shipping to multiple addresses is %s","Qté maximum permise pour expédition à multiples adresses est %s"
-"Minimum order amount is %s","Le montant minimum de la commande est de %s"
-"Move","Déplacer"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","Mettre dans la liste d'idées cadeaux"
-"Multishipping Checkout","Sortie caisse différentes expéditions"
-"Multishipping Checkout Address (Any) Form","Formulaire sortie caisse différentes expéditions (toutes)"
-"Multishipping Checkout Billing Address Creation","Création adresse facturation sortie caisse multiples expéditions"
-"Multishipping Checkout Billing Address Edit Form","Modification formulaire adresse facturation sortie caisse multiples expéditions"
-"Multishipping Checkout Billing Address Selection","Sélection adresse facturation sortie caisse multiples expéditions"
-"Multishipping Checkout Billing Information Step","Étape information facturation sortie caisse multiples expéditions"
-"Multishipping Checkout Customer Address Edit Form","Modifier formulaire adresse client sortie caisse multiples expéditions"
-"Multishipping Checkout Overview","Vue générale sortie caisse multiples expéditions"
-"Multishipping Checkout Shipping Address Creation","Création adresse expédition sortie caisse multiples expéditions"
-"Multishipping Checkout Shipping Address Edit Form","Modifier formulaire adresse expédition sortie caisse multiples expéditions"
-"Multishipping Checkout Shipping Address Selection","Sélection adresse expédition sortie caisse multiples expédition"
-"Multishipping Checkout Shipping Information Step","Étape information expédition sortie caisse multiples expéditions"
-"Multishipping Checkout Success","Sortie caisse multiples expéditions réussie"
+"Edit item parameters","Modifier les paramètres de l'objet"
+Edit,Modifier
+"Remove item","Supprimer l'objet"
+Item,Item
+"Unit Price","Prix unitaire"
+Loading...,Loading...
+"* Required Fields","* Champs obligatoires"
+Change,Changer
+"See price before order confirmation.","Voir le prix avant la confirmation de commande."
+"What's this?","Qu'est-ce ?"
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name","Product Name"
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
"My Cart","Mon caddy"
-"My Cart (%s item)","Mon caddy (%s ar"
-"My Cart (%s items)","Mon caddy (%s articles)"
-"My Cart Link","Lien vers Mon caddy"
"New Address","Nouvelle adresse"
-"New Condition","Nouvelle Condition"
-"New Terms and Conditions","Nouvelles conditions générales"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","LA COMMANDE TOTALE S'AFFICHERA AVANT QUE VOUS LA SOUMETTIEZ"
-"One Page Checkout","Paiement en une page"
-"One Page Checkout Failure","Échec de règlement une page"
-"One Page Checkout Overview","Aperçu caisse de sortie en une page"
-"One Page Checkout Success","Succès de règlement une page"
-"One item of products do not have identifier or sku","Un objet n'a pas d'identifiant ou sku"
-"One item of products is not belong any of quote item","Un objet ne correspond à aucune estimation"
-"Order","Commande n°"
-"Order Review","Révision de la commande"
-"Order Success","Succès commande"
-"Order place error.","Erreur passage commande."
-"Other Items in Your Order","Autres articles dans votre panier"
-"Overview Items After","Aperçu articles après"
-"Password","Mot de passe"
-"Payment Failed Email Reciever","Destinataire de l'e-mail en cas d'échec de paiement"
-"Payment Failed Email Sender","Échec paiement expéditeur courriel"
-"Payment Failed Emails","Échec paiement courriels"
-"Payment Failed Template","Modèle Échec paiement"
+Country,Pays
+State/Province,Etat/pays
+"Billing Information","Informations de facturation"
+"Checkout Method","Méthode de paiement"
"Payment Information","Information paiement"
-"Payment Method","Méthode de paiement"
-"Payment Methods After Checkout Button","Méthodes paiement après bouton règlement"
-"Payment Methods Before Checkout Button","Méthodes de paiement avant le bouton de validation"
-"Payment method information","Renseignements méthode de paiement"
-"Payment method is not defined","La méthode de paiement n'est pas définie"
-"Payment methods in shopping cart","Méthodes de paiement dans le panier"
-"Payment profile # %s: ""%s"".","Profil de paiement # %s: ""%s""."
-"Place Order","Passer la commande"
-"Please agree to all Terms and Conditions before placing the order.","Veuillez agréer à tous les termes et conditions avant de passer commande."
-"Please agree to all Terms and Conditions before placing the orders.","Veuillez agréer à tous les termes et conditions avant de passer les commandes."
+"Order Review","Révision de la commande"
+"Shipping Information","Informations d'expédition"
+"Shipping Method","Méthode d'expédition"
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.","L'encart pour passer la commande est désactivé."
+Checkout,Paiement
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
"Please agree to all the terms and conditions before placing the order.","Veuillez agréer à tous les termes et conditions avant de passer commande."
-"Please check billing address information.","Veuillez vérifier l'adresse de facturation."
-"Please check shipping address information.","Veuillez vérifier l'adresse d'expédition."
-"Please check shipping addresses information.","Veuillez vérifier les adresses d'expédition."
-"Please choose to register or to checkout as a guest","Veuillez choisir de vous enregistrer ou de passer à la caisse en tant qu'invité"
-"Please log in below:","Veuillez vous connecter ci-dessous :"
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.","Le produit n'existe pas."
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart","Afficher le nombre d'objets dans le panier"
+"Display item quantities","Afficher les quantités d'objets"
+"Load customer quote error","Charger erreur devis client"
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes","Codes de réduction"
+"Enter your code","Enter your code"
+"Apply Coupon","Utiliser le coupon"
+"Cancel Coupon","Annuler le coupon"
+"Continue Shopping","Continuer les achats"
+"Update Shopping Cart","Mettre à jour le panier"
+"Clear Shopping Cart","Vider le panier"
+"Update Cart","Mettre à jour le panier"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)","Objets ajoutés récemment"
+"You have no items in your shopping cart.","Il n'y a aucun objet dans votre panier."
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?","Etes-vous sûr de vouloir supprimer cet objet de votre panier ?"
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax","Estimation du port et des taxes."
+"Enter your destination to get a shipping estimate.","Entrez votre destination pour obtenir une estimation des frais de port."
"Please select region, state or province","Veuillez sélectionner la région, l'état et le pays"
-"Please select shipping address for applicable items","Veuillez sélectionner l'adresse d'expédition"
-"Please select shipping methods for all addresses","Veuillez sélectionner une méthode d'expédition pour toutes les adresses"
-"Please select valid payment method.","Veuillez sélectionner une méthode de paiement valide."
-"Please specify payment method.","Veuillez préciser une méthode de paiement."
-"Please specify shipping method.","Veuillez spécifier la méthode d'expédition."
-"Please specify shipping methods for all addresses.","Veuillez spécifier des méthodes d'expédition pour toutes les addresses."
-"Price","Prix"
+City,Ville
+"Zip/Postal Code","Code postal"
+"Get a Quote","Obtenir une estimation"
+"Update Total","Mettre à jour le total"
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item","Modifier l'objet"
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...","Chargement étape suivante..."
+"Select a billing address from your address book or enter a new address.","Choisir une adresse de facturation depuis votre carnet d'adresses ou entrer une nouvelle adresse."
+"Email Address","Adresse email"
+Company,Société
+"VAT Number","Numéro TVA"
+Address,Adresse
+"Street Address",Rue
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,"Mot de passe"
+"Confirm Password","Confirmez le mot de passe"
+"Save in address book","Sauvegarder dans le carnet d'adresses"
+"Ship to this address","Envoyer à cette adresse"
+"Ship to different address","Envoyer à une différente adresse"
+Continue,Continuer
+"Order #","Order #"
"Proceed to Checkout","Continuer le paiement"
-"Product","Produit"
-"Product","Nom du produit"
-"Products","Produits"
-"Quantity","Qté"
-"Quantity:","Quantité :"
-"Quantity was recalculated from %d to %d","La quantité a été recalculée de %d à %d"
-"Quote Lifetime (days)","Estimation"
-"Quote item does not exist.","L'article évalué n'existe pas."
-"Quote item is not found.","L'article évalué n'a pas été trouvé."
-"Recently added item(s)","Objets ajoutés récemment"
-"Register","S'inscrire"
-"Register and save time!","S'enregistre et gagner du temps !"
+Login,Identifiant
+"Already registered?","Déjà enregistré ?"
+"Please log in below:","Veuillez vous connecter ci-dessous :"
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register","Payer en tant qu'invité ou s'enregistrer"
+"Checkout as a Guest","Checkout as a Guest"
"Register to Create an Account","Inscrivez-vous pour créer un compte"
+"Register and save time!","S'enregistre et gagner du temps !"
"Register with us for future convenience:","S'enregistrer pour plus de pratique"
-"Remove Item","Supprimer objet"
-"Remove This Item","Supprimer cet objet"
-"Remove coupon code from shopping cart","Retirer le code coupon du panier"
-"Remove item","Supprimer l'objet"
-"Remove product from shopping cart","Retirer le produit du panier"
-"Remove product(s) from shopping cart","Retirer le(s) produit(s) du panier"
-"Require Customer To Be Logged In To Checkout","Exige du client qu'il soit connecté pour passer à la caisse"
-"Retrieve information about shopping cart","Récupérer les informations relatives au panier"
-"Review Order","Vérification de la commande"
-"Review Order - %s","Vérification de la commande - %s"
-"Sales","Ventes"
-"Save Condition","Enregistrer la situation"
-"Save in address book","Sauvegarder dans le carnet d'adresses"
-"See price before order confirmation.","Voir le prix avant la confirmation de commande."
-"Select Address","Sélectionner l'Adresse"
-"Select Addresses","Sélectionner adresses"
-"Select Shipping Method","Sélectionner la Méthode de Livraison"
-"Select State/Province...","Sélectionner état/pays"
-"Select a billing address from your address book or enter a new address.","Choisir une adresse de facturation depuis votre carnet d'adresses ou entrer une nouvelle adresse."
-"Select a shipping address from your address book or enter a new address.","Choisir une adresse de facturation depuis votre carnet d'adresses ou entrer une nouvelle adresse."
-"Send Payment Failed Email Copy Method","Méthode d'envoi des mails de notification d'échec de paiement"
-"Send Payment Failed Email Copy To","Envoyer les mails de notification d'échec de paiement à "
-"Send To","Envoyer A"
-"Separate by "","".","Séparer par des "",""."
-"Set customer for shopping cart","Définir le client pour le panier"
-"Set customer's addresses in shopping cart","Fixer les adresses de clients dans le panier"
-"Set payment method","Déterminer la méthode de paiement"
-"Set shipping method","Déterminer la méthode d'expédition"
-"Ship to Multiple Addresses","Expédier à des Adresses Multiples"
-"Ship to different address","Envoyer à une différente adresse"
-"Ship to this address","Envoyer à cette adresse"
+"Fast and easy check out","Paiement rapide et facile."
+"Easy access to your order history and status","Accès facile à votre historique de commandes et statut"
+"Checkout as Guest","Payer en tant qu'invité"
+Register,S'inscrire
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress","Progression du paiement"
+"Billing Address","Adresse de facturation"
"Shipping Address","Adresse d'expédition"
-"Shipping Information","Informations d'expédition"
-"Shipping Method","Méthode d'expédition"
-"Shipping Methods","Modes d'expédition"
-"Shipping To","Expédition à "
-"Shipping information","Informations d'expédition"
"Shipping method has not been selected yet","Méthode d'expédition non sélectionnée"
-"Shipping methods in shopping cart","Méthodes d'expédition dans le panier"
-"Shipping selection is not applicable.","Méthode d'expédition non disponible."
-"Shopping Cart","Panier"
-"Shopping Cart Form Before","Panier précédent"
-"Shopping Cart Sidebar","Barre d'outils du panier"
-"Shopping Cart Sidebar Extra Actions","Shopping Cart Sidebar Extra Actions"
-"Shopping Cart is Empty","Le panier est vide"
-"Shopping cart ability to set coupon code","Possibilité d'utiliser des codes de réduction"
-"Show Content as","Afficher le contenu comme"
-"Some of the requested products are not available in the desired quantity.","Certains des produits demandés ne sont pas disponibles dans les quantités demandées."
-"Some of the requested products are unavailable.","Certains produits sélectionnés ne sont pas disponibles."
-"Some products quantities were recalculated because of quantity increment mismatch","Certaines quantités de produits ont été recalculées en raison d'incompatibilités."
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Désolé, le passage à la caisse des invités n'est pas activé. Veuillez réessayez ou contactez le propriétaire du magasin."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Désolé, la validation des achats n'est pas activée. Veuillez essayer à nouveau ou contacter le propriétaire de la boutique."
+"Payment Method","Méthode de paiement"
+"Place Order","Passer la commande"
+"Forgot an Item?","Oublié un objet ?"
+"Edit Your Cart","Modifier votre panier"
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.","Choisir une adresse de facturation depuis votre carnet d'adresses ou entrer une nouvelle adresse."
+"Use Billing Address","Utiliser l'adresse de facturation"
"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande."
-"State/Province","Etat/pays"
-"Status","Statut"
-"Store View","Vue du magasin"
-"Street Address","Rue"
-"Street Address %s","Adresse municipale %s"
-"Submitting order information...","Envoi des informations de la commande ...."
-"Subtotal","Sous-total"
-"Subtotal must exceed minimum order amount","Le montant partiel doit dépasser le montant minimum de la commande"
-"Phone","Téléphone"
-"Terms and Conditions","Conditions d'utilisation"
-"Terms and Conditions Information","Information des conditions d'utilisation"
-"Terms and conditions","Conditions d'utilisation"
-"Text","Texte"
"Thank you for your purchase!","Merci pour votre achat !"
-"The condition has been deleted","La condition a été supprimée"
-"The condition has been saved.","La condition a été enregistrée"
-"The onepage checkout is disabled.","L'encart pour passer la commande est désactivé."
-"The product could not be found.","Le produit n'a pas pu être trouvé."
-"The product does not exist.","Le produit n'existe pas."
-"There are <a href=""%s"">%s items</a> in your cart.","Il y a <a href=""%s"">%s objets</a> dans votre panier."
-"There is <a href=""%s"">1 item</a> in your cart.","<a href=""%s"">1 objet</a> dans votre panier"
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Il y a déjà un client enregistré utilisant cette adresse de courriel. Veuillez vous connecter en utilisant cette adresse de courriel ou entrer une adresse de courriel différente pour enregistrer votre compte."
-"There was an error processing your order. Please contact us or try again later.","Il y a une erreur lors de la confirmation de votre commande. Veuillez nous contacter ou réessayer plus tard."
-"This condition no longer exists.","Cette condition n'existe plus."
-"Total","Total"
-"Total for this address","Total pour cette adresse"
-"Unable to set Payment Method.","Impossible de définir la méthode de paiement"
-"Unit Price","Prix unitaire"
-"Update Cart","Mettre à jour le panier"
-"Update Quantity & Addresses","Mettre à jour la quantité"
-"Update Shopping Cart","Mettre à jour le panier"
-"Update Total","Mettre à jour le total"
-"Update product quantities in shopping cart","Mettre à jour les quantités de produit dans le panier"
-"Update product(s) quantities in shopping cart","Mettre à jour les quantités de produits dans le panier"
-"Use Billing Address","Utiliser l'adresse de facturation"
-"VAT Number","Numéro TVA"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Nous sommes en train de prendre en compte votre commande et vous recevrez rapidement un email. Une fois la commande expédiée, vous recevrez un autre email avec un lien vers le suivi."
-"What's this?","Qu'est-ce ?"
-"You have no items in your shopping cart.","Il n'y a aucun objet dans votre panier."
+"Your order # is: %1.","Your order # is: %1."
"You will receive an order confirmation email with details of your order and a link to track its progress.","Vous recevrez un mail de confirmation de commande, puis un second mail vous permettant d'accéder au suivi du colis."
-"Your Checkout Progress","Progression du paiement"
-"Your order # is: %s.","Votre commande # est %s."
-"Your order cannot be completed at this time as there is no payment methods available for it.","Votre commande ne peut être terminée pour l’heure, car aucun moyen de paiement n’est disponible pour elle."
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Votre commande ne peut pas être réalisée pour le moment étant donné qu'aucune méthode de livraison n'est disponible. Veuillez apporter les modifications nécessaires à votre adresse de livraison."
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.","Veuillez préciser une méthode de paiement."
+"Please agree to all Terms and Conditions before placing the orders.","Veuillez agréer à tous les termes et conditions avant de passer les commandes."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"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."
-"Your order number is ","Votre numéro de commande est"
-"Your recurring payments:","Vos profils de paiement récurrents :"
-"Zip/Postal Code","Code postal"
diff --git a/app/code/Magento/Checkout/i18n/nl_NL.csv b/app/code/Magento/Checkout/i18n/nl_NL.csv
index 1011acf1121..08c79333d58 100644
--- a/app/code/Magento/Checkout/i18n/nl_NL.csv
+++ b/app/code/Magento/Checkout/i18n/nl_NL.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s is aan uw mandje toegevoegd."
-"%s was updated in your shopping cart.","%s is bijgewerkt in uw winkelmandje."
-"* Required Fields","* Vereiste Velden"
-"Add New Address","Adres Toevoegen"
-"Add New Condition","Nieuwe voorwaarde toevoegen"
-"Add coupon code for shopping cart","Vouchercode voor winkelmandje toevoegen"
-"Add gift messages to shopping cart","Cadeauboodschappen aan winkelmandje toevoegen"
-"Add product to shopping cart","Product aan winkelmandje toevoegen"
-"Add product(s) to shopping cart","Product(en) aan winkelmandje toevoegen"
-"Add to Cart","Voeg toe aan winkelwagen"
-"Add to Compare","Toevoegen om te vergelijken"
-"Add to Wishlist","Aan wenslijst toevoegen"
-"Additional Product Info","Verdere productinformatie"
-"Address","Adres"
-"Address %s of %s","Adres %s van %s"
-"After Adding a Product Redirect to Shopping Cart","Ga na het toevoegen van een product naar het mandje"
-"Allow Guest Checkout","Gasten toestaan om uit te checken"
-"Already registered?","Bent u al geregistreerd?"
-"An error occurred in the process of payment","Er heeft zich een fout voorgedaan in het betalingsproces"
-"An error occurred while deleting this condition.","Er heeft zich een fout voorgedaan bij het verwijderen van deze voorwaarde"
-"An error occurred while saving this condition.","Er heeft zich een fout voorgedaan bij het opslaan van deze voorwaarde."
-"Apply Coupon","Coupon gebruiken"
-"Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?"
-"Back","Terug"
-"Back to Billing Information","Terug naar de betalingsinformatie"
-"Back to Select Addresses","Terug naar de adresselectie"
-"Back to Shipping Information","Terug naar de verzendingsinformatie"
-"Back to Shopping Cart","Terug naar het mandje"
-"Based on your selection, you may be interested in the following items:","Gebaseerd op uw keuze, bent u misschien geïnteresseerd in de volgende items:"
-"Billing Address","Factuuradres"
-"Billing Information","Betalingsinformatie"
-"Billing Information - %s","Betalingsinformatie - %s"
-"Cancel Coupon","Coupon annuleren"
-"Cannot add item to the shopping cart.","Het item kan niet aan het mandje toegevoegd worden."
-"Cannot add the item to shopping cart","Het item kan niet aan het mandje toegevoegd worden."
-"Cannot add the item to shopping cart.","Het item kan niet aan het mandje toegevoegd worden."
-"Cannot apply the coupon code.","De couponcode kan niet gebruikt worden."
-"Cannot configure product.","Kan product niet configureren."
-"Cannot open the overview page","De overzichtspagina kan niet geopend worden"
-"Cannot process the item.","Kan artikel niet verwerken."
-"Cannot remove the item.","Het item kan niet verwijderd worden."
-"Cannot update shopping cart.","Het mandje kan niet geupdate worden"
-"Cannot update the item.","Kan artikel niet bijwerken."
-"Card Verification Number Visual Reference","Visuele referentie kaartverificatienummer"
-"Cart Product API","Mandje product API"
-"Cart Subtotal:","Subtotaal mandje:"
-"Change","Wijzigen"
-"Change Billing Address","Verander Factuuradres"
-"Checkbox Text","Tekst checkbox"
-"Checkout","Betalen"
-"Checkout Conditions","Betalingsvoorwaarden"
-"Checkout Method","Betalingsmethode"
-"Checkout Options","Betalingsopties"
-"Checkout Progress Wrapper","Afrekening voortgang wrapper"
-"Checkout Section","Betalingsdeel"
-"Checkout Terms and Conditions","Algemene Voorwaarden Afrekenen"
-"Checkout as Guest","Als een gast uitchecken"
-"Checkout as a Guest or Register","Betalen als een gast of registreren"
-"Checkout with Multiple Addresses","Met meerdere adressen uitchecken"
-"City","Stad"
-"Clear Shopping Cart","Maak winkelwagen leeg"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Klik <a href=""%s"">hier</a> om een kopie van uw bestellingsbevestiging te printen."
-"Click <a href=""%s"">here</a> to continue shopping.","Klik <a href=""%s"">here</a> om door te gaan met winkelen."
-"Close","Sluiten"
-"Company","Bedrijf"
-"Condition Name","Naam voorwaarde"
-"Configure Cart Item","Artikel in mandje configureren"
-"Confirm Password","Bevestig Wachtwoord"
-"Content","inhoud"
-"Content Height","Hoogte inhoud"
-"Content Height (css)","Hoogte inhoud (css)"
-"Continue","Doorgaan"
-"Continue Shopping","Doorgaan met shoppen"
-"Continue to Billing Information","Doorgaan naar de betalingsinformatie"
-"Continue to Review Your Order","Doorgaan om uw bestelling te controleren"
-"Continue to Shipping Information","Doorgaan naar verzendingsinformatie"
-"Country","Land"
-"Coupon code ""%s"" is not valid.","Vouchercode ""%s"" is niet geldig."
-"Coupon code ""%s"" was applied.","Vouchercode ""%s"" is toegepast."
-"Coupon code was canceled.","De coupon code is geannuleerd"
-"Create Billing Address","Betaaladres aanmaken"
-"Create Shipping Address","Verzendadres aanmaken"
-"Create an order from shopping cart","Maak een bestelling van het winkelmandje aan"
-"Create shopping cart","Winkelmandje aanmaken"
-"Customer Address is not valid.","Klantadres is niet geldig."
-"Customer Information","Klantinformatie"
-"Customer's information","Informatie van de klant"
-"Data saving problem","Probleem met het opslaan van data"
-"Default Billing","Standaard facturering"
-"Default Shipping","Standaard verzending"
-"Delete Condition","Verwijder voorwaarde"
-"Details","Details"
-"Disabled","Uitgeschakeld"
-"Discount Codes","Kortingcodes"
-"Display Cart Summary","Toon overzicht van winkelwagen"
-"Display Shopping Cart Sidebar","Toon winkelwagen zijbalk"
-"Display item quantities","Toon item hoeveelheden"
-"Display number of items in cart","Toon het aantal items in de winkelwagen"
-"Display number of items in wishlist","Aantal artikelen in verlanglijstje weergeven"
-"Easy access to your order history and status","Makkelijke toegang tot uw bestelgeschiedenis en -status"
-"Edit","Bewerk"
-"Edit Address","Bewerk adres"
-"Edit Billing Address","Bewerk factureeradres"
-"Edit Condition","Voorwaarde aanpassen"
-"Edit Items","Bewerk items"
-"Edit Shipping Address","Bewerk verzendadres"
-"Edit Terms and Conditions","Bewerk voorwaarden"
-"Edit Your Cart","Bewerk uw winkelwagen"
-"Edit item","Artikel bewerken"
-"Edit item parameters","Parameters van artikel bewerken"
-"Email Address","E-mail adres"
-"Enable Onepage Checkout","Activeer Eenpagina afrekenen"
-"Enable Terms and Conditions","Activeer voorwaarden."
-"Enabled","Ingeschakeld"
-"Enter a New Address","Voer een nieuw adres in"
-"Enter your coupon code if you have one.","Voer uw kortingsbon in als u die heeft."
-"Enter your destination to get a shipping estimate.","Voer uw bestemming in om een schatting van de verzendkosten te krijgen."
-"Estimate Shipping and Tax","Schat de verzendkosten en btw"
+Remove,Remove
+Back,Terug
+Price,prijs
+"Shopping Cart",Winkelmandje
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,Qty
+Subtotal,Subtotaal
"Excl. Tax","exclusief btw"
-"Fast and easy check out","Snel en makkelijk afrekenen"
-"Fax","Fax"
-"Forgot an Item?","Een item vergeten?"
-"Forgot your password?","Bent u uw wachtwoord vergeten?"
-"Get a Quote","Verkrijg een prijsopgave"
-"Get list of available payment methods","Lijst van beschikbare betalingsmethoden verkrijgen"
-"Get list of available shipping methods","Lijst van beschikbare verzendingsmethoden verkrijgen"
-"Get list of products in shopping cart","Lijst van producten in winkelmandje verkrijgen"
-"Get terms and conditions","Voorwaarden verkrijgen"
-"Get total prices for shopping cart","Totale prijs voor winkelmandje verkrijgen"
-"Gift Message","Cadeauboodschap"
-"Grand Total:","Alles bij elkaar:"
-"HTML","HTML"
-"ID","identiteit"
+Total,totaal
"Incl. Tax","inclusief btw"
-"Invalid checkout type.","Ongeldig checkout-soort"
-"Invalid data.","Ongeldige data."
-"Invalid email address ""%s""","Ongeldig e-mailadres ""%s"""
-"Invalid method: %s","Ongeldige methode: %s"
-"Invalid shipping method.","Ongeldige verzendmethode."
-"Item not found or already ordered","Item niet gevonden of al besteld"
-"Items","Artikelen"
-"Items After","Artikelen na"
-"Items Before","Artikelen voor"
-"Load customer quote error","Laad klant prijsopgave fout"
-"Loading next step...","De volgende stap wordt geladen..."
-"Login","log in"
-"Login/Registration Before","Inloggen/Registratie voor"
-"Manage Terms and Conditions","Beheer Algemene Voorwaarden"
-"Maximum Display Recently Added Item(s)","Maximale weergave recentelijk toegevoegd(e) item(s)"
-"Maximum qty allowed for Shipping to multiple addresses is %s","Maximale toegestane hoeveelheid voor verzending naar meerdere adressen is %s"
-"Minimum order amount is %s","Minimale bestelhoeveelheid is %s"
-"Move","Verplaats"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","ga naar verlanglijstje"
-"Multishipping Checkout","Multiverzending afrekening"
-"Multishipping Checkout Address (Any) Form","Adresserings (alle) formulier voor multiverzending afrekening"
-"Multishipping Checkout Billing Address Creation","Aanmaken van multiverzending afrekening factureeradres"
-"Multishipping Checkout Billing Address Edit Form","Bewerkingsformulier voor multiverzending afrekening factureeradres"
-"Multishipping Checkout Billing Address Selection","Factureringsadres-selectie voor multiverzending afrekening"
-"Multishipping Checkout Billing Information Step","Factureringsinformatie stap voor multiverzending afrekening"
-"Multishipping Checkout Customer Address Edit Form","Klantadres bewerkingsformulier voor multiverzending afrekening"
-"Multishipping Checkout Overview","Multiverzending afrekening overzicht"
-"Multishipping Checkout Shipping Address Creation","Aanmaak van verzendingsadres voor multiverzending afrekening"
-"Multishipping Checkout Shipping Address Edit Form","Verzendadres bewerkingsformulier voor multiverzending afrekening"
-"Multishipping Checkout Shipping Address Selection","Verzendingsadres-selectie voor multiverzending afrekening"
-"Multishipping Checkout Shipping Information Step","Verzendingsinformatie stap vooo multiverzending afrekening"
-"Multishipping Checkout Success","Multiverzending afrekening gelukt"
+"Edit item parameters","Parameters van artikel bewerken"
+Edit,Bewerk
+"Remove item","Verwijder artikel"
+Item,Item
+"Unit Price","Prijs per stuk"
+Loading...,Loading...
+"* Required Fields","* Vereiste Velden"
+Change,Wijzigen
+"See price before order confirmation.","Zie prijs voor bevestiging van bestelling."
+"What's this?","Wat is dit?"
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name","Product Name"
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
"My Cart","Mijn winkelwagen"
-"My Cart (%s item)","Mijn winkelwagen (%s item)"
-"My Cart (%s items)","Mijn winkelwagen (%s items)"
-"My Cart Link","Link naar mijn winkelwagen"
"New Address","Nieuw Adres"
-"New Condition","Nieuwe Voorwaarde"
-"New Terms and Conditions","Nieuwe Algemene Voorwaarden"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","BESTELTOTAAL ZAL WORDEN GETOOND VOORDAT U DE BESTELLING VERSTUURD"
-"One Page Checkout","Een-pagina afrekenen"
-"One Page Checkout Failure","Een pagina-afrekening mislukt"
-"One Page Checkout Overview","Afrekeningsoverzicht op een pagina"
-"One Page Checkout Success","Een pagina-afrekening gelukt"
-"One item of products do not have identifier or sku","Een item van de producten heeft geen identifier of sku"
-"One item of products is not belong any of quote item","Een item van de producten behoort niet toe tot een van de offerte items"
-"Order","Bestelling #"
+Country,Land
+State/Province,staat/provincie
+"Billing Information",Betalingsinformatie
+"Checkout Method",Betalingsmethode
+"Payment Information",Betaalinformatie
"Order Review","Overzicht bestelling"
-"Order Success","Bestelling Succes"
-"Order place error.","Fout bij het plaatsen van bestelling."
-"Other Items in Your Order","Andere Artikelen in Uw Bestelling"
-"Overview Items After","Overzicht artikelen na"
-"Password","Wachtwoord"
-"Payment Failed Email Reciever","Betaling Mislukt Email Ontvanger"
-"Payment Failed Email Sender","Betaling Mislukt E-mail Verzender"
-"Payment Failed Emails","Betaling Mislukt E-mails"
-"Payment Failed Template","Betaling Mislukt Sjabloon"
-"Payment Information","Betaalinformatie"
-"Payment Method","Betaalwijze"
-"Payment Methods After Checkout Button","Betaalwijzen Na Kassa Knop"
-"Payment Methods Before Checkout Button","Betalingsmethoden Voor Afrekenknop"
-"Payment method information","Informatie betalingsmethode"
-"Payment method is not defined","Betaalwijze is niet gedefinieerd"
-"Payment methods in shopping cart","Betalingsmethoden in winkelmandje"
-"Payment profile # %s: ""%s"".","Betalingsprofiel # %s: ""%s""."
-"Place Order","Bestelling plaatsen"
-"Please agree to all Terms and Conditions before placing the order.","Gelieve in te stemmen met de Algemene Voorwaarden voor het plaatsen van de bestelling."
-"Please agree to all Terms and Conditions before placing the orders.","Gelieve in te stemmen met de Algemene Voorwaarden voor het plaatsen van de bestellingen."
+"Shipping Information",Verzendinformatie
+"Shipping Method",Verzendwijze
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.","Afrekenen op een pagina is uitgeschakeld."
+Checkout,Betalen
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
"Please agree to all the terms and conditions before placing the order.","Gelieve in te stemmen met de algemene voorwaarden voor het plaatsen van de bestelling."
-"Please check billing address information.","Gelieve de facturatieadresgegevens te controleren."
-"Please check shipping address information.","Gelieve de gegevens van het afleveradres te controleren."
-"Please check shipping addresses information.","Gelieve de gegevens van het afleveradres te controleren."
-"Please choose to register or to checkout as a guest","Registreer of check uit als gast a.u.b."
-"Please log in below:","Gelieve hieronder aanmelden:"
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.","Het product bestaat niet."
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart","Toon het aantal items in de winkelwagen"
+"Display item quantities","Toon item hoeveelheden"
+"Load customer quote error","Laad klant prijsopgave fout"
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes",Kortingcodes
+"Enter your code","Enter your code"
+"Apply Coupon","Coupon gebruiken"
+"Cancel Coupon","Coupon annuleren"
+"Continue Shopping","Doorgaan met shoppen"
+"Update Shopping Cart","Winkelwagen bijwerken"
+"Clear Shopping Cart","Maak winkelwagen leeg"
+"Update Cart","Mandje bijwerken"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)","Recent toegevoegde artikel(en)"
+"You have no items in your shopping cart.","Uw winkelwagen bevat geen artikelen."
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?"
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax","Schat de verzendkosten en btw"
+"Enter your destination to get a shipping estimate.","Voer uw bestemming in om een schatting van de verzendkosten te krijgen."
"Please select region, state or province","Selecteer alstublieft regio, staat of provincie"
-"Please select shipping address for applicable items","Gelieve een verzendadres selecteren voor de toepasselijke artikelen"
-"Please select shipping methods for all addresses","Gelieve verzendwijzen selecteren voor alle adressen"
-"Please select valid payment method.","Gelieve een geldige betalingsmethode te kiezen."
-"Please specify payment method.","Geef wijze van betaling aan"
-"Please specify shipping method.","Gelieve een verzendingsmethode te specificeren."
-"Please specify shipping methods for all addresses.","Gelieve verzendingsmethodes voor alle adressen te selecteren."
-"Price","prijs"
+City,Stad
+"Zip/Postal Code",Postcode
+"Get a Quote","Verkrijg een prijsopgave"
+"Update Total","Totaal bijwerken"
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item","Artikel bewerken"
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...","De volgende stap wordt geladen..."
+"Select a billing address from your address book or enter a new address.","Selecteer een factuuradres uit uw adresboek of voer een nieuw adres in."
+"Email Address","E-mail adres"
+Company,Bedrijf
+"VAT Number","BTW nummer"
+Address,Adres
+"Street Address","Straat Adres"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Wachtwoord
+"Confirm Password","Bevestig Wachtwoord"
+"Save in address book","Opslaan in adresboek"
+"Ship to this address","Verzend naar dit adres"
+"Ship to different address","Verzend naar ander adres"
+Continue,Doorgaan
+"Order #","Order #"
"Proceed to Checkout","Doorgaan naar Kassa"
-"Product","product"
-"Product","Productnaam"
-"Products","Producten"
-"Quantity","Hoeveelheid"
-"Quantity:","Hoeveelheid:"
-"Quantity was recalculated from %d to %d","Kwantiteit is herberekend van %d naar %d"
-"Quote Lifetime (days)","Prijsopgave Levensduur (dagen)"
-"Quote item does not exist.","Prijsopgaaf artikel bestaat niet."
-"Quote item is not found.","Prijsopgaaf artikel is niet gevonden."
-"Recently added item(s)","Recent toegevoegde artikel(en)"
-"Register","Registreer"
-"Register and save time!","Registreer en bespaar tijd!"
+Login,"log in"
+"Already registered?","Bent u al geregistreerd?"
+"Please log in below:","Gelieve hieronder aanmelden:"
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register","Betalen als een gast of registreren"
+"Checkout as a Guest","Checkout as a Guest"
"Register to Create an Account","Registreer om een Account aan te maken"
+"Register and save time!","Registreer en bespaar tijd!"
"Register with us for future convenience:","Registreer bij ons voor gemak in de toekomst:"
-"Remove Item","Product verwijderen"
-"Remove This Item","Verwijder Dit Artikel"
-"Remove coupon code from shopping cart","Verwijder vouchercode uit winkelmandje"
-"Remove item","Verwijder artikel"
-"Remove product from shopping cart","Verwijder product uit winkelmandje"
-"Remove product(s) from shopping cart","Verwijder product(en) uit winkelmandje"
-"Require Customer To Be Logged In To Checkout","Verzoek Klant in te loggen voordat Afgerekend wordt."
-"Retrieve information about shopping cart","Informatie over winkelmandje verkrijgen"
-"Review Order","Herzien Bestelling"
-"Review Order - %s","Herzien Bestelling - %s"
-"Sales","Verkoop"
-"Save Condition","Bewaar Staat"
-"Save in address book","Opslaan in adresboek"
-"See price before order confirmation.","Zie prijs voor bevestiging van bestelling."
-"Select Address","Kies Adres"
-"Select Addresses","Selecteer Adressen"
-"Select Shipping Method","Kies Verzendingsmethode"
-"Select State/Province...","Selecteer Staat/Provincie..."
-"Select a billing address from your address book or enter a new address.","Selecteer een factuuradres uit uw adresboek of voer een nieuw adres in."
-"Select a shipping address from your address book or enter a new address.","Selecteer een verzendadres vanuit uw adresboek of geef een nieuw e-mailadres in"
-"Send Payment Failed Email Copy Method","Stuur Betaling Mislukt E-mail Kopie Methode"
-"Send Payment Failed Email Copy To","Stuur Betaling Mislukt E-mail Kopie Naar"
-"Send To","Stuur Naar"
-"Separate by "","".","Scheid door "",""."
-"Set customer for shopping cart","Klant instellen voor winkelmandje"
-"Set customer's addresses in shopping cart","Stel adres van klant in winkelmandje in"
-"Set payment method","Stel betalingsmethode in"
-"Set shipping method","Stel verzendingsmethode in"
-"Ship to Multiple Addresses","Stuur naar Meerdere Adressen"
-"Ship to different address","Verzend naar ander adres"
-"Ship to this address","Verzend naar dit adres"
+"Fast and easy check out","Snel en makkelijk afrekenen"
+"Easy access to your order history and status","Makkelijke toegang tot uw bestelgeschiedenis en -status"
+"Checkout as Guest","Als een gast uitchecken"
+Register,Registreer
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress","Uw betalingsvoortgang"
+"Billing Address",Factuuradres
"Shipping Address","Ontvangst Adres"
-"Shipping Information","Verzendinformatie"
-"Shipping Method","Verzendwijze"
-"Shipping Methods","Versturing Methodes"
-"Shipping To","Verzenden naar"
-"Shipping information","Verzendingsinformatie"
"Shipping method has not been selected yet","Verzendwijze is nog niet geselecteerd"
-"Shipping methods in shopping cart","Verzendingsmethoden in winkelmandje"
-"Shipping selection is not applicable.","Verzenden selectie is niet toepasbaar."
-"Shopping Cart","Winkelmandje"
-"Shopping Cart Form Before","Winkelwagen Formulier Voor"
-"Shopping Cart Sidebar","Winkelwagen Zijbalk"
-"Shopping Cart Sidebar Extra Actions","Winkelmandje zijbalk extra acties"
-"Shopping Cart is Empty","Winkelwagen is Leeg"
-"Shopping cart ability to set coupon code","Mogelijk in winkelmandje om vouchercode in te stellen"
-"Show Content as","Laat inhoud zien als"
-"Some of the requested products are not available in the desired quantity.","Sommige van de gevraagde producten zijn niet beschikbaar in de gevraagde hoeveelheid."
-"Some of the requested products are unavailable.","Sommige van de gewenste producten zijn niet beschikbaar."
-"Some products quantities were recalculated because of quantity increment mismatch","Sommige productkwantiteiten zijn opnieuw berekend door wanverhouding kwantiteitstoename"
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Sorry, kassa is niet ingeschakeld voor gasten. Probeer het opnieuw of neem contact op met de eigenaar van de winkel."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Sorry, gast afrekenen niet geactiveerd. Probeer het opnieuw of neem contact op met de eigenaar van de winkel."
+"Payment Method",Betaalwijze
+"Place Order","Bestelling plaatsen"
+"Forgot an Item?","Een item vergeten?"
+"Edit Your Cart","Bewerk uw winkelwagen"
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.","Selecteer een verzendadres vanuit uw adresboek of geef een nieuw e-mailadres in"
+"Use Billing Address","Factuuradres gebruiken"
"Sorry, no quotes are available for this order at this time.","Sorry, op dit moment zijn er geen offertes beschikbaar voor deze bestelling."
-"State/Province","staat/provincie"
-"Status","Status"
-"Store View","winkelweergave"
-"Street Address","Straat Adres"
-"Street Address %s","Straatnaam en huisnummer %s"
-"Submitting order information...","Doorgeven order informatie..."
-"Subtotal","Subtotaal"
-"Subtotal must exceed minimum order amount","Subtotaal moet groter zijn dan minimum bestelaantal"
-"Phone","telefoon"
-"Terms and Conditions","Algemene voorwaarden"
-"Terms and Conditions Information","Algemene voorwaarden Informatie"
-"Terms and conditions","Voorwaarden"
-"Text","Tekst"
"Thank you for your purchase!","Bedankt voor uw aankoop!"
-"The condition has been deleted","De voorwaarde is verwijderd"
-"The condition has been saved.","De voorwaarde is opgeslagen."
-"The onepage checkout is disabled.","Afrekenen op een pagina is uitgeschakeld."
-"The product could not be found.","Het product kan niet gevonden worden."
-"The product does not exist.","Het product bestaat niet."
-"There are <a href=""%s"">%s items</a> in your cart.","Er zijn <a href=""%s"">%s artikelen</a> in uw winkelmandje."
-"There is <a href=""%s"">1 item</a> in your cart.","Er is <a href=""%s"">1 artikel</a> in uw winkelmandje."
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Er is al een klant geregistreerd met behulp van dit e-mailadres. Log in met dit e-mailadres of gebruik een ander e-mailadres om je account te registreren."
-"There was an error processing your order. Please contact us or try again later.","Er is een fout opgetreden tijdens de verwerking van uw bestelling. Neem contact op met ons of probeer het later opnieuw."
-"This condition no longer exists.","Deze voorwaarde bestaat niet meer."
-"Total","totaal"
-"Total for this address","Totaal voor dit adres"
-"Unable to set Payment Method.","Niet mogelijk om de betaalwijze in te stellen."
-"Unit Price","Prijs per stuk"
-"Update Cart","Mandje bijwerken"
-"Update Quantity & Addresses","Bijwerken Aantal & Adressen"
-"Update Shopping Cart","Winkelwagen bijwerken"
-"Update Total","Totaal bijwerken"
-"Update product quantities in shopping cart","Productkwantiteiten in winkelmandje bijwerken"
-"Update product(s) quantities in shopping cart","Kwantiteit product(en) in winkelmandje bijwerken"
-"Use Billing Address","Factuuradres gebruiken"
-"VAT Number","BTW nummer"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","We verwerken uw order en u ontvangt binnenkort een email met de details van uw bestelling. Zodra uw bestelling is verzonden ontvangt u een andere email met een link om de zending te kunnen volgen."
-"What's this?","Wat is dit?"
-"You have no items in your shopping cart.","Uw winkelwagen bevat geen artikelen."
+"Your order # is: %1.","Your order # is: %1."
"You will receive an order confirmation email with details of your order and a link to track its progress.","U ontvangt een email met de bevestiging van uw bestelling en een link om uw zending te volgen."
-"Your Checkout Progress","Uw betalingsvoortgang"
-"Your order # is: %s.","Uw bestelling # is: %s."
-"Your order cannot be completed at this time as there is no payment methods available for it.","Uw bestelling kan nu niet worden afgerond omdat er geen betaalmethoden beschikbaar zijn."
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Uw bestelling kan nu niet worden afgerond omdat er geen verzendmethoden beschikbaar zijn. Maak de noodzakelijke veranderingen uw in afleveradres."
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.","Geef wijze van betaling aan"
+"Please agree to all Terms and Conditions before placing the orders.","Gelieve in te stemmen met de Algemene Voorwaarden voor het plaatsen van de bestellingen."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"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."
-"Your order number is ","Uw bestelnummer is"
-"Your recurring payments:","Uw herbruikbare betalingsprofielen:"
-"Zip/Postal Code","Postcode"
diff --git a/app/code/Magento/Checkout/i18n/pt_BR.csv b/app/code/Magento/Checkout/i18n/pt_BR.csv
index 6baf3bbeab4..92b3452c02f 100644
--- a/app/code/Magento/Checkout/i18n/pt_BR.csv
+++ b/app/code/Magento/Checkout/i18n/pt_BR.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s foi adicionado ao seu carrinho de compras."
-"%s was updated in your shopping cart.","%s foi atualizado no seu carrinho de compras."
-"* Required Fields","* Campos obrigatórios"
-"Add New Address","Adicionar Novo Endereço"
-"Add New Condition","Adicionar Nova Condição"
-"Add coupon code for shopping cart","Adicionar o código de cupom para carrinho de compras"
-"Add gift messages to shopping cart","Adicionar mensagens de presente a carrinho de compras"
-"Add product to shopping cart","Adicionar produto ao carrinho de compras"
-"Add product(s) to shopping cart","Adicionar produto(s) ao carrinho de compras"
-"Add to Cart","Adicionar ao carrinho"
-"Add to Compare","Adicionar para Comparar"
-"Add to Wishlist","Adicionar à Lista de Desejos"
-"Additional Product Info","Informação Adicional do Produto"
-"Address","Endereço"
-"Address %s of %s","Endereço %s de %s"
-"After Adding a Product Redirect to Shopping Cart","Após Adicionar um Produto Redirecionar para o Carrinho de Compras"
-"Allow Guest Checkout","Permitir Caixa de SaÃda a Visitante"
-"Already registered?","Já está registado?"
-"An error occurred in the process of payment","Ocorreu um erro no processo de pagamento"
-"An error occurred while deleting this condition.","Ocorreu um erro durante a exclusão desta condição."
-"An error occurred while saving this condition.","Ocorreu um erro ao salvar esta condição."
-"Apply Coupon","Aplicar Coupon"
-"Are you sure you would like to remove this item from the shopping cart?","Tem certeza de que deseja remover este item do carrinho de compras?"
-"Back","Voltar"
-"Back to Billing Information","Voltar para Informações de Faturamento"
-"Back to Select Addresses","Voltar para Selecionar Endereços"
-"Back to Shipping Information","Voltar para Informações de Envio/Frete"
-"Back to Shopping Cart","Voltar para Carrinho de Compras"
-"Based on your selection, you may be interested in the following items:","Com base em sua seleção, você pode se interessar pelos seguintes itens:"
-"Billing Address","Endereço de faturamento"
-"Billing Information","Dados de Faturamento"
-"Billing Information - %s","Dados de Faturamento - %s"
-"Cancel Coupon","Cancelar Cupom"
-"Cannot add item to the shopping cart.","ImpossÃvel adicionar item ao carrinho."
-"Cannot add the item to shopping cart","ImpossÃvel adicionar o item ao carrinho"
-"Cannot add the item to shopping cart.","ImpossÃvel adicionar item ao carrinho."
-"Cannot apply the coupon code.","ImpossÃvel aplicar o código do cupom."
-"Cannot configure product.","ImpossÃvel configurar produto."
-"Cannot open the overview page","ImpossÃvel abrir a página de panorama"
-"Cannot process the item.","ImpossÃvel processar o item."
-"Cannot remove the item.","ImpossÃvel remover o item."
-"Cannot update shopping cart.","ImpossÃvel atualizar carrinho de compras."
-"Cannot update the item.","ImpossÃvel atualizar o item."
-"Card Verification Number Visual Reference","Referência Visual de Número de Verificação do Cartão"
-"Cart Product API","API para Produtos no Carrinho"
-"Cart Subtotal:","Subtotal do Carrinho:"
-"Change","Mudar"
-"Change Billing Address","Alterar o endereço de faturamento"
-"Checkbox Text","Texto para Caixa de Verificação"
-"Checkout","Encerrar Compra"
-"Checkout Conditions","Condições para Encerrar Compra"
-"Checkout Method","Método para Encerrar Compra"
-"Checkout Options","Opções para Encerrar Compra"
-"Checkout Progress Wrapper","Código referente ao Progresso do Encerramento da Compra"
-"Checkout Section","Seção do Encerramento de Compra"
-"Checkout Terms and Conditions","Verificação dos Termos e Condições"
-"Checkout as Guest","Checkout como Visitante"
-"Checkout as a Guest or Register","Checkout como um Visitante ou se Registe"
-"Checkout with Multiple Addresses","Encerrar Compra com Vários Endereços"
-"City","Cidade"
-"Clear Shopping Cart","Limpar Carrinho de Compras"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Clique <a href=""%s"">aqui para imprimir</a> uma cópia da confirmação de seu pedido."
-"Click <a href=""%s"">here</a> to continue shopping.","Clique <a href=""%s"">aqui</a> para continuar as compras."
-"Close","Fechar"
-"Company","Companhia"
-"Condition Name","Nome de Condição"
-"Configure Cart Item","Configurar Item de Carrinho"
-"Confirm Password","Confirmar a senha"
-"Content","Conteúdo"
-"Content Height","Altura do Conteúdo"
-"Content Height (css)","Altura do Conteúdo (CSS)"
-"Continue","Continue"
-"Continue Shopping","Continuar Comprando"
-"Continue to Billing Information","Continuar para Dados de Faturamento"
-"Continue to Review Your Order","Continuar para Rever Seu Pedido"
-"Continue to Shipping Information","Continuar para Informações de Envio/Frete"
-"Country","PaÃs"
-"Coupon code ""%s"" is not valid.","O código de cupom ""%s"" é inválido."
-"Coupon code ""%s"" was applied.","O código de cupom ""%s"" foi aplicado."
-"Coupon code was canceled.","O código de cupom ""%s"" foi cancelado."
-"Create Billing Address","Criar Endereço para Faturamento"
-"Create Shipping Address","Criar Endereço para Entrega"
-"Create an order from shopping cart","Criar pedido a partir do carrinho"
-"Create shopping cart","Criar carrinho de compras"
-"Customer Address is not valid.","O endereço do cliente não é válido."
-"Customer Information","Dados do Cliente"
-"Customer's information","Dados do Cliente"
-"Data saving problem","Problema ao salvar dados"
-"Default Billing","Faturamento-Padrão"
-"Default Shipping","Frete-Padrão"
-"Delete Condition","Apagar Condição"
-"Details","Detalhes"
-"Disabled","Desativado"
-"Discount Codes","Códigos de Desconto"
-"Display Cart Summary","Exibir Resumo de Carrinho"
-"Display Shopping Cart Sidebar","Exibir Barra Lateral do Carrinho"
-"Display item quantities","Exibir quantidades do item"
-"Display number of items in cart","Exibir número de itens no carrinho"
-"Display number of items in wishlist","Exibir número de itens na lista de desejos"
-"Easy access to your order history and status","Fácil acesso ao seu histórico de pedidos e estado"
-"Edit","Editar"
-"Edit Address","Editar endereço"
-"Edit Billing Address","Editar Endereço de Faturamento"
-"Edit Condition","Editar condição"
-"Edit Items","Editar Itens"
-"Edit Shipping Address","Editar Endereço de Entrega"
-"Edit Terms and Conditions","Editar Termos e Condições"
-"Edit Your Cart","Editar Seu Carrinho"
-"Edit item","Editar Item"
-"Edit item parameters","Editar parâmetros de item"
-"Email Address","Endereço de e-mail"
-"Enable Onepage Checkout","Habilitar Encerramento de Conta Onepage"
-"Enable Terms and Conditions","Habilitar Termos e Condições"
-"Enabled","Ativado"
-"Enter a New Address","Informar Endereço Novo"
-"Enter your coupon code if you have one.","Informe seu código de cupom, caso o tenha."
-"Enter your destination to get a shipping estimate.","Informe seu destino, para cálculo estimado do frete."
-"Estimate Shipping and Tax","Cálculo Estimado de Frete e Imposto"
+Remove,Remove
+Back,Voltar
+Price,Preço
+"Shopping Cart","Carrinho de compras"
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,Qty
+Subtotal,Subtotal
"Excl. Tax","Excluir taxas"
-"Fast and easy check out","Checkout rápido e fácil"
-"Fax","Fax"
-"Forgot an Item?","Esqueceu algum item?"
-"Forgot your password?","Esqueceu sua senha?"
-"Get a Quote","Receber Orçamento"
-"Get list of available payment methods","Receber lista de métodos de pagamento disponÃveis"
-"Get list of available shipping methods","Receber lista de formas de envio disponÃveis"
-"Get list of products in shopping cart","Receber lista de produtos no carrinho"
-"Get terms and conditions","Receber Termos e Condições"
-"Get total prices for shopping cart","Totalizar preços no carrinho de compras"
-"Gift Message","Mensagem de presente"
-"Grand Total:","Total geral:"
-"HTML","HTML"
-"ID","Identidade"
+Total,Total
"Incl. Tax","Incluir taxas"
-"Invalid checkout type.","Tipo de checkout inválido."
-"Invalid data.","Dados inválidos."
-"Invalid email address ""%s""","Endereço de e-mail inválido ""%s"""
-"Invalid method: %s","Método inválido: %s"
-"Invalid shipping method.","Método de envio inválido."
-"Item not found or already ordered","Item não encontrado ou já encomendado"
-"Items","Itens"
-"Items After","Itens Após"
-"Items Before","Itens Antes"
-"Load customer quote error","Carregar erro de orçamento do cliente"
-"Loading next step...","Carregando próximo passo..."
-"Login","Conectar-se"
-"Login/Registration Before","Login/Registro Antes"
-"Manage Terms and Conditions","Gerenciar Termos e Condições"
-"Maximum Display Recently Added Item(s)","Item(ns) Adicionado(s) Recentemente Mais Exibido(s)"
-"Maximum qty allowed for Shipping to multiple addresses is %s","Qtde. máxima permitida para entrega em vários endereços é %s"
-"Minimum order amount is %s","A quantidade mÃnima de pedido é %s"
-"Move","Mover"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","Mover para lista de presentes"
-"Multishipping Checkout","Encerramento de Compra com Várias Entregas"
-"Multishipping Checkout Address (Any) Form","Encerrar Compra c/ Várias Entregas: Endereço (Qualquer um)"
-"Multishipping Checkout Billing Address Creation","Encerrar Compra c/ Várias Entregas: Endereço de Faturamento"
-"Multishipping Checkout Billing Address Edit Form","Encerrar Compra c/ Várias Entregas: Editar Endereço de Faturamento"
-"Multishipping Checkout Billing Address Selection","Seleção de Endereço Multienvio de Faturamento de SaÃda"
-"Multishipping Checkout Billing Information Step","Passo de Informação de Faturamento de Multienvio de SaÃda"
-"Multishipping Checkout Customer Address Edit Form","Formulário de Edição do Endereço do Cliente de Multienvio de SaÃda"
-"Multishipping Checkout Overview","Resumo de Caixa de Multienvio"
-"Multishipping Checkout Shipping Address Creation","Criação do Endereço de Envio de Multienvio de SaÃda"
-"Multishipping Checkout Shipping Address Edit Form","Formulário de Edição do Endereço de Envio de Multienvio de SaÃda"
-"Multishipping Checkout Shipping Address Selection","Seleção do Endereço de Envio de Multienvio de SaÃda"
-"Multishipping Checkout Shipping Information Step","Passo de Informação de Envio de Multienvio de SaÃda"
-"Multishipping Checkout Success","Sucesso na MultisaÃda de SaÃda"
+"Edit item parameters","Editar parâmetros de item"
+Edit,Editar
+"Remove item","Remover item"
+Item,Item
+"Unit Price","Preço Unitário"
+Loading...,Loading...
+"* Required Fields","* Campos obrigatórios"
+Change,Mudar
+"See price before order confirmation.","Ver preço antes de confirmar pedido."
+"What's this?","O que é isso?"
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name","Product Name"
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
"My Cart","Meu Carrinho"
-"My Cart (%s item)","Meu Carrinho (%s item)"
-"My Cart (%s items)","Meu Carrinho (%s itens)"
-"My Cart Link","Ligação do Meu Carrinho"
"New Address","Novo Endereço"
-"New Condition","Nova Condição"
-"New Terms and Conditions","Novos Termos e Condições"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","O TOTAL DO PEDIDO SERà EXIBIDO ANTES DE VOCÊ ENVIAR O PEDIDO"
-"One Page Checkout","SaÃda de Uma Página"
-"One Page Checkout Failure","Falha na SaÃda de Uma Página"
-"One Page Checkout Overview","Resumo da SaÃda de Uma Página"
-"One Page Checkout Success","Sucesso na SaÃda de Uma Página"
-"One item of products do not have identifier or sku","Um item de produtos não têm identificador ou sku"
-"One item of products is not belong any of quote item","Um item de produtos não pertence a qualquer item citado"
-"Order","Ordem #"
-"Order Review","Revisão da Ordem"
-"Order Success","Sucesso da Ordem"
-"Order place error.","Erro de colocação da ordem."
-"Other Items in Your Order","Outros itens em Sua Ordem"
-"Overview Items After","Resumo Geral de Itens Depois"
-"Password","Senha"
-"Payment Failed Email Reciever","Recetor do Email de Pagamento Falhado"
-"Payment Failed Email Sender","Remetente do Email de Pagamento Falhado"
-"Payment Failed Emails","Emails de Pagamento Falhado"
-"Payment Failed Template","Modelo de Pagamento Falhado"
+Country,PaÃs
+State/Province,Estado/ProvÃncia
+"Billing Information","Dados de Faturamento"
+"Checkout Method","Método para Encerrar Compra"
"Payment Information","Informação de Pagamento"
-"Payment Method","Método de Pagamento"
-"Payment Methods After Checkout Button","Método de Pagamento Após Botão de Checkout"
-"Payment Methods Before Checkout Button","Método de Pagamento Antes de Botão de Checkout"
-"Payment method information","Informação de método de pagamento"
-"Payment method is not defined","Método de pagamento não definido"
-"Payment methods in shopping cart","Método de pagamento no carrinho de compras"
-"Payment profile # %s: ""%s"".","Perfil de pagamento # %s: ""%s""."
-"Place Order","Colocar Ordem"
-"Please agree to all Terms and Conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem."
-"Please agree to all Terms and Conditions before placing the orders.","Por favor concorde com todos os Termos e Condições antes de colocar as ordens."
+"Order Review","Revisão da Ordem"
+"Shipping Information","Dados de Frete"
+"Shipping Method","Tipo de Frete"
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.","O checkout de uma página está desativado."
+Checkout,"Encerrar Compra"
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
"Please agree to all the terms and conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem."
-"Please check billing address information.","Por favor cheque as informações do endereço de cobrança."
-"Please check shipping address information.","Por favor cheque as informações do endereço de envio."
-"Please check shipping addresses information.","Por favor cheque as informações dos endereços de envio."
-"Please choose to register or to checkout as a guest","Por favor escolha registrar ou fazer checkout como um convidado"
-"Please log in below:","Por favor, faça o login abaixo:"
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.","O produto não existe."
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart","Exibir número de itens no carrinho"
+"Display item quantities","Exibir quantidades do item"
+"Load customer quote error","Carregar erro de orçamento do cliente"
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes","Códigos de Desconto"
+"Enter your code","Enter your code"
+"Apply Coupon","Aplicar Coupon"
+"Cancel Coupon","Cancelar Cupom"
+"Continue Shopping","Continuar Comprando"
+"Update Shopping Cart","Atualização do Carrinho de Compras"
+"Clear Shopping Cart","Limpar Carrinho de Compras"
+"Update Cart","Atualizar Carrinho"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)","Item(ns) adicionado(s) recentemente"
+"You have no items in your shopping cart.","Você não possui itens no carrinho de compras."
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?","Tem certeza de que deseja remover este item do carrinho de compras?"
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax","Cálculo Estimado de Frete e Imposto"
+"Enter your destination to get a shipping estimate.","Informe seu destino, para cálculo estimado do frete."
"Please select region, state or province","Selecione a região, estado ou provÃncia"
-"Please select shipping address for applicable items","Por favor selecione endereço de entrega para os itens aplicáveis"
-"Please select shipping methods for all addresses","Por favor selecione os métodos de transporte para todos os endereços"
-"Please select valid payment method.","Por favor selecione uma forma de pagamento válida."
-"Please specify payment method.","Por favor especifique o método de pagamento."
-"Please specify shipping method.","Por favor especifique o método de envio."
-"Please specify shipping methods for all addresses.","Por favor especifique as formas de envio para todos os endereços."
-"Price","Preço"
+City,Cidade
+"Zip/Postal Code","Zip/Código Postal"
+"Get a Quote","Receber Orçamento"
+"Update Total","Atualizar Total"
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item","Editar Item"
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...","Carregando próximo passo..."
+"Select a billing address from your address book or enter a new address.","Selecione um endereço de cobrança de seu catálogo de endereços ou insira um novo endereço"
+"Email Address","Endereço de e-mail"
+Company,Companhia
+"VAT Number","Número VAT"
+Address,Endereço
+"Street Address","Endereço da Rua"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Senha
+"Confirm Password","Confirmar a senha"
+"Save in address book","Salvar no catálogo de endereços"
+"Ship to this address","Enviar para este endereço"
+"Ship to different address","Enviar para endereço diferente"
+Continue,Continue
+"Order #","Order #"
"Proceed to Checkout","Prosseguir para a verificação"
-"Product","Produto"
-"Product","Nome do produto"
-"Products","Produtos"
-"Quantity","Quant."
-"Quantity:","Quantidade:"
-"Quantity was recalculated from %d to %d","A quantidade foi recalculada de %d para %d"
-"Quote Lifetime (days)","Duração de cotação (dias)"
-"Quote item does not exist.","O item da cotação não existe."
-"Quote item is not found.","O item da cotação não foi encontrado."
-"Recently added item(s)","Item(ns) adicionado(s) recentemente"
-"Register","Registrar"
-"Register and save time!","Cadastre-se e poupe tempo!"
+Login,Conectar-se
+"Already registered?","Já está registado?"
+"Please log in below:","Por favor, faça o login abaixo:"
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register","Checkout como um Visitante ou se Registe"
+"Checkout as a Guest","Checkout as a Guest"
"Register to Create an Account","Cadastre-se para Criar uma Conta"
+"Register and save time!","Cadastre-se e poupe tempo!"
"Register with us for future convenience:","Faça um cadastro conosco para ter comodidade no futuro:"
-"Remove Item","Remover Item"
-"Remove This Item","Remover Este Item"
-"Remove coupon code from shopping cart","Remover código do cupom do carrinho de compras"
-"Remove item","Remover item"
-"Remove product from shopping cart","Remover produto do carrinho de compras"
-"Remove product(s) from shopping cart","Remover produto(s) do carrinho de compras"
-"Require Customer To Be Logged In To Checkout","Requerer que o cliente esteja logado para fazer checkout"
-"Retrieve information about shopping cart","Recuperar informações sobre o carrinho de compras"
-"Review Order","Analisar o pedido"
-"Review Order - %s","Analisar o pedido - %s"
-"Sales","Vendas"
-"Save Condition","Salvar Condição"
-"Save in address book","Salvar no catálogo de endereços"
-"See price before order confirmation.","Ver preço antes de confirmar pedido."
-"Select Address","Selecionar Endereço"
-"Select Addresses","Selecionar Endereços"
-"Select Shipping Method","Selecionar Tipo de Frete"
-"Select State/Province...","Selecione Estado/ProvÃncia..."
-"Select a billing address from your address book or enter a new address.","Selecione um endereço de cobrança de seu catálogo de endereços ou insira um novo endereço"
-"Select a shipping address from your address book or enter a new address.","Selecione um endereço para envio do seu livro de endereços ou insira um novo endereço."
-"Send Payment Failed Email Copy Method","Falha no Envio de Pagamento - Enviar Por Email"
-"Send Payment Failed Email Copy To","Falha no Envio de Pagamento - Enviar Por Email para"
-"Send To","Enviar Para"
-"Separate by "","".","Separados por "",""."
-"Set customer for shopping cart","Configurar cliente para carrinho de compras"
-"Set customer's addresses in shopping cart","Configurar endereços de clientes para carrinho de compras"
-"Set payment method","Configurar método de pagamento"
-"Set shipping method","Configurar tipo de frete"
-"Ship to Multiple Addresses","Entregar em Vários Endereços"
-"Ship to different address","Enviar para endereço diferente"
-"Ship to this address","Enviar para este endereço"
+"Fast and easy check out","Checkout rápido e fácil"
+"Easy access to your order history and status","Fácil acesso ao seu histórico de pedidos e estado"
+"Checkout as Guest","Checkout como Visitante"
+Register,Registrar
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress","Progresso de seu Pagamento"
+"Billing Address","Endereço de faturamento"
"Shipping Address","Endereço de Envio"
-"Shipping Information","Dados de Frete"
-"Shipping Method","Tipo de Frete"
-"Shipping Methods","Tipos de Frete"
-"Shipping To","Enviar Para"
-"Shipping information","Informação de Envio"
"Shipping method has not been selected yet","Método de envio ainda não foi selecionado"
-"Shipping methods in shopping cart","Métodos de envio no carrinho de compras"
-"Shipping selection is not applicable.","Seleção de envio não é aplicável"
-"Shopping Cart","Carrinho de compras"
-"Shopping Cart Form Before","Anterior Formulário de Carrinho de Compras"
-"Shopping Cart Sidebar","Barra Lateral do Carrinho de Compras"
-"Shopping Cart Sidebar Extra Actions","Ações Extra da Barra Lateral do Carrinho de Compras"
-"Shopping Cart is Empty","Carrinho de Compras está Vazio"
-"Shopping cart ability to set coupon code","Capacidade do carrinho de compras para definir código de cupom"
-"Show Content as","Mostrar Conteúdo como"
-"Some of the requested products are not available in the desired quantity.","Alguns dos produtos solicitados não estão disponÃveis na quantidade desejada."
-"Some of the requested products are unavailable.","Alguns dos produtos solicitados não estão disponÃveis."
-"Some products quantities were recalculated because of quantity increment mismatch","Algumas quantidades de produtos foram recalculadas por causa de incompatibilidade no incremento da quantidade"
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Desculpe, o checkout de convidado não está ativado. Por favor tente novamente ou entre em contato com o proprietário da loja."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Desculpe, o checkout de convidado não é permitido. Por favor tente novamente ou entre em contato com o proprietário da loja."
+"Payment Method","Método de Pagamento"
+"Place Order","Colocar Ordem"
+"Forgot an Item?","Esqueceu algum item?"
+"Edit Your Cart","Editar Seu Carrinho"
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.","Selecione um endereço para envio do seu livro de endereços ou insira um novo endereço."
+"Use Billing Address","Use Endereço de Cobrança"
"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponÃveis neste momento para esta ordem."
-"State/Province","Estado/ProvÃncia"
-"Status","Status"
-"Store View","Visualização da loja"
-"Street Address","Endereço da Rua"
-"Street Address %s","Endereço da Rua %s"
-"Submitting order information...","Enviando informações da ordem..."
-"Subtotal","Subtotal"
-"Subtotal must exceed minimum order amount","O subtotal precisa exceder a quantidade mÃnima de pedido"
-"Phone","Telefone"
-"Terms and Conditions","Termos e Condições"
-"Terms and Conditions Information","Informação de Termos e Condições"
-"Terms and conditions","Termos e Condições"
-"Text","Texto"
"Thank you for your purchase!","Obrigado por sua compra!"
-"The condition has been deleted","A condição foi apagada"
-"The condition has been saved.","A condição foi salva."
-"The onepage checkout is disabled.","O checkout de uma página está desativado."
-"The product could not be found.","O produto não pôde ser encontrado."
-"The product does not exist.","O produto não existe."
-"There are <a href=""%s"">%s items</a> in your cart.","Há <a href=""%s"">%s itens</a> no seu carrinho."
-"There is <a href=""%s"">1 item</a> in your cart.","Há <a href=""%s"">1 item</a> no seu carrinho."
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Já há um usuário registrado usando esse endereço de e-mail. Por favor faça login usando esse endereço de e-mail ou informe um endereço de e-mail diferente para registrar a sua conta."
-"There was an error processing your order. Please contact us or try again later.","Ocorreu um erro ao processar sua ordem. Entre em contato conosco ou tente novamente mais tarde."
-"This condition no longer exists.","Esta condição não existe mais."
-"Total","Total"
-"Total for this address","Total para este endereço"
-"Unable to set Payment Method.","Não é possÃvel definir o Método de Pagamento."
-"Unit Price","Preço Unitário"
-"Update Cart","Atualizar Carrinho"
-"Update Quantity & Addresses","Atualização de Quantidade e Endereços"
-"Update Shopping Cart","Atualização do Carrinho de Compras"
-"Update Total","Atualizar Total"
-"Update product quantities in shopping cart","Atualizar quantidades de produtos no carrinho de compras"
-"Update product(s) quantities in shopping cart","Atualizar quantidades de produto(s) no carrinho de compras"
-"Use Billing Address","Use Endereço de Cobrança"
-"VAT Number","Número VAT"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Estamos processando o seu pedido e em breve você receberá um email com detalhes da ordem. Uma vez que o pedido seja enviado você receberá outro email com um link para acompanhar seu progresso."
-"What's this?","O que é isso?"
-"You have no items in your shopping cart.","Você não possui itens no carrinho de compras."
+"Your order # is: %1.","Your order # is: %1."
"You will receive an order confirmation email with details of your order and a link to track its progress.","Você irá receber um e-mail de confirmação de pedido com detalhes de seu pedido e um link para acompanhar o progresso."
-"Your Checkout Progress","Progresso de seu Pagamento"
-"Your order # is: %s.","Seu pedido # está: %s."
-"Your order cannot be completed at this time as there is no payment methods available for it.","Seu pedido não pode ser concluÃdo neste momento pois não há métodos de pagamento disponÃveis para ele."
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Seu pedido não pode ser concluÃdo neste momento pois não há métodos de envio disponÃveis para ele. Por favor faça as mudanças necessárias no seu endereço de envio."
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.","Por favor especifique o método de pagamento."
+"Please agree to all Terms and Conditions before placing the orders.","Por favor concorde com todos os Termos e Condições antes de colocar as ordens."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"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."
-"Your order number is ","O número do seu pedido é"
-"Your recurring payments:","Seus perfis de pagamentos recorrentes:"
-"Zip/Postal Code","Zip/Código Postal"
diff --git a/app/code/Magento/Checkout/i18n/zh_CN.csv b/app/code/Magento/Checkout/i18n/zh_CN.csv
index 4889bcf7316..5f6e8376b37 100644
--- a/app/code/Magento/Checkout/i18n/zh_CN.csv
+++ b/app/code/Magento/Checkout/i18n/zh_CN.csv
@@ -1,332 +1,180 @@
-"%s was added to your shopping cart.","%s å·²æ·»åŠ åˆ°æ‚¨çš„è´ç‰©è½¦ã€‚"
-"%s was updated in your shopping cart.","您的è´ç‰©è½¦ä¸çš„ %s 已更新。"
-"* Required Fields","*å¿…è¦å—段"
-"Add New Address","æ·»åŠ æ–°åœ°å€"
-"Add New Condition","æ·»åŠ æ–°æ¡ä»¶"
-"Add coupon code for shopping cart","为è´ç‰©è½¦æ·»åŠ ä¼˜æƒ ä»£ç "
-"Add gift messages to shopping cart","æ·»åŠ ç¤¼å“消æ¯åˆ°è´ç‰©è½¦"
-"Add product to shopping cart","æ·»åŠ äº§å“到è´ç‰©è½¦"
-"Add product(s) to shopping cart","æ·»åŠ äº§å“到è´ç‰©è½¦"
-"Add to Cart","æ·»åŠ åˆ°è´ç‰©è½¦"
-"Add to Compare","æ·»åŠ å¹¶æ¯”è¾ƒ"
-"Add to Wishlist","æ·»åŠ åˆ°æ”¶è—"
-"Additional Product Info","é¢å¤–产å“ä¿¡æ¯"
-"Address","地å€"
-"Address %s of %s","åœ°å€ %s，共 %s 个地å€"
-"After Adding a Product Redirect to Shopping Cart","æ·»åŠ äº§å“åŽé‡å®šå‘至è´ç‰©è½¦"
-"Allow Guest Checkout","å…许æ¥å®¾ç»“è´¦"
-"Already registered?","已注册？"
-"An error occurred in the process of payment","支付æµç¨‹å‘生错误"
-"An error occurred while deleting this condition.","å½“åˆ é™¤è¯¥æ¡ä»¶æ—¶å‘生错误。"
-"An error occurred while saving this condition.","当ä¿å˜è¯¥æ¡ä»¶æ—¶å‘生错误。"
-"Apply Coupon","åº”ç”¨ä¼˜æƒ åˆ¸"
-"Are you sure you would like to remove this item from the shopping cart?","您确认è¦ä»Žè´ç‰©è½¦ä¸åˆ 除该项目å—？"
-"Back","返回"
-"Back to Billing Information","返回到账å•ä¿¡æ¯"
-"Back to Select Addresses","返回到选择地å€"
-"Back to Shipping Information","返回到è¿é€ä¿¡æ¯"
-"Back to Shopping Cart","返回到è´ç‰©è½¦"
-"Based on your selection, you may be interested in the following items:","æ ¹æ®æ‚¨çš„选择，您å¯èƒ½å¯¹ä¸‹åˆ—内容感兴趣："
-"Billing Address","è´¦å•åœ°å€"
-"Billing Information","è´¦å•ä¿¡æ¯"
-"Billing Information - %s","è´¦å•ä¿¡æ¯ - %s"
-"Cancel Coupon","å–æ¶ˆä¼˜æƒ åˆ¸"
-"Cannot add item to the shopping cart.","æ— æ³•æ·»åŠ é¡¹ç›®åˆ°è´ç‰©è½¦ã€‚"
-"Cannot add the item to shopping cart","æ— æ³•æ·»åŠ è¯¥é¡¹ç›®åˆ°è´ç‰©è½¦"
-"Cannot add the item to shopping cart.","æ— æ³•æ·»åŠ è¯¥é¡¹ç›®åˆ°è´ç‰©è½¦ã€‚"
-"Cannot apply the coupon code.","æ— æ³•åº”ç”¨ä¼˜æƒ ä»£ç 。"
-"Cannot configure product.","æ— æ³•é…置产å“。"
-"Cannot open the overview page","æ— æ³•æ‰“å¼€æ¦‚è§ˆé¡µé¢"
-"Cannot process the item.","æ— æ³•å¤„ç†è¯¥é¡¹ç›®ã€‚"
-"Cannot remove the item.","æ— æ³•ç§»é™¤é¡¹ç›®ã€‚"
-"Cannot update shopping cart.","æ— æ³•æ›´æ–°è´ç‰©è½¦ã€‚"
-"Cannot update the item.","æ— æ³•æ›´æ–°è¯¥é¡¹ç›®ã€‚"
-"Card Verification Number Visual Reference","信用å¡éªŒè¯å·ç 视觉å‚考"
-"Cart Product API","è´ç‰©è½¦äº§å“ API"
-"Cart Subtotal:","è´ç‰©è½¦å°è®¡ï¼š"
-"Change","更改"
-"Change Billing Address","更改账å•åœ°å€"
-"Checkbox Text","å¤é€‰æ¡†æ–‡æœ¬"
-"Checkout","结账"
-"Checkout Conditions","支付æ¡ä»¶"
-"Checkout Method","支付方法"
-"Checkout Options","支付选项"
-"Checkout Progress Wrapper","支付进度å°è£…器"
-"Checkout Section","支付区域"
-"Checkout Terms and Conditions","结账æ¡æ¬¾å’Œæƒ…况"
-"Checkout as Guest","作为æ¥å®¾ç»“è´¦"
-"Checkout as a Guest or Register","以æ¥å®¾èº«ä»½ç»“账或注册"
-"Checkout with Multiple Addresses","按多个地å€æ”¯ä»˜"
-"City","城市"
-"Clear Shopping Cart","清空è´ç‰©è½¦"
-"Click <a href=""%s"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","å•å‡»<a href=""%s"">这里æ¥æ‰“å°</a>您订å•ç¡®è®¤ä¿¡æ¯çš„æ‹·è´ã€‚"
-"Click <a href=""%s"">here</a> to continue shopping.","å•å‡»<a href=""%s"">这里</a>æ¥ç»§ç»è´ç‰©ã€‚"
-"Close","å…³é—"
-"Company","å…¬å¸"
-"Condition Name","æ¡ä»¶å称"
-"Configure Cart Item","é…ç½®è´ç‰©è½¦é¡¹ç›®"
-"Confirm Password","确认密ç "
-"Content","内容"
-"Content Height","内容高度"
-"Content Height (css)","内容高度 (css)"
-"Continue","继ç»"
-"Continue Shopping","继ç»è´ç‰©"
-"Continue to Billing Information","继ç»ä»¥æŸ¥çœ‹è´¦å•ä¿¡æ¯"
-"Continue to Review Your Order","继ç»ä»¥æŸ¥çœ‹è®¢å•"
-"Continue to Shipping Information","继ç»ä»¥æŸ¥çœ‹è¿é€ä¿¡æ¯"
-"Country","国家"
-"Coupon code ""%s"" is not valid.","ä¼˜æƒ åˆ¸ä»£ç “%sâ€æ— 效。"
-"Coupon code ""%s"" was applied.","ä¼˜æƒ ä»£ç “%sâ€å·²åº”用。"
-"Coupon code was canceled.","ä¼˜æƒ ä»£ç 已被å–消。"
-"Create Billing Address","创建账å•åœ°å€"
-"Create Shipping Address","创建è¿é€åœ°å€"
-"Create an order from shopping cart","从è´ç‰©è½¦åˆ›å»ºè®¢å•"
-"Create shopping cart","创建è´ç‰©è½¦"
-"Customer Address is not valid.","客户地å€æ— 效。"
-"Customer Information","客户信æ¯"
-"Customer's information","客户信æ¯"
-"Data saving problem","æ•°æ®ä¿å˜é—®é¢˜"
-"Default Billing","默认账å•"
-"Default Shipping","默认è¿é€"
-"Delete Condition","åˆ é™¤æ¡ä»¶"
-"Details","详情"
-"Disabled","å·²ç¦ç”¨"
-"Discount Codes","折扣代ç "
-"Display Cart Summary","显示è´ç‰©è½¦æ¦‚è¦"
-"Display Shopping Cart Sidebar","显示è´ç‰©è½¦ä¾§è¾¹æ "
-"Display item quantities","显示项目数é‡"
-"Display number of items in cart","显示è´ç‰©è½¦ä¸é¡¹ç›®çš„æ•°é‡"
-"Display number of items in wishlist","显示愿望列表ä¸é¡¹ç›®çš„æ•°é‡"
-"Easy access to your order history and status","è½»æ¾è®¿é—®æ‚¨çš„订å•åŽ†å²è®°å½•å’ŒçŠ¶æ€"
-"Edit","编辑"
-"Edit Address","编辑地å€"
-"Edit Billing Address","编辑账å•åœ°å€"
-"Edit Condition","编辑æ¡ä»¶"
-"Edit Items","编辑项目"
-"Edit Shipping Address","编辑è¿é€åœ°å€"
-"Edit Terms and Conditions","编辑æ¡æ¬¾å’Œæ¡ä»¶"
-"Edit Your Cart","编辑您的è´ç‰©è½¦"
-"Edit item","编辑项目"
-"Edit item parameters","编辑项目å‚æ•°"
-"Email Address","编辑电å邮件地å€"
-"Enable Onepage Checkout","å¯ç”¨å•é¡µé¢ç»“è´¦"
-"Enable Terms and Conditions","å¯ç”¨æ¡æ¬¾å’Œæ¡ä»¶"
-"Enabled","å·²å¯ç”¨"
-"Enter a New Address","输入新地å€"
-"Enter your coupon code if you have one.","å¦‚æžœæ‚¨æœ‰ä¼˜æƒ ä»£ç ，请输入。"
-"Enter your destination to get a shipping estimate.","输入您的目的地æ¥èŽ·å¾—预计è¿é€ä¿¡æ¯ã€‚"
-"Estimate Shipping and Tax","预计è¿è´¹å’Œç¨Žè´¹"
-"Excl. Tax","ä¸å«ç¨Ž"
-"Fast and easy check out","方便快æ·çš„结账"
-"Fax","ä¼ çœŸ"
-"Forgot an Item?","忘记æŸä¸ªé¡¹ç›®ï¼Ÿ"
-"Forgot your password?","忘记您的密ç ？"
-"Get a Quote","获得报价"
-"Get list of available payment methods","获得å¯ç”¨æ”¯ä»˜æ–¹æ³•çš„列表"
-"Get list of available shipping methods","获得å¯ç”¨è¿é€æ–¹å¼çš„列表"
-"Get list of products in shopping cart","获得è´ç‰©è½¦ä¸çš„产å“列表"
-"Get terms and conditions","获å–æ¡æ¬¾å’Œæ¡ä»¶"
-"Get total prices for shopping cart","获得è´ç‰©è½¦ä¸æ€»ä»·æ ¼"
-"Gift Message","礼å“消æ¯"
-"Grand Total:","总计："
-"HTML","HTML"
-"ID","ID"
-"Incl. Tax","å«ç¨Ž"
-"Invalid checkout type.","æ— æ•ˆçš„ç»“è´¦ç±»åž‹ã€‚"
-"Invalid data.","æ— æ•ˆæ•°æ®ã€‚"
-"Invalid email address ""%s""","æ— æ•ˆçš„ç”µåé‚®ä»¶åœ°å€ ""%s"""
-"Invalid method: %s","æ— æ•ˆçš„æ–¹æ³•ï¼š%s"
-"Invalid shipping method.","è¿é€æ–¹æ³•æ— 效。"
-"Item not found or already ordered","æ— æ³•æ‰¾åˆ°é¡¹ç›®ï¼Œæˆ–é¡¹ç›®å·²è¢«è®¢è´"
-"Items","项目"
-"Items After","项目晚于"
-"Items Before","之å‰çš„项目"
-"Load customer quote error","载入客户报价错误"
-"Loading next step...","æ£åœ¨è½½å…¥ä¸‹ä¸€æ¥..."
-"Login","登录"
-"Login/Registration Before","登录/注册早于"
-"Manage Terms and Conditions","管ç†æ¡æ¬¾ä¸Žåè®®"
-"Maximum Display Recently Added Item(s)","æœ€å¤§æ˜¾ç¤ºè¿‘æœŸæ·»åŠ çš„é¡¹ç›®"
-"Maximum qty allowed for Shipping to multiple addresses is %s","è¿é€åˆ°å¤šä¸ªåœ°å€æ‰€å…许的最大数é‡ä¸º %s"
-"Minimum order amount is %s","最å°è®¢è´æ•°é‡ä¸º %s"
-"Move","移动"
-"Move to Wishlist","移动到愿望清å•"
-"Multishipping Checkout","多é‡è¿é€ç»“è´¦"
-"Multishipping Checkout Address (Any) Form","多é‡è¿é€åœ°å€ï¼ˆä»»ä½•ï¼‰è¡¨å•"
-"Multishipping Checkout Billing Address Creation","多é‡è¿é€è´¦å•åœ°å€åˆ›å»º"
-"Multishipping Checkout Billing Address Edit Form","多é‡ç»“账账å•åœ°å€ç¼–辑表å•"
-"Multishipping Checkout Billing Address Selection","多é‡è¿é€ç»“账账å•åœ°å€é€‰æ‹©"
-"Multishipping Checkout Billing Information Step","多é‡è¿é€è´¦å•ä¿¡æ¯æ¥éª¤"
-"Multishipping Checkout Customer Address Edit Form","多é‡è¿é€ç»“账客户地å€ç¼–辑表å•"
-"Multishipping Checkout Overview","多é‡è¿é€ç»“账概览"
-"Multishipping Checkout Shipping Address Creation","多é‡è¿é€ç»“è´¦è¿é€åœ°å€åˆ›å»º"
-"Multishipping Checkout Shipping Address Edit Form","多é‡è¿é€ç»“è´¦è¿é€åœ°å€ç¼–辑表å•"
-"Multishipping Checkout Shipping Address Selection","多é‡è¿é€ç»“è´¦è¿é€åœ°å€é€‰æ‹©"
-"Multishipping Checkout Shipping Information Step","多é‡è¿é€ç»“è´¦è¿é€ä¿¡æ¯æ¥éª¤"
-"Multishipping Checkout Success","多é‡è¿é€ç»“è´¦æˆåŠŸ"
-"My Cart","我的è´ç‰©è½¦"
-"My Cart (%s item)","我的è´ç‰©è½¦ï¼ˆ%s 个项目）"
-"My Cart (%s items)","我的è´ç‰©è½¦ï¼ˆ%s 个项目）"
-"My Cart Link","我的è´ç‰©è½¦é“¾æŽ¥"
-"New Address","新地å€"
-"New Condition","æ–°æ¡ä»¶"
-"New Terms and Conditions","新建æ¡æ¬¾ä¸Žåè®®"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","æ交订å•å‰å°†æ˜¾ç¤ºè®¢è´çš„总数"
-"One Page Checkout","å•é¡µé¢ç»“è´¦"
-"One Page Checkout Failure","å•é¡µé¢ç»“账失败"
-"One Page Checkout Overview","å•é¡µé¢ç»“账概览"
-"One Page Checkout Success","å•é¡µé¢ç»“è´¦æˆåŠŸ"
-"One item of products do not have identifier or sku","产å“ä¸çš„一个项目ä¸åŒ…å«æ ‡è¯†æˆ– SKU"
-"One item of products is not belong any of quote item","产å“ä¸çš„一个项目ä¸å±žäºŽä»»ä½•æŠ¥ä»·é¡¹ç›®"
-"Order #","è®¢å• #"
-"Order Review","订å•æ€»è§ˆ"
-"Order Success","订è´æˆåŠŸ"
-"Order place error.","æ交订å•é”™è¯¯ã€‚"
-"Other Items in Your Order","您订å•ä¸çš„其它项目"
-"Overview Items After","项目概览"
-"Password","密ç "
-"Payment Failed Email Reciever","支付失败电å邮件接收者"
-"Payment Failed Email Sender","支付失败电å邮件å‘é€è€…"
-"Payment Failed Emails","支付失败电å邮件"
-"Payment Failed Template","支付失败模æ¿"
-"Payment Information","支付信æ¯"
-"Payment Method","支付方å¼"
-"Payment Methods After Checkout Button","按下结账按钮åŽçš„支付方å¼"
-"Payment Methods Before Checkout Button","按下结账按钮å‰çš„支付方å¼"
-"Payment method information","支付方å¼ä¿¡æ¯"
-"Payment method is not defined","支付方å¼æœªå®šä¹‰"
-"Payment methods in shopping cart","è´ç‰©è½¦ä¸çš„支付方å¼"
-"Payment profile # %s: ""%s"".","支付资料 # %s: ""%s""。"
-"Place Order","下订å•"
-"Please agree to all Terms and Conditions before placing the order.","请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚"
-"Please agree to all Terms and Conditions before placing the orders.","请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚"
-"Please agree to all the terms and conditions before placing the order.","请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚"
-"Please check billing address information.","请检查账å•åœ°å€ä¿¡æ¯ã€‚"
-"Please check shipping address information.","请检查è¿é€åœ°å€ä¿¡æ¯ã€‚"
-"Please check shipping addresses information.","请检查è¿é€åœ°å€ä¿¡æ¯ã€‚"
-"Please choose to register or to checkout as a guest","请选择地区或以æ¥å®¾èº«ä»½ç»“è´¦"
-"Please log in below:","请在下é¢ç™»å½•ï¼š"
-"Please select region, state or province","请选择地区ã€å·žï¼Œæˆ–çœ"
-"Please select shipping address for applicable items","请为适用项目选择è¿é€åœ°å€"
-"Please select shipping methods for all addresses","请为所有地å€é€‰æ‹©è¿é€æ–¹å¼"
-"Please select valid payment method.","请选择有效的支付方法。"
-"Please specify payment method.","请指定支付方å¼ã€‚"
-"Please specify shipping method.","请指定å‘货方å¼ã€‚"
-"Please specify shipping methods for all addresses.","请为所有地å€åˆ¶å®šè¿é€æ–¹å¼ã€‚"
-"Price","ä»·æ ¼"
-"Proceed to Checkout","进行结账"
-"Product","产å“"
-"Product Name","产å“å"
-"Products","产å“"
-"Qty","æ•°é‡"
-"Qty:","æ•°é‡ï¼š"
-"Quantity was recalculated from %d to %d","æ•°é‡å·²é‡æ–°è®¡ç®—，从 %d 到 %d"
-"Quote Lifetime (days)","报价生命期（天）"
-"Quote item does not exist.","报价项目ä¸å˜åœ¨ã€‚"
-"Quote item is not found.","报价项目未找到。"
-"Recently added item(s)","æœ€è¿‘æ·»åŠ çš„é¡¹ç›®"
-"Register","注册"
-"Register and save time!","注册并节约时间ï¼"
-"Register to Create an Account","注册以创建å¸æˆ·"
-"Register with us for future convenience:","在这里注册以åŽå¯ä»¥æ›´æ–¹ä¾¿ï¼š"
-"Remove Item","åˆ é™¤é¡¹ç›®"
-"Remove This Item","åˆ é™¤è¯¥å†…å®¹"
-"Remove coupon code from shopping cart","从è´ç‰©è½¦ä¸åˆ é™¤ä¼˜æƒ ä»£ç "
-"Remove item","åˆ é™¤é¡¹ç›®"
-"Remove product from shopping cart","从è´ç‰©è½¦ä¸åˆ 除产å“"
-"Remove product(s) from shopping cart","从è´ç‰©è½¦ä¸åˆ 除产å“"
-"Require Customer To Be Logged In To Checkout","需è¦é¡¾å®¢ç™»å½•æ‰èƒ½ç»“è´¦"
-"Retrieve information about shopping cart","获å–关于è´ç‰©è½¦çš„ä¿¡æ¯"
-"Review Order","查看订å•"
-"Review Order - %s","æŸ¥çœ‹è®¢å• - %s"
-"Sales","销售"
-"Save Condition","ä¿å˜æ¡ä»¶"
-"Save in address book","ä¿å˜åˆ°åœ°å€ç°¿"
-"See price before order confirmation.","确认订å•å‰æ˜¾ç¤ºä»·æ ¼ã€‚"
-"Select Address","选择地å€"
-"Select Addresses","选择地å€"
-"Select Shipping Method","选择è¿é€æ–¹å¼"
-"Select State/Province...","选择州/çœ..."
-"Select a billing address from your address book or enter a new address.","从您的地å€ç°¿é€‰æ‹©è´¦å•åœ°å€ï¼Œæˆ–输入新地å€ã€‚"
-"Select a shipping address from your address book or enter a new address.","从您的地å€ç°¿é€‰æ‹©å‘货地å€ï¼Œæˆ–输入新地å€ã€‚"
-"Send Payment Failed Email Copy Method","å‘é€æ”¯ä»˜å¤±è´¥ç”µå邮件å¤åˆ¶æ–¹æ³•"
-"Send Payment Failed Email Copy To","å‘é€æ”¯ä»˜å¤±è´¥ç”µå邮件拷è´è‡³"
-"Send To","å‘é€è‡³"
-"Separate by "","".","以“,â€åˆ†éš”。"
-"Set customer for shopping cart","设置客户的è´ç‰©è½¦"
-"Set customer's addresses in shopping cart","设置è´ç‰©è½¦ä¸å®¢æˆ·çš„地å€"
-"Set payment method","设置支付方法"
-"Set shipping method","设置è¿é€æ–¹å¼"
-"Ship to Multiple Addresses","è¿é€åˆ°å¤šä¸ªåœ°å€"
-"Ship to different address","é€è´§åˆ°ä¸åŒåœ°å€"
-"Ship to this address","é€è´§åˆ°è¿™ä¸ªåœ°å€"
-"Shipping Address","é€è´§åœ°å€"
-"Shipping Information","è¿é€ä¿¡æ¯"
-"Shipping Method","è¿é€æ–¹å¼"
-"Shipping Methods","è¿é€æ–¹å¼"
-"Shipping To","è¿é€è‡³"
-"Shipping information","è¿é€ä¿¡æ¯"
-"Shipping method has not been selected yet","è¿é€æ–¹å¼å°šæœªè¢«é€‰æ‹©"
-"Shipping methods in shopping cart","è´ç‰©è½¦ä¸çš„è¿é€æ–¹å¼"
-"Shipping selection is not applicable.","è¿é€é€‰æ‹©ä¸é€‚用。"
-"Shopping Cart","è´ç‰©è½¦"
-"Shopping Cart Form Before","è´ç‰©è½¦å½¢æˆä»¥å‰"
-"Shopping Cart Sidebar","è´ç‰©è½¦ä¾§è¾¹æ "
-"Shopping Cart Sidebar Extra Actions","è´ç‰©è½¦ä¾§è¾¹æ é¢å¤–æ“作"
-"Shopping Cart is Empty","è´ç‰©è½¦ä¸ºç©º"
-"Shopping cart ability to set coupon code","è´ç‰©è½¦è®¾ç½®ä¼˜æƒ 代ç "
-"Show Content as","显示内容为"
-"Some of the requested products are not available in the desired quantity.","部分已请求的产å“ä¸ç¬¦åˆéœ€æ±‚çš„æ•°é‡ã€‚"
-"Some of the requested products are unavailable.","部分已请求的产å“æš‚æ— ä¾›åº”ã€‚"
-"Some products quantities were recalculated because of quantity increment mismatch","由于数é‡å¢žé‡ä¸åŒ¹é…，部分产å“æ•°é‡å·²è¢«é‡æ–°è®¡ç®—"
-"Sorry, guest checkout is not enabled. Please try again or contact store owner.","很抱æ‰ï¼Œæ¥å®¾ç»“账尚未å¯ç”¨ã€‚请é‡è¯•æˆ–è”系商店店主。"
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","对ä¸èµ·ï¼Œä¸å…许æ¥å®¾ç»“账。请é‡è¯•æˆ–è”系店主。"
-"Sorry, no quotes are available for this order at this time.","抱æ‰ï¼Œå½“å‰è¯¥è®¢å•ä¸æ²¡æœ‰æŠ¥ä»·å¯ç”¨ã€‚"
-"State/Province","å·ž/çœ"
-"Status","状æ€"
-"Store View","店铺视图"
-"Street Address","è¡—é“地å€"
-"Street Address %s","è¡—é“åœ°å€ %s"
-"Submitting order information...","æ£åœ¨æ交订å•ä¿¡æ¯..."
-"Subtotal","å°è®¡"
-"Subtotal must exceed minimum order amount","总数必须超出å…许订è´çš„最å°æ•°é‡"
-"Telephone","电è¯"
-"Terms and Conditions","æ¡æ¬¾å’Œæ¡ä»¶"
-"Terms and Conditions Information","æ¡æ¬¾å’Œæ¡ä»¶ä¿¡æ¯"
-"Terms and conditions","æ¡æ¬¾å’Œæ¡ä»¶"
-"Text","æ–‡å—"
-"Thank you for your purchase!","感谢您的è´ä¹°ï¼"
-"The condition has been deleted","æ¡ä»¶å·²è¢«åˆ 除"
-"The condition has been saved.","æ¡ä»¶å·²ä¿å˜ã€‚"
-"The onepage checkout is disabled.","å•é¡µé¢ç»“账已被ç¦ç”¨ã€‚"
-"The product could not be found.","æ— æ³•æ‰¾åˆ°äº§å“。"
-"The product does not exist.","产å“ä¸å˜åœ¨ã€‚"
-"There are <a href=""%s"">%s items</a> in your cart.","您的è´ç‰©è½¦ä¸æœ‰ <a href=""%s"">%s 个项目</a>。"
-"There is <a href=""%s"">1 item</a> in your cart.","您的è´ç‰©è½¦ä¸æœ‰ <a href=""%s"">1 个项目</a>。"
-"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","å·²å˜åœ¨ä½¿ç”¨æ¤ç”µå邮件地å€æ³¨å†Œçš„客户。请使用æ¤ç”µå邮件登录或输入ä¸åŒçš„电å邮件地å€æ¥æ³¨å†Œæ‚¨çš„账户。"
-"There was an error processing your order. Please contact us or try again later.","处ç†æ‚¨çš„订å•æ—¶é‡åˆ°äº†é”™è¯¯ã€‚请è”系我们，或ç¨åŽå†è¯•ã€‚"
-"This condition no longer exists.","该æ¡ä»¶å·²ä¸å˜åœ¨ã€‚"
-"Total","总数"
-"Total for this address","该地å€çš„总é¢"
-"Unable to set Payment Method.","æ— æ³•è®¾ç½®æ”¯ä»˜æ–¹å¼ã€‚"
-"Unit Price","å•ä»·"
-"Update Cart","æ›´æ–°è´ç‰©è½¦"
-"Update Qty & Addresses","æ›´æ–°æ•°é‡ä¸Žåœ°å€"
-"Update Shopping Cart","æ›´æ–°è´ç‰©è½¦"
-"Update Total","更新总é¢"
-"Update product quantities in shopping cart","æ›´æ–°è´ç‰©è½¦ä¸çš„产å“æ•°é‡"
-"Update product(s) quantities in shopping cart","æ›´æ–°è´ç‰©è½¦ä¸çš„产å“æ•°é‡"
-"Use Billing Address","使用账å•åœ°å€"
+Remove,Remove
+Back,返回
+Price,ä»·æ ¼
+"Shopping Cart",è´ç‰©è½¦
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid."
+"Shopping Cart Items","Shopping Cart Items"
+Qty,æ•°é‡
+Subtotal,å°è®¡
+"Excl. Tax",ä¸å«ç¨Ž
+Total,总数
+"Incl. Tax",å«ç¨Ž
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist",移动到愿望清å•
+"Edit item parameters",编辑项目å‚æ•°
+Edit,编辑
+"Remove item",åˆ é™¤é¡¹ç›®
+Item,Item
+"Unit Price",å•ä»·
+Loading...,Loading...
+"* Required Fields",*å¿…è¦å—段
+Change,更改
+"See price before order confirmation.",确认订å•å‰æ˜¾ç¤ºä»·æ ¼ã€‚
+"What's this?",这是什么？
+"1 item","1 item"
+"%1 items","%1 items"
+"Product Name",产å“å
+"Invalid method: %1","Invalid method: %1"
+"My Cart (1 item)","My Cart (1 item)"
+"My Cart (%1 items)","My Cart (%1 items)"
+"My Cart",我的è´ç‰©è½¦
+"New Address",新地å€
+Country,国家
+State/Province,å·ž/çœ
+"Billing Information",è´¦å•ä¿¡æ¯
+"Checkout Method",支付方法
+"Payment Information",支付信æ¯
+"Order Review",订å•æ€»è§ˆ
+"Shipping Information",è¿é€ä¿¡æ¯
+"Shipping Method",è¿é€æ–¹å¼
+"Minimum order amount is %1","Minimum order amount is %1"
+"We cannot add this item to your shopping cart","We cannot add this item to your shopping cart"
+"We can't find the quote item.","We can't find the quote item."
+"We cannot configure the product.","We cannot configure the product."
+"%1 was updated in your shopping cart.","%1 was updated in your shopping cart."
+"We cannot update the item.","We cannot update the item."
+"We cannot update the shopping cart.","We cannot update the shopping cart."
+"We cannot remove the item.","We cannot remove the item."
+"The coupon code ""%1"" was applied.","The coupon code ""%1"" was applied."
+"The coupon code was canceled.","The coupon code was canceled."
+"We cannot apply the coupon code.","We cannot apply the coupon code."
+"The onepage checkout is disabled.",å•é¡µé¢ç»“账已被ç¦ç”¨ã€‚
+Checkout,结账
+"Unable to set Payment Method","Unable to set Payment Method"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
+"Please agree to all the terms and conditions before placing the order.",请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚
+"Something went wrong processing your order. Please try again later.","Something went wrong processing your order. Please try again later."
+"We can't find the product.","We can't find the product."
+"The product does not exist.",产å“ä¸å˜åœ¨ã€‚
+"We don't have some of the products you want.","We don't have some of the products you want."
+"We don't have as many of some products as you want.","We don't have as many of some products as you want."
+"Quantity was recalculated from %1 to %2","Quantity was recalculated from %1 to %2"
+"Some products quantities were recalculated because of quantity increment mismatch.","Some products quantities were recalculated because of quantity increment mismatch."
+"This quote item does not exist.","This quote item does not exist."
+"Display number of items in cart",显示è´ç‰©è½¦ä¸é¡¹ç›®çš„æ•°é‡
+"Display item quantities",显示项目数é‡
+"Load customer quote error",载入客户报价错误
+"Invalid data","Invalid data"
+"The customer address is not valid.","The customer address is not valid."
+"There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account.","There is already a registered customer using this email address. Please log in using this email address or enter a different email address to register your account."
+"Password and password confirmation are not equal.","Password and password confirmation are not equal."
+"Invalid shipping method","Invalid shipping method"
+"There are more than one shipping address.","There are more than one shipping address."
+"Sorry, guest checkout is not enabled.","Sorry, guest checkout is not enabled."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+"Discount Codes",折扣代ç
+"Enter your code","Enter your code"
+"Apply Coupon",åº”ç”¨ä¼˜æƒ åˆ¸
+"Cancel Coupon",å–æ¶ˆä¼˜æƒ åˆ¸
+"Continue Shopping",继ç»è´ç‰©
+"Update Shopping Cart",æ›´æ–°è´ç‰©è½¦
+"Clear Shopping Cart",清空è´ç‰©è½¦
+"Update Cart",æ›´æ–°è´ç‰©è½¦
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Items in Cart","Items in Cart"
+"Recently added item(s)",æœ€è¿‘æ·»åŠ çš„é¡¹ç›®
+"You have no items in your shopping cart.",您的è´ç‰©è½¦å†…没有物å“。
+"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order"
+"Cart Subtotal","Cart Subtotal"
+"View cart","View cart"
+"Are you sure you would like to remove this item from the shopping cart?",您确认è¦ä»Žè´ç‰©è½¦ä¸åˆ 除该项目å—？
+"Click <a href=""%1"">here</a> to continue shopping.","Click <a href=""%1"">here</a> to continue shopping."
+"Estimate Shipping and Tax",预计è¿è´¹å’Œç¨Žè´¹
+"Enter your destination to get a shipping estimate.",输入您的目的地æ¥èŽ·å¾—预计è¿é€ä¿¡æ¯ã€‚
+"Please select region, state or province",请选择地区ã€å·žï¼Œæˆ–çœ
+City,城市
+"Zip/Postal Code",邮政编ç
+"Get a Quote",获得报价
+"Update Total",更新总é¢
+"View Details","View Details"
+"Options Details","Options Details"
+Total:,Total:
+"Edit item",编辑项目
+"You will see the order total before you submit the order.","You will see the order total before you submit the order."
+"Loading next step...",æ£åœ¨è½½å…¥ä¸‹ä¸€æ¥...
+"Select a billing address from your address book or enter a new address.",从您的地å€ç°¿é€‰æ‹©è´¦å•åœ°å€ï¼Œæˆ–输入新地å€ã€‚
+"Email Address",编辑电å邮件地å€
+Company,å…¬å¸
"VAT Number","VAT ç¼–å·"
-"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","我们æ£åœ¨å¤„ç†æ‚¨çš„订å•ï¼Œæ‚¨å°†å¾ˆå¿«æ”¶åˆ°åŒ…å«è®¢å•è¯¦æƒ…的电å邮件。当订å•è¿é€åŽï¼Œæ‚¨ä¼šæ”¶åˆ°å¦ä¸€å°é‚®ä»¶ï¼Œå¹¶å¯ä½¿ç”¨é‚®ä»¶ä¸çš„链接æ¥è¿½è¸ªè¿é€è¿›åº¦ã€‚"
-"What's this?","这是什么？"
-"You have no items in your shopping cart.","您的è´ç‰©è½¦å†…没有物å“。"
-"You will receive an order confirmation email with details of your order and a link to track its progress.","您将会收到一份内å«è®¢å•è¯¦ç»†ä¿¡æ¯å’Œå¯æŸ¥è¯¢è¿›å±•æƒ…况链接的确认邮件"
-"Your Checkout Progress","您的结å¸æµç¨‹"
-"Your order # is: %s.","您的订å•ç¼–å·ä¸ºï¼š %s"
-"Your order cannot be completed at this time as there is no payment methods available for it.","由于付款方法ä¸å¯ç”¨ï¼ŒçŽ°åœ¨æ— 法完æˆæ‚¨çš„订å•ã€‚"
-"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","由于é€è´§æ–¹æ³•ä¸å¯ç”¨ï¼ŒçŽ°åœ¨æ— 法完æˆæ‚¨çš„订å•ã€‚请更改您的收货地å€ã€‚"
-"Your order has been received.","我们已ç»æ”¶åˆ°æ‚¨çš„订å•ã€‚"
-"Your order number is ","您的订å•å·æ˜¯"
-"Your recurring payments:","您的付款档案："
-"Zip/Postal Code","邮政编ç "
+Address,地å€
+"Street Address",è¡—é“地å€
+"Street Address %1","Street Address %1"
+Telephone,电è¯
+Fax,ä¼ çœŸ
+Password,密ç
+"Confirm Password",确认密ç
+"Save in address book",ä¿å˜åˆ°åœ°å€ç°¿
+"Ship to this address",é€è´§åˆ°è¿™ä¸ªåœ°å€
+"Ship to different address",é€è´§åˆ°ä¸åŒåœ°å€
+Continue,继ç»
+"Order #","è®¢å• #"
+"Proceed to Checkout",进行结账
+Login,登录
+"Already registered?",已注册？
+"Please log in below:",请在下é¢ç™»å½•ï¼š
+"Forgot Your Password?","Forgot Your Password?"
+"Checkout as a Guest or Register",以æ¥å®¾èº«ä»½ç»“账或注册
+"Checkout as a Guest","Checkout as a Guest"
+"Register to Create an Account",注册以创建å¸æˆ·
+"Register and save time!",注册并节约时间ï¼
+"Register with us for future convenience:",在这里注册以åŽå¯ä»¥æ›´æ–¹ä¾¿ï¼š
+"Fast and easy check out",方便快æ·çš„结账
+"Easy access to your order history and status",è½»æ¾è®¿é—®æ‚¨çš„订å•åŽ†å²è®°å½•å’ŒçŠ¶æ€
+"Checkout as Guest",作为æ¥å®¾ç»“è´¦
+Register,注册
+"No Payment Methods","No Payment Methods"
+"Your Checkout Progress",您的结å¸æµç¨‹
+"Billing Address",è´¦å•åœ°å€
+"Shipping Address",é€è´§åœ°å€
+"Shipping method has not been selected yet",è¿é€æ–¹å¼å°šæœªè¢«é€‰æ‹©
+"Payment Method",支付方å¼
+"Place Order",下订å•
+"Forgot an Item?",忘记æŸä¸ªé¡¹ç›®ï¼Ÿ
+"Edit Your Cart",编辑您的è´ç‰©è½¦
+"Your credit card will be charged for","Your credit card will be charged for"
+"Select a shipping address from your address book or enter a new address.",从您的地å€ç°¿é€‰æ‹©å‘货地å€ï¼Œæˆ–输入新地å€ã€‚
+"Use Billing Address",使用账å•åœ°å€
+"Sorry, no quotes are available for this order at this time.",抱æ‰ï¼Œå½“å‰è¯¥è®¢å•ä¸æ²¡æœ‰æŠ¥ä»·å¯ç”¨ã€‚
+"Thank you for your purchase!",感谢您的è´ä¹°ï¼
+"Your order # is: %1.","Your order # is: %1."
+"You will receive an order confirmation email with details of your order and a link to track its progress.",您将会收到一份内å«è®¢å•è¯¦ç»†ä¿¡æ¯å’Œå¯æŸ¥è¯¢è¿›å±•æƒ…况链接的确认邮件
+"Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation."
+"Please specify a shipping method.","Please specify a shipping method."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Please specify payment method.",请指定支付方å¼ã€‚
+"Please agree to all Terms and Conditions before placing the orders.",请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Checkout Options","Checkout Options"
+"Enable Onepage Checkout","Enable Onepage Checkout"
+"Allow Guest Checkout","Allow Guest Checkout"
+"Require Customer To Be Logged In To Checkout","Require Customer To Be Logged In To Checkout"
+"Quote Lifetime (days)","Quote Lifetime (days)"
+"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"My Cart Link","My Cart Link"
+"Display Cart Summary","Display Cart Summary"
+"Shopping Cart Sidebar","Shopping Cart Sidebar"
+"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
+"Payment Failed Emails","Payment Failed Emails"
+"Payment Failed Email Sender","Payment Failed Email Sender"
+"Payment Failed Email Receiver","Payment Failed Email Receiver"
+"Payment Failed Template","Payment Failed Template"
+"Send Payment Failed Email Copy To","Send Payment Failed Email Copy To"
+"Separate by "","".","Separate by "",""."
+"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
+"Your order has been received.",我们已ç»æ”¶åˆ°æ‚¨çš„订å•ã€‚
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
index 2ec74313eff..e8ac9f9cae1 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
@@ -29,13 +29,13 @@
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Cart" name="checkout.cart" template="cart.phtml">
<container name="checkout.cart.items" label="invisible" as="with-items">
+ <container name="checkout.cart.form.before" as="form_before" label="Shopping Cart Items Before" htmlTag="div" htmlClass="rewards" before="checkout.cart.form" />
<block class="Magento\Checkout\Block\Cart" name="checkout.cart.form" as="cart-items" template="cart/form.phtml">
<block class="Magento\Framework\View\Element\RendererList" name="checkout.cart.item.renderers" as="renderer.list" />
- <container name="checkout.cart.form.before" as="form_before" label="Shopping Cart Items Before" htmlTag="div" htmlClass="rewards"/>
- <container name="checkout.cart.widget" as="checkout_cart_widget" label="Shopping Cart Items After"/>
</block>
- <block class="Magento\Checkout\Block\Cart\Shipping" name="checkout.cart.shipping" as="shipping" after="checkout.cart.summary.title" template="cart/shipping.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Coupon" name="checkout.cart.coupon" as="coupon" after="checkout.cart.shipping" template="cart/coupon.phtml"/>
+ <container name="checkout.cart.widget" as="checkout_cart_widget" label="Shopping Cart Items After"/>
+ <block class="Magento\Checkout\Block\Cart\Shipping" name="checkout.cart.shipping" as="shipping" template="cart/shipping.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Coupon" name="checkout.cart.coupon" as="coupon" template="cart/coupon.phtml"/>
<block class="Magento\Checkout\Block\Cart\Totals" name="checkout.cart.totals" as="totals" template="cart/totals.phtml"/>
<block class="Magento\Checkout\Block\Cart" name="checkout.cart.methods.bottom" template="cart/methods.phtml">
<container name="checkout.cart.methods" as="methods" label="Payment Methods After Checkout Button">
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml
index 344e68a17bb..ac0c94c543e 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml
@@ -24,12 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <update handle="page_two_columns_left"/>
- <referenceContainer name="left">
- <container name="checkout.progress.wrapper" label="Checkout Progress Wrapper" htmlTag="div" htmlId="checkout-progress-wrapper">
- <block class="Magento\Checkout\Block\Onepage\Progress" name="checkout.progress" before="-" template="onepage/progress.phtml"/>
- </container>
- </referenceContainer>
+ <update handle="page_one_column"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Onepage" name="checkout.onepage" template="onepage.phtml">
<block class="Magento\Checkout\Block\Onepage\Login" name="checkout.onepage.login" as="login" template="onepage/login.phtml" cacheable="false">
@@ -51,6 +46,9 @@
</block>
<block class="Magento\Checkout\Block\Onepage\Review" name="checkout.onepage.review" as="review" template="onepage/review.phtml" cacheable="false"/>
</block>
+ <container name="checkout.progress.wrapper" label="Checkout Progress Wrapper" htmlTag="div" htmlClass="opc-block-progress-wrapper" htmlId="checkout-progress-wrapper" after="-">
+ <block class="Magento\Checkout\Block\Onepage\Progress" name="checkout.progress" before="-" template="onepage/progress.phtml"/>
+ </container>
</referenceContainer>
<update handle="customer_form_template_handle"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
index f9837a62f3a..f0dc79b258d 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
@@ -26,8 +26,9 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
<update handle="page_one_column"/>
<referenceBlock name="page.main.title">
+ <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="button.phtml"/>
<action method="setPageTitle">
- <argument translate="true" name="title" xsi:type="string">Your order has been received.</argument>
+ <argument translate="true" name="title" xsi:type="string">Thank you for your purchase!</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
new file mode 100644
index 00000000000..7b20e0ba7fb
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /** @var $this \Magento\Checkout\Block\Onepage\Success */ ?>
+
+<?php if ($this->getCanViewOrder() && $this->getCanPrintOrder()) :?>
+ <?php echo __('<a href="%1" onclick="this.target=\'_blank\'" class="print">Print receipt</a>', $this->getPrintUrl()) ?>
+ <?php echo $this->getChildHtml() ?>
+<?php endif;?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index e8893844658..e19ec443adb 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -40,7 +40,7 @@
<input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
</div>
</div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<?php if(!strlen($this->getCouponCode())): ?>
<div class="primary">
<button class="action apply primary" type="button" value="<?php echo __('Apply Coupon') ?>">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index f034595f6df..30cc87289a9 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -79,8 +79,8 @@
<?php echo $this->getChildHtml('shopping.cart.table.after'); ?>
<script type="text/javascript">
(function($) {
- $('.cart.summary').mage('sticky', {
- container: '.cart.container'
+ $('.cart-summary').mage('sticky', {
+ container: '.cart-container'
});
})(jQuery)
</script>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index 2f7f6d462a6..5ec4ce2d625 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -27,24 +27,26 @@
<?php $_product = $this->getProduct(); ?>
<?php $buttonTitle = __('Update Cart'); ?>
<?php if ($_product->isSaleable()): ?>
- <div class="box tocart update">
- <?php if ($this->shouldRenderQuantity()): ?>
- <div class="field qty">
- <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
- <div class="control">
- <input type="number" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{required:true,digits:true}"/>
+ <div class="box-tocart update">
+ <fieldset class="fieldset">
+ <?php if ($this->shouldRenderQuantity()): ?>
+ <div class="field qty">
+ <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
+ <div class="control">
+ <input type="number" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{required:true,digits:true}"/>
+ </div>
</div>
- </div>
- <?php endif; ?>
- <div class="actions">
- <button type="button"
- title="<?php echo $buttonTitle ?>"
- class="action primary tocart"
- id="product-updatecart-button">
- <span><?php echo $buttonTitle ?></span>
- </button>
- <?php echo $this->getChildHtml('', true) ?>
- </div>
+ <?php endif; ?>
+ <div class="actions">
+ <button type="button"
+ title="<?php echo $buttonTitle ?>"
+ class="action primary tocart"
+ id="product-updatecart-button">
+ <span><?php echo $buttonTitle ?></span>
+ </button>
+ <?php echo $this->getChildHtml('', true) ?>
+ </div>
+ </fieldset>
</div>
<script type="text/javascript">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 0ebdcde8663..113d146ae00 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -66,7 +66,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<?php endif;?>
<?php if ($messages = $this->getMessages()): ?>
<?php foreach ($messages as $message): ?>
- <div class="cart item message <?php echo $message['type'] ?>"><div>* <?php echo $this->escapeHtml($message['text']) ?></div></div>
+ <div class="cart item message <?php echo $message['type'] ?>"><div><?php echo $this->escapeHtml($message['text']) ?></div></div>
<?php endforeach; ?>
<?php endif; ?>
<?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
@@ -120,11 +120,11 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
<?php endforeach; ?>
<?php endif; ?>
</div>
@@ -149,7 +149,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmountInclTax()); ?>
<?php else: ?>
<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
<?php endif; ?>
@@ -160,7 +160,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<div class="cart tax info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
@@ -175,7 +175,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<div class="cart tax total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmountInclTax()); ?></span>
</div>
<?php endif; ?>
<?php endif; ?>
@@ -217,11 +217,11 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
<?php endforeach; ?>
<?php endif; ?>
</div>
@@ -248,7 +248,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<span class="cart msrp subtotal">--</span>
<?php else: ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmountInclTax()); ?>
<?php else: ?>
<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
@@ -262,7 +262,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<div class="cart tax info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
@@ -277,7 +277,7 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<div class="cart tax total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmountInclTax()); ?></span>
</div>
<?php endif; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index d5cd934e599..a44c91ff72f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -25,9 +25,9 @@
/** @var $this \Magento\Checkout\Block\Cart\Sidebar */
?>
<?php if ($this->getInList()): ?>
- <li data-block="minicart" class="minicart wrapper">
+ <li data-block="minicart" class="minicart-wrapper">
<?php else: ?>
- <div data-block="minicart" class="minicart wrapper">
+ <div data-block="minicart" class="minicart-wrapper">
<?php endif; ?>
<?php $_cartQty = (float) $this->getSummaryCount() ?>
<?php if (!$this->getIsLinkMode() || !$this->getIsNeedToDisplaySideBar()): ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index a0733178dee..60e0be53b16 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -60,7 +60,7 @@
<input class="input-text" data-validate="{<?php if ($this->isZipCodeRequired()):?> 'required-entry':true,<?php endif;?>'validate-zip':true}" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->escapeHtml($this->getEstimatePostcode()) ?>" />
</div>
</div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action quote primary"><span><?php echo __('Get a Quote') ?></span></button>
</div>
@@ -112,8 +112,10 @@
</dd>
<?php endforeach; ?>
</dl>
- <div class="actions">
- <button type="submit" class="action update" name="do" value="<?php echo __('Update Total') ?>"><span><?php echo __('Update Total') ?></span></button>
+ <div class="actions-toolbar">
+ <div class="primary">
+ <button type="submit" class="action primary update" name="do" value="<?php echo __('Update Total') ?>"><span><?php echo __('Update Total') ?></span></button>
+ </div>
</div>
</fieldset>
</form>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
index 711dd1f0e52..16b3b3389b5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
@@ -28,7 +28,7 @@
* @var $this \Magento\Checkout\Block\Cart\Totals
*/
?>
-<div class="cart totals">
+<div class="cart-totals">
<?php if ($this->canApplyMsrp()): ?>
<div class="msrp totals"><?php echo __('You will see the order total before you submit the order.'); ?></div>
<?php else: ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 8002e34e2b9..7ed49535eb3 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -49,16 +49,16 @@ $config = array(
$mageConfig = json_encode($config);
?>
-<div class="opc wrapper">
+<div class="opc-wrapper">
<ol class="opc" id="checkoutSteps">
<?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
<?php if (!$this->getChildBlock($_stepId) || !$this->getChildBlock($_stepId)->isShow()): continue; endif; $i++ ?>
<li id="opc-<?php echo $_stepId ?>" class="section<?php echo !empty($_stepInfo['allow'])?' allow':'' ?><?php echo !empty($_stepInfo['complete'])?' saved':'' ?>">
- <div class="step title" data-role="title">
+ <div class="step-title" data-role="title">
<span class="number"><?php echo $i ?></span>
<h2><?php echo $_stepInfo['label'] ?></h2>
</div>
- <div id="checkout-step-<?php echo $_stepId ?>" class="step content" data-role="content" data-mage-init='<?php echo $mageConfig;?>'>
+ <div id="checkout-step-<?php echo $_stepId ?>" class="step-content" data-role="content" data-mage-init='<?php echo $mageConfig;?>'>
<?php echo $this->getChildHtml($_stepId) ?>
</div>
</li>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
index 39845461887..ad04faa679b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
@@ -167,7 +167,7 @@
<div class="field confirm required">
<label class="label" for="billing:confirm_password"><span><?php echo __('Confirm Password') ?></span></label>
<div class="control">
- <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true}"/>
+ <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true, equalTo: '#billing\\:customer_password'}"/>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml
index ef238a171a2..71ba691841e 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml
@@ -29,7 +29,7 @@
*/
/** @var $this \Magento\Checkout\Block\Onepage\Login */
?>
-<div class="step login wrapper">
+<div class="login-wrapper">
<?php echo $this->getChildHtml('login_before')?>
<div class="block customer login">
<div class="title"><strong><?php echo __('Login') ?></strong></div>
@@ -55,7 +55,7 @@
</div>
</div>
<?php echo $this->getChildHtml('form_additional_info'); ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<input name="context" type="hidden" value="checkout" />
<div class="primary">
<button type="submit" class="action login primary" data-action="checkout-method-login"><span><?php echo __('Login') ?></span></button>
@@ -113,7 +113,7 @@
<?php else: ?>
<input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
<?php endif; ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<?php if ($this->isAllowedGuestCheckout()): ?>
<button data-role="opc-continue" id="onepage-guest-register-button" type="button" class="action continue primary" data-checkout='{"isGuestCheckoutAllowed":true}'><span><?php echo __('Continue') ?></span></button>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
index 9bcfe5a2b2a..cfc0b4adde2 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
@@ -29,7 +29,7 @@
<div id="checkout-payment-method-load"><?php echo $this->getChildHtml('methods') ?></div>
</fieldset>
<?php echo $this->getChildChildHtml('additional') ?>
- <div class="actions toolbar" id="payment-buttons-container">
+ <div class="actions-toolbar" id="payment-buttons-container">
<div class="primary">
<button data-role="opc-continue" type="button" class="button action continue primary"><span><?php echo __('Continue') ?></span></button>
</div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
index eee6b68d3e4..9437d15084a 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
@@ -29,20 +29,20 @@
* @var $this \Magento\Checkout\Block\Onepage\Payment\Methods
*/
?>
-<dl class="items methods payment">
+<dl class="items methods-payment">
<?php
$methods = $this->getMethods();
$oneMethod = count($methods) <= 1;
?>
<?php if (empty($methods)): ?>
- <dt class="item title">
+ <dt class="item-title">
<?php echo __('No Payment Methods') ?>
</dt>
<?php else:
foreach ($methods as $_method):
$_code = $_method->getCode();
?>
- <dt class="item title <?php echo $_code ?>">
+ <dt class="item-title <?php echo $_code ?>">
<?php if(!$oneMethod): ?>
<input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
<?php else: ?>
@@ -52,7 +52,7 @@
<label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
</dt>
<?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
- <dd class="item content <?php echo $_code ?>">
+ <dd class="item-content <?php echo $_code ?>">
<?php echo $html; ?>
</dd>
<?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml
index e6db9ac2b52..5bd564e8519 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml
@@ -23,23 +23,23 @@
*/
/* @var $this \Magento\Checkout\Block\Onepage\Progress */
?>
-<div class="block progress onepage opc-block-progress">
+<div class="opc-block-progress<?php if ($this->isStepComplete('billing')): ?> active<?php endif; ?><?php if ($this->isStepComplete('payment')): ?> order-review-step<?php endif; ?>">
<div class="title">
<strong><?php echo __('Your Checkout Progress') ?></strong>
</div>
<div class="content">
- <dl>
+ <dl class="items">
<?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
<?php if ($this->isStepComplete('billing')): ?>
- <dt class="complete">
- <?php echo __('Billing Address') ?>
+ <dt class="item-title complete">
+ <span><?php echo __('Billing Address') ?></span>
<a href="#billing" data-goto-section="billing" class="action billing"><?php echo __('Change') ?></a>
</dt>
- <dd class="complete">
+ <dd class="item-content complete">
<address><?php echo $this->getBilling()->format('html') ?></address>
</dd>
<?php else: ?>
- <dt>
+ <dt class="item-title">
<?php echo __('Billing Address') ?>
</dt>
<?php endif; ?>
@@ -47,27 +47,27 @@
<?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
<?php if ($this->isStepComplete('shipping')): ?>
- <dt class="complete">
- <?php echo __('Shipping Address') ?>
+ <dt class="item-title complete">
+ <span><?php echo __('Shipping Address') ?></span>
<a href="#payment" data-goto-section="shipping" class="action shipping address"><?php echo __('Change') ?></a>
</dt>
- <dd class="complete">
+ <dd class="item-content complete">
<address><?php echo $this->getShipping()->format('html') ?></address>
</dd>
<?php else: ?>
- <dt>
- <?php echo __('Shipping Address') ?>
+ <dt class="item-title">
+ <span><?php echo __('Shipping Address') ?></span>
</dt>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
<?php if ($this->isStepComplete('shipping_method')): ?>
- <dt class="complete">
- <?php echo __('Shipping Method') ?>
+ <dt class="item-title complete">
+ <span><?php echo __('Shipping Method') ?></span>
<a href="#shipping_method" data-goto-section="shipping_method" class="action shipping method"><?php echo __('Change') ?></a>
</dt>
- <dd class="complete">
+ <dd class="item-content complete">
<?php if ($this->getShippingMethod()): ?>
<?php echo $this->escapeHtml($this->getShippingDescription()) ?>
@@ -87,24 +87,24 @@
<?php endif; ?>
</dd>
<?php else: ?>
- <dt>
- <?php echo __('Shipping Method') ?>
+ <dt class="item-title">
+ <span><?php echo __('Shipping Method') ?></span>
</dt>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
<?php if ($this->isStepComplete('payment')): ?>
- <dt class="complete">
- <?php echo __('Payment Method') ?>
+ <dt class="item-title complete">
+ <span><?php echo __('Payment Method') ?></span>
<a href="#payment" data-goto-section="payment" class="action payment method"><?php echo __('Change') ?></a>
</dt>
- <dd class="complete">
+ <dd class="item-content complete">
<?php echo $this->getPaymentHtml() ?>
</dd>
<?php else: ?>
- <dt>
- <?php echo __('Payment Method') ?>
+ <dt class="item-title">
+ <span><?php echo __('Payment Method') ?></span>
</dt>
<?php endif; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
index 9faa54fcbd1..3fd1100c57e 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
@@ -56,9 +56,9 @@
</table>
</div>
<?php echo $this->getChildHtml('items_after'); ?>
-<div id="checkout-review-submit" data-mage-init='{"paymentAuthentication":{}}' class="checkout submit order">
+<div id="checkout-review-submit" data-mage-init='{"paymentAuthentication":{}}' class="checkout-submit-order">
<?php echo $this->getChildHtml('agreements') ?>
- <div class="actions" id="review-buttons-container">
+ <div class="actions-toolbar" id="review-buttons-container">
<div class="primary"><?php echo $this->getChildHtml('button') ?></div>
<div class="secondary"><?php echo __('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>" class="action edit"><span><?php echo __('Edit Your Cart') ?></span></a></div>
</div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
index 81d693a2bcb..309a7f7125a 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
@@ -24,12 +24,14 @@
/** @var $this Magento\Checkout\Block\Cart\Item\Renderer */
-$_item = $this->getItem()
+$_item = $this->getItem();
+/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
?>
<tr>
<td class="col item"><strong class="product name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong>
<?php if ($_options = $this->getOptionList()):?>
- <dl class="review item options">
+ <dl class="review-item-options">
<?php foreach ($_options as $_option) : ?>
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
@@ -77,11 +79,11 @@ $_item = $this->getItem()
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
<?php endforeach; ?>
<?php endif; ?>
</div>
@@ -104,7 +106,7 @@ $_item = $this->getItem()
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_weeeHelper->getWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
<?php endif; ?>
@@ -115,7 +117,7 @@ $_item = $this->getItem()
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
@@ -130,7 +132,7 @@ $_item = $this->getItem()
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<div class="cart tax total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="weee"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_weeeHelper->getWeeeTaxInclTax($_item)); ?></span>
</div>
<?php endif; ?>
<?php endif; ?>
@@ -161,11 +163,11 @@ $_item = $this->getItem()
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
<?php endforeach; ?>
<?php endif; ?>
</div>
@@ -188,7 +190,7 @@ $_item = $this->getItem()
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
@@ -201,7 +203,7 @@ $_item = $this->getItem()
<div class="cart tax info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
@@ -216,7 +218,7 @@ $_item = $this->getItem()
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<div class="cart tax total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <span class="weee"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?></span>
</div>
<?php endif; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
index 6ef98d165ed..66387563d75 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
@@ -22,14 +22,14 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<form class="form shipping methods" id="co-shipping-method-form">
+<form class="form methods-shipping" id="co-shipping-method-form">
<div id="checkout-shipping-method-load">
<?php echo $this->getChildHtml('available') ?>
</div>
<div id="onepage-checkout-shipping-method-additional-load">
<?php echo $this->getChildHtml('additional') ?>
</div>
- <div class="actions toolbar" id="shipping-method-buttons-container">
+ <div class="actions-toolbar" id="shipping-method-buttons-container">
<div class="primary">
<button data-role="opc-continue" type="button" class="button action continue primary"><span><?php echo __('Continue') ?></span></button>
</div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
index 4a96d6bbd85..bae3a2e7c7c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
@@ -27,11 +27,11 @@
<?php if (!$_shippingRateGroups): ?>
<p><?php echo __('Sorry, no quotes are available for this order at this time.') ?></p>
<?php else: ?>
- <dl class="items methods shipping">
+ <dl class="items methods-shipping">
<?php $shippingCodePrice = array(); ?>
<?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
- <dt class="item title <?php echo $code ?>"><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
- <dd class="item content <?php echo $code ?>">
+ <dt class="item-title <?php echo $code ?>"><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
+ <dd class="item-content <?php echo $code ?>">
<?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
<?php $shippingCodePrice[] = '"'.$_rate->getCode().'":'.(float)$_rate->getPrice(); ?>
<div class="field choice">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index bda8e276299..08eb436cd98 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -23,26 +23,21 @@
*/
?>
<?php /** @var $this \Magento\Checkout\Block\Onepage\Success */ ?>
-<div class="checkout success">
- <h2 class="subtitle"><?php echo __('Thank you for your purchase!') ?></h2>
+<div class="checkout-success">
<?php if ($this->getOrderId()):?>
<?php if ($this->getCanViewOrder()) :?>
- <p><?php echo __('Your order # is: %1.', sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getViewOrderUrl()), $this->escapeHtml($this->getOrderId()))) ?></p>
+ <p><?php echo __('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $this->escapeHtml($this->getViewOrderUrl()), $this->escapeHtml($this->getOrderId()))) ?></p>
<?php else :?>
- <p><?php echo __('Your order # is: %1.', $this->escapeHtml($this->getOrderId())) ?></p>
+ <p><?php echo __('Your order # is: <span>%1</span>.', $this->escapeHtml($this->getOrderId())) ?></p>
<?php endif;?>
<p><?php echo __('You will receive an order confirmation email with details of your order and a link to track its progress.') ?></p>
- <?php if ($this->getCanViewOrder() && $this->getCanPrintOrder()) :?>
- <p>
- <?php echo __('Click <a href="%1" onclick="this.target=\'_blank\'">here to print</a> a copy of your order confirmation.', $this->getPrintUrl()) ?>
- <?php echo $this->getChildHtml() ?>
- </p>
- <?php endif;?>
<?php endif;?>
<?php echo $this->getAdditionalInfoHtml() ?>
- <div class="actions">
- <a class="action continue" title="<?php echo __('Continue Shopping') ?>" href="<?php echo $this->getUrl() ?>"><span><?php echo __('Continue Shopping') ?></span></a>
+ <div class="actions-toolbar">
+ <div class="primary">
+ <a class="action primary continue" title="<?php echo __('Continue Shopping') ?>" href="<?php echo $this->getUrl() ?>"><span><?php echo __('Continue Shopping') ?></span></a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/CheckoutAgreements/i18n/de_DE.csv b/app/code/Magento/CheckoutAgreements/i18n/de_DE.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/de_DE.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/CheckoutAgreements/i18n/en_US.csv b/app/code/Magento/CheckoutAgreements/i18n/en_US.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/en_US.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/CheckoutAgreements/i18n/es_ES.csv b/app/code/Magento/CheckoutAgreements/i18n/es_ES.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/es_ES.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/CheckoutAgreements/i18n/fr_FR.csv b/app/code/Magento/CheckoutAgreements/i18n/fr_FR.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/fr_FR.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/CheckoutAgreements/i18n/nl_NL.csv b/app/code/Magento/CheckoutAgreements/i18n/nl_NL.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/nl_NL.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/CheckoutAgreements/i18n/pt_BR.csv b/app/code/Magento/CheckoutAgreements/i18n/pt_BR.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/pt_BR.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/CheckoutAgreements/i18n/zh_CN.csv b/app/code/Magento/CheckoutAgreements/i18n/zh_CN.csv
new file mode 100644
index 00000000000..64927202823
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/i18n/zh_CN.csv
@@ -0,0 +1,32 @@
+ID,ID
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Store View","Store View"
+Content,Content
+Text,Text
+"Terms and Conditions","Terms and Conditions"
+"Add New Condition","Add New Condition"
+"Save Condition","Save Condition"
+"Delete Condition","Delete Condition"
+"Edit Terms and Conditions","Edit Terms and Conditions"
+"New Terms and Conditions","New Terms and Conditions"
+"Terms and Conditions Information","Terms and Conditions Information"
+"Condition Name","Condition Name"
+"Show Content as","Show Content as"
+HTML,HTML
+"Checkbox Text","Checkbox Text"
+"Content Height (css)","Content Height (css)"
+"Content Height","Content Height"
+Condition,Condition
+"This condition no longer exists.","This condition no longer exists."
+"New Condition","New Condition"
+"Edit Condition","Edit Condition"
+"The condition has been saved.","The condition has been saved."
+"Something went wrong while saving this condition.","Something went wrong while saving this condition."
+"The condition has been deleted.","The condition has been deleted."
+"Something went wrong while deleting this condition.","Something went wrong while deleting this condition."
+Sales,Sales
+"Checkout Conditions","Checkout Conditions"
+"Checkout Terms and Conditions","Checkout Terms and Conditions"
+"Enable Terms and Conditions","Enable Terms and Conditions"
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page.php b/app/code/Magento/Cms/Controller/Adminhtml/Page.php
index 6e0a298de1b..c5c5043a477 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page.php
@@ -25,8 +25,6 @@ namespace Magento\Cms\Controller\Adminhtml;
/**
* Cms manage pages controller
- *
- * @author Magento Core Team <core@magentocommerce.com>
*/
class Page extends \Magento\Backend\App\Action
{
@@ -35,7 +33,7 @@ class Page extends \Magento\Backend\App\Action
*
* @var \Magento\Framework\Registry
*/
- protected $_coreRegistry = null;
+ protected $_coreRegistry;
/**
* @var \Magento\Framework\Stdlib\DateTime\Filter\Date
@@ -112,12 +110,12 @@ class Page extends \Magento\Backend\App\Action
$this->_title->add(__('Pages'));
// 1. Get ID and create model
- $id = $this->getRequest()->getParam('page_id');
+ $pageId = $this->getRequest()->getParam('page_id');
$model = $this->_objectManager->create('Magento\Cms\Model\Page');
// 2. Initial checking
- if ($id) {
- $model->load($id);
+ if ($pageId) {
+ $model->load($pageId);
if (!$model->getId()) {
$this->messageManager->addError(__('This page no longer exists.'));
$this->_redirect('*/*/');
@@ -128,7 +126,7 @@ class Page extends \Magento\Backend\App\Action
$this->_title->add($model->getId() ? $model->getTitle() : __('New Page'));
// 3. Set entered data if was error when we do save
- $data = $this->_objectManager->get('Magento\Backend\Model\Session')->getFormData(true);
+ $data = $this->_session->getFormData(true);
if (!empty($data)) {
$model->setData($data);
}
@@ -138,8 +136,8 @@ class Page extends \Magento\Backend\App\Action
// 5. Build edit form
$this->_initAction()->_addBreadcrumb(
- $id ? __('Edit Page') : __('New Page'),
- $id ? __('Edit Page') : __('New Page')
+ $pageId ? __('Edit Page') : __('New Page'),
+ $pageId ? __('Edit Page') : __('New Page')
);
$this->_view->renderLayout();
@@ -157,11 +155,12 @@ class Page extends \Magento\Backend\App\Action
if ($data) {
$data = $this->_filterPostData($data);
//init model and set data
+ /** @var \Magento\Cms\Model\Page $model */
$model = $this->_objectManager->create('Magento\Cms\Model\Page');
- $id = $this->getRequest()->getParam('page_id');
- if ($id) {
- $model->load($id);
+ $pageId = $this->getRequest()->getParam('page_id');
+ if ($pageId) {
+ $model->load($pageId);
}
$model->setData($data);
@@ -185,7 +184,7 @@ class Page extends \Magento\Backend\App\Action
// display success message
$this->messageManager->addSuccess(__('The page has been saved.'));
// clear previously saved data from session
- $this->_objectManager->get('Magento\Backend\Model\Session')->setFormData(false);
+ $this->_session->setFormData(false);
// check if 'Save and Continue'
if ($this->getRequest()->getParam('back')) {
$this->_redirect('*/*/edit', array('page_id' => $model->getId(), '_current' => true));
@@ -200,7 +199,7 @@ class Page extends \Magento\Backend\App\Action
$this->messageManager->addException($e, __('Something went wrong while saving the page.'));
}
- $this->_getSession()->setFormData($data);
+ $this->_session->setFormData($data);
$this->_redirect('*/*/edit', array('page_id' => $this->getRequest()->getParam('page_id')));
return;
}
@@ -215,13 +214,13 @@ class Page extends \Magento\Backend\App\Action
public function deleteAction()
{
// check if we know what should be deleted
- $id = $this->getRequest()->getParam('page_id');
- if ($id) {
- $title = "";
+ $pageId = $this->getRequest()->getParam('page_id');
+ if ($pageId) {
+ $title = '';
try {
// init model and delete
$model = $this->_objectManager->create('Magento\Cms\Model\Page');
- $model->load($id);
+ $model->load($pageId);
$title = $model->getTitle();
$model->delete();
// display success message
@@ -241,7 +240,7 @@ class Page extends \Magento\Backend\App\Action
// display error message
$this->messageManager->addError($e->getMessage());
// go back to edit form
- $this->_redirect('*/*/edit', array('page_id' => $id));
+ $this->_redirect('*/*/edit', array('page_id' => $pageId));
return;
}
}
@@ -301,9 +300,8 @@ class Page extends \Magento\Backend\App\Action
if (!empty($data['layout_update_xml']) && !$validatorCustomLayout->isValid($data['layout_update_xml'])) {
$errorNo = false;
}
- if (!empty($data['custom_layout_update_xml']) && !$validatorCustomLayout->isValid(
- $data['custom_layout_update_xml']
- )
+ if (!empty($data['custom_layout_update_xml'])
+ && !$validatorCustomLayout->isValid($data['custom_layout_update_xml'])
) {
$errorNo = false;
}
diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index 53448909ec9..4e4fcce399c 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -70,13 +70,16 @@ class Page extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
*/
const NOROUTE_PAGE_ID = 'no-route';
- /**
+ /**#@+
* Page's Statuses
*/
const STATUS_ENABLED = 1;
-
const STATUS_DISABLED = 0;
+ /**#@-*/
+ /**
+ * CMS page cache tag
+ */
const CACHE_TAG = 'cms_page';
/**
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index f837a38133c..c575c7ab7cb 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -29,12 +29,23 @@ namespace Magento\Cms\Model\Wysiwyg;
class Config extends \Magento\Framework\Object
{
/**
- * Wysiwyg behaviour
+ * Wysiwyg status enabled
*/
const WYSIWYG_ENABLED = 'enabled';
+ /**
+ * Wysiwyg status configuration path
+ */
+ const WYSIWYG_STATUS_CONFIG_PATH = 'cms/wysiwyg/enabled';
+
+ /**
+ * Wysiwyg status hidden
+ */
const WYSIWYG_HIDDEN = 'hidden';
+ /**
+ * Wysiwyg status disabled
+ */
const WYSIWYG_DISABLED = 'disabled';
/**
@@ -62,13 +73,6 @@ class Config extends \Magento\Framework\Object
*/
protected $_widgetConfig;
- /**
- * Cms data
- *
- * @var \Magento\Cms\Helper\Data
- */
- protected $_cmsData;
-
/**
* Core event manager proxy
*
@@ -96,7 +100,6 @@ class Config extends \Magento\Framework\Object
/**
* @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Cms\Helper\Data $cmsData
* @param \Magento\Framework\AuthorizationInterface $authorization
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Core\Model\Variable\Config $variableConfig
@@ -108,7 +111,6 @@ class Config extends \Magento\Framework\Object
public function __construct(
\Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Cms\Helper\Data $cmsData,
\Magento\Framework\AuthorizationInterface $authorization,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Core\Model\Variable\Config $variableConfig,
@@ -119,7 +121,6 @@ class Config extends \Magento\Framework\Object
) {
$this->_backendUrl = $backendUrl;
$this->_eventManager = $eventManager;
- $this->_cmsData = $cmsData;
$this->_scopeConfig = $scopeConfig;
$this->_authorization = $authorization;
$this->_assetRepo = $assetRepo;
@@ -142,7 +143,7 @@ class Config extends \Magento\Framework\Object
* files_browser_*: Files Browser (media, images) settings
* encode_directives: Encode template directives with JS or not
*
- * @param array|\Magento\Framework\Object $data \Magento\Framework\Object constructor params to override default config values
+ * @param array|\Magento\Framework\Object $data Object constructor params to override default config values
* @return \Magento\Framework\Object
*/
public function getConfig($data = array())
@@ -157,7 +158,6 @@ class Config extends \Magento\Framework\Object
'add_variables' => true,
'add_widgets' => true,
'no_display' => false,
- 'translator' => $this->_cmsData,
'encode_directives' => true,
'directives_url' => $this->_backendUrl->getUrl('cms/wysiwyg/directive'),
'popup_css' => $this->_assetRepo->getUrl(
@@ -218,7 +218,11 @@ class Config extends \Magento\Framework\Object
*/
public function isEnabled()
{
- $wysiwygState = $this->_scopeConfig->getValue('cms/wysiwyg/enabled', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->getStoreId());
+ $wysiwygState = $this->_scopeConfig->getValue(
+ self::WYSIWYG_STATUS_CONFIG_PATH,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $this->getStoreId()
+ );
return in_array($wysiwygState, array(self::WYSIWYG_ENABLED, self::WYSIWYG_HIDDEN));
}
@@ -229,6 +233,10 @@ class Config extends \Magento\Framework\Object
*/
public function isHidden()
{
- return $this->_scopeConfig->getValue('cms/wysiwyg/enabled', \Magento\Store\Model\ScopeInterface::SCOPE_STORE) == self::WYSIWYG_HIDDEN;
+ $status = $this->_scopeConfig->getValue(
+ self::WYSIWYG_STATUS_CONFIG_PATH,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ );
+ return $status == self::WYSIWYG_HIDDEN;
}
}
diff --git a/app/code/Magento/Cms/README.md b/app/code/Magento/Cms/README.md
new file mode 100644
index 00000000000..a663eb38181
--- /dev/null
+++ b/app/code/Magento/Cms/README.md
@@ -0,0 +1 @@
+The CMS module allows creating, editing and managing pages with different content type.
\ No newline at end of file
diff --git a/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php
index 40543d9e140..06dcbc28422 100644
--- a/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php
+++ b/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php
@@ -23,16 +23,6 @@
*/
/** @var \Magento\Cms\Model\Resource\Setup $this */
-$cmsBlocks = array(
- array(
- 'title' => 'Footer Links',
- 'identifier' => 'footer_links',
- 'content' => "<ul>\r\n<li><a href=\"{{store direct_url=\"about-magento-demo-store\"}}\">About Us</a></li>\r\n<li class=\"last\"><a href=\"{{store direct_url=\"customer-service\"}}\">Customer Service</a></li>\r\n</ul>",
- 'is_active' => 1,
- 'stores' => 0
- )
-);
-
$cmsPages = array(
array(
'title' => '404 Not Found 1',
@@ -56,26 +46,6 @@ $cmsPages = array(
'stores' => array(0),
'sort_order' => 0
),
- array(
- 'title' => 'About Us',
- 'root_template' => 'two_columns_right',
- 'identifier' => 'about-magento-demo-store',
- 'content_heading' => 'About Magento Store',
- 'content' => "<div class=\"col3-set\">\r\n<div class=\"col-1\"><p><a href=\"http://www.magento.com/\"><img src=\"{{view url='Magento_Cms::images/about_us_img.jpg' area=frontend}}\" title=\"Varien\" alt=\"Varien\" /></a></p><p style=\"line-height:1.2em;\"><small>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.</small></p>\r\n<p style=\"color:#888; font:1.2em/1.4em georgia, serif;\">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta.</p></div>\r\n<div class=\"col-2\">\r\n<p><strong style=\"color:#de036f;\">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.</strong></p>\r\n<p>Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo. </p>\r\n<p>Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus. Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi. Vestibulum sapien dolor, aliquet nec, porta ac, malesuada a, libero. Praesent feugiat purus eget est. Nulla facilisi. Vestibulum tincidunt sapien eu velit. Mauris purus. Maecenas eget mauris eu orci accumsan feugiat. Pellentesque eget velit. Nunc tincidunt.</p></div>\r\n<div class=\"col-3\">\r\n<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper </p>\r\n<p><strong style=\"color:#de036f;\">Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus.</strong></p>\r\n<p>Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.</p>\r\n<div class=\"divider\"></div>\r\n<p>To all of you, from all of us at Magento Store - Thank you and Happy eCommerce!</p>\r\n<p style=\"line-height:1.2em;\"><strong style=\"font:italic 2em Georgia, serif;\">John Doe</strong><br /><small>Some important guy</small></p></div>\r\n</div>",
- 'is_active' => 1,
- 'stores' => array(0),
- 'sort_order' => 0
- ),
- array(
- 'title' => 'Customer Service',
- 'root_template' => 'three_columns',
- 'identifier' => 'customer-service',
- 'content_heading' => 'Customer Service',
- 'content' => "<ul class=\"disc\">\r\n<li><a href=\"#answer1\">Shipping & Delivery</a></li>\r\n<li><a href=\"#answer2\">Privacy & Security</a></li>\r\n<li><a href=\"#answer3\">Returns & Replacements</a></li>\r\n<li><a href=\"#answer4\">Ordering</a></li>\r\n<li><a href=\"#answer5\">Payment, Pricing & Promotions</a></li>\r\n<li><a href=\"#answer6\">Viewing Orders</a></li>\r\n<li><a href=\"#answer7\">Updating Account Information</a></li>\r\n</ul>\r\n<dl>\r\n<dt id=\"answer1\">Shipping & Delivery</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n<dt id=\"answer2\">Privacy & Security</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n<dt id=\"answer3\">Returns & Replacements</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n<dt id=\"answer4\">Ordering</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n<dt id=\"answer5\">Payment, Pricing & Promotions</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n<dt id=\"answer6\">Viewing Orders</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n<dt id=\"answer7\">Updating Account Information</dt>\r\n<dd>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.</dd>\r\n</dl>",
- 'is_active' => 1,
- 'stores' => array(0),
- 'sort_order' => 0
- ),
array(
'title' => 'Enable Cookies',
'root_template' => 'one_column',
@@ -87,13 +57,6 @@ $cmsPages = array(
)
);
-/**
- * Insert default blocks
- */
-foreach ($cmsBlocks as $data) {
- $this->createBlock()->setData($data)->save();
-}
-
/**
* Insert default and system pages
*/
diff --git a/app/code/Magento/Cms/i18n/de_DE.csv b/app/code/Magento/Cms/i18n/de_DE.csv
index e2d7b7efcd1..09eb96234df 100644
--- a/app/code/Magento/Cms/i18n/de_DE.csv
+++ b/app/code/Magento/Cms/i18n/de_DE.csv
@@ -1,127 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","Ein Block Bezeichner mit denselben Eigenschaften existiert bereits in dem ausgewählten Store."
-"A directory with the same name already exists. Please try another folder name.","Ein Verzeichnis mit dem gleichen Namen existiert bereits. Bitte versuchen Sie einen anderen Ordnernamen."
-"A page URL key for specified store already exists.","Ein Seiten URL Key für den angegebenen Store existiert bereits."
-"Action","Aktion"
+ID,ID
+Action,Aktion
+"Delete File","Datei löschen"
+"-- Please Select --","-- Please Select --"
+"Custom Design","Eigene Gestaltung"
+"Block Information",Blockinformation
+Status,Status
+Disabled,Deaktiviert
+Enabled,Aktiviert
+"Save and Continue Edit","Save and Continue Edit"
+Title,Titel
+"URL Key","URL Schlüssel"
+"Store View",Store-Ansicht
+Description,Beschreibung
+Home,Startseite
+"Browse Files...","Browse Files..."
+Content,Inhalt
+"General Information","Allgemeine Information"
+"Go to Home Page","Zur Startseite gehen"
+px.,px.
+"Collapse All","Alle einklappen"
+"Expand All","Alle ausklappen"
+"Static Blocks","Statische Blöcke"
"Add New Block","Neuen Block hinzufügen"
+"Save Block","Block speichern"
+"Delete Block","Block löschen"
+"Edit Block '%1'","Edit Block '%1'"
+"New Block","Neuer Block"
+"Block Title",Blocktitel
+Identifier,Bezeichner
+"Manage Pages","Seiten verwalten"
"Add New Page","Neue Seite hinzufügen"
-"All Countries","Alle Länder"
-"An error occurred while saving the page.","Fehler beim Speichern der Seite."
-"Anchor Custom Text","Anchor eigener Text"
-"Anchor Custom Title","Anchor eigener Titel"
-"Are you sure you want to delete current folder?","Soll der aktuelle Ordner wirklich gelöscht werden?"
-"Are you sure you want to delete the selected file?","Soll die ausgewählte Datei wirklich gelöscht werden?"
-"Block","Block"
-"Block Information","Blockinformation"
-"Block Title","Blocktitel"
-"CMS","CMS"
-"CMS Content Wrapper","CMS Content Wrapper"
-"CMS Home Page","CMS Startseite"
-"CMS No Cookies Page","CMS keine Cookies Seite"
-"CMS No Route Page","CMS keine Route Seite"
-"CMS No-Route Page","CMS Keine-Route Seite"
-"CMS Page","CMS Seite"
-"CMS Page Link","CMS Seitenlink"
-"CMS Page Link Block Template","CMS Seitenlink Blockvorlage"
-"CMS Page Link Inline Template","CMS Seitenlink Inlinevorlage"
-"CMS Pages (All)","CMS Seiten (Alle)"
-"CMS Static Block","CMS statischer Block"
-"CMS Static Block Default Template","CMS statischer Block Standardvorlage"
-"Cannot create new directory.","Neues Verzeichnis kann nicht erstellt werden."
-"Cannot delete directory %s.","Verzeichnis %s kann nicht gelöscht werden."
-"Cannot delete root directory %s.","Rootverzeichnis %s kann nicht gelöscht werden."
-"Cannot upload file.","Datei kann nicht hochgeladen werden."
-"Collapse All","Alle einklappen"
-"Content","Inhalt"
-"Content Heading","Contentheading"
-"Content Management","Content Management"
-"Contents of a Static Block","Inhalte eines statischen Blocks"
-"Create Folder...","Ordner anlegen…"
-"Custom Design","Eigene Gestaltung"
+"Save Page","Seite speichern"
+"Delete Page","Seite löschen"
+"Edit Page '%1'","Edit Page '%1'"
+"New Page","Neue Seite"
+"Content Heading",Contentheading
+"Page Layout",Seitenlayout
+Layout,Layout
+"Layout Update XML","Layout Update XML"
"Custom Design From","Eigene Gestaltung von"
"Custom Design To","Eigene Gestaltung bis"
+"Custom Theme","Eigenes Theme"
"Custom Layout","Eigenes Layout"
"Custom Layout Update XML","Eigenes Layout Update XML"
-"Custom Theme","Eigenes Theme"
-"Customer Tax Class Information","Kunden Steuerklasse Information"
-"Date Created","Angelegt am"
-"Delete Block","Block löschen"
-"Delete File","Datei löschen"
+Design,Gestaltung
+"Page Information",Seiteninformation
+"Page Title",Seitentitel
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status",Seitenstatus
+"Meta Data",Metadaten
+Keywords,Schlüsselwörter
+"Meta Keywords",Metaschlüsselwörter
+"Meta Description",Metabeschreibung
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage",Medienspeicher
+"Create Folder...","Ordner anlegen…"
"Delete Folder","Ordner löschen"
-"Delete Page","Seite löschen"
-"Description","Beschreibung"
-"Design","Gestaltung"
-"Disabled","Deaktiviert"
-"Disabled Completely","Komplett deaktiviert"
-"Disabled by Default","Standard-Deaktivierung"
-"Edit Block","Block bearbeiten"
-"Edit Block '%s'","Block '%s' bearbeiten"
-"Edit Page","Seite bearbeiten"
-"Edit Page '%s'","Seite '%s' bearbeiten"
-"Enable WYSIWYG Editor","WYSIWYG-Editor aktivieren"
-"Enabled","Aktiviert"
-"Enabled by Default","Standard-Aktivierung"
-"Expand All","Alle ausklappen"
-"General Information","Allgemeine Information"
-"Go to Home Page","Zur Startseite gehen"
-"Home","Startseite"
-"ID","ID"
-"Identifier","Bezeichner"
-"If empty, the Page Title will be used","Falls leer, wird der Seitentitel verwendet"
-"Images (%s)","Bilder (%s)"
"Insert File","Datei einfügen"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Ungültiger Ordnername. Bitte verwenden Sie alphanumerische Zeichen, Unterstriche und Bindestriche."
-"Keywords","Schlüsselwörter"
-"Last Modified","Zuletzt geändert"
-"Layout","Layout"
-"Layout Update XML","Layout Update XML"
-"Link to a CMS Page","Link zu einer CMS Seite"
-"Manage Pages","Seiten verwalten"
-"Media Gallery","Mediengalerie"
-"Media Storage","Medienspeicher"
-"Meta Data","Metadaten"
-"Meta Description","Metabeschreibung"
-"Meta Keywords","Metaschlüsselwörter"
-"New Block","Neuer Block"
"New Folder Name:","Neuer Ordner Name:"
-"New Page","Neue Seite"
-"No files found","Keine Dateien gefunden"
-"Page Information","Seiteninformation"
-"Page Layout","Seitenlayout"
-"Page Status","Seitenstatus"
-"Page Title","Seitentitel"
-"Pages","Seiten"
-"Product Tax Class Information","Produktsteuerklasse Information"
-"Redirect to CMS-page if Cookies are Disabled","Zu CMS-Seite weiterleiten wenn Cookies deaktiviert sind."
-"Relative to Website Base URL","Relativ zu Website Base URL"
-"Save Block","Block speichern"
-"Save Page","Seite speichern"
-"Save Process","Prozess speichern"
-"Select Block...","Block wählen..."
-"Select Page...","Seite wählen..."
-"Show Breadcrumbs for CMS Pages","Breadcrumbs für CMS Seiten anzeigen"
-"Show Notice if JavaScript is Disabled","Hinweis zeigen wenn JavaScript deaktiviert ist"
-"Static Blocks","Statische Blöcke"
-"Status","Status"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
"Storage Root","Speicher Root"
-"Store View","Store-Ansicht"
-"Template","Vorlage"
-"The block has been deleted.","Der Block wurde gelöscht."
-"The block has been saved.","Der Block wurde gespeichert."
-"The directory %s is not writable by server.","Das Verzeichnis %s ist nicht vom Server beschreibbar."
-"The page URL key cannot consist only of numbers.","Der Seiten URL Schlüssel kann nicht nur aus Ziffern bestehen."
-"The page URL key contains capital letters or disallowed symbols.","Die URL dieser Seite enthält Großbuchstaben oder unerlaubte Symbole."
-"The page has been deleted.","Die Seite wurde gelöscht."
-"The page has been saved.","Die Seite wurde gespeichert."
-"The static block content cannot contain directive with its self.","Der statische Block selbst darf keine Anweisungen enthalten.
-
-
-
-"
+CMS,CMS
+Blocks,Blocks
"This block no longer exists.","Dieser Block existiert nicht mehr."
+"Edit Block","Block bearbeiten"
+"The block has been saved.","Der Block wurde gespeichert."
+"The block has been deleted.","Der Block wurde gelöscht."
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,Seiten
"This page no longer exists.","Diese Seite existiert nicht mehr."
-"Title","Titel"
-"URL Key","URL Schlüssel"
-"Unable to find a block to delete.","Es kann kein Block zum Löschen gefunden werden."
-"Unable to find a page to delete.","Es kann keine Seite zum Löschen gefunden werden."
-"WYSIWYG Options","WYSIWYG Optionen"
-"px.","px."
+"Edit Page","Seite bearbeiten"
+"The page has been saved.","Die Seite wurde gespeichert."
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.","Die Seite wurde gelöscht."
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
+"Enabled by Default",Standard-Aktivierung
+"Disabled by Default",Standard-Deaktivierung
+"Disabled Completely","Komplett deaktiviert"
+"A block identifier with the same properties already exists in the selected store.","Ein Block Bezeichner mit denselben Eigenschaften existiert bereits in dem ausgewählten Store."
+"A page URL key for specified store already exists.","Ein Seiten URL Key für den angegebenen Store existiert bereits."
+"The page URL key contains capital letters or disallowed symbols.","Die URL dieser Seite enthält Großbuchstaben oder unerlaubte Symbole."
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
+"No files found","Keine Dateien gefunden"
+Block,Block
+Template,Vorlage
+"Anchor Custom Text","Anchor eigener Text"
+"Anchor Custom Title","Anchor eigener Titel"
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
+"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
+"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
+"WYSIWYG Options","WYSIWYG Options"
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
+"CMS Page Link","CMS Seitenlink"
+"Link to a CMS Page","Link zu einer CMS Seite"
+"CMS Page","CMS Seite"
+"If empty, the Page Title will be used","Falls leer, wird der Seitentitel verwendet"
+"CMS Page Link Block Template","CMS Seitenlink Blockvorlage"
+"CMS Page Link Inline Template","CMS Seitenlink Inlinevorlage"
+"CMS Static Block","CMS statischer Block"
+"Contents of a Static Block","Inhalte eines statischen Blocks"
+"CMS Static Block Default Template","CMS statischer Block Standardvorlage"
diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv
index 3920b54d590..03a82317472 100644
--- a/app/code/Magento/Cms/i18n/en_US.csv
+++ b/app/code/Magento/Cms/i18n/en_US.csv
@@ -1,123 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","A block identifier with the same properties already exists in the selected store."
-"A directory with the same name already exists. Please try another folder name.","A directory with the same name already exists. Please try another folder name."
-"A page URL key for specified store already exists.","A page URL key for specified store already exists."
-"Action","Action"
-"Add New Block","Add New Block"
-"Add New Page","Add New Page"
-"All Countries","All Countries"
-"An error occurred while saving the page.","An error occurred while saving the page."
-"Anchor Custom Text","Anchor Custom Text"
-"Anchor Custom Title","Anchor Custom Title"
-"Are you sure you want to delete current folder?","Are you sure you want to delete current folder?"
-"Are you sure you want to delete the selected file?","Are you sure you want to delete the selected file?"
-"Block","Block"
+ID,ID
+Action,Action
+"Delete File","Delete File"
+"-- Please Select --","-- Please Select --"
+"Custom Design","Custom Design"
"Block Information","Block Information"
-"Block Title","Block Title"
-"CMS","CMS"
-"CMS Content Wrapper","CMS Content Wrapper"
-"CMS Home Page","CMS Home Page"
-"CMS No Cookies Page","CMS No Cookies Page"
-"CMS No Route Page","CMS No Route Page"
-"CMS No-Route Page","CMS No-Route Page"
-"CMS Page","CMS Page"
-"CMS Page Link","CMS Page Link"
-"CMS Page Link Block Template","CMS Page Link Block Template"
-"CMS Page Link Inline Template","CMS Page Link Inline Template"
-"CMS Pages (All)","CMS Pages (All)"
-"CMS Static Block","CMS Static Block"
-"CMS Static Block Default Template","CMS Static Block Default Template"
-"Cannot create new directory.","Cannot create new directory."
-"Cannot delete directory %s.","Cannot delete directory %s."
-"Cannot delete root directory %s.","Cannot delete root directory %s."
-"Cannot upload file.","Cannot upload file."
+Status,Status
+Disabled,Disabled
+Enabled,Enabled
+"Save and Continue Edit","Save and Continue Edit"
+Title,Title
+"URL Key","URL Key"
+"Store View","Store View"
+Description,Description
+Home,Home
+"Browse Files...","Browse Files..."
+Content,Content
+"General Information","General Information"
+"Go to Home Page","Go to Home Page"
+px.,px.
"Collapse All","Collapse All"
-"Content","Content"
+"Expand All","Expand All"
+"Static Blocks","Static Blocks"
+"Add New Block","Add New Block"
+"Save Block","Save Block"
+"Delete Block","Delete Block"
+"Edit Block '%1'","Edit Block '%1'"
+"New Block","New Block"
+"Block Title","Block Title"
+Identifier,Identifier
+"Manage Pages","Manage Pages"
+"Add New Page","Add New Page"
+"Save Page","Save Page"
+"Delete Page","Delete Page"
+"Edit Page '%1'","Edit Page '%1'"
+"New Page","New Page"
"Content Heading","Content Heading"
-"Content Management","Content Management"
-"Contents of a Static Block","Contents of a Static Block"
-"Create Folder...","Create Folder..."
-"Custom Design","Custom Design"
+"Page Layout","Page Layout"
+Layout,Layout
+"Layout Update XML","Layout Update XML"
"Custom Design From","Custom Design From"
"Custom Design To","Custom Design To"
+"Custom Theme","Custom Theme"
"Custom Layout","Custom Layout"
"Custom Layout Update XML","Custom Layout Update XML"
-"Custom Theme","Custom Theme"
-"Customer Tax Class Information","Customer Tax Class Information"
-"Date Created","Date Created"
-"Delete Block","Delete Block"
-"Delete File","Delete File"
+Design,Design
+"Page Information","Page Information"
+"Page Title","Page Title"
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status","Page Status"
+"Meta Data","Meta Data"
+Keywords,Keywords
+"Meta Keywords","Meta Keywords"
+"Meta Description","Meta Description"
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage","Media Storage"
+"Create Folder...","Create Folder..."
"Delete Folder","Delete Folder"
-"Delete Page","Delete Page"
-"Description","Description"
-"Design","Design"
-"Disabled","Disabled"
-"Disabled Completely","Disabled Completely"
-"Disabled by Default","Disabled by Default"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
+"Storage Root","Storage Root"
+CMS,CMS
+Blocks,Blocks
+"This block no longer exists.","This block no longer exists."
"Edit Block","Edit Block"
-"Edit Block '%s'","Edit Block '%s'"
+"The block has been saved.","The block has been saved."
+"The block has been deleted.","The block has been deleted."
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,Pages
+"This page no longer exists.","This page no longer exists."
"Edit Page","Edit Page"
-"Edit Page '%s'","Edit Page '%s'"
-"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
-"Enabled","Enabled"
+"The page has been saved.","The page has been saved."
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.","The page has been deleted."
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
"Enabled by Default","Enabled by Default"
-"Expand All","Expand All"
-"General Information","General Information"
-"Go to Home Page","Go to Home Page"
-"Home","Home"
-"ID","ID"
-"Identifier","Identifier"
-"If empty, the Page Title will be used","If empty, the Page Title will be used"
-"Images (%s)","Images (%s)"
-"Insert File","Insert File"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Invalid folder name. Please, use alphanumeric characters, underscores and dashes."
-"Keywords","Keywords"
-"Last Modified","Last Modified"
-"Layout","Layout"
-"Layout Update XML","Layout Update XML"
-"Link to a CMS Page","Link to a CMS Page"
-"Manage Pages","Manage Pages"
-"Media Gallery","Media Gallery"
-"Media Storage","Media Storage"
-"Meta Data","Meta Data"
-"Meta Description","Meta Description"
-"Meta Keywords","Meta Keywords"
-"New Block","New Block"
-"New Folder Name:","New Folder Name:"
-"New Page","New Page"
+"Disabled by Default","Disabled by Default"
+"Disabled Completely","Disabled Completely"
+"A block identifier with the same properties already exists in the selected store.","A block identifier with the same properties already exists in the selected store."
+"A page URL key for specified store already exists.","A page URL key for specified store already exists."
+"The page URL key contains capital letters or disallowed symbols.","The page URL key contains capital letters or disallowed symbols."
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
"No files found","No files found"
-"Page Information","Page Information"
-"Page Layout","Page Layout"
-"Page Status","Page Status"
-"Page Title","Page Title"
-"Pages","Pages"
-"Product Tax Class Information","Product Tax Class Information"
-"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
-"Relative to Website Base URL","Relative to Website Base URL"
-"Save Block","Save Block"
-"Save Page","Save Page"
-"Save Process","Save Process"
-"Select Block...","Select Block..."
-"Select Page...","Select Page..."
+Block,Block
+Template,Template
+"Anchor Custom Text","Anchor Custom Text"
+"Anchor Custom Title","Anchor Custom Title"
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
-"Static Blocks","Static Blocks"
-"Status","Status"
-"Storage Root","Storage Root"
-"Store View","Store View"
-"Template","Template"
-"The block has been deleted.","The block has been deleted."
-"The block has been saved.","The block has been saved."
-"The directory %s is not writable by server.","The directory %s is not writable by server."
-"The page URL key cannot consist only of numbers.","The page URL key cannot consist only of numbers."
-"The page URL key contains capital letters or disallowed symbols.","The page URL key contains capital letters or disallowed symbols."
-"The page has been deleted.","The page has been deleted."
-"The page has been saved.","The page has been saved."
-"The static block content cannot contain directive with its self.","The static block content cannot contain directive with its self."
-"This block no longer exists.","This block no longer exists."
-"This page no longer exists.","This page no longer exists."
-"Title","Title"
-"URL Key","URL Key"
-"Unable to find a block to delete.","Unable to find a block to delete."
-"Unable to find a page to delete.","Unable to find a page to delete."
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
"WYSIWYG Options","WYSIWYG Options"
-"px.","px."
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
+"CMS Page Link","CMS Page Link"
+"Link to a CMS Page","Link to a CMS Page"
+"CMS Page","CMS Page"
+"If empty, the Page Title will be used","If empty, the Page Title will be used"
+"CMS Page Link Block Template","CMS Page Link Block Template"
+"CMS Page Link Inline Template","CMS Page Link Inline 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"
diff --git a/app/code/Magento/Cms/i18n/es_ES.csv b/app/code/Magento/Cms/i18n/es_ES.csv
index 69eeff8042e..90bcb395cd0 100644
--- a/app/code/Magento/Cms/i18n/es_ES.csv
+++ b/app/code/Magento/Cms/i18n/es_ES.csv
@@ -1,123 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","Ya existe un identificador de bloque con las mismas propiedades en la tienda seleccionada."
-"A directory with the same name already exists. Please try another folder name.","Ya existe un directorio con el mismo nombre. Por favor elija otro nombre de carpeta."
-"A page URL key for specified store already exists.","Ya existe una clave de página URL para la tienda especificada."
-"Action","Acción"
-"Add New Block","Añadir nuevo bloque"
-"Add New Page","Añadir nueva página"
-"All Countries","Todos los paÃses"
-"An error occurred while saving the page.","Ocurrió un error mientras se grababa la página."
-"Anchor Custom Text","Texto personalizado del delimitador"
-"Anchor Custom Title","TÃtulo personalizado del delimitador"
-"Are you sure you want to delete current folder?","Está usted seguro de borrar la carpeta acutal?"
-"Are you sure you want to delete the selected file?","Está usted seguro de borrar el archivo seleccionado?"
-"Block","Bloque"
+ID,ID
+Action,Acción
+"Delete File","Borrar Archivo"
+"-- Please Select --","-- Please Select --"
+"Custom Design","Diseño Personalizado"
"Block Information","Información de bloque"
-"Block Title","TÃtulo de bloque"
-"CMS","CMS"
-"CMS Content Wrapper","CMS contenedor de contenido"
-"CMS Home Page","Página principal del CMS"
-"CMS No Cookies Page","Página CMS sin cookies"
-"CMS No Route Page","Página CMS sin ruta"
-"CMS No-Route Page","Página sin ruta del CMS"
-"CMS Page","Página CMS"
-"CMS Page Link","Enlace de página CMS"
-"CMS Page Link Block Template","Plantilla en bloque de la página de enlaces del CMS"
-"CMS Page Link Inline Template","Plantilla en lÃnea de la página de enlaces del CMS"
-"CMS Pages (All)","Páginas del CMS (Todas)"
-"CMS Static Block","Bloque estático CMS"
-"CMS Static Block Default Template","Tema por defecto del bloque estático CMS"
-"Cannot create new directory.","No puede crearse un nuevo directorio."
-"Cannot delete directory %s.","No puede borrarse el directorio %s."
-"Cannot delete root directory %s.","No puede borrarse el directorio raÃz %s."
-"Cannot upload file.","No puede subir el archivo"
+Status,Estado
+Disabled,Deshabilitado
+Enabled,Habilitado
+"Save and Continue Edit","Save and Continue Edit"
+Title,TÃtulo
+"URL Key","Clave URL"
+"Store View","Ver Tienda"
+Description,Descripción
+Home,Inicio
+"Browse Files...","Browse Files..."
+Content,Contenido
+"General Information","Información general"
+"Go to Home Page","Ir a la página de inicio"
+px.,px.
"Collapse All","Desplegar Todo"
-"Content","Contenido"
+"Expand All","Expandir todo"
+"Static Blocks","Bloques estáticos"
+"Add New Block","Añadir nuevo bloque"
+"Save Block","Guardar bloque"
+"Delete Block","Borrar Bloque"
+"Edit Block '%1'","Edit Block '%1'"
+"New Block","Nuevo bloque"
+"Block Title","TÃtulo de bloque"
+Identifier,Identificador
+"Manage Pages","Administrar páginas"
+"Add New Page","Añadir nueva página"
+"Save Page","Guardar página"
+"Delete Page","Borrar Página"
+"Edit Page '%1'","Edit Page '%1'"
+"New Page","Nueva Página"
"Content Heading","Cabecera de Contenido"
-"Content Management","Gestión de Contenido"
-"Contents of a Static Block","Cotenidos de un bloque estático"
-"Create Folder...","Crear Carpeta ..."
-"Custom Design","Diseño Personalizado"
+"Page Layout","Diseño de página"
+Layout,Diseño
+"Layout Update XML","XML para actualización de diseño"
"Custom Design From","Diseño personalizado desde"
"Custom Design To","Diseño personalizado a"
+"Custom Theme","Tema personalizado"
"Custom Layout","Diseño Personalizado"
"Custom Layout Update XML","Actualización diseño personalizado XML"
-"Custom Theme","Tema personalizado"
-"Customer Tax Class Information","Información de clase de impuestos del cliente"
-"Date Created","Fecha Creada"
-"Delete Block","Borrar Bloque"
-"Delete File","Borrar Archivo"
+Design,Diseño
+"Page Information","Información de la página"
+"Page Title","TÃtulo de la página"
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status","Estado de la página"
+"Meta Data",Metadatos
+Keywords,"Palabras clave"
+"Meta Keywords","Meta palabras clave"
+"Meta Description",Metadescipción
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage","Almacenamiento de objetos multimedia"
+"Create Folder...","Crear Carpeta ..."
"Delete Folder","Borrar Carpeta"
-"Delete Page","Borrar Página"
-"Description","Descripción"
-"Design","Diseño"
-"Disabled","Deshabilitado"
-"Disabled Completely","Desactivar completamente"
-"Disabled by Default","Deshabilitado por defecto"
-"Edit Block","Editar bloque"
-"Edit Block '%s'","Editar Bloque '%s'"
-"Edit Page","Editar Página"
-"Edit Page '%s'","Editar Página '%s'"
-"Enable WYSIWYG Editor","Activar Editor WYSIWYG"
-"Enabled","Habilitado"
-"Enabled by Default","Habilitado por defecto"
-"Expand All","Expandir todo"
-"General Information","Información general"
-"Go to Home Page","Ir a la página de inicio"
-"Home","Inicio"
-"ID","ID"
-"Identifier","Identificador"
-"If empty, the Page Title will be used","Si se deja vacÃo, se usará elTÃtulo de la Página"
-"Images (%s)","Imágenes (%s)"
"Insert File","Añadir Fichero"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Nombre de carpeta inválido. Por favor, use caracteres alfanuméricos, subrayados y guiones."
-"Keywords","Palabras clave"
-"Last Modified","Ultima modificación"
-"Layout","Diseño"
-"Layout Update XML","XML para actualización de diseño"
-"Link to a CMS Page","Enlace a una página de CMS"
-"Manage Pages","Administrar páginas"
-"Media Gallery","GalerÃa de medios"
-"Media Storage","Almacenamiento de objetos multimedia"
-"Meta Data","Metadatos"
-"Meta Description","Metadescipción"
-"Meta Keywords","Meta palabras clave"
-"New Block","Nuevo bloque"
"New Folder Name:","Nombre de la nueva carpeta"
-"New Page","Nueva Página"
-"No files found","No se encontraron archivos"
-"Page Information","Información de la página"
-"Page Layout","Diseño de página"
-"Page Status","Estado de la página"
-"Page Title","TÃtulo de la página"
-"Pages","Páginas"
-"Product Tax Class Information","Información de clase impositiva del producto"
-"Redirect to CMS-page if Cookies are Disabled","Redirigir a página CMS si las cookies están desactivadas"
-"Relative to Website Base URL","En relación a la URL básica del sitio web"
-"Save Block","Guardar bloque"
-"Save Page","Guardar página"
-"Save Process","Guardar proceso"
-"Select Block...","Seleccionar bloque..."
-"Select Page...","Seleccionar página..."
-"Show Breadcrumbs for CMS Pages","Mostrar rastro de navegación para las páginas CMS"
-"Show Notice if JavaScript is Disabled","Mostrar aviso si JavaScript está desactivado"
-"Static Blocks","Bloques estáticos"
-"Status","Estado"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
"Storage Root","RaÃz de almacenamiento"
-"Store View","Ver Tienda"
-"Template","Plantilla"
-"The block has been deleted.","Se eliminó el bloque."
-"The block has been saved.","Se guardó el bloque."
-"The directory %s is not writable by server.","El servidor no puede escribir en el directorio %s."
-"The page URL key cannot consist only of numbers.","La clave de dirección URL de la página no puede consistir sólo en números."
-"The page URL key contains capital letters or disallowed symbols.","El URL de la página contiene letras mayúsculas o sÃmbolos no permitidos."
-"The page has been deleted.","Se eliminó la página."
-"The page has been saved.","Se guardó la página."
-"The static block content cannot contain directive with its self.","El contenido del bloque estático no puede incluir directriz dentro de sÃ."
+CMS,CMS
+Blocks,Blocks
"This block no longer exists.","Este bloque ya no existe."
+"Edit Block","Editar bloque"
+"The block has been saved.","Se guardó el bloque."
+"The block has been deleted.","Se eliminó el bloque."
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,Páginas
"This page no longer exists.","Esta página ya no existe."
-"Title","TÃtulo"
-"URL Key","Clave URL"
-"Unable to find a block to delete.","No se puede encontrar un bloque para eliminar."
-"Unable to find a page to delete.","No se puede encontrar una página para eliminar."
-"WYSIWYG Options","Opciones de formato WYSIWYG"
-"px.","px."
+"Edit Page","Editar Página"
+"The page has been saved.","Se guardó la página."
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.","Se eliminó la página."
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
+"Enabled by Default","Habilitado por defecto"
+"Disabled by Default","Deshabilitado por defecto"
+"Disabled Completely","Desactivar completamente"
+"A block identifier with the same properties already exists in the selected store.","Ya existe un identificador de bloque con las mismas propiedades en la tienda seleccionada."
+"A page URL key for specified store already exists.","Ya existe una clave de página URL para la tienda especificada."
+"The page URL key contains capital letters or disallowed symbols.","El URL de la página contiene letras mayúsculas o sÃmbolos no permitidos."
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
+"No files found","No se encontraron archivos"
+Block,Bloque
+Template,Plantilla
+"Anchor Custom Text","Texto personalizado del delimitador"
+"Anchor Custom Title","TÃtulo personalizado del delimitador"
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
+"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
+"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
+"WYSIWYG Options","WYSIWYG Options"
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
+"CMS Page Link","Enlace de página CMS"
+"Link to a CMS Page","Enlace a una página de CMS"
+"CMS Page","Página CMS"
+"If empty, the Page Title will be used","Si se deja vacÃo, se usará elTÃtulo de la Página"
+"CMS Page Link Block Template","Plantilla en bloque de la página de enlaces del CMS"
+"CMS Page Link Inline Template","Plantilla en lÃnea de la página de enlaces del CMS"
+"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"
diff --git a/app/code/Magento/Cms/i18n/fr_FR.csv b/app/code/Magento/Cms/i18n/fr_FR.csv
index 7d023b99ab5..3feb0add8c1 100644
--- a/app/code/Magento/Cms/i18n/fr_FR.csv
+++ b/app/code/Magento/Cms/i18n/fr_FR.csv
@@ -1,123 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","Un identificateur de blocs existe déjà avec la même boutique sélectionnée."
-"A directory with the same name already exists. Please try another folder name.","Un répertoire avec le même nom existe déjà . Veuillez essayer un autre nom de dossier."
-"A page URL key for specified store already exists.","Une clé d'URL de la page pour la boutique spécifiée existe déjà ."
-"Action","Action"
-"Add New Block","Ajouter nouveau bloc"
-"Add New Page","Ajouter nouvelle page"
-"All Countries","Tous les pays"
-"An error occurred while saving the page.","Une erreur est survenue lors de l'enregistrement de la page"
-"Anchor Custom Text","Fixer texte personnalisé"
-"Anchor Custom Title","Fixer titre personnalisé"
-"Are you sure you want to delete current folder?","Etes-vous sûr de vouloir supprimer le dossier actuel ?"
-"Are you sure you want to delete the selected file?","Etes-vous sûr de vouloir supprimer le fichier sélectionné ?"
-"Block","Bloc"
+ID,ID
+Action,Action
+"Delete File","Supprimer fichier"
+"-- Please Select --","-- Please Select --"
+"Custom Design","Dessin sur mesure"
"Block Information","Bloquer l'information"
-"Block Title","Titre du bloc"
-"CMS","CMS"
-"CMS Content Wrapper","CMS Content Wrapper"
-"CMS Home Page","Page d'accueil du CMS"
-"CMS No Cookies Page","Page sans cookies du CMS"
-"CMS No Route Page","Page sans tracage du CMS"
-"CMS No-Route Page","Page sans tracage du CMS"
-"CMS Page","Page du CMS"
-"CMS Page Link","Lien de la page du CMS"
-"CMS Page Link Block Template","Modèle de lien vers la page de CMS"
-"CMS Page Link Inline Template","Modèle de la ligne du lien vers la page du CMS"
-"CMS Pages (All)","Toutes les pages du CMS"
-"CMS Static Block","Bloc statique du CMS"
-"CMS Static Block Default Template","Modèle de bloc statique par défaut du CMS"
-"Cannot create new directory.","Ne peut pas créer le nouveau répertoire."
-"Cannot delete directory %s.","Ne peut pas supprimer le répertoire %s."
-"Cannot delete root directory %s.","Ne peut pas supprimer le répertoire racine %s."
-"Cannot upload file.","Ne peut pas envoyer le fichier."
+Status,Statut
+Disabled,Désactivé
+Enabled,Activé
+"Save and Continue Edit","Save and Continue Edit"
+Title,Titre
+"URL Key","Clé de l'URL"
+"Store View","Vue du magasin"
+Description,Description
+Home,Accueil
+"Browse Files...","Browse Files..."
+Content,Contenu
+"General Information","Informations générales"
+"Go to Home Page","Aller à la page d'accueil"
+px.,px.
"Collapse All","Afficher tout"
-"Content","Contenu"
+"Expand All","Tout afficher"
+"Static Blocks","Blocs statiques"
+"Add New Block","Ajouter nouveau bloc"
+"Save Block","Sauvegarder le bloc"
+"Delete Block","Supprimer bloc"
+"Edit Block '%1'","Edit Block '%1'"
+"New Block","Nouveau bloc"
+"Block Title","Titre du bloc"
+Identifier,Identificateur
+"Manage Pages","Gérer les pages"
+"Add New Page","Ajouter nouvelle page"
+"Save Page","Sauvegarder la page"
+"Delete Page","Supprimer page"
+"Edit Page '%1'","Edit Page '%1'"
+"New Page","Nouvelle page"
"Content Heading","Titre du contenu"
-"Content Management","Gestion du contenu"
-"Contents of a Static Block","Contenu des blocs statiques"
-"Create Folder...","Créer dossier ..."
-"Custom Design","Dessin sur mesure"
+"Page Layout","Disposition de la page"
+Layout,Disposition
+"Layout Update XML","Mise à jour XML de la disposition"
"Custom Design From","Design personnalisé de"
"Custom Design To","Design personnalisé à "
+"Custom Theme","Thème personnalisé"
"Custom Layout","Disposition personnalisée"
"Custom Layout Update XML","Mise à jour XML de la disposition personnalisée"
-"Custom Theme","Thème personnalisé"
-"Customer Tax Class Information","Information sur la classe de taxe client"
-"Date Created","Date de création"
-"Delete Block","Supprimer bloc"
-"Delete File","Supprimer fichier"
+Design,Design
+"Page Information","Informations de la page"
+"Page Title","Titre de la page"
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status","Statut de la page"
+"Meta Data",méta-données
+Keywords,"Mots clés"
+"Meta Keywords","Méta-mots clés"
+"Meta Description",Méta-description
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage","Stockage des médias"
+"Create Folder...","Créer dossier ..."
"Delete Folder","Supprimer dossier"
-"Delete Page","Supprimer page"
-"Description","Description"
-"Design","Design"
-"Disabled","Désactivé"
-"Disabled Completely","Entièrement désactivé"
-"Disabled by Default","Désactivé par défaut"
-"Edit Block","Modifier bloc"
-"Edit Block '%s'","Modifier Block '%s'"
-"Edit Page","Modifier page"
-"Edit Page '%s'","Modifier page '%s'"
-"Enable WYSIWYG Editor","Activer l'éditeur WYSIWYG"
-"Enabled","Activé"
-"Enabled by Default","Activé par défaut"
-"Expand All","Tout afficher"
-"General Information","Informations générales"
-"Go to Home Page","Aller à la page d'accueil"
-"Home","Accueil"
-"ID","ID"
-"Identifier","Identificateur"
-"If empty, the Page Title will be used","Si vide, le titre de la page sera utilisé"
-"Images (%s)","Images (%s)"
"Insert File","Insérer un fichier"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Nom de dossier invalide. Veuillez n'utilisez que des caractères alphanumériques et des tirets."
-"Keywords","Mots clés"
-"Last Modified","Modifié pour la dernière fois"
-"Layout","Disposition"
-"Layout Update XML","Mise à jour XML de la disposition"
-"Link to a CMS Page","Lien vers une page CMS"
-"Manage Pages","Gérer les pages"
-"Media Gallery","Media Gallery"
-"Media Storage","Stockage des médias"
-"Meta Data","méta-données"
-"Meta Description","Méta-description"
-"Meta Keywords","Méta-mots clés"
-"New Block","Nouveau bloc"
"New Folder Name:","Nouveau nom de dossier :"
-"New Page","Nouvelle page"
-"No files found","Aucun fichier trouvé"
-"Page Information","Informations de la page"
-"Page Layout","Disposition de la page"
-"Page Status","Statut de la page"
-"Page Title","Titre de la page"
-"Pages","Pages"
-"Product Tax Class Information","Information sur la catégorie de taxe sur les produits"
-"Redirect to CMS-page if Cookies are Disabled","Rediriger vers une page du CMS si les cookies sont désactivés"
-"Relative to Website Base URL","Dépend de l'URL de base du site web"
-"Save Block","Sauvegarder le bloc"
-"Save Page","Sauvegarder la page"
-"Save Process","Sauvegarder le processus"
-"Select Block...","Sélectionner le bloc ..."
-"Select Page...","Sélectionner la page ...."
-"Show Breadcrumbs for CMS Pages","Afficher les miettes pour les pages du CMS"
-"Show Notice if JavaScript is Disabled","Afficher l'avertissement si le Javascript est désactivé"
-"Static Blocks","Blocs statiques"
-"Status","Statut"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
"Storage Root","Racine du stockage"
-"Store View","Vue du magasin"
-"Template","Modèle visuel"
-"The block has been deleted.","Le bloc a été supprimé."
-"The block has been saved.","Le bloc a été sauvegardé."
-"The directory %s is not writable by server.","Le répertoire %s n'est pas accessible en écriture."
-"The page URL key cannot consist only of numbers.","La clé de l'URL de la page ne peut pas contenir uniquement des chiffres."
-"The page URL key contains capital letters or disallowed symbols.","L'URL de la page contient des lettres capitales ou des symboles non autorisés."
-"The page has been deleted.","La page a été supprimée."
-"The page has been saved.","La page a été sauvegardée."
-"The static block content cannot contain directive with its self.","Le bloc statique ne peut pas comporter une instruction avec lui-même. "
+CMS,CMS
+Blocks,Blocks
"This block no longer exists.","Ce bloc n'existe plus."
+"Edit Block","Modifier bloc"
+"The block has been saved.","Le bloc a été sauvegardé."
+"The block has been deleted.","Le bloc a été supprimé."
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,Pages
"This page no longer exists.","Cette page n'existe plus."
-"Title","Titre"
-"URL Key","Clé de l'URL"
-"Unable to find a block to delete.","Impossible de trouver un bloc à supprimer"
-"Unable to find a page to delete.","Impossible de trouver une page à supprimer."
-"WYSIWYG Options","Options WYSIWYG"
-"px.","px."
+"Edit Page","Modifier page"
+"The page has been saved.","La page a été sauvegardée."
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.","La page a été supprimée."
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
+"Enabled by Default","Activé par défaut"
+"Disabled by Default","Désactivé par défaut"
+"Disabled Completely","Entièrement désactivé"
+"A block identifier with the same properties already exists in the selected store.","Un identificateur de blocs existe déjà avec la même boutique sélectionnée."
+"A page URL key for specified store already exists.","Une clé d'URL de la page pour la boutique spécifiée existe déjà ."
+"The page URL key contains capital letters or disallowed symbols.","L'URL de la page contient des lettres capitales ou des symboles non autorisés."
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
+"No files found","Aucun fichier trouvé"
+Block,Bloc
+Template,"Modèle visuel"
+"Anchor Custom Text","Fixer texte personnalisé"
+"Anchor Custom Title","Fixer titre personnalisé"
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
+"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
+"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
+"WYSIWYG Options","WYSIWYG Options"
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
+"CMS Page Link","Lien de la page du CMS"
+"Link to a CMS Page","Lien vers une page CMS"
+"CMS Page","Page du CMS"
+"If empty, the Page Title will be used","Si vide, le titre de la page sera utilisé"
+"CMS Page Link Block Template","Modèle de lien vers la page de CMS"
+"CMS Page Link Inline Template","Modèle de la ligne du lien vers la page du CMS"
+"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"
diff --git a/app/code/Magento/Cms/i18n/nl_NL.csv b/app/code/Magento/Cms/i18n/nl_NL.csv
index fd4a1199c56..259123f1fe6 100644
--- a/app/code/Magento/Cms/i18n/nl_NL.csv
+++ b/app/code/Magento/Cms/i18n/nl_NL.csv
@@ -1,123 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","Een blok identificeerder met dezelfde waarden bestaat reeds in de geselecteerde winkel."
-"A directory with the same name already exists. Please try another folder name.","Een directory met dezelfde naam bestaat reeds. Probeer a.u.b. een andere mapnaam."
-"A page URL key for specified store already exists.","Een pagina URL sleutel voor gespecificeerde winkel bestaat reeds."
-"Action","Actie"
+ID,ID
+Action,Actie
+"Delete File","Verwijder bestand"
+"-- Please Select --","-- Please Select --"
+"Custom Design","Aangepast ontwerp"
+"Block Information",Blokkeerinformatie
+Status,Status
+Disabled,Uitgeschakeld
+Enabled,"Werkzaam gemaakt"
+"Save and Continue Edit","Save and Continue Edit"
+Title,Titel
+"URL Key","URL sleutel"
+"Store View",Winkelweergave
+Description,Omschrijving
+Home,Thuis
+"Browse Files...","Browse Files..."
+Content,Inhoud
+"General Information","Algemene informatie"
+"Go to Home Page","Ga naar homepage"
+px.,px.
+"Collapse All","Vouw allen in"
+"Expand All","Klap allen uit"
+"Static Blocks","Statische blokken"
"Add New Block","Voeg nieuw blok toe."
+"Save Block","Sla blok op"
+"Delete Block","Verwijder blok"
+"Edit Block '%1'","Edit Block '%1'"
+"New Block","Nieuw blok"
+"Block Title",Blokkeertitel
+Identifier,Identificeerder
+"Manage Pages","beheer pagina's"
"Add New Page","Voeg nieuwe pagina toe"
-"All Countries","Alle landen"
-"An error occurred while saving the page.","Er is een fout opgetreden tijdens het opslaan van de pagina."
-"Anchor Custom Text","Anker aangepaste tekst"
-"Anchor Custom Title","Anker aangepaste titel"
-"Are you sure you want to delete current folder?","Weet u zeker dat u de huidige map wilt verwijderen?"
-"Are you sure you want to delete the selected file?","Weet u zeker dat u het geselecteerde bestand wilt verwijderen?"
-"Block","Blokkeer"
-"Block Information","Blokkeerinformatie"
-"Block Title","Blokkeertitel"
-"CMS","CMS"
-"CMS Content Wrapper","CMS inhouds wikkel"
-"CMS Home Page","CMS thuispagina"
-"CMS No Cookies Page","CMS geen cookies pagina"
-"CMS No Route Page","CMS geen route pagina"
-"CMS No-Route Page","CMS geen-route pagina"
-"CMS Page","CMS pagina"
-"CMS Page Link","CMS pagina link"
-"CMS Page Link Block Template","CMS pagina link blokkeer thema"
-"CMS Page Link Inline Template","CMS pagina link in lijn thema"
-"CMS Pages (All)","CMS pagina's (alle)"
-"CMS Static Block","CMS statisch blok"
-"CMS Static Block Default Template","CMS statisch blok standaard thema"
-"Cannot create new directory.","Kan geen nieuwe directory maken"
-"Cannot delete directory %s.","Kan directory %s niet verwijderen."
-"Cannot delete root directory %s.","Kan worteldirectory %s niet verwijderen."
-"Cannot upload file.","Kan bestand niet uploaden"
-"Collapse All","Vouw allen in"
-"Content","Inhoud"
+"Save Page","Sla pagina op"
+"Delete Page","Verwijder pagina"
+"Edit Page '%1'","Edit Page '%1'"
+"New Page","Nieuwe pagina"
"Content Heading","Inhoud hoofd"
-"Content Management","Inhoudsbeheer"
-"Contents of a Static Block","Inhoud van een statisch blok"
-"Create Folder...","Maak map..."
-"Custom Design","Aangepast ontwerp"
+"Page Layout","Pagina layout"
+Layout,layout
+"Layout Update XML","layout update XML"
"Custom Design From","Aangepast ontwerp formulier"
"Custom Design To","Aangepast ontwerp naar"
+"Custom Theme","Aangepast thema"
"Custom Layout","Aangepaste layout"
"Custom Layout Update XML","Aangepaste layout vernieuwing XML"
-"Custom Theme","Aangepast thema"
-"Customer Tax Class Information","Klant belasting klasse informatie"
-"Date Created","datum gecreëerd."
-"Delete Block","Verwijder blok"
-"Delete File","Verwijder bestand"
-"Delete Folder","Verwijder map"
-"Delete Page","Verwijder pagina"
-"Description","Omschrijving"
-"Design","Ontwerp"
-"Disabled","Uitgeschakeld"
-"Disabled Completely","Compleet uitgeschakeld"
-"Disabled by Default","Uitgeschakeld in standaardmodus"
-"Edit Block","Bewerk blok"
-"Edit Block '%s'","Bewerk blok '%s'"
-"Edit Page","Bewerk pagina"
-"Edit Page '%s'","Bewerk pagina '%s'"
-"Enable WYSIWYG Editor","Stel WYSIWYG bewerker in"
-"Enabled","Werkzaam gemaakt"
-"Enabled by Default","Ingeschakeld door standaard"
-"Expand All","Klap allen uit"
-"General Information","Algemene informatie"
-"Go to Home Page","Ga naar homepage"
-"Home","Thuis"
-"ID","ID"
-"Identifier","Identificeerder"
-"If empty, the Page Title will be used","Indien leeg, zal de paginatitel worden gebruikt"
-"Images (%s)","Afbeeldingen (%s)"
-"Insert File","Voeg bestand in"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Onjuiste mapnaam. Gebruik a.u.b. alfanumerieke karakters, lage streepjes en streepjes."
-"Keywords","sleutelwoorden"
-"Last Modified","laatst gemodificeerd"
-"Layout","layout"
-"Layout Update XML","layout update XML"
-"Link to a CMS Page","Link naar een CMS pagina"
-"Manage Pages","beheer pagina's"
-"Media Gallery","Media gallerij"
-"Media Storage","Media opslag"
+Design,Ontwerp
+"Page Information","Pagina informatie"
+"Page Title","Pagina titel"
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status","Pagina status"
"Meta Data","Meta data"
-"Meta Description","Meta omschrijving"
+Keywords,sleutelwoorden
"Meta Keywords","Meta sleutelwoorden"
-"New Block","Nieuw blok"
+"Meta Description","Meta omschrijving"
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage","Media opslag"
+"Create Folder...","Maak map..."
+"Delete Folder","Verwijder map"
+"Insert File","Voeg bestand in"
"New Folder Name:","Nieuwe mapnaam:"
-"New Page","Nieuwe pagina"
-"No files found","Geen bestanden gevonden"
-"Page Information","Pagina informatie"
-"Page Layout","Pagina layout"
-"Page Status","Pagina status"
-"Page Title","Pagina titel"
-"Pages","Pagina's"
-"Product Tax Class Information","Product belasting klasse informatie"
-"Redirect to CMS-page if Cookies are Disabled","Leid om naar CMS-pagina indien cookies zijn uitgeschakeld"
-"Relative to Website Base URL","Relatief aan website basis URL"
-"Save Block","Sla blok op"
-"Save Page","Sla pagina op"
-"Save Process","Sla proces op"
-"Select Block...","Selecteer blok..."
-"Select Page...","Selecteer pagina..."
-"Show Breadcrumbs for CMS Pages","Toon broodkruimels voor CMS pagina's"
-"Show Notice if JavaScript is Disabled","Toon notitie indien JavaScript is aangezet"
-"Static Blocks","Statische blokken"
-"Status","Status"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
"Storage Root","Opslag wortel"
-"Store View","Winkelweergave"
-"Template","Thema"
-"The block has been deleted.","Het blok is verwijderd"
-"The block has been saved.","Het blok is opgeslagen"
-"The directory %s is not writable by server.","De directory%s is niet overschrijfbaar door de server."
-"The page URL key cannot consist only of numbers.","De pagina-URL sleutel kan niet alleen uit nummers bestaan."
-"The page URL key contains capital letters or disallowed symbols.","De pagina-URL sleutel bevat hoofdletters of niet-toegestane symbolen."
-"The page has been deleted.","De pagina is verwijderd"
-"The page has been saved.","De pagina is opgeslagen"
-"The static block content cannot contain directive with its self.","De inhoud van het statische blok mag geen richtlijn met zichzelf bevatten."
+CMS,CMS
+Blocks,Blocks
"This block no longer exists.","Dit blok bestaat niet langer"
+"Edit Block","Bewerk blok"
+"The block has been saved.","Het blok is opgeslagen"
+"The block has been deleted.","Het blok is verwijderd"
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,Pagina's
"This page no longer exists.","Deze pagina bestaat niet langer"
-"Title","Titel"
-"URL Key","URL sleutel"
-"Unable to find a block to delete.","Niet in staat om een blok te vinden om te verwijderen"
-"Unable to find a page to delete.","Niet in staat om een pagina te vinden om te verwijderen"
-"WYSIWYG Options","WYSIWYG opties"
-"px.","px."
+"Edit Page","Bewerk pagina"
+"The page has been saved.","De pagina is opgeslagen"
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.","De pagina is verwijderd"
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
+"Enabled by Default","Ingeschakeld door standaard"
+"Disabled by Default","Uitgeschakeld in standaardmodus"
+"Disabled Completely","Compleet uitgeschakeld"
+"A block identifier with the same properties already exists in the selected store.","Een blok identificeerder met dezelfde waarden bestaat reeds in de geselecteerde winkel."
+"A page URL key for specified store already exists.","Een pagina URL sleutel voor gespecificeerde winkel bestaat reeds."
+"The page URL key contains capital letters or disallowed symbols.","De pagina-URL sleutel bevat hoofdletters of niet-toegestane symbolen."
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
+"No files found","Geen bestanden gevonden"
+Block,Blokkeer
+Template,Thema
+"Anchor Custom Text","Anker aangepaste tekst"
+"Anchor Custom Title","Anker aangepaste titel"
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
+"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
+"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
+"WYSIWYG Options","WYSIWYG Options"
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
+"CMS Page Link","CMS pagina link"
+"Link to a CMS Page","Link naar een CMS pagina"
+"CMS Page","CMS pagina"
+"If empty, the Page Title will be used","Indien leeg, zal de paginatitel worden gebruikt"
+"CMS Page Link Block Template","CMS pagina link blokkeer thema"
+"CMS Page Link Inline Template","CMS pagina link in lijn 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"
diff --git a/app/code/Magento/Cms/i18n/pt_BR.csv b/app/code/Magento/Cms/i18n/pt_BR.csv
index 95ffb909c18..daf3cf4a6f5 100644
--- a/app/code/Magento/Cms/i18n/pt_BR.csv
+++ b/app/code/Magento/Cms/i18n/pt_BR.csv
@@ -1,123 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","Já existe na loja selecionada um identificador de bloco com as mesmas propriedades."
-"A directory with the same name already exists. Please try another folder name.","Já existe um diretório com o mesmo nome. Experimente outro nome de pasta."
-"A page URL key for specified store already exists.","Já existe uma chave de URL para a loja especificada."
-"Action","Ação"
-"Add New Block","Adicionar Novo Bloco"
-"Add New Page","Adicionar Nova Página"
-"All Countries","Todos os PaÃses"
-"An error occurred while saving the page.","Ocorreu um erro ao salvar a página."
-"Anchor Custom Text","Texto âncora personalizado"
-"Anchor Custom Title","TÃtulo âncora personalizado"
-"Are you sure you want to delete current folder?","Tem certeza de que deseja apagar a pasta atual?"
-"Are you sure you want to delete the selected file?","Tem certeza de que deseja apagar o arquivo selecionado?"
-"Block","Bloco"
+ID,Identidade
+Action,Ação
+"Delete File","Apagar Arquivo"
+"-- Please Select --","-- Please Select --"
+"Custom Design","Personalizar Design"
"Block Information","Informações de bloco"
-"Block Title","TÃtulo de Bloco"
-"CMS","SGC"
-"CMS Content Wrapper","Adaptador de conteúdo de SGC"
-"CMS Home Page","Página inicial de SGC"
-"CMS No Cookies Page","Página CMS para Bloqueio de Cookies"
-"CMS No Route Page","Página CMS para Bloqueio de Rotas"
-"CMS No-Route Page","Página sem rota de SGC"
-"CMS Page","Página CMS"
-"CMS Page Link","Link de Página CMS"
-"CMS Page Link Block Template","Modelo de bloco de link da página de SGC"
-"CMS Page Link Inline Template","Modelo Em Linha de Link de Página CMS"
-"CMS Pages (All)","Páginas CMS (Todas)"
-"CMS Static Block","Bloco Estático do CMS"
-"CMS Static Block Default Template","Template Padrão do Bloco Estático do CMS"
-"Cannot create new directory.","Não foi possÃvel criar um novo diretório."
-"Cannot delete directory %s.","Não foi possÃvel apagar o diretório %s."
-"Cannot delete root directory %s.","Não foi possÃvel apagar o diretório raiz %s."
-"Cannot upload file.","Não foi possÃvel atualizar o arquivo."
+Status,Status
+Disabled,Desativado
+Enabled,Ativado
+"Save and Continue Edit","Save and Continue Edit"
+Title,TÃtulo
+"URL Key","Chave URL"
+"Store View","Visualização da loja"
+Description,Descrição
+Home,InÃcio
+"Browse Files...","Browse Files..."
+Content,Conteúdo
+"General Information","Informações gerais"
+"Go to Home Page","Ir para Página Inicial"
+px.,px.
"Collapse All","Fechar Tudo"
-"Content","Conteúdo"
+"Expand All","Expandir Todos"
+"Static Blocks","Blocos Estáticos"
+"Add New Block","Adicionar Novo Bloco"
+"Save Block","Salvar Bloco"
+"Delete Block","Apagar Bloco"
+"Edit Block '%1'","Edit Block '%1'"
+"New Block","Novo Bloco"
+"Block Title","TÃtulo de Bloco"
+Identifier,Identificador
+"Manage Pages","Gerenciar Páginas"
+"Add New Page","Adicionar Nova Página"
+"Save Page","Salvar Página"
+"Delete Page","Apagar Página"
+"Edit Page '%1'","Edit Page '%1'"
+"New Page","Nova página"
"Content Heading","Cabeçalho do conteúdo"
-"Content Management","Gerenciamento do Conteúdo"
-"Contents of a Static Block","Conteúdos de um Bloco Estático"
-"Create Folder...","Criar Pasta..."
-"Custom Design","Personalizar Design"
+"Page Layout","Layout da Página"
+Layout,Layout
+"Layout Update XML","Atualização de Layout XML"
"Custom Design From","Design Personalizado De"
"Custom Design To","Modelo Personalizado Para"
+"Custom Theme","Tema Personalizado"
"Custom Layout","Layout do Modelo"
"Custom Layout Update XML","XML de Atualização do Layout Personalizado"
-"Custom Theme","Tema Personalizado"
-"Customer Tax Class Information","Informação Sobre Escalão de Imposto do Cliente"
-"Date Created","Data da Criação"
-"Delete Block","Apagar Bloco"
-"Delete File","Apagar Arquivo"
+Design,Design
+"Page Information","Informação da Página"
+"Page Title","TÃtulo da Página"
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status","Status da Página"
+"Meta Data",Metadados
+Keywords,Palavras-chave
+"Meta Keywords","Meta Keywords"
+"Meta Description","Meta Descrição"
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage","Armazenamento de MÃdia"
+"Create Folder...","Criar Pasta..."
"Delete Folder","Apagar Pasta"
-"Delete Page","Apagar Página"
-"Description","Descrição"
-"Design","Design"
-"Disabled","Desativado"
-"Disabled Completely","Completamente desativado"
-"Disabled by Default","Desativada por Defeito"
-"Edit Block","Editar bloco"
-"Edit Block '%s'","Editar bloco ""%s"""
-"Edit Page","Editar página"
-"Edit Page '%s'","Editar página ""%s"""
-"Enable WYSIWYG Editor","Ativar editor WYSIWYG"
-"Enabled","Ativado"
-"Enabled by Default","Habilitado como padrão"
-"Expand All","Expandir Todos"
-"General Information","Informações gerais"
-"Go to Home Page","Ir para Página Inicial"
-"Home","InÃcio"
-"ID","Identidade"
-"Identifier","Identificador"
-"If empty, the Page Title will be used","Caso esteja em branco, o tÃtulo da página será utilizado"
-"Images (%s)","Imagens (%s)"
"Insert File","Inserir arquivo"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Nome de pasta inválido. Utilize caracteres alfanuméricos, sublinhado ou hÃfens."
-"Keywords","Palavras-chave"
-"Last Modified","Última alteração"
-"Layout","Layout"
-"Layout Update XML","Atualização de Layout XML"
-"Link to a CMS Page","Links para uma Página CMS"
-"Manage Pages","Gerenciar Páginas"
-"Media Gallery","Galeria de MÃdia"
-"Media Storage","Armazenamento de MÃdia"
-"Meta Data","Metadados"
-"Meta Description","Meta Descrição"
-"Meta Keywords","Meta Keywords"
-"New Block","Novo Bloco"
"New Folder Name:","Nome Nome da Pasta:"
-"New Page","Nova página"
-"No files found","Arquivos não encontrados"
-"Page Information","Informação da Página"
-"Page Layout","Layout da Página"
-"Page Status","Status da Página"
-"Page Title","TÃtulo da Página"
-"Pages","Páginas"
-"Product Tax Class Information","Informação do Escalão de Imposto do Produto"
-"Redirect to CMS-page if Cookies are Disabled","Redirecionar para a página CMS se os Cookies estiverem Desabilitados"
-"Relative to Website Base URL","Relativo a um Website com Base URL"
-"Save Block","Salvar Bloco"
-"Save Page","Salvar Página"
-"Save Process","Salvar Progresso"
-"Select Block...","Selecionar Bloco..."
-"Select Page...","Selecionar Página..."
-"Show Breadcrumbs for CMS Pages","Mostrar Caminho Completo para Páginas CMS"
-"Show Notice if JavaScript is Disabled","Mostrar Notificação se Javascript estiver Desativado"
-"Static Blocks","Blocos Estáticos"
-"Status","Status"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
"Storage Root","Raiz Tuberosa"
-"Store View","Visualização da loja"
-"Template","Modelo"
-"The block has been deleted.","O bloco foi apagado."
-"The block has been saved.","O bloco foi salvo."
-"The directory %s is not writable by server.","O diretório %s não é editável pelo servidor."
-"The page URL key cannot consist only of numbers.","A chave de URL não pode compor-se apenas de números."
-"The page URL key contains capital letters or disallowed symbols.","A chave de URL contém letras maiúsculas ou sÃmbolos desautorizados."
-"The page has been deleted.","A página foi apagada."
-"The page has been saved.","A página foi salva."
-"The static block content cannot contain directive with its self.","O conteúdo do bloco estático não pode conter diretiva com seu próprio."
+CMS,SGC
+Blocks,Blocks
"This block no longer exists.","O bloco não existe mais."
+"Edit Block","Editar bloco"
+"The block has been saved.","O bloco foi salvo."
+"The block has been deleted.","O bloco foi apagado."
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,Páginas
"This page no longer exists.","A página não existe mais."
-"Title","TÃtulo"
-"URL Key","Chave URL"
-"Unable to find a block to delete.","ImpossÃvel encontrar bloco a ser apagado."
-"Unable to find a page to delete.","ImpossÃvel encontrar página a ser apagada."
-"WYSIWYG Options","Opções WYSIWYG"
-"px.","px."
+"Edit Page","Editar página"
+"The page has been saved.","A página foi salva."
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.","A página foi apagada."
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
+"Enabled by Default","Habilitado como padrão"
+"Disabled by Default","Desativada por Defeito"
+"Disabled Completely","Completamente desativado"
+"A block identifier with the same properties already exists in the selected store.","Já existe na loja selecionada um identificador de bloco com as mesmas propriedades."
+"A page URL key for specified store already exists.","Já existe uma chave de URL para a loja especificada."
+"The page URL key contains capital letters or disallowed symbols.","A chave de URL contém letras maiúsculas ou sÃmbolos desautorizados."
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
+"No files found","Arquivos não encontrados"
+Block,Bloco
+Template,Modelo
+"Anchor Custom Text","Texto âncora personalizado"
+"Anchor Custom Title","TÃtulo âncora personalizado"
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
+"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
+"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
+"WYSIWYG Options","WYSIWYG Options"
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
+"CMS Page Link","Link de Página CMS"
+"Link to a CMS Page","Links para uma Página CMS"
+"CMS Page","Página CMS"
+"If empty, the Page Title will be used","Caso esteja em branco, o tÃtulo da página será utilizado"
+"CMS Page Link Block Template","Modelo de bloco de link da página de SGC"
+"CMS Page Link Inline Template","Modelo Em Linha de Link de Página CMS"
+"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"
diff --git a/app/code/Magento/Cms/i18n/zh_CN.csv b/app/code/Magento/Cms/i18n/zh_CN.csv
index dd64c0df867..e27e81aa3b8 100644
--- a/app/code/Magento/Cms/i18n/zh_CN.csv
+++ b/app/code/Magento/Cms/i18n/zh_CN.csv
@@ -1,123 +1,121 @@
-"A block identifier with the same properties already exists in the selected store.","具有相åŒå±žæ€§çš„区å—æ ‡è¯†ç¬¦å·²åœ¨é€‰å®šçš„å•†åº—å˜åœ¨ã€‚"
-"A directory with the same name already exists. Please try another folder name.","具有åŒæ ·å称的目录已å˜åœ¨ã€‚请å°è¯•å¦ä¸€ä¸ªæ–‡ä»¶å¤¹å称。"
+ID,ID
+Action,æ“作
+"Delete File",åˆ é™¤æ–‡ä»¶
+"-- Please Select --","-- Please Select --"
+"Custom Design",自定义设计
+"Block Information",å—ä¿¡æ¯
+Status,状æ€
+Disabled,å·²ç¦ç”¨
+Enabled,å·²å¯ç”¨
+"Save and Continue Edit","Save and Continue Edit"
+Title,æ ‡é¢˜
+"URL Key","URL Key"
+"Store View",店铺视图
+Description,æè¿°
+Home,主页
+"Browse Files...","Browse Files..."
+Content,内容
+"General Information",常规信æ¯
+"Go to Home Page",å‰å¾€ä¸»é¡µ
+px.,åƒç´
+"Collapse All",折å 全部
+"Expand All",全部展开
+"Static Blocks",é™æ€å—
+"Add New Block",æ·»åŠ æ–°åŒºå—
+"Save Block",ä¿å˜åŒºå—
+"Delete Block",åˆ é™¤åŒºå—
+"Edit Block '%1'","Edit Block '%1'"
+"New Block",æ–°å—
+"Block Title",区å—æ ‡é¢˜
+Identifier,æ ‡è¯†
+"Manage Pages",管ç†é¡µé¢
+"Add New Page",æ·»åŠ æ–°é¡µé¢
+"Save Page",ä¿å˜é¡µé¢
+"Delete Page",åˆ é™¤é¡µé¢
+"Edit Page '%1'","Edit Page '%1'"
+"New Page",新页é¢
+"Content Heading",å†…å®¹æ ‡é¢˜
+"Page Layout",页é¢å¸ƒå±€
+Layout,布局
+"Layout Update XML","布局更新 XML"
+"Custom Design From",自定义设计，æ¥è‡ªï¼š
+"Custom Design To",自定义设计到
+"Custom Theme",自定义主题
+"Custom Layout",自定义布局
+"Custom Layout Update XML","自定义布局更新 XML"
+Design,设计
+"Page Information",页é¢ä¿¡æ¯
+"Page Title",页é¢æ ‡é¢˜
+"Relative to Web Site Base URL","Relative to Web Site Base URL"
+"Page Status",页é¢çŠ¶æ€
+"Meta Data",元数æ®
+Keywords,关键è¯
+"Meta Keywords",元关键è¯
+"Meta Description",å…ƒæè¿°
+Created,Created
+Modified,Modified
+Preview,Preview
+"Media Storage",媒体å˜å‚¨
+"Create Folder...",创建文件夹...
+"Delete Folder",åˆ é™¤æ–‡ä»¶å¤¹
+"Insert File",æ’入文件
+"New Folder Name:",新文件夹å称：
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Images (%1)","Images (%1)"
+"Storage Root",å˜å‚¨æ ¹ç›®å½•
+CMS,CMS
+Blocks,Blocks
+"This block no longer exists.",区å—å·²ä¸å˜åœ¨ã€‚
+"Edit Block",编辑区å—
+"The block has been saved.",区å—å·²ä¿å˜ã€‚
+"The block has been deleted.",该区å—å·²è¢«åˆ é™¤ã€‚
+"We can't find a block to delete.","We can't find a block to delete."
+Pages,页é¢
+"This page no longer exists.",该页é¢å·²ä¸å˜åœ¨ã€‚
+"Edit Page",编辑页é¢
+"The page has been saved.",页é¢å·²ä¿å˜ã€‚
+"Something went wrong while saving the page.","Something went wrong while saving the page."
+"The page has been deleted.",页é¢å·²è¢«åˆ 除。
+"We can't find a page to delete.","We can't find a page to delete."
+"The directory %1 is not writable by server.","The directory %1 is not writable by server."
+"Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
+"Enabled by Default",默认å¯ç”¨
+"Disabled by Default",默认被ç¦ç”¨
+"Disabled Completely",完全ç¦ç”¨
+"A block identifier with the same properties already exists in the selected store.",具有相åŒå±žæ€§çš„区å—æ ‡è¯†ç¬¦å·²åœ¨é€‰å®šçš„å•†åº—å˜åœ¨ã€‚
"A page URL key for specified store already exists.","ç‰¹å®šå•†åº—çš„é¡µé¢ URL 密钥已å˜åœ¨ã€‚"
-"Action","æ“作"
-"Add New Block","æ·»åŠ æ–°åŒºå—"
-"Add New Page","æ·»åŠ æ–°é¡µé¢"
-"All Countries","全部国家"
-"An error occurred while saving the page.","ä¿å˜é¡µé¢æ—¶å‘生错误。"
-"Anchor Custom Text","自定义文本锚点"
-"Anchor Custom Title","è‡ªå®šä¹‰æ ‡é¢˜é”šç‚¹"
-"Are you sure you want to delete current folder?","您确认è¦åˆ 除当å‰æ–‡ä»¶å¤¹å—？"
-"Are you sure you want to delete the selected file?","您确认è¦åˆ 除已选择的文件å—？"
-"Block","区å—"
-"Block Information","å—ä¿¡æ¯"
-"Block Title","区å—æ ‡é¢˜"
-"CMS","CMS"
-"CMS Content Wrapper","CMS 内容包装器"
-"CMS Home Page","CMS首页"
-"CMS No Cookies Page","CMS æ— Cookie 页é¢"
-"CMS No Route Page","CMS æ— è·¯ç”±é¡µé¢"
-"CMS No-Route Page","CMSéžè·¯ç”±é¡µ"
-"CMS Page","CMS 页é¢"
+"The page URL key contains capital letters or disallowed symbols.","é¡µé¢ URL 密钥包å«å¤§å†™å—æ¯æˆ–ä¸å…许的符å·ã€‚"
+"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
+"Please correct the folder name. Use only letters, numbers, underscores and dashes.","Please correct the folder name. Use only letters, numbers, underscores and dashes."
+"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
+"We cannot create a new directory.","We cannot create a new directory."
+"We cannot delete directory %1.","We cannot delete directory %1."
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+"Directory %1 is not under storage root path.","Directory %1 is not under storage root path."
+"No files found",没有找到文件
+Block,区å—
+Template,模æ¿
+"Anchor Custom Text",自定义文本锚点
+"Anchor Custom Title",è‡ªå®šä¹‰æ ‡é¢˜é”šç‚¹
+"CMS Home Page","CMS Home Page"
+"CMS No Route Page","CMS No Route Page"
+"CMS No Cookies Page","CMS No Cookies Page"
+"Show Breadcrumbs for CMS Pages","Show Breadcrumbs for CMS Pages"
+"Browser Capabilities Detection","Browser Capabilities Detection"
+"Redirect to CMS-page if Cookies are Disabled","Redirect to CMS-page if Cookies are Disabled"
+"Show Notice if JavaScript is Disabled","Show Notice if JavaScript is Disabled"
+"Show Notice if Local Storage is Disabled","Show Notice if Local Storage is Disabled"
+"Content Management","Content Management"
+"WYSIWYG Options","WYSIWYG Options"
+"Enable WYSIWYG Editor","Enable WYSIWYG Editor"
"CMS Page Link","CMS 页é¢é“¾æŽ¥"
-"CMS Page Link Block Template","CMS页é¢é“¾æŽ¥å—模æ¿"
-"CMS Page Link Inline Template","CMS页é¢é“¾æŽ¥å†…è”摸æ¿"
-"CMS Pages (All)","CMS页é¢ï¼ˆå…¨éƒ¨ï¼‰"
+"Link to a CMS Page","链接到 CMS 页é¢"
+"CMS Page","CMS 页é¢"
+"If empty, the Page Title will be used",如果为空，将使用页é¢æ ‡é¢˜
+"CMS Page Link Block Template",CMS页é¢é“¾æŽ¥å—模æ¿
+"CMS Page Link Inline Template",CMS页é¢é“¾æŽ¥å†…è”摸æ¿
"CMS Static Block","CMS é™æ€åŒºå—"
+"Contents of a Static Block",é™æ€åŒºå—的内容
"CMS Static Block Default Template","CMS é™æ€åŒºå—默认模æ¿"
-"Cannot create new directory.","æ— æ³•åˆ›å»ºæ–°ç›®å½•ã€‚"
-"Cannot delete directory %s.","æ— æ³•åˆ é™¤ç›®å½• %s。"
-"Cannot delete root directory %s.","æ— æ³•åˆ é™¤æ ¹ç›®å½• %s。"
-"Cannot upload file.","æ— æ³•ä¸Šä¼ æ–‡ä»¶ã€‚"
-"Collapse All","折å 全部"
-"Content","内容"
-"Content Heading","å†…å®¹æ ‡é¢˜"
-"Content Management","内容管ç†"
-"Contents of a Static Block","é™æ€åŒºå—的内容"
-"Create Folder...","创建文件夹..."
-"Custom Design","自定义设计"
-"Custom Design From","自定义设计，æ¥è‡ªï¼š"
-"Custom Design To","自定义设计到"
-"Custom Layout","自定义布局"
-"Custom Layout Update XML","自定义布局更新 XML"
-"Custom Theme","自定义主题"
-"Customer Tax Class Information","自定义税费类别信æ¯"
-"Date Created","创建日期"
-"Delete Block","åˆ é™¤åŒºå—"
-"Delete File","åˆ é™¤æ–‡ä»¶"
-"Delete Folder","åˆ é™¤æ–‡ä»¶å¤¹"
-"Delete Page","åˆ é™¤é¡µé¢"
-"Description","æè¿°"
-"Design","设计"
-"Disabled","å·²ç¦ç”¨"
-"Disabled Completely","完全ç¦ç”¨"
-"Disabled by Default","默认被ç¦ç”¨"
-"Edit Block","编辑区å—"
-"Edit Block '%s'","编辑区å—“%sâ€"
-"Edit Page","编辑页é¢"
-"Edit Page '%s'","编辑页é¢â€œ%sâ€"
-"Enable WYSIWYG Editor","å¯ç”¨ WYSIWYG 编辑器"
-"Enabled","å·²å¯ç”¨"
-"Enabled by Default","默认å¯ç”¨"
-"Expand All","全部展开"
-"General Information","常规信æ¯"
-"Go to Home Page","å‰å¾€ä¸»é¡µ"
-"Home","主页"
-"ID","ID"
-"Identifier","æ ‡è¯†"
-"If empty, the Page Title will be used","如果为空，将使用页é¢æ ‡é¢˜"
-"Images (%s)","图片 (%s)"
-"Insert File","æ’入文件"
-"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","æ— æ•ˆçš„æ–‡ä»¶å¤¹å称。请使用å—æ¯æ•°å—å—符ã€ä¸‹åˆ’线和çŸåˆ’线。"
-"Keywords","关键è¯"
-"Last Modified","上次修改"
-"Layout","布局"
-"Layout Update XML","布局更新 XML"
-"Link to a CMS Page","链接到 CMS 页é¢"
-"Manage Pages","管ç†é¡µé¢"
-"Media Gallery","媒体库"
-"Media Storage","媒体å˜å‚¨"
-"Meta Data","元数æ®"
-"Meta Description","å…ƒæè¿°"
-"Meta Keywords","元关键è¯"
-"New Block","æ–°å—"
-"New Folder Name:","新文件夹å称："
-"New Page","新页é¢"
-"No files found","没有找到文件"
-"Page Information","页é¢ä¿¡æ¯"
-"Page Layout","页é¢å¸ƒå±€"
-"Page Status","页é¢çŠ¶æ€"
-"Page Title","页é¢æ ‡é¢˜"
-"Pages","页é¢"
-"Product Tax Class Information","产å“税费类别信æ¯"
-"Redirect to CMS-page if Cookies are Disabled","如果 Cookie 被ç¦ç”¨ï¼Œåˆ™é‡å®šå‘到 CMS 页é¢"
-"Relative to Website Base URL","关于网站基本 URL"
-"Save Block","ä¿å˜åŒºå—"
-"Save Page","ä¿å˜é¡µé¢"
-"Save Process","ä¿å˜è¿‡ç¨‹"
-"Select Block...","选择区å—..."
-"Select Page...","选择页é¢..."
-"Show Breadcrumbs for CMS Pages","显示 CMS 页é¢çš„é¢åŒ…屑"
-"Show Notice if JavaScript is Disabled","如果 JavaScript 被ç¦ç”¨ï¼Œåˆ™æ˜¾ç¤ºé€šçŸ¥"
-"Static Blocks","é™æ€å—"
-"Status","状æ€"
-"Storage Root","å˜å‚¨æ ¹ç›®å½•"
-"Store View","店铺视图"
-"Template","模æ¿"
-"The block has been deleted.","该区å—å·²è¢«åˆ é™¤ã€‚"
-"The block has been saved.","区å—å·²ä¿å˜ã€‚"
-"The directory %s is not writable by server.","目录 %s 对æœåŠ¡å™¨ç«¯ä¸å¯å†™ã€‚"
-"The page URL key cannot consist only of numbers.","é¡µé¢ URL 密钥ä¸èƒ½ä»…由数å—组æˆã€‚"
-"The page URL key contains capital letters or disallowed symbols.","é¡µé¢ URL 密钥包å«å¤§å†™å—æ¯æˆ–ä¸å…许的符å·ã€‚"
-"The page has been deleted.","页é¢å·²è¢«åˆ 除。"
-"The page has been saved.","页é¢å·²ä¿å˜ã€‚"
-"The static block content cannot contain directive with its self.","é™æ€å—内容ä¸èƒ½åŒ…å«åˆ°è‡ªå·±çš„指令。"
-"This block no longer exists.","区å—å·²ä¸å˜åœ¨ã€‚"
-"This page no longer exists.","该页é¢å·²ä¸å˜åœ¨ã€‚"
-"Title","æ ‡é¢˜"
-"URL Key","URL Key"
-"Unable to find a block to delete.","æ— æ³•æ‰¾åˆ°å¯åˆ 除的区å—。"
-"Unable to find a page to delete.","æ— æ³•æ‰¾åˆ°è¦åˆ 除的页é¢ã€‚"
-"WYSIWYG Options","WYSIWYG 选项"
-"px.","åƒç´ "
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 52e90949ac7..17ac2f7bb67 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -177,7 +177,8 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
'productId' => $currentProduct->getId(),
'chooseText' => __('Choose an Option...'),
'taxConfig' => $attributePrice->getTaxConfig(),
- 'images' => $options['images']
+ 'images' => $options['images'],
+ 'baseImage' => $options['baseImage']
);
if ($currentProduct->hasPreconfiguredValues() && !empty($attributes['defaultValues'])) {
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php
index c66da2cb5ff..5f4aa59f291 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Data.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php
@@ -76,6 +76,7 @@ class Data
$options['images'][$productAttributeId][$attributeValue][$productId] = $imageUrl;
}
}
+ $options['baseImage'] = $baseImageUrl;
return $options;
}
diff --git a/app/code/Magento/ConfigurableProduct/i18n/de_DE.csv b/app/code/Magento/ConfigurableProduct/i18n/de_DE.csv
index 789fd602d63..3f76dea4031 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/de_DE.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/de_DE.csv
@@ -1,16 +1,55 @@
-"Configurable Product","Konfigurierbare Produkte"
-"Configurable Product Settings","Konfigurierbare Produkteinstellungen"
-"Configurable Product Image","Konfigurierbares Produktbild"
-"This attribute is used in configurable products","Dieses Attribut wird für konfigurierbare Produkte verwendet"
-"Attribute '%s' used in configurable products","Attribut '%s' wird für konfigurierbare Produkte verwendet"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product","Verwenden um konfigurierbares Produkt zu erstellen"
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
"Select Configurable Attributes","Konfigurierbare Merkmale auswählen"
-"Configure Product","Produkt konfigurieren"
-"Copy From Configurable","Aus konfigurierbaren Produkteinstellungen kopieren"
-"Product with this combination of attributes already associated to configurable.","Produktkombination mit diesen Attributen existiert bereits im konfigurierbaren Produkt."
-"Scope must not be changed, because the attribute is used in configurable products.","Der Umfang darf nicht geändert werden, da dieses Attribut bei konfigurierbaren Produkten verwendet wird."
+"Configurable Product Settings","Konfigurierbare Produkteinstellungen"
+"Choose an Option...","Choose an Option..."
"This attribute is used in configurable products.","Das Attribut wurde in konfigurierbaren Produkten verwendet."
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
"This attribute is used in configurable products. You cannot remove it from the attribute set.","Diese Eigenschaft wird für konfigurierbare Produkte benötigt. Sie können sie nicht aus dem Eigenschaftenset entfernen."
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Diese Gruppe enthält Eigenschaften, die für konfigurierbare Produkte benutzt werden. Bitte verschieben Sie diese Eigenschaften in eine andere Gruppe und versuchen Sie es noch einmal."
-"Use To Create Configurable Product","Verwenden um konfigurierbares Produkt zu erstellen"
-"Wrong product type to extract configurable options.","Falscher Produkt-Typ, um konfigurierbare Optionen zu extrahieren."
-
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/i18n/en_US.csv b/app/code/Magento/ConfigurableProduct/i18n/en_US.csv
index afd577b8268..47d96f24de6 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/en_US.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/en_US.csv
@@ -1,17 +1,55 @@
-"Configurable Product","Configurable Product"
-"Configurable Product Settings","Configurable Product Settings"
-"Configurable Product Image","Configurable Product Image"
-"Attribute '%s' used in configurable products","Attribute '%s' used in configurable products"
-"This attribute is used in configurable products","This attribute is used in configurable products"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product","Use To Create Configurable Product"
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
"Select Configurable Attributes","Select Configurable Attributes"
-"Configure Product","Configure Product"
-"Copy From Configurable","Copy From Configurable"
-"Product with this combination of attributes already associated to configurable.","Product with this combination of attributes already associated to configurable."
-"Scope must not be changed, because the attribute is used in configurable products.","Scope must not be changed, because the attribute is used in configurable products."
-"Select Configurable Attributes ","Select Configurable Attributes "
+"Configurable Product Settings","Configurable Product Settings"
+"Choose an Option...","Choose an Option..."
"This attribute is used in configurable products.","This attribute is used in configurable products."
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
"This attribute is used in configurable products. You cannot remove it from the attribute set.","This attribute is used in configurable products. You cannot remove it from the attribute set."
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","This group contains attributes, used in configurable products. Please move these attributes to another group and try again."
-"Use To Create Configurable Product","Use To Create Configurable Product"
-"Wrong product type to extract configurable options.","Wrong product type to extract configurable options."
-
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/i18n/es_ES.csv b/app/code/Magento/ConfigurableProduct/i18n/es_ES.csv
index 6aba9b65ee4..d054b94127f 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/es_ES.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/es_ES.csv
@@ -1,15 +1,55 @@
-"Configurable Product","Producto Configurable"
-"Configurable Product Settings","Parametrización de Producto Configurable"
-"Configurable Product Image","Imagen configurable del producto"
-"Attribute '%s' used in configurable products","Campo ""%s"" utilizado en productos configurables"
-"This attribute is used in configurable products","Este atributo se utiliza en productos configurables"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product","Utilizar para crear producto configurable"
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
"Select Configurable Attributes","Seleccionar atributos configurables"
-"Configure Product","Configurar Producto"
-"Copy From Configurable","Copiar desde Configurable"
-"Product with this combination of attributes already associated to configurable.","El producto con esta combinación de atributos ya ha sido asociado a configurables."
-"Scope must not be changed, because the attribute is used in configurable products.","No se puede cambiar el ámbito de aplicación, dado que el atributo se utiliza en productos configurables."
+"Configurable Product Settings","Parametrización de Producto Configurable"
+"Choose an Option...","Choose an Option..."
"This attribute is used in configurable products.","Este atributo se utiliza en productos configurables."
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
"This attribute is used in configurable products. You cannot remove it from the attribute set.","Este atributo se utiliza en productos configurables. No es posible eliminarlo del conjunto de atributos."
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Este grupo contiene atributos utilizados en productos configurables. Páselos a otro grupo y vuelva a intentarlo."
-"Use To Create Configurable Product","Utilizar para crear producto configurable"
-"Wrong product type to extract configurable options.","Tipo de producto incorrecto para extraer opciones configurables."
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/i18n/fr_FR.csv b/app/code/Magento/ConfigurableProduct/i18n/fr_FR.csv
index c9591bb41bf..7b4b4b12cda 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/fr_FR.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/fr_FR.csv
@@ -1,16 +1,55 @@
-"Configurable Product","Produit configurable"
-"Configurable Product Settings","Réglages du produit configurable"
-"Configurable Product Image","Image de produit configurable"
-"Attribute '%s' used in configurable products","L'attribut ""%s"" est utilisé dans les produits configurables"
-"This attribute is used in configurable products","Cet attribut est utilisé pour des produits configurables"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product","Permet de créer des produits configurables"
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
"Select Configurable Attributes","Sélectionner les attributs configurables"
-"Configure Product","Configurer produit"
-"Copy From Configurable","Copier depuis configurable"
-"Product with this combination of attributes already associated to configurable.","Les produits avec cette combinaison d'attributs sont déjà associés à configurable."
-"Scope must not be changed, because the attribute is used in configurable products.","Le champ ne doit pas être changé, car l'attribut est utilisé dans des produits configurables."
-"Select Configurable Attributes ","Sélectionner les attributs configurables"
+"Configurable Product Settings","Réglages du produit configurable"
+"Choose an Option...","Choose an Option..."
"This attribute is used in configurable products.","Cet attribut est utilisé dans les produits configurables."
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
"This attribute is used in configurable products. You cannot remove it from the attribute set.","L'attribut est utilisé dans des produits paramétrables. Vous ne pouvez pas le retirer de la série d'attributs."
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Le groupe contient des attributs, utilisés dans des produits paramétrables. Veuillez déplacer ces attributs vers un autre groupe et réessayer."
-"Use To Create Configurable Product","Permet de créer des produits configurables"
-"Wrong product type to extract configurable options.","Mauvais type de produit pour extraire des options configurables."
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/i18n/nl_NL.csv b/app/code/Magento/ConfigurableProduct/i18n/nl_NL.csv
index 8922e9076f9..26f35ed0749 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/nl_NL.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/nl_NL.csv
@@ -1,16 +1,55 @@
-"Configurable Product","Configureerbaar Product"
-"Configurable Product Settings","Configureerbare Productinstellingen"
-"Configurable Product Image","Instelbare productafbeelding"
-"Attribute '%s' used in configurable products","Attribuut '%s' gebruikt in configureerbare producten"
-"This attribute is used in configurable products","Dit attribuut wordt gebruikt in configureerbare producten"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product","Gebruik Om Configureerbaar Product Te Creëren"
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
"Select Configurable Attributes","Selecteer Configureerbare Attributen"
-"Configure Product","Product instellen"
-"Copy From Configurable","Kopieer Van Configureerbaar"
-"Product with this combination of attributes already associated to configurable.","Product met deze combinatie van attributen is reeds geassocieerd met configureerbaar."
-"Scope must not be changed, because the attribute is used in configurable products.","Reikwijdte moet niet veranderd worden, omdat de attribuut gebruikt wordt door configureerbare producten."
-"Select Configurable Attributes ","Selecteer Configureerbare Attributen"
+"Configurable Product Settings","Configureerbare Productinstellingen"
+"Choose an Option...","Choose an Option..."
"This attribute is used in configurable products.","Dit kenmerk wordt gebruikt in configureerbare producten."
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
"This attribute is used in configurable products. You cannot remove it from the attribute set.","Dit attribuut wordt gebruikt in configureerbare producten. U kunt het niet verwijderen uit de attributenreeks."
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Deze groep bevat attributen die gebruikt worden in configureerbare producten. Verplaats deze attributen naar een andere groep en probeer het opnieuw."
-"Use To Create Configurable Product","Gebruik Om Configureerbaar Product Te Creëren"
-"Wrong product type to extract configurable options.","Verkeerd producttype om configureerbare opties van af te nemen."
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/i18n/pt_BR.csv b/app/code/Magento/ConfigurableProduct/i18n/pt_BR.csv
index ea2c452a5de..610564aef34 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/pt_BR.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/pt_BR.csv
@@ -1,16 +1,55 @@
-"Configurable Product","Produto Configurável"
-"Configurable Product Settings","CaracterÃsticas do Produto Configurável"
-"Configurable Product Image","Imagem Configurável de Produto"
-"Attribute '%s' used in configurable products","Atributo '%s' usado em produtos configuráveis"
-"This attribute is used in configurable products","Este atributo é utilizado em produtos configuráveis"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product","Use Para Criar Produto Configurável"
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
"Select Configurable Attributes","Selecionar Atributos Configuráveis"
-"Configure Product","Configurar Produto"
-"Copy From Configurable","Copiar de Configurável"
-"Product with this combination of attributes already associated to configurable.","O produto com esta combinação de atributos já está associado aos configuráveis."
-"Scope must not be changed, because the attribute is used in configurable products.","O limite não pode ser alterado, porque o atributo é usado em produtos configuráveis."
-"Select Configurable Attributes ","Selecionar Atributos Configuráveis"
+"Configurable Product Settings","CaracterÃsticas do Produto Configurável"
+"Choose an Option...","Choose an Option..."
"This attribute is used in configurable products.","O atributo é usado em produtos configuráveis."
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
"This attribute is used in configurable products. You cannot remove it from the attribute set.","Este atributo é usado em produtos configuráveis​​. Você não pode removê-lo do conjunto de atributos."
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Este grupo contém atributos, usados ​​em produtos configuráveis. Por favor mova esses atributos para outro grupo e tente novamente."
-"Use To Create Configurable Product","Use Para Criar Produto Configurável"
-"Wrong product type to extract configurable options.","Tipo de produto errado para extrair opções configuráveis."
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/i18n/zh_CN.csv b/app/code/Magento/ConfigurableProduct/i18n/zh_CN.csv
index 41eef6d67fb..39182d64a08 100644
--- a/app/code/Magento/ConfigurableProduct/i18n/zh_CN.csv
+++ b/app/code/Magento/ConfigurableProduct/i18n/zh_CN.csv
@@ -1,16 +1,55 @@
-"Configurable Product","å¯é…置的产å“"
-"Configurable Product Settings","å¯é…置的产å“设置"
-"Configurable Product Image","å¯é…置产å“图片"
-"This attribute is used in configurable products","该属性已用于å¯é…置产å“"
-"Attribute '%s' used in configurable products","é…置产å“ä¸ä½¿ç”¨çš„属性 '%s'"
-"Select Configurable Attributes","选择å¯é…置属性"
-"Configure Product","é…置产å“"
-"Copy From Configurable","从é…ç½®ä¸å¤åˆ¶"
-"Product with this combination of attributes already associated to configurable.","具有æ¤å±žæ€§ç»„åˆçš„产å“已与å¯é…置产å“å…³è”。"
-"Scope must not be changed, because the attribute is used in configurable products.","范围ä¸èƒ½æ›´æ”¹ï¼Œå› 为å¯é…置产å“ä¸ä½¿ç”¨äº†å±žæ€§ã€‚"
-"Select Configurable Attributes ","选择å¯é…置属性"
-"This attribute is used in configurable products.","该属性已用于å¯é…置产å“。"
-"This attribute is used in configurable products. You cannot remove it from the attribute set.","该属性用于å¯é…置的产å“ã€‚æ‚¨æ— æ³•ä»Žå±žæ€§é›†ä¸å°†å…¶åˆ 除。"
-"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","该群组包å«ç”¨äºŽå¯é…置产å“的属性。请移动这些属性到å¦ä¸€ç¾¤ç»„并é‡è¯•ã€‚"
-"Use To Create Configurable Product","用于创建å¯é…置的产å“"
-"Wrong product type to extract configurable options.","错误的产å“类型æ¥æå–å¯é…置选项。"
+Cancel,Cancel
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Qty,Qty
+"Incl. Tax","Incl. Tax"
+"Use Default","Use Default"
+Delete,Delete
+Name,Name
+"Add Option","Add Option"
+"Stock Availability","Stock Availability"
+"In Stock","In Stock"
+"Out of Stock","Out of Stock"
+Image,Image
+"Use To Create Configurable Product",用于创建å¯é…置的产å“
+"Create Empty","Create Empty"
+"Generate Variations","Generate Variations"
+"Create New Variation Set","Create New Variation Set"
+"Associated Products","Associated Products"
+"Quick simple product creation","Quick simple product creation"
+Autogenerate,Autogenerate
+"Select Configurable Attributes",选择å¯é…置属性
+"Configurable Product Settings",å¯é…置的产å“设置
+"Choose an Option...","Choose an Option..."
+"This attribute is used in configurable products.",该属性已用于å¯é…置产å“。
+"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
+"Please specify the product's option(s).","Please specify the product's option(s)."
+"Some product variations fields are not valid.","Some product variations fields are not valid."
+"This group contains attributes used in configurable products. Please move these attributes to another group and try again.","This group contains attributes used in configurable products. Please move these attributes to another group and try again."
+"This attribute is used in configurable products. You cannot remove it from the attribute set.",该属性用于å¯é…置的产å“ã€‚æ‚¨æ— æ³•ä»Žå±žæ€§é›†ä¸å°†å…¶åˆ 除。
+"Delete Variations Group","Delete Variations Group"
+"Sort Variations","Sort Variations"
+"Variation Label","Variation Label"
+Label,Label
+"Change Price","Change Price"
+Include,Include
+%,%
+"begin typing to add value","begin typing to add value"
+Variations,Variations
+"Current Variations","Current Variations"
+Display,Display
+Weight,Weight
+"Upload Image","Upload Image"
+Choose,Choose
+Select,Select
+"No Image","No Image"
+"Attribute set comprising all selected configurable attributes need to be in order to save generated variations.","Attribute set comprising all selected configurable attributes need to be in order to save generated variations."
+"Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")","Add configurable attributes to the current set (""<span data-role=""name-container"">%1</span>"")"
+"Add configurable attributes to the new set based on current","Add configurable attributes to the new set based on current"
+"New attribute set name","New attribute set name"
+"Choose Affected Attribute Set","Choose Affected Attribute Set"
+Confirm,Confirm
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configurable Product Image","Configurable Product Image"
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 194be8c1896..ff53bff5ebd 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -210,7 +210,12 @@ define(['jquery', 'jquery-ui', 'jquery.parsequery'], function($){
_changeProductImage: function () {
var images = this.options.spConfig.images,
imagesArray = null,
- galleryElement = $(this.options.mediaGallerySelector);
+ galleryElement = $(this.options.mediaGallerySelector),
+ baseImage = {
+ small: this.options.spConfig.baseImage,
+ medium: this.options.spConfig.baseImage,
+ large: this.options.spConfig.baseImage
+ };
$.each(this.options.settings, function (k, v) {
var selectValue = parseInt(v.value, 10),
attributeId = v.id.replace(/[a-z]*/, '');
@@ -230,21 +235,18 @@ define(['jquery', 'jquery-ui', 'jquery.parsequery'], function($){
});
var result = [];
- $.each(imagesArray || {}, function (k, v) {
+ $.each(imagesArray || baseImage, function (k, v) {
result.push({
small: v,
medium: v,
large: v
});
});
-
- if (galleryElement.length) {
- if (result.length === 1) {
- this.initialGalleryImages = this.initialGalleryImages || galleryElement.gallery('option', 'images');
- galleryElement.gallery('option', 'images', result);
- } else {
- galleryElement.gallery('option', 'images', this.initialGalleryImages);
- }
+ if (result.length !== 1) {
+ result = [baseImage];
+ }
+ if (galleryElement.length && typeof galleryElement.gallery != 'undefined') {
+ galleryElement.gallery('option', 'images', result);
}
},
diff --git a/app/code/Magento/Connect/i18n/de_DE.csv b/app/code/Magento/Connect/i18n/de_DE.csv
index d923864ca1c..51c0c7efdb8 100644
--- a/app/code/Magento/Connect/i18n/de_DE.csv
+++ b/app/code/Magento/Connect/i18n/de_DE.csv
@@ -1,58 +1,60 @@
-"1.5.0.0 & later","1.5.0.0 & neuer"
-"Action","Aktion"
-"Add Author","Verfasser hinzufügen"
-"Add Contents Path","Inhalte hinzufügen Pfad"
-"Add PHP Extension dependency","PHP Erweiterung Abhängigkeit hinzufügen"
-"Add Package dependency","Paket Abhängigkeit hinzufügen"
-"Add files","Dateien hinzufügen"
-"Authors","Verfasser"
-"Channel","Kanal"
-"Contents","Inhalte"
-"Create Extension Package","Erweiterungs-Paket erstellen"
-"Dependencies","Abhängigkeiten"
-"Description","Beschreibung"
-"Edit Extension","Erweiterung bearbeiten"
-"Email","E-Mail"
-"Extension","Erweiterung"
-"Extensions","Erweiterungen"
-"Failed to create the package.","Paket konnte nicht erstellt werden."
-"Failed to load the package data.","Paketdaten konnten nicht geladen werden."
-"Failed to save the package.","Paket konnte nicht gespeichert werden."
-"Files","Dateien"
-"Folder","Ordner"
-"Ignore","Ignorieren"
-"Include","Inkludieren"
-"License","Lizenz"
-"License URI","Lizenz URI"
-"Load Local Package","Lokales Paket laden"
-"Load local Package","Lokales Paket laden"
-"Magento Connect","Magento Connect"
-"Magento Connect Manager","Magento Connect Manager"
-"Max","Max"
-"Maximum","Maximum"
-"Min","Min"
-"Minimum","Minimum"
-"Name","Name"
+Remove,Entfernen
+Action,Aktion
+File,File
+Email,E-Mail
+Name,Name
+Type,Typ
+Description,Beschreibung
+Summary,Zusammenfassung
+Include,Inkludieren
+"Save Data and Create Package","Daten speichern und Paket erstellen"
+"Save As...","Speichern als..."
+"Save package with custom package file name","Paket speichern mit individueller Bezeichnung der Paketdatei"
"New Extension","Neue Erweiterung"
+"Add files","Dateien hinzufügen"
+Authors,Verfasser
+"Add Author","Verfasser hinzufügen"
+Contents,Inhalte
"PHP Version","PHP Version"
-"Package","Verpackung"
-"Package Extensions","Paket-Erweiterungen"
+Minimum,Minimum
+Maximum,Maximum
+Dependencies,Abhängigkeiten
+Folder,Ordner
+Package,Verpackung
+"Load Local Package","Lokales Paket laden"
"Package File Name","Paket Datei-Name"
+Channel,Kanal
+"1.5.0.0 & later","1.5.0.0 & neuer"
+Pre-1.5.0.0,"früher als 1.5.0.0"
+"Supported releases","Unterstützte Versionen"
+License,Lizenz
+"License URI","Lizenz URI"
"Package Info","Paket Info"
-"Packages","Pakete"
-"Path","Pfad"
-"Pre-1.5.0.0","früher als 1.5.0.0"
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
"Release Info","Informationen zur Veröffentlichung"
-"Remove","Entfernen"
-"Save As...","Speichern als..."
-"Save Data and Create Package","Daten speichern und Paket erstellen"
-"Save package with custom package file name","Paket speichern mit individueller Bezeichnung der Paketdatei"
-"Summary","Zusammenfassung"
-"Supported releases","Unterstützte Versionen"
-"System","System"
-"Target","Ziel"
-"The package %s data has been loaded.","Die Paket %s Daten wurden geladen."
+"Create Extension Package","Erweiterungs-Paket erstellen"
+"Package Extensions",Paket-Erweiterungen
+Extension,Erweiterung
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
"The package data has been saved.","Die Paketdaten wurden gespeichert."
-"There was a problem saving package data","Beim Speichern der Paketdaten ist ein Fehler aufgetreten."
-"Type","Typ"
-"User","Benutzer"
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,Benutzer
+Target,Ziel
+Path,Pfad
+Ignore,Ignorieren
+"Recursive Dir","Recursive Dir"
+"Add Contents Path","Inhalte hinzufügen Pfad"
+Packages,Pakete
+Min,Min
+Max,Max
+Files,Dateien
+"Add Package dependency","Paket Abhängigkeit hinzufügen"
+Extensions,Erweiterungen
+"Add PHP Extension dependency","PHP Erweiterung Abhängigkeit hinzufügen"
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Connect/i18n/en_US.csv b/app/code/Magento/Connect/i18n/en_US.csv
index 6470dc9e4cf..e295c68fbf6 100644
--- a/app/code/Magento/Connect/i18n/en_US.csv
+++ b/app/code/Magento/Connect/i18n/en_US.csv
@@ -1,58 +1,60 @@
-"1.5.0.0 & later","1.5.0.0 & later"
-"Action","Action"
-"Add Author","Add Author"
-"Add Contents Path","Add Contents Path"
-"Add PHP Extension dependency","Add PHP Extension dependency"
-"Add Package dependency","Add Package dependency"
-"Add files","Add files"
-"Authors","Authors"
-"Channel","Channel"
-"Contents","Contents"
-"Create Extension Package","Create Extension Package"
-"Dependencies","Dependencies"
-"Description","Description"
-"Edit Extension","Edit Extension"
-"Email","Email"
-"Extension","Extension"
-"Extensions","Extensions"
-"Failed to create the package.","Failed to create the package."
-"Failed to load the package data.","Failed to load the package data."
-"Failed to save the package.","Failed to save the package."
-"Files","Files"
-"Folder","Folder"
-"Ignore","Ignore"
-"Include","Include"
-"License","License"
-"License URI","License URI"
-"Load Local Package","Load Local Package"
-"Load local Package","Load local Package"
-"Magento Connect","Magento Connect"
-"Magento Connect Manager","Magento Connect Manager"
-"Max","Max"
-"Maximum","Maximum"
-"Min","Min"
-"Minimum","Minimum"
-"Name","Name"
+Remove,Remove
+Action,Action
+File,File
+Email,Email
+Name,Name
+Type,Type
+Description,Description
+Summary,Summary
+Include,Include
+"Save Data and Create Package","Save Data and Create Package"
+"Save As...","Save As..."
+"Save package with custom package file name","Save package with custom package file name"
"New Extension","New Extension"
+"Add files","Add files"
+Authors,Authors
+"Add Author","Add Author"
+Contents,Contents
"PHP Version","PHP Version"
-"Package","Package"
-"Package Extensions","Package Extensions"
+Minimum,Minimum
+Maximum,Maximum
+Dependencies,Dependencies
+Folder,Folder
+Package,Package
+"Load Local Package","Load Local Package"
"Package File Name","Package File Name"
+Channel,Channel
+"1.5.0.0 & later","1.5.0.0 & later"
+Pre-1.5.0.0,Pre-1.5.0.0
+"Supported releases","Supported releases"
+License,License
+"License URI","License URI"
"Package Info","Package Info"
-"Packages","Packages"
-"Path","Path"
-"Pre-1.5.0.0","Pre-1.5.0.0"
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
"Release Info","Release Info"
-"Remove","Remove"
-"Save As...","Save As..."
-"Save Data and Create Package","Save Data and Create Package"
-"Save package with custom package file name","Save package with custom package file name"
-"Summary","Summary"
-"Supported releases","Supported releases"
-"System","System"
-"Target","Target"
-"The package %s data has been loaded.","The package %s data has been loaded."
+"Create Extension Package","Create Extension Package"
+"Package Extensions","Package Extensions"
+Extension,Extension
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
"The package data has been saved.","The package data has been saved."
-"There was a problem saving package data","There was a problem saving package data"
-"Type","Type"
-"User","User"
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,User
+Target,Target
+Path,Path
+Ignore,Ignore
+"Recursive Dir","Recursive Dir"
+"Add Contents Path","Add Contents Path"
+Packages,Packages
+Min,Min
+Max,Max
+Files,Files
+"Add Package dependency","Add Package dependency"
+Extensions,Extensions
+"Add PHP Extension dependency","Add PHP Extension dependency"
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Connect/i18n/es_ES.csv b/app/code/Magento/Connect/i18n/es_ES.csv
index c5a5abbfc92..a6d22252e56 100644
--- a/app/code/Magento/Connect/i18n/es_ES.csv
+++ b/app/code/Magento/Connect/i18n/es_ES.csv
@@ -1,58 +1,60 @@
-"1.5.0.0 & later","1.5.0.0 y posterior"
-"Action","Acción"
-"Add Author","Añadir Autor"
-"Add Contents Path","Añadir Trayectoria de Contenidos"
-"Add PHP Extension dependency","Añadir dependencia de la Extensión PHP"
-"Add Package dependency","Añadir dependencia del Paquete"
-"Add files","Agregar archivos"
-"Authors","Autores"
-"Channel","Canal"
-"Contents","Contenido"
-"Create Extension Package","Crear paquete de extensión"
-"Dependencies","Dependencias"
-"Description","Descripción"
-"Edit Extension","Editar extensión"
-"Email","Correo electrónico"
-"Extension","Extensión"
-"Extensions","Extensiones"
-"Failed to create the package.","No se pudo crear el paquete."
-"Failed to load the package data.","No se pudo cargar los datos del paquete."
-"Failed to save the package.","No se pudo guardar el paquete."
-"Files","Archivos"
-"Folder","Carpeta"
-"Ignore","Ignorar"
-"Include","Incluir"
-"License","Licencia"
-"License URI","Dirección URI de la licencia"
-"Load Local Package","Cargar paquete local"
-"Load local Package","Cargar Paquete local"
-"Magento Connect","Magento Connect"
-"Magento Connect Manager","Administrador de Magento Connect"
-"Max","Máximo"
-"Maximum","Máximo"
-"Min","MÃnimo"
-"Minimum","MÃnimo"
-"Name","Nombre"
+Remove,Eliminar
+Action,Acción
+File,File
+Email,"Correo electrónico"
+Name,Nombre
+Type,Tipo
+Description,Descripción
+Summary,Resumen
+Include,Incluir
+"Save Data and Create Package","Guardar datos y crear paquete"
+"Save As...","Guardar como..."
+"Save package with custom package file name","Guardar paquete con nombre de archivo de paquete personalizado"
"New Extension","Nueva extensión"
+"Add files","Agregar archivos"
+Authors,Autores
+"Add Author","Añadir Autor"
+Contents,Contenido
"PHP Version","Versión de PHP"
-"Package","Paquete"
-"Package Extensions","Extensiones de paquete"
+Minimum,MÃnimo
+Maximum,Máximo
+Dependencies,Dependencias
+Folder,Carpeta
+Package,Paquete
+"Load Local Package","Cargar paquete local"
"Package File Name","Nombre de archivo de paquete"
+Channel,Canal
+"1.5.0.0 & later","1.5.0.0 y posterior"
+Pre-1.5.0.0,"Pre 1.5.0.0"
+"Supported releases","Publicaciones soportadas"
+License,Licencia
+"License URI","Dirección URI de la licencia"
"Package Info","Información de paquete"
-"Packages","Paquetes"
-"Path","Camino"
-"Pre-1.5.0.0","Pre 1.5.0.0"
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
"Release Info","Información de versión"
-"Remove","Eliminar"
-"Save As...","Guardar como..."
-"Save Data and Create Package","Guardar datos y crear paquete"
-"Save package with custom package file name","Guardar paquete con nombre de archivo de paquete personalizado"
-"Summary","Resumen"
-"Supported releases","Publicaciones soportadas"
-"System","Sistema"
-"Target","Destino"
-"The package %s data has been loaded.","Se cargaron los datos del paquete %s."
+"Create Extension Package","Crear paquete de extensión"
+"Package Extensions","Extensiones de paquete"
+Extension,Extensión
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
"The package data has been saved.","Se guardaron los datos del paquete."
-"There was a problem saving package data","Se produjo un problema al guardar los datos del paquete"
-"Type","Tipo"
-"User","Usuario"
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,Usuario
+Target,Destino
+Path,Camino
+Ignore,Ignorar
+"Recursive Dir","Recursive Dir"
+"Add Contents Path","Añadir Trayectoria de Contenidos"
+Packages,Paquetes
+Min,MÃnimo
+Max,Máximo
+Files,Archivos
+"Add Package dependency","Añadir dependencia del Paquete"
+Extensions,Extensiones
+"Add PHP Extension dependency","Añadir dependencia de la Extensión PHP"
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Connect/i18n/fr_FR.csv b/app/code/Magento/Connect/i18n/fr_FR.csv
index f4dcc7fa8c4..7f7655d9e89 100644
--- a/app/code/Magento/Connect/i18n/fr_FR.csv
+++ b/app/code/Magento/Connect/i18n/fr_FR.csv
@@ -1,58 +1,60 @@
-"1.5.0.0 & later","1.5.0.0 et suivantes"
-"Action","Action"
-"Add Author","Ajouter un auteur"
-"Add Contents Path","Ajouter un chemin vers des contenus"
-"Add PHP Extension dependency","Ajouter dépendances PHP"
-"Add Package dependency","Ajouter dépendances"
-"Add files","Ajouter des fichiers"
-"Authors","Auteurs"
-"Channel","Canal"
-"Contents","Contenus"
-"Create Extension Package","Créer un paquet d'extension"
-"Dependencies","Dépendances"
-"Description","Description"
-"Edit Extension","Éditer l'extension"
-"Email","Email"
-"Extension","Extension"
-"Extensions","Extensions"
-"Failed to create the package.","Échec de la création du paquet"
-"Failed to load the package data.","Échec du chargement des données du paquet"
-"Failed to save the package.","Échec de la sauvegarde du paquet."
-"Files","Fichiers"
-"Folder","Dossier"
-"Ignore","Ignorer"
-"Include","Inclure"
-"License","Licence"
-"License URI","URI de la licence"
-"Load Local Package","Charger le paquet local"
-"Load local Package","Charger le forfait local"
-"Magento Connect","Magento Connect"
-"Magento Connect Manager","Magento Connect Manager"
-"Max","Max"
-"Maximum","Maximum"
-"Min","Min"
-"Minimum","Minimum"
-"Name","Nom"
+Remove,Supprimer
+Action,Action
+File,File
+Email,Email
+Name,Nom
+Type,Type
+Description,Description
+Summary,Résumé
+Include,Inclure
+"Save Data and Create Package","Enregistrer les données et créer un paquet"
+"Save As...","Enregistrer sous..."
+"Save package with custom package file name","Enregistrer le paquet avec un nom de fichier personnalisé"
"New Extension","Nouvelle extension"
+"Add files","Ajouter des fichiers"
+Authors,Auteurs
+"Add Author","Ajouter un auteur"
+Contents,Contenus
"PHP Version","Version PHP"
-"Package","Colis"
-"Package Extensions","Extensions du paquet"
+Minimum,Minimum
+Maximum,Maximum
+Dependencies,Dépendances
+Folder,Dossier
+Package,Colis
+"Load Local Package","Charger le paquet local"
"Package File Name","Nom de fichier du paquet"
+Channel,Canal
+"1.5.0.0 & later","1.5.0.0 et suivantes"
+Pre-1.5.0.0,"Antérieures à 1.5.0.0"
+"Supported releases","Versions supportées"
+License,Licence
+"License URI","URI de la licence"
"Package Info","Info du paquet"
-"Packages","Paquets"
-"Path","Chemin"
-"Pre-1.5.0.0","Antérieures à 1.5.0.0"
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
"Release Info","Info sur la release"
-"Remove","Supprimer"
-"Save As...","Enregistrer sous..."
-"Save Data and Create Package","Enregistrer les données et créer un paquet"
-"Save package with custom package file name","Enregistrer le paquet avec un nom de fichier personnalisé"
-"Summary","Résumé"
-"Supported releases","Versions supportées"
-"System","Système"
-"Target","Cible"
-"The package %s data has been loaded.","Les données paquet %s ont été chargées."
+"Create Extension Package","Créer un paquet d'extension"
+"Package Extensions","Extensions du paquet"
+Extension,Extension
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
"The package data has been saved.","Les données du paquet ont été sauvegardées"
-"There was a problem saving package data","Il y a eu un problème lors de la sauvegarde des données du paquet"
-"Type","Type"
-"User","Utilisateur"
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,Utilisateur
+Target,Cible
+Path,Chemin
+Ignore,Ignorer
+"Recursive Dir","Recursive Dir"
+"Add Contents Path","Ajouter un chemin vers des contenus"
+Packages,Paquets
+Min,Min
+Max,Max
+Files,Fichiers
+"Add Package dependency","Ajouter dépendances"
+Extensions,Extensions
+"Add PHP Extension dependency","Ajouter dépendances PHP"
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Connect/i18n/nl_NL.csv b/app/code/Magento/Connect/i18n/nl_NL.csv
index 9ad018955b6..402f35fa1a9 100644
--- a/app/code/Magento/Connect/i18n/nl_NL.csv
+++ b/app/code/Magento/Connect/i18n/nl_NL.csv
@@ -1,58 +1,60 @@
-"1.5.0.0 & later","1.5.0.0 & later"
-"Action","Actie"
-"Add Author","Voeg auteur toe"
-"Add Contents Path","Voeg inhoudspad toe"
-"Add PHP Extension dependency","Voeg PHP extensie afhankelijkheid toe"
-"Add Package dependency","Voeg pakket afhankelijkheid toe"
-"Add files","Voeg bestanden toe"
-"Authors","Auteurs"
-"Channel","Kanaal"
-"Contents","Inhoud"
-"Create Extension Package","Creëer extensie pakket"
-"Dependencies","Afhankelijkheden"
-"Description","Omschrijving"
-"Edit Extension","Bewerk extensie"
-"Email","Email"
-"Extension","Extensie"
-"Extensions","Extensies"
-"Failed to create the package.","Niet in staat om het pakket te creëren."
-"Failed to load the package data.","Niet in staat om de pakketdata te laden."
-"Failed to save the package.","Niet in staat om het pakket op te slaan."
-"Files","Bestanden"
-"Folder","Map"
-"Ignore","Negeer"
-"Include","Sluit in"
-"License","Licentie"
-"License URI","Licentie URL"
-"Load Local Package","Laad lokaal pakket"
-"Load local Package","Laad lokaal pakket"
-"Magento Connect","Magento verbinden"
-"Magento Connect Manager","Magento verbindingsmanager"
-"Max","Maximaal"
-"Maximum","Maximum"
-"Min","Minimaal"
-"Minimum","Minimum"
-"Name","Naam"
+Remove,Verwijder
+Action,Actie
+File,File
+Email,Email
+Name,Naam
+Type,type
+Description,Omschrijving
+Summary,Overzicht
+Include,"Sluit in"
+"Save Data and Create Package","Sla data op en creëer pakket."
+"Save As...","Sla op als..."
+"Save package with custom package file name","Sla pakket op met aangepaste pakket bestandsnaam"
"New Extension","Nieuwe extensie"
+"Add files","Voeg bestanden toe"
+Authors,Auteurs
+"Add Author","Voeg auteur toe"
+Contents,Inhoud
"PHP Version","PHP versie"
-"Package","Pakket"
-"Package Extensions","Pakket extensies"
+Minimum,Minimum
+Maximum,Maximum
+Dependencies,Afhankelijkheden
+Folder,Map
+Package,Pakket
+"Load Local Package","Laad lokaal pakket"
"Package File Name","Pakket bestandsnaam"
-"Package Info","Pakket info"
-"Packages","Pakketten"
-"Path","Pad"
-"Pre-1.5.0.0","Pre-1.5.0.0"
-"Release Info","Uitbrengingsinformatie"
-"Remove","Verwijder"
-"Save As...","Sla op als..."
-"Save Data and Create Package","Sla data op en creëer pakket."
-"Save package with custom package file name","Sla pakket op met aangepaste pakket bestandsnaam"
-"Summary","Overzicht"
+Channel,Kanaal
+"1.5.0.0 & later","1.5.0.0 & later"
+Pre-1.5.0.0,Pre-1.5.0.0
"Supported releases","Ondersteunde uitbrenging"
-"System","Systeem"
-"Target","Doel"
-"The package %s data has been loaded.","De data van het pakket %s is geladen."
+License,Licentie
+"License URI","Licentie URL"
+"Package Info","Pakket info"
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
+"Release Info",Uitbrengingsinformatie
+"Create Extension Package","Creëer extensie pakket"
+"Package Extensions","Pakket extensies"
+Extension,Extensie
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
"The package data has been saved.","De data van het pakket is opgeslagen"
-"There was a problem saving package data","Er is een probleem opgetreden bij het opslaan van de pakketdata"
-"Type","type"
-"User","Gebruiker"
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,Gebruiker
+Target,Doel
+Path,Pad
+Ignore,Negeer
+"Recursive Dir","Recursive Dir"
+"Add Contents Path","Voeg inhoudspad toe"
+Packages,Pakketten
+Min,Minimaal
+Max,Maximaal
+Files,Bestanden
+"Add Package dependency","Voeg pakket afhankelijkheid toe"
+Extensions,Extensies
+"Add PHP Extension dependency","Voeg PHP extensie afhankelijkheid toe"
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Connect/i18n/pt_BR.csv b/app/code/Magento/Connect/i18n/pt_BR.csv
index cd45c5af239..d716e05c15e 100644
--- a/app/code/Magento/Connect/i18n/pt_BR.csv
+++ b/app/code/Magento/Connect/i18n/pt_BR.csv
@@ -1,58 +1,60 @@
-"1.5.0.0 & later","1.5.0.0 e posterior"
-"Action","Ação"
-"Add Author","Adicionar autor"
-"Add Contents Path","Adicionar sequência de conteúdos"
-"Add PHP Extension dependency","Adicionar dependência de Extensão PHP"
-"Add Package dependency","Adicionar dependência de Pacote"
-"Add files","Adicionar arquivos"
-"Authors","Autores"
-"Channel","Canal"
-"Contents","Conteúdos"
-"Create Extension Package","Criar pacote de expansão"
-"Dependencies","Dependências"
-"Description","Descrição"
-"Edit Extension","Editar extensão"
-"Email","E-mail"
-"Extension","Extensão"
-"Extensions","Extensões"
-"Failed to create the package.","Ocorreu um erro ao tentar criar o pacote."
-"Failed to load the package data.","Ocorreu um erro ao tentar carregar os dados do pacote."
-"Failed to save the package.","Ocorreu um erro ao tentar salvar o pacote."
-"Files","Arquivos"
-"Folder","Pasta"
-"Ignore","Ignorar"
-"Include","Incluir"
-"License","Licença"
-"License URI","Licença de URI"
-"Load Local Package","Carregar Pacote Local"
-"Load local Package","Carregar Pacote Local"
-"Magento Connect","Conexão Magento"
-"Magento Connect Manager","Gerenciador de Conexão Magento"
-"Max","Máximo"
-"Maximum","Máximo"
-"Min","Min"
-"Minimum","MÃnimo"
-"Name","Nome"
+Remove,Remover
+Action,Ação
+File,File
+Email,E-mail
+Name,Nome
+Type,Tipo
+Description,Descrição
+Summary,Sumário
+Include,Incluir
+"Save Data and Create Package","Salvar Dados e Criar Pacote"
+"Save As...","Salvar Como..."
+"Save package with custom package file name","Salvar pacote com nome do arquivo de pacote personalizado"
"New Extension","Nova Extensão"
+"Add files","Adicionar arquivos"
+Authors,Autores
+"Add Author","Adicionar autor"
+Contents,Conteúdos
"PHP Version","Versão PHP"
-"Package","Embalagem"
-"Package Extensions","Extensões da Embalagem"
+Minimum,MÃnimo
+Maximum,Máximo
+Dependencies,Dependências
+Folder,Pasta
+Package,Embalagem
+"Load Local Package","Carregar Pacote Local"
"Package File Name","Nome do Arquivo do Pacote"
+Channel,Canal
+"1.5.0.0 & later","1.5.0.0 e posterior"
+Pre-1.5.0.0,Pré-1.5.0.0
+"Supported releases","Versões suportadas"
+License,Licença
+"License URI","Licença de URI"
"Package Info","Informação do Pacote"
-"Packages","Embalagens"
-"Path","Caminho"
-"Pre-1.5.0.0","Pré-1.5.0.0"
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
"Release Info","Informação de Lançamento"
-"Remove","Remover"
-"Save As...","Salvar Como..."
-"Save Data and Create Package","Salvar Dados e Criar Pacote"
-"Save package with custom package file name","Salvar pacote com nome do arquivo de pacote personalizado"
-"Summary","Sumário"
-"Supported releases","Versões suportadas"
-"System","Sistema"
-"Target","Objetivo"
-"The package %s data has been loaded.","Os dados do pacote %s foram carregados."
+"Create Extension Package","Criar pacote de expansão"
+"Package Extensions","Extensões da Embalagem"
+Extension,Extensão
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
"The package data has been saved.","Os dados do pacote foram salvos."
-"There was a problem saving package data","Houve um problema ao salvar dados do pacote"
-"Type","Tipo"
-"User","Usuário"
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,Usuário
+Target,Objetivo
+Path,Caminho
+Ignore,Ignorar
+"Recursive Dir","Recursive Dir"
+"Add Contents Path","Adicionar sequência de conteúdos"
+Packages,Embalagens
+Min,Min
+Max,Máximo
+Files,Arquivos
+"Add Package dependency","Adicionar dependência de Pacote"
+Extensions,Extensões
+"Add PHP Extension dependency","Adicionar dependência de Extensão PHP"
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Connect/i18n/zh_CN.csv b/app/code/Magento/Connect/i18n/zh_CN.csv
index c4fa0fbf652..f23e3c39cac 100644
--- a/app/code/Magento/Connect/i18n/zh_CN.csv
+++ b/app/code/Magento/Connect/i18n/zh_CN.csv
@@ -1,58 +1,60 @@
+Remove,åˆ é™¤
+Action,æ“作
+File,File
+Email,电å邮件
+Name,姓å
+Type,类型
+Description,æè¿°
+Summary,摘è¦
+Include,包å«
+"Save Data and Create Package",ä¿å˜æ•°æ®å¹¶åˆ›å»ºåŒ…
+"Save As...",å¦å˜ä¸º...
+"Save package with custom package file name",使用自定义包文件åä¿å˜åŒ…
+"New Extension",新扩展
+"Add files",æ·»åŠ æ–‡ä»¶
+Authors,作者
+"Add Author",æ·»åŠ ä½œè€…
+Contents,内容
+"PHP Version",PHP版本
+Minimum,最å°
+Maximum,最大
+Dependencies,ä¾å˜æ€§
+Folder,文件夹
+Package,包裹
+"Load Local Package",åŠ è½½æœ¬åœ°åŒ…
+"Package File Name",包文件å
+Channel,æ¸ é“
"1.5.0.0 & later","1.5.0.0 åŠæ›´æ–°ç‰ˆ"
-"Action","æ“作"
-"Add Author","æ·»åŠ ä½œè€…"
-"Add Contents Path","æ·»åŠ å†…å®¹è·¯å¾„"
-"Add PHP Extension dependency","æ·»åŠ PHP扩展ä¾å˜æ€§"
-"Add Package dependency","æ·»åŠ æ•°æ®åŒ…ä¾å˜æ€§"
-"Add files","æ·»åŠ æ–‡ä»¶"
-"Authors","作者"
-"Channel","æ¸ é“"
-"Contents","内容"
-"Create Extension Package","创建扩展包"
-"Dependencies","ä¾å˜æ€§"
-"Description","æè¿°"
-"Edit Extension","修改扩展"
-"Email","电å邮件"
-"Extension","扩展"
-"Extensions","扩展"
-"Failed to create the package.","创建包失败。"
-"Failed to load the package data.","åŠ è½½åŒ…æ•°æ®å¤±è´¥ã€‚"
-"Failed to save the package.","ä¿å˜åŒ…失败。"
-"Files","文件"
-"Folder","文件夹"
-"Ignore","忽略"
-"Include","包å«"
-"License","许å¯"
-"License URI","许å¯URI"
-"Load Local Package","åŠ è½½æœ¬åœ°åŒ…"
-"Load local Package","载入本地包"
-"Magento Connect","Magento连接"
-"Magento Connect Manager","Magento连接管ç†å™¨"
-"Max","最大"
-"Maximum","最大"
-"Min","最å°"
-"Minimum","最å°"
-"Name","姓å"
-"New Extension","新扩展"
-"PHP Version","PHP版本"
-"Package","包裹"
-"Package Extensions","包括扩展"
-"Package File Name","包文件å"
-"Package Info","包信æ¯"
-"Packages","包裹"
-"Path","路径"
-"Pre-1.5.0.0","Pre-1.5.0.0"
-"Release Info","å‘布信æ¯"
-"Remove","åˆ é™¤"
-"Save As...","å¦å˜ä¸º..."
-"Save Data and Create Package","ä¿å˜æ•°æ®å¹¶åˆ›å»ºåŒ…"
-"Save package with custom package file name","使用自定义包文件åä¿å˜åŒ…"
-"Summary","摘è¦"
-"Supported releases","支æŒçš„版本"
-"System","系统"
-"Target","ç›®æ ‡"
-"The package %s data has been loaded.","åŒ…ä¸ %s æ•°æ®å·²è½½å…¥ã€‚"
-"The package data has been saved.","包ä¸æ•°æ®å·²ä¿å˜ã€‚"
-"There was a problem saving package data","ä¿å˜åŒ…æ•°æ®æ—¶é‡åˆ°é—®é¢˜"
-"Type","类型"
-"User","用户"
+Pre-1.5.0.0,Pre-1.5.0.0
+"Supported releases",支æŒçš„版本
+License,许å¯
+"License URI",许å¯URI
+"Package Info",包信æ¯
+Release,Release
+"Release Version","Release Version"
+"Release Stability","Release Stability"
+Notes,Notes
+"Release Info",å‘布信æ¯
+"Create Extension Package",创建扩展包
+"Package Extensions",包括扩展
+Extension,扩展
+"Something went wrong loading the package data.","Something went wrong loading the package data."
+"The package %1 data has been loaded.","The package %1 data has been loaded."
+"The package data has been saved.",包ä¸æ•°æ®å·²ä¿å˜ã€‚
+"Something went wrong saving the package data.","Something went wrong saving the package data."
+"Something went wrong saving the package.","Something went wrong saving the package."
+"Something went wrong creating the package.","Something went wrong creating the package."
+User,用户
+Target,ç›®æ ‡
+Path,路径
+Ignore,忽略
+"Recursive Dir","Recursive Dir"
+"Add Contents Path",æ·»åŠ å†…å®¹è·¯å¾„
+Packages,包裹
+Min,最å°
+Max,最大
+Files,文件
+"Add Package dependency",æ·»åŠ æ•°æ®åŒ…ä¾å˜æ€§
+Extensions,扩展
+"Add PHP Extension dependency",æ·»åŠ PHP扩展ä¾å˜æ€§
+"Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads.","Caution: All unsaved form data will be lost as soon as you you click on the row and the package data loads."
diff --git a/app/code/Magento/Contact/i18n/de_DE.csv b/app/code/Magento/Contact/i18n/de_DE.csv
index deac9d2e26a..ec1c149e716 100644
--- a/app/code/Magento/Contact/i18n/de_DE.csv
+++ b/app/code/Magento/Contact/i18n/de_DE.csv
@@ -1,19 +1,16 @@
+Email,E-Mail
+Name,Name
+Submit,Senden
"* Required Fields","* Notwendige Felder"
-"Comment","Kommentar"
-"Contact Form","Kontaktformular"
-"Contact Information","Kontaktinformation"
-"Contact Us","Kontakt"
-"Contact Us Form","Kontaktformular"
-"Contacts","Kontakte"
-"Contacts Section","Kontaktbuch"
-"Email","E-Mail"
-"Email Options","E-Mail-Optionen"
-"Email Sender","E-Mail-Absender"
-"Email Template","E-Mail-Vorlage"
-"Enable Contact Us","Kontaktfunktion aktivieren"
-"Name","Name"
-"Send Emails To","E-Mails senden an"
-"Submit","Senden"
-"Phone","Telefon"
-"Unable to submit your request. Please, try again later","Ihre Anfrage konnte nicht verarbeitet werden. Bitte versuchen Sie es später erneut"
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Ihre Anfrage wurde übermittelt und wir werden so bald wie möglich darauf antworten. Vielen Dank, dass Sie sich mit uns in Kontakt setzen."
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
+"Contact Information",Kontaktinformation
+Comment,Kommentar
+"Email Template","Email Template"
+Contacts,Contacts
+"Contact Us",Kontakt
+"Enable Contact Us","Enable Contact Us"
+"Email Options","Email Options"
+"Send Emails To","Send Emails To"
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/i18n/en_US.csv b/app/code/Magento/Contact/i18n/en_US.csv
index 32bf8de540f..71a433f8961 100644
--- a/app/code/Magento/Contact/i18n/en_US.csv
+++ b/app/code/Magento/Contact/i18n/en_US.csv
@@ -1,19 +1,16 @@
+Email,Email
+Name,Name
+Submit,Submit
"* Required Fields","* Required Fields"
-"Comment","Comment"
-"Contact Form","Contact Form"
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
"Contact Information","Contact Information"
-"Contact Us","Contact Us"
-"Contact Us Form","Contact Us Form"
-"Contacts","Contacts"
-"Contacts Section","Contacts Section"
-"Email","Email"
-"Email Options","Email Options"
-"Email Sender","Email Sender"
+Comment,Comment
"Email Template","Email Template"
+Contacts,Contacts
+"Contact Us","Contact Us"
"Enable Contact Us","Enable Contact Us"
-"Name","Name"
+"Email Options","Email Options"
"Send Emails To","Send Emails To"
-"Submit","Submit"
-"Phone","Phone"
-"Unable to submit your request. Please, try again later","Unable to submit your request. Please, try again later"
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us."
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/i18n/es_ES.csv b/app/code/Magento/Contact/i18n/es_ES.csv
index a567ef854ef..11fe1244a50 100644
--- a/app/code/Magento/Contact/i18n/es_ES.csv
+++ b/app/code/Magento/Contact/i18n/es_ES.csv
@@ -1,19 +1,16 @@
+Email,"Correo electrónico"
+Name,Nombre
+Submit,Enviar
"* Required Fields","* Campos Requeridos"
-"Comment","Comentario"
-"Contact Form","Formulario de contacto"
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
"Contact Information","Información de Contacto"
-"Contact Us","Contáctenos"
-"Contact Us Form","Formulario de contacto"
-"Contacts","Contactos"
-"Contacts Section","Sección de contactos"
-"Email","Correo electrónico"
-"Email Options","Opciones de correo electrónico"
-"Email Sender","Remitente del email"
-"Email Template","Plantilla de email"
-"Enable Contact Us","Activar Contactar"
-"Name","Nombre"
-"Send Emails To","Enviar correo electrónico a"
-"Submit","Enviar"
-"Phone","Teléfono"
-"Unable to submit your request. Please, try again later","No se ha podido enviar su solicitud. Por favor, inténtelo más tarde"
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Su solicitud ha sido enviada y le responderemos con la mayor brevedad posible. Gracias por contactar con nosotros"
+Comment,Comentario
+"Email Template","Email Template"
+Contacts,Contacts
+"Contact Us",Contáctenos
+"Enable Contact Us","Enable Contact Us"
+"Email Options","Email Options"
+"Send Emails To","Send Emails To"
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/i18n/fr_FR.csv b/app/code/Magento/Contact/i18n/fr_FR.csv
index eeca45bc414..e72bd8348b3 100644
--- a/app/code/Magento/Contact/i18n/fr_FR.csv
+++ b/app/code/Magento/Contact/i18n/fr_FR.csv
@@ -1,19 +1,16 @@
+Email,Email
+Name,Nom
+Submit,Soumettre
"* Required Fields","* Champs obligatoires"
-"Comment","Commenter"
-"Contact Form","Formulaire de contact"
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
"Contact Information","Informations de contact"
+Comment,Commenter
+"Email Template","Email Template"
+Contacts,Contacts
"Contact Us","Nous contacter"
-"Contact Us Form","Formulaire de contact"
-"Contacts","Contacts"
-"Contacts Section","Section de contacts"
-"Email","Email"
-"Email Options","Options d'email"
-"Email Sender","Expéditeur de l'email"
-"Email Template","Modèle d'email"
-"Enable Contact Us","Activer contatez-nous"
-"Name","Nom"
-"Send Emails To","Envoyer emails à "
-"Submit","Soumettre"
-"Phone","Téléphone"
-"Unable to submit your request. Please, try again later","Impossible de soumettre votre requête. Veuillez réessayer plus tard."
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Votre requête a été envoyée et nous y répondrons aussi vite que possible. Merci de nous avoir contactés."
+"Enable Contact Us","Enable Contact Us"
+"Email Options","Email Options"
+"Send Emails To","Send Emails To"
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/i18n/nl_NL.csv b/app/code/Magento/Contact/i18n/nl_NL.csv
index d0c64eeefa3..eb90906e3eb 100644
--- a/app/code/Magento/Contact/i18n/nl_NL.csv
+++ b/app/code/Magento/Contact/i18n/nl_NL.csv
@@ -1,19 +1,16 @@
+Email,Email
+Name,Naam
+Submit,Bevestig
"* Required Fields","* Vereiste velden"
-"Comment","Reactie"
-"Contact Form","contactformulier"
-"Contact Information","contactinformatie"
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
+"Contact Information",contactinformatie
+Comment,Reactie
+"Email Template","Email Template"
+Contacts,Contacts
"Contact Us","contacteer ons"
-"Contact Us Form","contacteer ons vanuit"
-"Contacts","contacten"
-"Contacts Section","contact sectie"
-"Email","Email"
-"Email Options","email opties"
-"Email Sender","email afzender"
-"Email Template","email thema"
-"Enable Contact Us","schakel contacteer ons in"
-"Name","Naam"
-"Send Emails To","verstuur emails naar"
-"Submit","Bevestig"
-"Phone","telefoon"
-"Unable to submit your request. Please, try again later","Niet in staat om uw aanvraag in te dienen. Probeer a.u.b. later opnieuw."
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Uw vraag is verstuurd en zal zo spoedig mogelijk beantwoord worden. Dank u dat u contact met ons heeft opgenomen."
+"Enable Contact Us","Enable Contact Us"
+"Email Options","Email Options"
+"Send Emails To","Send Emails To"
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/i18n/pt_BR.csv b/app/code/Magento/Contact/i18n/pt_BR.csv
index 93baa331169..11abd5480fb 100644
--- a/app/code/Magento/Contact/i18n/pt_BR.csv
+++ b/app/code/Magento/Contact/i18n/pt_BR.csv
@@ -1,19 +1,16 @@
+Email,E-mail
+Name,Nome
+Submit,Enviar
"* Required Fields","* Campos obrigatórios"
-"Comment","Comentário"
-"Contact Form","Formulário de Contato"
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
"Contact Information","Informações de contato"
-"Contact Us","Contate-nos"
-"Contact Us Form","Formulário de Contato"
-"Contacts","Contatos"
-"Contacts Section","Seção de Contatos"
-"Email","E-mail"
-"Email Options","Opções de Email"
-"Email Sender","Remetente do e-mail:"
-"Email Template","Modelo de e-mail"
-"Enable Contact Us","Ativar Contate-nos"
-"Name","Nome"
-"Send Emails To","Enviar Emails Para"
-"Submit","Enviar"
-"Phone","Telefone"
-"Unable to submit your request. Please, try again later","Não é possÃvel submeter o seu pedido. Por favor tente novamente mais tarde"
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Seu pedido de informação foi submetido e será respondido o mais rapidamente possÃvel. Obrigado por nos contatar."
+Comment,Comentário
+"Email Template","Email Template"
+Contacts,Contacts
+"Contact Us",Contate-nos
+"Enable Contact Us","Enable Contact Us"
+"Email Options","Email Options"
+"Send Emails To","Send Emails To"
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/i18n/zh_CN.csv b/app/code/Magento/Contact/i18n/zh_CN.csv
index 3f55c09759b..ffb2e35941d 100644
--- a/app/code/Magento/Contact/i18n/zh_CN.csv
+++ b/app/code/Magento/Contact/i18n/zh_CN.csv
@@ -1,19 +1,16 @@
-"* Required Fields","*å¿…è¦å—段"
-"Comment","评论"
-"Contact Form","è”系表å•"
-"Contact Information","è”系信æ¯"
-"Contact Us","è”系我们"
-"Contact Us Form","我们的è”系方å¼"
-"Contacts","è”系人"
-"Contacts Section","è”系人区域"
-"Email","电å邮件"
-"Email Options","电å邮件选项"
-"Email Sender","电å邮件å‘é€äºº"
-"Email Template","电å邮件模æ¿"
-"Enable Contact Us","å¯ç”¨è”系功能"
-"Name","姓å"
-"Send Emails To","å‘é€é‚®ä»¶åˆ°"
-"Submit","æ交"
-"Phone","电è¯"
-"Unable to submit your request. Please, try again later","æ— æ³•æ交您的请求。请ç¨å€™é‡è¯•"
-"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","您的咨询已æ交，我们将尽快回应。感谢您的è”系。"
+Email,电å邮件
+Name,姓å
+Submit,æ交
+"* Required Fields",*å¿…è¦å—段
+Telephone,Telephone
+"Thanks for contacting us with your comments and questions. We'll respond to you very soon.","Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+"We can't process your request right now. Sorry, that's all we know.","We can't process your request right now. Sorry, that's all we know."
+"Contact Information",è”系信æ¯
+Comment,评论
+"Email Template","Email Template"
+Contacts,Contacts
+"Contact Us",è”系我们
+"Enable Contact Us","Enable Contact Us"
+"Email Options","Email Options"
+"Send Emails To","Send Emails To"
+"Email Sender","Email Sender"
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index 74f3aa9c5a3..db3516d2fa9 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -56,7 +56,7 @@
</div>
<?php echo $this->getChildHtml('form.additional.info'); ?>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<input type="hidden" name="hideit" id="hideit" value="" />
<button type="submit" title="<?php echo __('Submit') ?>" class="action submit primary">
diff --git a/app/code/Magento/Core/Helper/Data.php b/app/code/Magento/Core/Helper/Data.php
index 3baacc98796..c772f4a460c 100644
--- a/app/code/Magento/Core/Helper/Data.php
+++ b/app/code/Magento/Core/Helper/Data.php
@@ -61,13 +61,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT
);
- /**
- * Core event manager proxy
- *
- * @var \Magento\Framework\Event\ManagerInterface
- */
- protected $_eventManager = null;
-
/**
* Core store config
*
diff --git a/app/code/Magento/Core/i18n/de_DE.csv b/app/code/Magento/Core/i18n/de_DE.csv
index 718acdc4375..7299a44c884 100644
--- a/app/code/Magento/Core/i18n/de_DE.csv
+++ b/app/code/Magento/Core/i18n/de_DE.csv
@@ -1,380 +1,42 @@
-"%s","%s"
-"%s already exist.","%s existieren bereits."
-"%s already exists.","%s existiert bereits."
+Configuration,Configuration
"-- Please Select --","-- Bitte auswählen --"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">Vorsicht!</strong> Wenn Sie CDN verwenden, kann es in einigen Fällen vorkommen, dass JavaScript nicht korrekt läuft, wenn CDN nicht in Ihrer Subdomain enthalten ist."
-"A category object is required for determining the product request path.","Es wird ein Kategorieobjekt benötigt um den Produktanfragepfad herauszufinden."
-"Add Block Names to Hints","Blocknamen zu Hinweisen hinzufügen"
-"Add Secret Key to URLs","Geheimschlüssel zu URLs hinzufügen"
-"Add Store Code to Urls","Storecode zu URLs hinzufügen"
-"Admin","Admin"
-"Admin Base URL","Admin Basis-URL"
-"Admin User Emails","Admin Benutzeremails"
-"Advanced","Fortgeschritten"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","Nachdem Sie einen neuen Medienspeicherort gewählt haben, drücken Sie den ""Synchronisieren""-Knopf, um alle Medien an diesen Ort zu übertragen. Medien sind an diesem neuen Ort erst verfügbar, wenn der Synchronisierungsprozess abgeschlossen ist."
-"Allow Countries","Länder zulassen"
-"Allow Symlinks","Symlinks erlauben"
-"Allowed IPs (comma separated)","Zugelassene IPs (durch Kommata getrennt)"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Erlaubte Dateitypen: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Nicht alle Browser unterstützen alle dieser Formate!"
-"Allows customers to stay logged in when switching between different stores.","Erlaubt Kunden eingeloggt zu bleiben nachdem zu einem anderen Store gewechselt wurde."
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternativtext für den Weiter-Link in der Seitenübersicht. Sollte diese Angabe leer sein, wird das Standard-Pfeilsymbol verwendet."
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternativtext für den Zurück-Link in der Seitenübersicht. Sollte diese Angabe leer sein, wird das Standard-Pfeilsymbol verwendet."
-"An error occurred while saving. Please review the error log.","Beim Speichern trat ein Fehler auf. Bitte sehen Sie im Fehlerverlauf nach."
-"Anchor Text for Next","Link-Text für Weiter"
-"Anchor Text for Previous","Link-Text für Zurück"
-"Anchor symbol (#) is not supported in request path","Das Doppelkreuz (#) wird im Anforderungspfad nicht unterstützt"
-"Are you sure?","Sind Sie sicher?"
-"Auto-redirect to Base URL","Automatische Weiterleitung zur Basis-URL"
-"Back","Zurück"
-"Backup Options","Sicherungsoptionen"
-"Base JavaScript URL","Basis-URL Javascript"
-"Base Link URL","Basis-URL Links"
-"Base Media URL","Baiss-URL Medien"
-"Base Secure URL","Aufbau sichere URL"
-"Base Skin URL","Bais-URL Skins"
-"Base URL","Base URL"
-"Base Unsecure URL","Aufbau unsichere URL"
-"Before modifying the store view code please make sure that it is not used in index.php.","Bevor Sie den Store-View-Quelltext bearbeiten, sehen Sie bitte nach, dass es nicht in index.php verwendet wird."
-"Before modifying the website code please make sure that it is not used in index.php.","Bevor Sie den Webseitenquelltext bearbeiten, sehen Sie bitte nach, dass er nicht in index.php verwendet wird."
-"Block with name ""%s"" already exists","Ein Block mit dem Namen ""%s"" existiert bereits"
-"Browser Capabilities Detection","Browserunterstützungstest"
-"CSS Settings","CSS-Einstellungen"
-"Cache Storage Management","Zwischenspeicherverwaltung (Caching)"
-"Cache storage may contain additional data. Are you sure that you want flush it?","Der Cachespeicher könnte weitere Daten enthalten. Sind Sie sicher, dass Sie diese löschen möchten?"
-"Can not create invoice. Order was not found.","Rechnung konnte nicht erstellt werden. Es wurde keine Bestellung gefunden."
-"Can't retrieve request object","Objekt kann nicht abgefragt werden"
-"Can't retrieve entity config: %s","Kann Entität config: %s nicht auffinden"
-"Cancel","Abbrechen"
-"Cannot complete this operation from non-admin area.","Diese Aktion kann nicht außerhalb des Admin-Bereichs fertiggestellt werden."
-"Card type does not match credit card number.","Kartentyp entspricht nicht der Kreditkartennummer."
-"Code","Code"
-"Controller file was loaded but class does not exist","Controller-Datei wurde geladen, Klasse existiert jedoch nicht"
-"Cookie Domain","Cookie-Domain"
-"Cookie Lifetime","Cookie-Lebensdauer"
-"Cookie Path","Cookie-Pfad"
-"Cookie Restriction Mode","Modus zur Beschränkung von Cookies"
-"Copyright","Copyright"
-"Core","Kern"
-"Countries Options","Länderoptionen"
-"Country","Land"
-"Create Store","Erstelle Store"
-"Create Store View","Erstelle Store-View"
-"Create Website","Erstelle Website"
-"Credit card number does not match credit card type.","Kreditkartennummer entspricht nicht dem Kreditkartentyp."
-"Current Package Name","Aktueller Paketname"
-"Custom Admin Path","Benutzerdefinierter Administratorpfad"
-"Custom Admin URL","Individuelle Admin URL"
-"Custom Design","Eigene Gestaltung"
-"Custom Email 1","Angepasste Email 1"
-"Custom Email 2","Angepasste Email 2"
"Custom Variables","Angepasste Variablen"
-"Custom1 Contact Email","Kunde1 Kontakt-E-Mail"
-"Custom1 Contact Name","Kunde1 Kontaktname"
-"Custom2 Contact Email","Kunde2 Kontakt-E-Mail"
-"Custom2 Contact Name","Kunde2 Kontaktname"
-"Customer Support","Kundensupport"
-"Dashboard","Dashboard"
-"Date From","Datum ab"
-"Date To","Datum bis"
-"Date/time format ""%s"" is not supported.","Datum/Zeit-Format ""%s"" wird nicht unterstützt."
-"Debug","Debug"
-"Default","Standard"
-"Default Country","Standard Land"
-"Default Description","Standard-Beschreibung"
-"Default Keywords","Standard-Schlüsselwörter"
-"Default No-route URL","Standard-No-Route-URL"
-"Default Pages","Standardseiten"
-"Default Robots","Standard-Robots"
-"Default Store","Standard-Store"
-"Default Store View","Standard-Store-View"
-"Default Title","Standardtitel"
-"Default Web URL","Standard-Web-URL"
-"Delete","Löschen"
-"Delete Store","Shop löschen"
-"Delete Store View","Shopansicht löschen"
-"Delete Website","Webseite löschen"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Das Löschen von %1$s löscht nicht die Informationen die mit %1$s verbunden sind (z.B. Kategorien, Produkte, etc.), die %1$s können aber nicht mehr wiederhergestellt werden. Es ist empfohlen ein Datenbank Backup vor dem Löschen von %1$s zu machen."
-"Design","Gestaltung"
-"Design Change","Designänderung"
-"Developer","Developer"
-"Developer Client Restrictions","Developer Client Restrictions"
-"Disable Email Communications","E-Mail Kommunikation deaktivieren"
-"Disable Modules Output","Modul Output deaktivieren"
-"Display Demo Store Notice","Demo Shop Nachricht anzeigen"
-"Duplicate Of Template Name","Duplikat von Templatename"
-"Edit Design Change","Designänderung bearbeiten"
-"Edit Store","Shop bearbeiten"
-"Edit Store View","Shopansicht bearbeiten"
-"Edit Website","Webseite bearbeiten"
-"Empty identifier field name","Leerer Bezeichnerfeldname"
-"Empty main table name","Leerer Haupttabllenname"
-"Enable Charts","Tabellen aktivieren"
-"Enabled","Aktiviert"
-"Enabled for Admin","Für Admin aktivieren"
-"Enabled for Frontend","Für Frontend aktivieren"
-"Environment Update Time","Umgebungs-Update-Zeit"
-"Error in file: ""%s"" - %s","Fehler in Datei: ""%s"" - %s"
-"European Union Countries","Länder der Europäischen Union"
-"Exceptions Log File Name","Exceptions Logfile Name"
-"Favicon Icon","Favicon Icon"
-"File %s does not exist","Datei %s existiert nicht"
-"File %s is not readable","Datei %s kann nicht gelesen werden"
-"File not found","Datei nicht gefunden"
-"File system","Dateisystem"
-"File with an extension ""%value%"" is protected and cannot be uploaded","Dateien mit der Endung ""%value%"" sind geschützt und können nicht hochgeladen werden"
-"First Day of Week","Erster Wochentag"
-"Flush Cache Storage","Cache Storage entleeren"
-"Flush Magento Cache","Magento-Cache leeren"
-"Footer","Fußzeile"
-"Forgot Password Email Sender","E-Mail-Absender für vergessenes Passwort"
-"Forgot Password Email Template","Passwort vergessen E-Mail Template"
-"General","Allgemein"
-"General Contact","Allgemeiner Kontakt"
-"General Contact Email","Allgemeine Kontakt-E-Mail"
-"General Contact Name","Allgemeiner Kontaktname"
-"General Settings","Allgemeine Einstellungen"
-"Global","Weltweit"
-"HTML Head","HTML Kopf"
-"HTML tags are not allowed","HTML-Tags nicht zulässig"
-"Header","Kopfzeile"
-"Host","Host"
-"How many links to display at once.","Wie viele Links sind auf einmal anzuzeigen."
-"ID Path for Specified Store","ID Pfad für spezifizierten Shop"
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Falls die aktuelle Frame Position nicht die äußerste Seite abdeckt, wird der Link zur aktuellen Position plus/minus diesen Wert gerendert."
-"Incorrect credit card expiration date.","Falsches Verfallsdatum der Kreditkarte"
-"Input type ""%value%"" not found in the input types list.","Eingabetyp ""%value%"" wurde nicht in der Liste der Eingabetypen gefunden."
-"Invalid base url type","Ungültiger Base URL Typ"
-"Invalid block name to set child %s: %s","Ungültiger Blockname zum Child gesetzt: %s: %s"
-"Invalid block type: %s","Ungültiger Blocktyp: %s"
-"Invalid block: %s","Ungültiger Block: %s"
-"Invalid connection","Ungültige Verknüpfung"
-"Invalid layout update handle","Ungültiger Layout Update Identifikator"
-"Invalid messages storage ""%s"" for layout messages initialization","Ungültiger Nachrichtenspeicher ""%s"" für die Initialisierung der Layout-Nachrichten"
-"Invalid query","Ungültige Anfrage"
-"Invalid transactional email code: ","Ungültiger Transaktionsmailcode:"
-"Invalid website's configuration path: %s","Ungültiger Webseitenkonfigurationspfad: %s"
-"JavaScript Settings","JavaScript Einstellungen"
-"Layout","Layout"
-"Leave empty for access from any location.","Leer lassen für den Zugriff von jedem Standort aus."
-"List of stores","Liste der Speicherorte"
-"Locale","Sprachumgebung"
-"Locale Options","locale Einstellungen"
-"Log Settings","Log-Einstellungen"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging von \Magento\Framework\Logger befindet sich in {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging von \Magento\Framework\Logger. Die Datei befinden sich in {{base_dir}}/var/log"
-"Login is Case Sensitive","Login ist Case Sensitive"
-"Logo Image","Logobild"
-"Logo Image Alt","Logo Alt"
-"Logo Image Src","Bildquelle für Logo"
-"Mail Sending Settings","Sendeeinstellungen in Mail"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Stellen Sie sicher, dass Basis-URL endet mit '/' (Slash), z. B. http://yourdomain/magento"
-"Manage Stores","Stores verwalten"
-"Match expressions in the same order as displayed in the configuration.","Passende Ausdrücke in der gleichen Reihenfolge wie in der Konfiguration angezeigt."
-"Media Storage","Medienspeicher"
-"Merge CSS Files","CSS-Dateien zusammenlegen"
-"Merge JavaScript Files","Merge JavaScript-Dateien"
-"Miscellaneous HTML","Diverses HTML"
-"Miscellaneous Scripts","Verschiedene Scripts"
-"Model class does not exist: %s.","Modell-Klasse existiert nicht: %s."
-"Model collection resource name is not defined.","Modell-Erfassung Quelle-Name ist nicht definiert."
-"Module ""%1$s"" cannot depend on ""%2$s"".","Modul ""%1$s"" kann nicht von ""%2$s"" abhängig sein."
-"Module ""%1$s"" requires module ""%2$s"".","Modul ""%1$s"" benötigt das Modul ""%2$s""."
-"Name","Name"
-"New Design Change","Neue Designänderung"
-"New Store","Neuer Shop"
-"New Store View","Neue Filiale Ansicht"
-"New Website","Neue Webpräsenz"
-"No","Nein"
-"Offloader header","Offloader Titelzeile"
-"PHP SOAP extension is required.","PHP SOAP-Erweiterung erforderlich."
-"Package","Paket"
-"Pagination","Seiteneinteilung"
-"Pagination Frame","Seitennummerierungs-Frame"
-"Pagination Frame Skip","Seitennummerierung Frame Weiter"
-"Parent directory does not exist: %s","Ãœbergeordnetes Verzeichnis existiert nicht: %s"
-"Path ""%value%"" is not available and cannot be used.","Der Pfad ""%value%"" ist nicht verfügbar und kann nicht verwendet werden."
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
+"File system",Dateisystem
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format","Falsches Format Dateiinfo"
"Path ""%value%"" is protected and cannot be used.","Der Pfad ""%value%"" ist geschützt und kann nicht verwendet werden."
+"Path ""%value%"" is not available and cannot be used.","Der Pfad ""%value%"" ist nicht verfügbar und kann nicht verwendet werden."
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","Der Pfad ""%value%"" darf keinen Verweis auf das übergeordnete Verzeichnis enthalten (""../"", ""..\")."
-"Please define flag code.","Bitte definieren Sie Flag-Code."
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Bitte geben Sie 6 oder mehr Zeichen ein. Leerzeichen am Anfang oder Ende werden ignoriert."
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Bitte geben Sie 7 oder mehr Zeichen ein. Ihr Passwort sollte sowohl Zahlen als auch Buchstaben enthalten."
-"Please enter a number 0 or greater in this field.","Bitte geben Sie eine Zahl in das Feld ein, die 0 oder größer ist."
-"Please enter a number 1 or greater in this field.","Bitte geben sie hier eine Zahl ein, die mindestens 1 beträgt."
-"Please enter a number greater than 0 in this field.","Bitte geben Sie in diesem Feld eine Zahl ein, die größer als 0 ist."
-"Please enter a number lower than 100.","Bitte geben Sie eine Zahl unter 100 ein."
-"Please enter a valid $ amount. For example $100.00.","Bitte geben Sie einen gültigen Betrag in US-Dollar ein. Zum Beispiel 100,00 US-Dollar."
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Bitte geben Sie einen gültigen URL-Schlüssel an. Zum Beispiel ""beispiel-seite"", ""beispiel-seite.html"" oder ""andereebene/beispiel-seite""."
-"Please enter a valid URL. For example http://www.example.com or www.example.com","Bitte geben Sie eine gültige URL ein, z.B. http://www.beispiel.com oder www.beispiel.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Bitte geben Sie eine gültige URL mit dem dazugehörigen Protokoll (http://, https:// oder ftp://) an."
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Bitte geben Sie einen gültigen XML-Identifier an. Zum Beispiel irgendwas_1, block5, id-4."
-"Please enter a valid credit card number.","Bitte geben Sie eine gültige Kreditkartennummer ein."
-"Please enter a valid credit card verification number.","Bitte geben Sie eine gültige Kreditkarten-Überprüfungsnummer ein."
-"Please enter a valid date between %s and %s","Bitte geben Sie ein gültiges Datum zwischen %s und %s an."
-"Please enter a valid date equal to or greater than %s","Bitte geben Sie ein gültiges Datum gleich oder größer als %s an."
-"Please enter a valid date less than or equal to %s","Bitte geben Sie ein gültiges Datum kleiner oder gleich %s an."
-"Please enter a valid date.","Bitte geben Sie ein gültiges Datum ein."
-"Please enter a valid day (1-%1).","Bitte geben Sie einen gültigen Tag ein (1-%1)."
-"Please enter a valid email address. For example johndoe@domain.com.","Bitte geben Sie eine gültige E-Mail Adresse ein. Zum Beispiel johndoe@domain.com"
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Bitte geben Sie eine gültige Faxnummer an. Zum Beispiel (123) 456-7890 oder 123-456-7890."
-"Please enter a valid full date","Bitte geben Sie ein vollständiges, gültiges Datum an."
-"Please enter a valid month (1-12).","Bitte geben Sie einen gültigen Monat an (1-12)."
-"Please enter a valid number in this field.","Bitte geben Sie in dieses Feld eine gültige Nummer ein."
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Bitte geben Sie eine gültige Telefonnummer ein. Zum Beispiel (123)456-7890 oder 123-456-7890."
-"Please enter a valid social security number. For example 123-45-6789.","Bitte geben Sie eine gültige Sozialversicherungsnummer ein. Zum Beispiel 123-45-6789."
-"Please enter a valid year (1900-%1).","Bitte geben Sie ein gültiges Jahr an (1900-%1)."
-"Please enter a valid zip code.","Bitte geben Sie eine gültige Postleitzahl ein."
-"Please enter a valid zip code. For example 90602 or 90602-1234.","Bitte geben Sie eine gültige Postleitzahl ein. Zum Beispiel 90602 oder 90602-1234."
-"Please enter issue number or start date for switch/solo card type.","Bitte geben Sie Ihre Ausgabenummer oder das Erstellungsdatum Ihrer EC-/Debitkarte an."
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Bitte geben Sie eine gültige CSS-Länge an. Zum Beispiel 100px oder 77pt oder 20em oder .5ex oder 50%."
-"Please make sure your passwords match.","Bitte stellen Sie sicher, dass Ihre Passwörter übereinstimmen."
-"Please select State/Province.","Wählen Sie bitte Staat/Bundesland aus."
-"Please select a file","Wählen Sie bitte eine Datei aus"
-"Please select an option.","Bitte wählen Sie eine Option."
-"Please select one of the above options.","Wählen Sie bitte eine der obigen Optionen aus."
-"Please select one of the options.","Bitte wählen Sie eine Option."
"Please set available and/or protected paths list(s) before validation.","Bitte stellen Sie vor der Bestätigung die Liste(n) der verfügbaren und/oder geschützten Pfade ein."
-"Please specify either a category or a product, or both.","Bitte geben Sie eine Kategorie oder ein Produkt oder beides an."
-"Please use letters only (a-z or A-Z) in this field.","Bitte verwenden Sie ausschließlich Buchstaben (a-z oder A-Z) in diesem Feld."
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Bitte verwenden Sie in diesem Feld nur Zahlen. Vermeiden Sie bitte Leerzeichen und andere Zeichen, wie Punkt oder Komma."
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) in diesem Feld. Leerzeichen oder andere Zeichen sind nicht erlaubt."
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) oder Leerzeichen und Rauten (#) in diesem Feld."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Geben Sie in dieses Feld bitte nur Buchstaben (a-z oder A-Z), Ziffern (0-9) oder Unterstreichungszeichen(_) ein; als erstes Zeichen ist nur ein Buchstabe erlaubt."
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Bitte geben Sie in dieses Feld nur Buchstaben (a-z), Ziffern (0-9) oder Unterstriche (_) ein, das erste Zeichen sollte ein Buchstabe sein."
-"Please use only visible characters and spaces.","Bitte verwenden Sie nur lesbare Zeichen und Leerzeichen."
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Bitte verwenden Sie nur dieses Datumsformat: tt/mm/jjjj. Zum Beispiel 17/03/2006 für den 17. März 2006."
-"Please wait, loading...","Bitte warten, lädt..."
-"Port (25)","Port (25)"
-"Profiler","Profiler"
-"Recovery Link Expiration Interval (days)","Verbleibende Gültigkeitsdauer des Wiederherstellungslinks (Tage)"
-"Request Path for Specified Store","Aufrufpfad für angegebenen Shop"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","Die angefragte Datei darf keinen Verweis auf ein übergeordnetes Verzeichnis enthalten (""../"", ""..\" notation)"
-"Requested invalid store ""%s""","Ungültiger Speicher ""%s"" angefragt"
-"Resource is not set.","Ressource ist nicht gesetzt."
-"Retrieve store data","Gespeicherte Daten zurückholen"
-"Retrieve store list","Liste der Speicherorte abrufen"
-"Return-Path Email","Antwortpfad E-Mail"
-"Root Category","Hauptkategorie"
-"Sales Representative","Verkaufsmitarbeiter"
-"Sales Representative Contact Email","Verkaufsvertreter Kontakt-E-Mail"
-"Sales Representative Contact Name","Verkaufsvertreter Kontaktname"
-"Save","Speichern"
-"Save Store","Shop speichern"
-"Save Store View","Shopansicht speichern"
-"Save Website","Website speichern"
-"Search Engines Optimization","Suchmaschinenoptimierung"
-"Secure","Sicher"
-"Security","Sicherheit"
-"Select Date","Datum selektieren"
-"Select Media Database","Wählen Sie die Media Datenbank"
-"Sender Email","Absender E-Mail"
-"Sender Name","Name des Absenders"
-"Services","Services"
-"Session Cookie Management","Session-Cookie-Management"
-"Session Lifetime (seconds)","Session-Lebenszeit (Sekunden)"
-"Session Validation Settings","Einstellungen für die Gültigkeit der Session"
-"Set Return-Path","Antwortpfad setzen"
-"Set as Default","Als Standard festlegen"
-"Skin (Images / CSS)","Skin (Bilder / CSS)"
-"Sort Order","Sortierfolge"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","Angegebes Datum/Uhrzeit ""%1$s"" entspricht nicht dem Format ""%2$s""."
+"File with an extension ""%value%"" is protected and cannot be uploaded","Dateien mit der Endung ""%value%"" sind geschützt und können nicht hochgeladen werden"
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
"Start date cannot be greater than end date.","Das Anfangsdatum darf nicht nach dem Enddatum liegen."
-"Startup Page","Startseite"
-"Status","Status"
-"Storage Configuration for Media","Speicherkonfiguration für Media"
-"Store","Shop"
-"Store API","Speicher-API"
-"Store Contact Address","Store Kontaktadresse"
-"Store Contact Information","Store Kontaktdaten"
-"Store Contact Phone","Store Telefon"
-"Store Email Addresses","Store E-Mail-Adressen"
-"Store Information","Store Information"
-"Store","Store"
-"Store View","Store-Ansicht"
-"Store View Information","StoreView Information"
-"Store View","Name der Shop-View"
-"Store view doesn't exist","StoreView existiert nicht"
-"Store with the same code","Store mit identischem Identifikationscode"
-"System","System"
-"System Log File Name","Name der Systemprotokolldatei"
-"Template Path Hints","Anleitungen für den Vorlagenpfad"
-"Template Settings","Template-Einstellungen"
-"Template Variables","Vorlagenvariablen"
-"Templates","Vorlagen"
-"Text length does not satisfy specified text range.","Textlänge entspricht nicht dem angegebenen Textbereich."
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","Das von Ihnen angegebene %s ist ungültig. Bitte stellen Sie sicher, dass Ihre Eingabe dem ""http://domain.com/""-Format entspricht."
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Der Store-Code darf nur Buchstaben (a-z), Ziffern (0-9) oder Unterstriche(_) umfassen, das erste Zeichen muss ein Buchstabe sein"
-"The store does not exist","Der Shop existiert nicht."
-"The store has been deleted.","Der Store wurde gelöscht."
-"The store has been saved.","Der Shop wurde gespeichert."
-"The store view has been deleted.","Die Store-Ansicht wurde gelöscht."
-"The store view has been saved","Die Store-Ansicht wurde gespeichert"
-"The template Name must not be empty.","Der Vorlagenname darf nicht leer bleiben."
-"The value is not within the specified range.","Der Wert liegt nicht im angegebenen Bereich."
-"The website does not exist.","Die Website ist nicht vorhanden."
-"The website has been deleted.","Die Website wurde gelöscht."
-"The website has been saved.","Die Website wurde gespeichert."
-"Themes","Themes"
-"This category and all its child elements","Diese Kategorie und alle Kindelemente"
-"This category and its child categories only","Diese Kategorie und nur ihre Unterkategorien"
-"This category and its products only","Nur diese Kategorie und ihre Produkte"
-"This category only","Nur diese Kategorie"
-"This date is a required value.","Dieses Datum ist ein benötigter Wert."
-"This is a required field.","Dies ist ein Pflichtfeld."
-"This store cannot be deleted.","Dieser Store kann nicht gelöscht werden."
-"This store view cannot be deleted.","Diese StoreView kann nicht gelöscht werden."
-"This website cannot be deleted.","Diese Website kann nicht gelöscht werden."
-"This will be displayed just before body closing tag.","Dies wird vor dem schließenden Body-Tag ausgegeben."
-"This will be included before head closing tag in page HTML.","Dieses wird vor dem schließenden Head-Tag im HTML der Seite eingefügt."
-"Timezone","Zeitzone"
-"Title Prefix","Titel Prefix"
-"Title Suffix","Endung für den Titel"
-"Transactional Emails","Transaktions-E-Mails"
-"Translate Inline","Inline übersetzen"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Übersetzen, Blöcke und andere Ausgangs-Caches sollten sowohl für Frontend und Admin-Inline-Übersetzungen deaktiviert werden."
-"Translations","Ãœbersetzungen"
-"Two and more slashes together are not permitted in request path","Zwei und mehr zusammenhängende Schrägstriche sind in diesem Pfad nicht zulässig"
-"Unable to create directory: %s","Verzeichnis kann nicht angelegt werden: %s"
-"Unable to delete store view. Please, try again later.","Dieser StoreView kann nicht gelöscht werden. Versuchen Sie es später noch einmal."
-"Unable to delete store. Please, try again later.","Shop kann nicht gelöscht werden. Bitte versuchen Sie es später noch einmal."
-"Unable to delete website. Please, try again later.","Webseite konnte nicht gelöscht werden. Bitte versuchen Sie es später noch einmal."
-"Unable to proceed. Please, try again","Funktion kann nicht ausgeführt werden. Bitte versuchen Sie es noch einmal."
-"Unable to proceed. Please, try again.","Vorgang konnte nicht ausgeführt werden. Bitte versuchen Sie es später noch einmal."
-"Unable to save file ""%s"" at ""%s""","Datei ""%s"" kann nicht unter ""%s"" gespeichert werden."
-"Unable to save file: %s","Datei kann nicht gespeichert werden: %s"
-"Unknown old style column type definition: {$definition}.","Unbekannte Definition des Spaltentyps im alten Stil: {definition}."
-"Unknown scope ""%s"".","Unbekannter Anwendungsbereich ""%s""."
-"Unsecure","Ungesichert"
-"Url Options","URL Optionen"
-"Use Custom Admin Path","Verwenden Sie den angepassten Admin-Pfad"
-"Use Custom Admin URL","Individuelle Admin URL nutzen"
-"Use HTTP Only","Verwende nur HTTP"
-"Use SID on Frontend","Verwende Session-ID (SID) im Shopbereich"
-"Use Secure URLs in Admin","Verwende sichere URL im Administrationsbereich"
-"Use Secure URLs in Frontend","Verwende sichere URL im Shopbereich"
-"Use Web Server Rewrites","Webserver Rewrites verwenden"
-"VAT Number","MwSt.-Nummer"
-"Validate HTTP_USER_AGENT","Überprüfe HTTP_USER_AGENT"
-"Validate HTTP_VIA","Überprüfe HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","Überprüfe HTTP_X_FORWARDED_FOR"
-"Validate REMOTE_ADDR","REMOTE_ADDR validieren"
-"Validation has failed.","Prüfung fehlgeschlagen."
-"Values less than 60 are ignored. Note that changes will apply after logout.","Werte kleiner als 60 werden ignoriert. Beachten Sie, dass die Änderungen nach dem Abmelden wirksam werden."
-"Variable Code must be unique.","Variabler Code muß eindeutig sein."
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warnung! Die Aktivierung dieser Funktion ist im Arbeitsbereich nicht empfohlen, da sie ein potenzielles Sicherheitsrisiko darstellt."
-"Web","Web"
-"Website","Website"
-"Website Information","Webseiten-Information"
-"Website","Webseiten-Name"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Der Website-Code darf nur Buchstaben (a-z), Zahlen (0-9) oder Unterstrich (_) enthalten, das erste Zeichen muss ein Buchstabe sein."
-"Website with the same code","Webseite mit identischem Identifikationscode"
-"Weekend Days","Wochenende"
-"Welcome Text","Willkommenstext"
-"Wrong file info format","Falsches Format Dateiinfo"
-"Wrong number of arguments for %s","Falsche Anzahl von Argumenten für %s"
-"Wrong old style column type definition: {$definition}.","Falsche Spaltenartdefinition alter Art: {$definition}."
-"Yes","Ja"
-"You will have to log in after you save your custom admin path.","Nachdem Sie Ihren angepassten Admin-Pfad gespeichert haben, müssen Sie einloggen."
"Your design change for the specified store intersects with another one, please specify another date range.","Ihre Design-Änderung für den ausgewählten Store überschneidet sich mit einer anderen, bitte wählen Sie einen anderen Zeitraum."
-"database ""%s""","Datenbank ""%s"""
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.","Variabler Code muß eindeutig sein."
+"Validation has failed.","Prüfung fehlgeschlagen."
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Core/i18n/en_US.csv b/app/code/Magento/Core/i18n/en_US.csv
index d6894d7aba1..1505afedfcd 100644
--- a/app/code/Magento/Core/i18n/en_US.csv
+++ b/app/code/Magento/Core/i18n/en_US.csv
@@ -1,381 +1,42 @@
-"%s","%s"
-"%s already exist.","%s already exist."
-"%s already exists.","%s already exists."
+Configuration,Configuration
"-- Please Select --","-- Please Select --"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain"
-"A category object is required for determining the product request path.","A category object is required for determining the product request path."
-"Add Block Names to Hints","Add Block Names to Hints"
-"Add Secret Key to URLs","Add Secret Key to URLs"
-"Add Store Code to Urls","Add Store Code to Urls"
-"Admin","Admin"
-"Admin Base URL","Admin Base URL"
-"Admin User Emails","Admin User Emails"
-"Advanced","Advanced"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete."
-"Allow Countries","Allow Countries"
-"Allow Symlinks","Allow Symlinks"
-"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
-"Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternative text for next link in pagination menu. If empty, default arrow image will used."
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternative text for previous link in pagination menu. If empty, default arrow image will used."
-"An error occurred while saving. Please review the error log.","An error occurred while saving. Please review the error log."
-"Anchor Text for Next","Anchor Text for Next"
-"Anchor Text for Previous","Anchor Text for Previous"
-"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
-"Are you sure?","Are you sure?"
-"Auto-redirect to Base URL","Auto-redirect to Base URL"
-"Back","Back"
-"Backup Options","Backup Options"
-"Base JavaScript URL","Base JavaScript URL"
-"Base Link URL","Base Link URL"
-"Base Media URL","Base Media URL"
-"Base Secure URL","Base Secure URL"
-"Base Skin URL","Base Skin URL"
-"Base URL","Base URL"
-"Base Unsecure URL","Base Unsecure URL"
-"Before modifying the store view code please make sure that it is not used in index.php.","Before modifying the store view code please make sure that it is not used in index.php."
-"Before modifying the website code please make sure that it is not used in index.php.","Before modifying the website code please make sure that it is not used in index.php."
-"Block with name ""%s"" already exists","Block with name ""%s"" already exists"
-"Browser Capabilities Detection","Browser Capabilities Detection"
-"CSS Settings","CSS Settings"
-"Cache Storage Management","Cache Storage Management"
-"Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
-"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
-"Can't retrieve request object","Can't retrieve request object"
-"Can't retrieve entity config: %s","Can't retrieve entity config: %s"
-"Cancel","Cancel"
-"Cannot complete this operation from non-admin area.","Cannot complete this operation from non-admin area."
-"Card type does not match credit card number.","Card type does not match credit card number."
-"Code","Code"
-"Controller file was loaded but class does not exist","Controller file was loaded but class does not exist"
-"Cookie Domain","Cookie Domain"
-"Cookie Lifetime","Cookie Lifetime"
-"Cookie Path","Cookie Path"
-"Cookie Restriction Mode","Cookie Restriction Mode"
-"Copyright","Copyright"
-"Core","Core"
-"Countries Options","Countries Options"
-"Country","Country"
-"Create Store","Create Store"
-"Create Store View","Create Store View"
-"Create Website","Create Website"
-"Credit card number does not match credit card type.","Credit card number does not match credit card type."
-"Current Package Name","Current Package Name"
-"Custom Admin Path","Custom Admin Path"
-"Custom Admin URL","Custom Admin URL"
-"Custom Design","Custom Design"
-"Custom Email 1","Custom Email 1"
-"Custom Email 2","Custom Email 2"
"Custom Variables","Custom Variables"
-"Custom1 Contact Email","Custom1 Contact Email"
-"Custom1 Contact Name","Custom1 Contact Name"
-"Custom2 Contact Email","Custom2 Contact Email"
-"Custom2 Contact Name","Custom2 Contact Name"
-"Customer Support","Customer Support"
-"Dashboard","Dashboard"
-"Date From","Date From"
-"Date To","Date To"
-"Date/time format ""%s"" is not supported.","Date/time format ""%s"" is not supported."
-"Debug","Debug"
-"Default","Default"
-"Default Country","Default Country"
-"Default Description","Default Description"
-"Default Keywords","Default Keywords"
-"Default No-route URL","Default No-route URL"
-"Default Pages","Default Pages"
-"Default Robots","Default Robots"
-"Default Store","Default Store"
-"Default Store View","Default Store View"
-"Default Title","Default Title"
-"Default Web URL","Default Web URL"
-"Delete","Delete"
-"Delete Store","Delete Store"
-"Delete Store View","Delete Store View"
-"Delete Website","Delete Website"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s."
-"Design","Design"
-"Design Change","Design Change"
-"Developer","Developer"
-"Developer Client Restrictions","Developer Client Restrictions"
-"Disable Email Communications","Disable Email Communications"
-"Disable Modules Output","Disable Modules Output"
-"Display Demo Store Notice","Display Demo Store Notice"
-"Duplicate Of Template Name","Duplicate Of Template Name"
-"Edit Design Change","Edit Design Change"
-"Edit Store","Edit Store"
-"Edit Store View","Edit Store View"
-"Edit Website","Edit Website"
-"Empty identifier field name","Empty identifier field name"
-"Empty main table name","Empty main table name"
-"Enable Charts","Enable Charts"
-"Enabled","Enabled"
-"Enabled for Admin","Enabled for Admin"
-"Enabled for Frontend","Enabled for Frontend"
-"Environment Update Time","Environment Update Time"
-"Error in file: ""%s"" - %s","Error in file: ""%s"" - %s"
-"European Union Countries","European Union Countries"
-"Exceptions Log File Name","Exceptions Log File Name"
-"Favicon Icon","Favicon Icon"
-"File %s does not exist","File %s does not exist"
-"File %s is not readable","File %s is not readable"
-"File not found","File not found"
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
"File system","File system"
-"File with an extension ""%value%"" is protected and cannot be uploaded","File with an extension ""%value%"" is protected and cannot be uploaded"
-"First Day of Week","First Day of Week"
-"Flush Cache Storage","Flush Cache Storage"
-"Flush Magento Cache","Flush Magento Cache"
-"Footer","Footer"
-"Forgot Password Email Sender","Forgot Password Email Sender"
-"Forgot Password Email Template","Forgot Password Email Template"
-"General","General"
-"General Contact","General Contact"
-"General Contact Email","General Contact Email"
-"General Contact Name","General Contact Name"
-"General Settings","General Settings"
-"Global","Global"
-"HTML Head","HTML Head"
-"HTML tags are not allowed","HTML tags are not allowed"
-"Header","Header"
-"Host","Host"
-"How many links to display at once.","How many links to display at once."
-"ID Path for Specified Store","ID Path for Specified Store"
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
-"Incorrect credit card expiration date.","Incorrect credit card expiration date."
-"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
-"Invalid base url type","Invalid base url type"
-"Invalid block name to set child %s: %s","Invalid block name to set child %s: %s"
-"Invalid block type: %s","Invalid block type: %s"
-"Invalid block: %s","Invalid block: %s"
-"Invalid connection","Invalid connection"
-"Invalid layout update handle","Invalid layout update handle"
-"Invalid messages storage ""%s"" for layout messages initialization","Invalid messages storage ""%s"" for layout messages initialization"
-"Invalid query","Invalid query"
-"Invalid transactional email code: ","Invalid transactional email code: "
-"Invalid website's configuration path: %s","Invalid website's configuration path: %s"
-"JavaScript Settings","JavaScript Settings"
-"Layout","Layout"
-"Leave empty for access from any location.","Leave empty for access from any location."
-"List of stores","List of stores"
-"Locale","Locale"
-"Locale Options","Locale Options"
-"Log Settings","Log Settings"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
-"Login is Case Sensitive","Login is Case Sensitive"
-"Logo Image","Logo Image"
-"Logo Image Alt","Logo Image Alt"
-"Logo Image Src","Logo Image Src"
-"Mail Sending Settings","Mail Sending Settings"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
-"Manage Stores","Manage Stores"
-"Match expressions in the same order as displayed in the configuration.","Match expressions in the same order as displayed in the configuration."
-"Media Storage","Media Storage"
-"Merge CSS Files","Merge CSS Files"
-"Merge JavaScript Files","Merge JavaScript Files"
-"Miscellaneous HTML","Miscellaneous HTML"
-"Miscellaneous Scripts","Miscellaneous Scripts"
-"Model collection resource name is not defined.","Model collection resource name is not defined."
-"Module ""%1$s"" cannot depend on ""%2$s"".","Module ""%1$s"" cannot depend on ""%2$s""."
-"Module ""%1$s"" requires module ""%2$s"".","Module ""%1$s"" requires module ""%2$s""."
-"Name","Name"
-"New Design Change","New Design Change"
-"New Store","New Store"
-"New Store View","New Store View"
-"New Website","New Website"
-"No","No"
-"Offloader header","Offloader header"
-"PHP SOAP extension is required.","PHP SOAP extension is required."
-"Package","Package"
-"Pagination","Pagination"
-"Pagination Frame","Pagination Frame"
-"Pagination Frame Skip","Pagination Frame Skip"
-"Parent directory does not exist: %s","Parent directory does not exist: %s"
-"Path ""%value%"" is not available and cannot be used.","Path ""%value%"" is not available and cannot be used."
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format","Wrong file info format"
"Path ""%value%"" is protected and cannot be used.","Path ""%value%"" is protected and cannot be used."
+"Path ""%value%"" is not available and cannot be used.","Path ""%value%"" is not available and cannot be used."
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","Path ""%value%"" may not include parent directory traversal (""../"", ""..\")."
-"Please define flag code.","Please define flag code."
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
-"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
-"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
-"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
-"Please enter a number lower than 100.","Please enter a number lower than 100."
-"Please enter a valid $ amount. For example $100.00.","Please enter a valid $ amount. For example $100.00."
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
-"Please enter a valid URL. For example http://www.example.com or www.example.com","Please enter a valid URL. For example http://www.example.com or www.example.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
-"Please enter a valid credit card number.","Please enter a valid credit card number."
-"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
-"Please enter a valid date between %s and %s","Please enter a valid date between %s and %s"
-"Please enter a valid date equal to or greater than %s","Please enter a valid date equal to or greater than %s"
-"Please enter a valid date less than or equal to %s","Please enter a valid date less than or equal to %s"
-"Please enter a valid date.","Please enter a valid date."
-"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
-"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
-"Please enter a valid full date","Please enter a valid full date"
-"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
-"Please enter a valid number in this field.","Please enter a valid number in this field."
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890."
-"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
-"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
-"Please enter a valid zip code.","Please enter a valid zip code."
-"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
-"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
-"Please make sure your passwords match.","Please make sure your passwords match."
-"Please select State/Province.","Please select State/Province."
-"Please select a file","Please select a file"
-"Please select an option.","Please select an option."
-"Please select one of the above options.","Please select one of the above options."
-"Please select one of the options.","Please select one of the options."
"Please set available and/or protected paths list(s) before validation.","Please set available and/or protected paths list(s) before validation."
-"Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
-"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
-"Please use only visible characters and spaces.","Please use only visible characters and spaces."
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
-"Please wait, loading...","Please wait, loading..."
-"Port (25)","Port (25)"
-"Profiler","Profiler"
-"Recovery Link Expiration Interval (days)","Recovery Link Expiration Interval (days)"
-"Request Path for Specified Store","Request Path for Specified Store"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","Requested file may not include parent directory traversal (""../"", ""..\" notation)"
-"Requested invalid store ""%s""","Requested invalid store ""%s"""
-"Resource is not set.","Resource is not set."
-"Retrieve store data","Retrieve store data"
-"Retrieve store list","Retrieve store list"
-"Return-Path Email","Return-Path Email"
-"Root Category","Root Category"
-"Sales Representative","Sales Representative"
-"Sales Representative Contact Email","Sales Representative Contact Email"
-"Sales Representative Contact Name","Sales Representative Contact Name"
-"Save","Save"
-"Save Store","Save Store"
-"Save Store View","Save Store View"
-"Save Website","Save Website"
-"Search Engines Optimization","Search Engines Optimization"
-"Secure","Secure"
-"Security","Security"
-"Select Date","Select Date"
-"Select Media Database","Select Media Database"
-"Sender Email","Sender Email"
-"Sender Name","Sender Name"
-"Services","Services"
-"Session Cookie Management","Session Cookie Management"
-"Session Lifetime (seconds)","Session Lifetime (seconds)"
-"Session Validation Settings","Session Validation Settings"
-"Set Return-Path","Set Return-Path"
-"Set as Default","Set as Default"
-"Skin (Images / CSS)","Skin (Images / CSS)"
-"Sort Order","Sort Order"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","Specified date/time ""%1$s"" do not match format ""%2$s""."
+"File with an extension ""%value%"" is protected and cannot be uploaded","File with an extension ""%value%"" is protected and cannot be uploaded"
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
"Start date cannot be greater than end date.","Start date cannot be greater than end date."
-"Startup Page","Startup Page"
-"Status","Status"
-"Storage Configuration for Media","Storage Configuration for Media"
-"Store","Store"
-"Store API","Store API"
-"Store Contact Address","Store Contact Address"
-"Store Contact Information","Store Contact Information"
-"Store Contact Phone","Store Contact Phone"
-"Store Email Addresses","Store Email Addresses"
-"Store Information","Store Information"
-"Store","Store"
-"Store View","Store View"
-"Store View Information","Store View Information"
-"Store View","Store View"
-"Store view doesn't exist","Store view doesn't exist"
-"Store with the same code","Store with the same code"
-"System","System"
-"System Log File Name","System Log File Name"
-"Template Path Hints","Template Path Hints"
-"Template Settings","Template Settings"
-"Template Variables","Template Variables"
-"Templates","Templates"
-"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format."
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
-"The store does not exist","The store does not exist"
-"The store has been deleted.","The store has been deleted."
-"The store has been saved.","The store has been saved."
-"The store view has been deleted.","The store view has been deleted."
-"The store view has been saved","The store view has been saved"
-"The template Name must not be empty.","The template Name must not be empty."
-"The value is not within the specified range.","The value is not within the specified range."
-"The website does not exist.","The website does not exist."
-"The website has been deleted.","The website has been deleted."
-"The website has been saved.","The website has been saved."
-"Themes","Themes"
-"This category and all its child elements","This category and all its child elements"
-"This category and its child categories only","This category and its child categories only"
-"This category and its products only","This category and its products only"
-"This category only","This category only"
-"This date is a required value.","This date is a required value."
-"This is a required field.","This is a required field."
-"This store cannot be deleted.","This store cannot be deleted."
-"This store view cannot be deleted.","This store view cannot be deleted."
-"This website cannot be deleted.","This website cannot be deleted."
-"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
-"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
-"Timezone","Timezone"
-"Title Prefix","Title Prefix"
-"Title Suffix","Title Suffix"
-"Transactional Emails","Transactional Emails"
-"Translate Inline","Translate Inline"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
-"Translations","Translations"
-"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
-"Unable to create directory: %s","Unable to create directory: %s"
-"Unable to delete store view. Please, try again later.","Unable to delete store view. Please, try again later."
-"Unable to delete store. Please, try again later.","Unable to delete store. Please, try again later."
-"Unable to delete website. Please, try again later.","Unable to delete website. Please, try again later."
-"Unable to proceed. Please, try again","Unable to proceed. Please, try again"
-"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
-"Unable to save file ""%s"" at ""%s""","Unable to save file ""%s"" at ""%s"""
-"Unable to save file: %s","Unable to save file: %s"
-"Unknown old style column type definition: {$definition}.","Unknown old style column type definition: {$definition}."
-"Unknown scope ""%s"".","Unknown scope ""%s""."
-"Unsecure","Unsecure"
-"Url Options","Url Options"
-"Use Custom Admin Path","Use Custom Admin Path"
-"Use Custom Admin URL","Use Custom Admin URL"
-"Use HTTP Only","Use HTTP Only"
-"Use SID on Frontend","Use SID on Frontend"
-"Use Secure URLs in Admin","Use Secure URLs in Admin"
-"Use Secure URLs in Frontend","Use Secure URLs in Frontend"
-"Use Web Server Rewrites","Use Web Server Rewrites"
-"VAT Number","VAT Number"
-"Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT"
-"Validate HTTP_VIA","Validate HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR"
-"Validate REMOTE_ADDR","Validate REMOTE_ADDR"
-"Validation has failed.","Validation has failed."
-"Values less than 60 are ignored. Note that changes will apply after logout.","Values less than 60 are ignored. Note that changes will apply after logout."
-"Variable Code must be unique.","Variable Code must be unique."
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
-"Web","Web"
-"Website","Website"
-"Website Information","Website Information"
-"Website","Website"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
-"Website with the same code","Website with the same code"
-"Weekend Days","Weekend Days"
-"Welcome Text","Welcome Text"
-"Wrong file info format","Wrong file info format"
-"Wrong number of arguments for %s","Wrong number of arguments for %s"
-"Wrong old style column type definition: {$definition}.","Wrong old style column type definition: {$definition}."
-"Yes","Yes"
-"You will have to log in after you save your custom admin path.","You will have to log in after you save your custom admin path."
"Your design change for the specified store intersects with another one, please specify another date range.","Your design change for the specified store intersects with another one, please specify another date range."
-"database ""%s""","database ""%s"""
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.","Variable Code must be unique."
+"Validation has failed.","Validation has failed."
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Core/i18n/es_ES.csv b/app/code/Magento/Core/i18n/es_ES.csv
index a5c8ca02c83..eb11b11e933 100644
--- a/app/code/Magento/Core/i18n/es_ES.csv
+++ b/app/code/Magento/Core/i18n/es_ES.csv
@@ -1,380 +1,42 @@
-"%s","%s"
-"%s already exist.","%s ya existen."
-"%s already exists.","%s ya existe."
+Configuration,Configuration
"-- Please Select --","-- Seleccionar, por favor --"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">¡Aviso!</strong>Al usar CDN, en algunos casos JavaScript puede no funcionar correctamente si CDN no está en tu subdominio"
-"A category object is required for determining the product request path.","Se requiere un objeto de categorÃa para determinar la ruta de solicitud del producto."
-"Add Block Names to Hints","Agregar nombres de bloques a la ayuda"
-"Add Secret Key to URLs","Agregar clave secreta a las direcciones URL"
-"Add Store Code to Urls","Agregar código de tienda a las direcciones URL"
-"Admin","Administrar"
-"Admin Base URL","Dirección URL básica de administración"
-"Admin User Emails","Correos electrónicos de usuario de administración"
-"Advanced","Avanzado"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","Después de seleccionar una nueva ubicación de almacenamiento multimedia, pulsa el botón Sincronizar para transferir todos los archivos multimedia a esa ubicación. Los archivos multimedia no estarán disponibles en la nueva ubicación hasta que el proceso de sincronización se complete."
-"Allow Countries","Permitir paÃses"
-"Allow Symlinks","Permitir Symlinks"
-"Allowed IPs (comma separated)","Direcciones IP permitidas (separadas por comas)"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Tipos de archivo permitidos: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. ¡No todos los exploradores admiten todos estos formatos!"
-"Allows customers to stay logged in when switching between different stores.","Permitir que los clientes sigan con su sesión abierta al pasar de una tienda a otra."
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Texto alternativo para el enlace a la siguiente página en el menú de paginación. Si queda en blanco, se utilizará la imagen de flecha predeterminada."
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Texto alternativo para el enlace a la página anterior en el menú de paginación. Si queda en blanco, se utilizará la imagen de flecha predeterminada."
-"An error occurred while saving. Please review the error log.","Se produjo un error al guardar. Consulte el registro de errores."
-"Anchor Text for Next","Texto de ancla para página siguiente"
-"Anchor Text for Previous","Texto de ancla para página anterior"
-"Anchor symbol (#) is not supported in request path","El sÃmbolo ancla (#) no está soportado en la ruta solicitada"
-"Are you sure?","¿Está seguro?"
-"Auto-redirect to Base URL","Redireccionar automáticamente a la dirección URL básica"
-"Back","Volver"
-"Backup Options","Opciones de copia de respaldo"
-"Base JavaScript URL","Dirección URL básica de JavaScript"
-"Base Link URL","Dirección URL básica de enlace"
-"Base Media URL","Dirección URL básica multimedia"
-"Base Secure URL","Base URL segura"
-"Base Skin URL","Dirección URL básica para apariencias"
-"Base URL","Dirección URL básica"
-"Base Unsecure URL","Base URL insegura"
-"Before modifying the store view code please make sure that it is not used in index.php.","Antes de modificar el código de vista de tienda, asegúrese de que no se lo utilice en index.php."
-"Before modifying the website code please make sure that it is not used in index.php.","Antes de modificar el código del sitio web, asegúrese de que no se lo utilice index.php."
-"Block with name ""%s"" already exists","El bloque llamado ""%s"" ya existe"
-"Browser Capabilities Detection","Detección de capacidades del navegador"
-"CSS Settings","Configuración de CSS"
-"Cache Storage Management","Administración de almacenamiento de memoria caché"
-"Cache storage may contain additional data. Are you sure that you want flush it?","El almacenamiento de caché puede contener datos adicionales. ¿Estás seguro de que deseas eliminarlo?"
-"Can not create invoice. Order was not found.","No se puede crear la factura. No se encontró el pedido."
-"Can't retrieve request object","No se puede recuperar el objeto solicitado"
-"Can't retrieve entity config: %s","No se puede recuperar configuración de entidad: %s"
-"Cancel","Cancelar"
-"Cannot complete this operation from non-admin area.","No se puede completar esta operación desde una área que no sea de administración."
-"Card type does not match credit card number.","El tipo de tarjeta no se ajusta al número de tarjeta de crédito."
-"Code","Código"
-"Controller file was loaded but class does not exist","Se cargó el archivo de controlador, pero la clase no existe"
-"Cookie Domain","Dominio para cookies"
-"Cookie Lifetime","Duración de las cookies"
-"Cookie Path","Ruta de las cookies"
-"Cookie Restriction Mode","Modo de restricción de cookies"
-"Copyright","Copyright"
-"Core","Núcleo"
-"Countries Options","Opciones de paÃses"
-"Country","PaÃs"
-"Create Store","Crear tienda"
-"Create Store View","Crear vista de tienda"
-"Create Website","Crear sitio web"
-"Credit card number does not match credit card type.","El número de tarjeta de crédito no se ajusta al tipo de tarjeta de crédito."
-"Current Package Name","Nombre actual del paquete"
-"Custom Admin Path","Personalizar Ruta de Admin"
-"Custom Admin URL","URL de administración personalizada"
-"Custom Design","Diseño Personalizado"
-"Custom Email 1","Correo electrónico personalizado 1"
-"Custom Email 2","Correo electrónico personalizado 2"
"Custom Variables","Variables personalizadas"
-"Custom1 Contact Email","Correo electrónico de contacto del cliente1"
-"Custom1 Contact Name","Nombre de contacto del cliente1"
-"Custom2 Contact Email","Correo electrónico de contacto del cliente2"
-"Custom2 Contact Name","Nombre de contacto del cliente2"
-"Customer Support","Soporte al cliente"
-"Dashboard","Panel de control"
-"Date From","Fecha a partir de"
-"Date To","Fecha"
-"Date/time format ""%s"" is not supported.","El formato fecha/hora ""%s"" no se soporta."
-"Debug","Depurar"
-"Default","Predeterminada"
-"Default Country","PaÃs predeterminado"
-"Default Description","Descripción predeterminada"
-"Default Keywords","Palabras clave predeterminadas"
-"Default No-route URL","Dirección URL sin ruta predeterminada"
-"Default Pages","Páginas predeterminadas"
-"Default Robots","Robots predeterminados"
-"Default Store","Tienda predeterminada"
-"Default Store View","Vista de tienda predeterminada"
-"Default Title","TÃtulo por Defecto"
-"Default Web URL","Dirección URL web predeterminada"
-"Delete","Eliminar"
-"Delete Store","Eliminar tienda"
-"Delete Store View","Eliminar vista de la tienda"
-"Delete Website","Eliminar página web"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Eliminar un/una %1$s no eliminará la información asociada con el/la %1$s (ej.: categorÃas, productos, etc.), pero no será posible recuperar el/la %1$s. Le sugerimos que respalde la base de datos antes de eliminar el/la %1$s."
-"Design","Diseño"
-"Design Change","Diseñar cambio"
-"Developer","Desarrollador"
-"Developer Client Restrictions","Restricciones del cliente del desarrollador"
-"Disable Email Communications","Desactivar las notificaciones por correo electrónico"
-"Disable Modules Output","Desactivar la salida de los módulos"
-"Display Demo Store Notice","Mostrar aviso de tienda de demostración"
-"Duplicate Of Template Name","Duplicado del nombre de plantilla"
-"Edit Design Change","Editar Diseñar cambio"
-"Edit Store","Editar tienda"
-"Edit Store View","Editar vista de la tienda"
-"Edit Website","Editar página web"
-"Empty identifier field name","Vaciar el nombre del campo del identificador"
-"Empty main table name","Vaciar el nombre de la tabla principal"
-"Enable Charts","Activar gráficos"
-"Enabled","Habilitado"
-"Enabled for Admin","Activado para el administrador"
-"Enabled for Frontend","Activado para el Frontend"
-"Environment Update Time","Tiempo de Actualización del Entorno"
-"Error in file: ""%s"" - %s","Error el el archivo ""%s"" - %s"
-"European Union Countries","PaÃses de la Unión Europea"
-"Exceptions Log File Name","Nombre del archivo de registro de excepciones"
-"Favicon Icon","Icono de favoritos"
-"File %s does not exist","El archivo %s no existe"
-"File %s is not readable","El archivo %s no es legible"
-"File not found","Archivo no encontrado"
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
"File system","Sistema de archivos"
-"File with an extension ""%value%"" is protected and cannot be uploaded","El archivo con extensión ""%value%"" está protegido y no se puede subir"
-"First Day of Week","Primer dÃa de la semana"
-"Flush Cache Storage","Vaciar memoria caché"
-"Flush Magento Cache","Vaciar la caché de Magento"
-"Footer","Pie de página"
-"Forgot Password Email Sender","Emisor del correo de contraseña olvidada"
-"Forgot Password Email Template","Plantilla del correo de contraseña olvidada"
-"General","General"
-"General Contact","Contacto general"
-"General Contact Email","Correo electrónico de contacto general"
-"General Contact Name","Nombre de contacto general"
-"General Settings","Opciones generales"
-"Global","Global"
-"HTML Head","Encabezado HTML"
-"HTML tags are not allowed","No están permitidas las etiquetas HTML"
-"Header","Encabezado"
-"Host","Host"
-"How many links to display at once.","Número de enlaces para mostrar a la vez."
-"ID Path for Specified Store","Id ruta para tienda especificada"
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Si la posición actual del marco no cubre la mayorÃa de las páginas, se procesará un enlace a la posición actual más/menos este valor."
-"Incorrect credit card expiration date.","Fecha de caducidad de la tarjeta de crédito incorrecta"
-"Input type ""%value%"" not found in the input types list.","El tipo de entrada ""%value%"" no se encuentra en la lista de tipos de entrada."
-"Invalid base url type","El tipo de dirección URL base no es válido."
-"Invalid block name to set child %s: %s","Nombre de bloque para establecer %s infantil no válido: %s"
-"Invalid block type: %s","Tipo de bloque no válido: %s"
-"Invalid block: %s","Bloque no válido: %s"
-"Invalid connection","Conexión no válida"
-"Invalid layout update handle","El controlador para actualizar el diseño no es válido."
-"Invalid messages storage ""%s"" for layout messages initialization","Almacenamiento de mensajes no válido ""%s"" para el diseño de inicialización de mensajes"
-"Invalid query","Consulta no válida"
-"Invalid transactional email code: ","Código del mensaje transaccional no válido:"
-"Invalid website's configuration path: %s","Ruta de configuración de la página web no válida: %s"
-"JavaScript Settings","Configuración JavaScript"
-"Layout","Diseño"
-"Leave empty for access from any location.","Déjese en blanco para acceder desde cualquier sitio."
-"List of stores","Listado de tiendas"
-"Locale","Configuración regional"
-"Locale Options","Opciones de configuración regional"
-"Log Settings","Configuración de registro"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Registro desde \Magento\Framework\Logger. El archivo se encuentra ubicado en {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Registro desde \Magento\Framework\Logger. El archivo se encuentra ubicado en {{base_dir}}/var/log"
-"Login is Case Sensitive","Se distinguen mayúsculas al iniciar sesión."
-"Logo Image","Imagen del Logo"
-"Logo Image Alt","Imagen del logotipo alternativa"
-"Logo Image Src","Src de imagen de logotipo"
-"Mail Sending Settings","Configuración del envÃo de correo"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Asegúrese de que la dirección URL base termina con '/' (barra diagonal), ej.: http://yourdomain/magento/"
-"Manage Stores","Gestionar Tiendas"
-"Match expressions in the same order as displayed in the configuration.","Haga coincidir las expresiones siguiendo el mismo orden que se muestra en la configuración."
-"Media Storage","Almacenamiento de Medios"
-"Merge CSS Files","Combinar Archivos CSS"
-"Merge JavaScript Files","Combinar archivos JavaScript"
-"Miscellaneous HTML","HTML diverso"
-"Miscellaneous Scripts","Miscelánea Scripts"
-"Model class does not exist: %s.","La clase de modelo no existe: %s."
-"Model collection resource name is not defined.","No está definido el nombre de recurso de recopilación de modelos."
-"Module ""%1$s"" cannot depend on ""%2$s"".","El módulo ""%1$s"" no puede depender de ""%2$s""."
-"Module ""%1$s"" requires module ""%2$s"".","El módulo ""%1$s"" requiere del módulo ""%2$s""."
-"Name","Nombre"
-"New Design Change","Nuevo cambio en el diseño"
-"New Store","Nueva tienda"
-"New Store View","Nueva vista de tienda"
-"New Website","Nuevo sitio web"
-"No","No"
-"Offloader header","Encabezado del descargador"
-"PHP SOAP extension is required.","Se requiere la extensión PHP SOAP"
-"Package","Paquete"
-"Pagination","Paginación"
-"Pagination Frame","Marco de paginación"
-"Pagination Frame Skip","Omisión de marco de paginación"
-"Parent directory does not exist: %s","El directorio padre no existe: %s"
-"Path ""%value%"" is not available and cannot be used.","La ruta ""%value%"" no está disponible y no puede usarse."
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format","Formato de información del archivo incorrecto"
"Path ""%value%"" is protected and cannot be used.","La ruta ""%value%"" está protegida y no se puede utilizar."
+"Path ""%value%"" is not available and cannot be used.","La ruta ""%value%"" no está disponible y no puede usarse."
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","La ruta ""%value%"" no puede incluir accesos de ejecución transversal (""../"", ""..\")."
-"Please define flag code.","Defina el código de marcado."
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Introduzca 6 o más caracteres. Se ignorarán los espacios antes o después."
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Por favor, introduzca 7 o más caracteres. La contraseña tiene que contener tanto caracteres numéricos como alfabéticos."
-"Please enter a number 0 or greater in this field.","Por favor, introduzca un número 0 o superior en este campo."
-"Please enter a number 1 or greater in this field.","Por favor, introduzca un 1 o un número superior en este campo."
-"Please enter a number greater than 0 in this field.","Ingrese un número mayor que 0 en este campo."
-"Please enter a number lower than 100.","Por favor, introduzca un número menor que 100."
-"Please enter a valid $ amount. For example $100.00.","Ingrese un monto válido en $. Por ejemplo: $100.00."
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Por favor, introduzca una Clave de URL válida. Por ejemplo ""pagina-ejemplo"", ""pagina-ejemplo.html"" o ""otronivel/pagina-ejemplo"""
-"Please enter a valid URL. For example http://www.example.com or www.example.com","Por favor, introduzca una URL válida. Por ejemplo, http://www.example.com o www.example.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Por favor, introduzca una URL válida. Es necesario el protocolo (http://, https:// or ftp://)"
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Por favor, introduzca un identificador-XML válido. Por ejemplo, algo_1, bloque5, id-4."
-"Please enter a valid credit card number.","Ingrese un número de tarjeta de crédito válido."
-"Please enter a valid credit card verification number.","Introduzca un número correcto de verificación de tarjeta de crédito."
-"Please enter a valid date between %s and %s","Por favor, introduzca una fecha válida entre %s y %s"
-"Please enter a valid date equal to or greater than %s","Por favor, introduzca una fecha válida igual o superior a %s"
-"Please enter a valid date less than or equal to %s","Por favor, introduzca una fecha válida menor o igual a %s"
-"Please enter a valid date.","Ingrese una fecha válida."
-"Please enter a valid day (1-%1).","Por favor, introduzca un dÃa válido (1-%1)."
-"Please enter a valid email address. For example johndoe@domain.com.","Ingrese una dirección de correo electrónico válida. Por ejemplo: juanperez@dominio.com."
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Por favor, introduzca un número de fax válido. Por ejemplo (123) 456-7890 o 123-456-7890."
-"Please enter a valid full date","Por favor, introduzca una fecha válida completa"
-"Please enter a valid month (1-12).","Por favor, introduzca un mes válido (1-12)."
-"Please enter a valid number in this field.","Ingrese un número válido en este campo."
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Ingrese un número de teléfono válido. Por ejemplo: (123) 456-7890 o 123-456-7890."
-"Please enter a valid social security number. For example 123-45-6789.","Ingrese un número de seguro social válido. Por ejemplo: 123-45-6789."
-"Please enter a valid year (1900-%1).","Por favor, introduzca un año válido (1900-%1)."
-"Please enter a valid zip code.","Ingrese un código postal válido."
-"Please enter a valid zip code. For example 90602 or 90602-1234.","Ingrese un código postal válido. Por ejemplo: 90602 o 90602-1234."
-"Please enter issue number or start date for switch/solo card type.","Por favor, introduzca un número de emisión o fecha de inicio para el tipo de tarjeta switch/solo."
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Por favor, introduzca una longitud válida de CSS. Por ejemplo, 100px o 77pt o 20em o .5ex o 50%"
-"Please make sure your passwords match.","Asegúrese de que sus contraseñas coincidan."
-"Please select State/Province.","Por favor, selecciona Estado/Provincia."
-"Please select a file","Por favor seleccione un archivo"
-"Please select an option.","Seleccione una opción."
-"Please select one of the above options.","Por favor, selecciona una de las opciones anteriores."
-"Please select one of the options.","Seleccione una de las opciones."
"Please set available and/or protected paths list(s) before validation.","Por favor, indique la(s) lista(s) de rutas disponibles y/o protegidas antes de la validación."
-"Please specify either a category or a product, or both.","Especifique una categorÃa, un producto o ambos."
-"Please use letters only (a-z or A-Z) in this field.","Por favor, use sólo letras (a-z o A-Z) en este campo."
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","En este campo sólo se pueden escribir números. Evite los espacios en blanco u otros caracteres, como los puntos o las comas, por ejemplo."
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor, utilice solo letras (a-z o A-Z) o números (0-9) solo en este campo. No están permitidos los espacios u otros caracteres."
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Por favor, utilice solo letras (a-z o A-Z) o números (0-9) o espacios y # solo en este campo."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Por favor, utilice solamente letras (a-z o A-Z), números (0-9) o guion bajo (_) en este campo, el primer carácter debe ser una letra."
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Utilice sólo letras (a-z), números (0-9) o guiones bajos (_) en este campo. El primer caracter debe ser una letra."
-"Please use only visible characters and spaces.","Por favor, utilice solo caracteres visibles y espacios."
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Utilice este formato de fecha: dd/mm/aaaa. Por ejemplo, 17/03/2006 para el 17 de marzo de 2006."
-"Please wait, loading...","Espera, por favor. Cargando...."
-"Port (25)","Puerto (25)"
-"Profiler","Motor de perfiles"
-"Recovery Link Expiration Interval (days)","Periodo de caducidad del enlace de recuperación (dÃas)"
-"Request Path for Specified Store","Solicitar ruta para la tienda especificada"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","El fichero solicitado no puede incluir accesos de ejecución tranversal (""../"", ""..\" notación)"
-"Requested invalid store ""%s""","Solicitada tienda ""%s"" no válida"
-"Resource is not set.","No se estableció el recurso."
-"Retrieve store data","Obtener datos de la tienda"
-"Retrieve store list","Obtener lista de tiendas"
-"Return-Path Email","Correo electrónico de ruta de retorno"
-"Root Category","CategorÃa de raÃz"
-"Sales Representative","Representante de ventas"
-"Sales Representative Contact Email","Correo electrónico de contacto del agente de ventas"
-"Sales Representative Contact Name","Nombre de contacto del agente de ventas"
-"Save","Guardar"
-"Save Store","Guardar tienda"
-"Save Store View","Guardar vista de tienda"
-"Save Website","Guardar sitio web"
-"Search Engines Optimization","Optimización de motores de búsqueda"
-"Secure","Seguro"
-"Security","Seguridad"
-"Select Date","Seleccionar Fechas"
-"Select Media Database","Selecionar base de datos de medios"
-"Sender Email","E-mail del Remitente"
-"Sender Name","Nombre del remitente"
-"Services","Servicios"
-"Session Cookie Management","Gestión de las Cookies de sesión"
-"Session Lifetime (seconds)","Duración de la sesión (en segundos)"
-"Session Validation Settings","Ajustes de validación de sesión"
-"Set Return-Path","Establecer path de vuelta"
-"Set as Default","Establecer por defecto"
-"Skin (Images / CSS)","Apariencia (Imágenes / CSS)"
-"Sort Order","Orden de selección"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","Señalar fecha/hora ""%1$s"" no coincide con el formato ""%2$s""."
+"File with an extension ""%value%"" is protected and cannot be uploaded","El archivo con extensión ""%value%"" está protegido y no se puede subir"
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
"Start date cannot be greater than end date.","La fecha de inicio no puede ser mayor que la de fin."
-"Startup Page","Página de inicio"
-"Status","Estado"
-"Storage Configuration for Media","Configuración del almacenamiento de medios"
-"Store","Tienda"
-"Store API","Tienda API"
-"Store Contact Address","Almacenar información de contacto"
-"Store Contact Information","Almacenar información de Contacto"
-"Store Contact Phone","Almacenar teléfono de contacto"
-"Store Email Addresses","Almacenar dirección de email"
-"Store Information","Almacenar información"
-"Store","Nombre de la Tienda"
-"Store View","Ver Tienda"
-"Store View Information","Ver Información de la Tienda"
-"Store View","Nombre de la vista de tienda"
-"Store view doesn't exist","El nombre de la tienda no existe"
-"Store with the same code","Tienda con el mismo código"
-"System","Sistema"
-"System Log File Name","Nombre de archivo de registro del sistema"
-"Template Path Hints","Pistas del path de plantilla"
-"Template Settings","Modelo de los ajustes"
-"Template Variables","Variables de plantilla"
-"Templates","Plantillas"
-"Text length does not satisfy specified text range.","La longitud del texto no satisface el rango de texto señalado"
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","El %s que ha introducido no es válido. Por favor asegurese de que sigue el formato ""http://domain.com/"""
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","El código de tienda sólo puede contener letras (a-z), números (0-9) o guiones bajos (_). El primer caracter debe ser una letra"
-"The store does not exist","La tienda no existe"
-"The store has been deleted.","La tienda se ha eliminado."
-"The store has been saved.","Se ha grabado la tienda."
-"The store view has been deleted.","La vista de tienda se ha eliminado."
-"The store view has been saved","La vista de tienda se ha guardado"
-"The template Name must not be empty.","El nombre de plantilla no debe quedar vacÃo."
-"The value is not within the specified range.","El valor no está dentro del rango permitido."
-"The website does not exist.","El sitio web no existe."
-"The website has been deleted.","El sitio web se eliminó."
-"The website has been saved.","Se ha grabado la página web."
-"Themes","Temas"
-"This category and all its child elements","Esta categorÃa y sus elementos secundarios"
-"This category and its child categories only","Sólo esta categorÃa y sus categorÃas secundarias"
-"This category and its products only","Solo esta categorÃa y sus productos"
-"This category only","Solo esta categorÃa"
-"This date is a required value.","La fecha es un valor obligatorio."
-"This is a required field.","Este es un campo obligatorio."
-"This store cannot be deleted.","No se puede eliminar esta tienda."
-"This store view cannot be deleted.","No se puede eliminar esta vista de tienda."
-"This website cannot be deleted.","No se puede borrar la página web."
-"This will be displayed just before body closing tag.","Este texto se mostrará antes de la etiqueta de cierre del cuerpo."
-"This will be included before head closing tag in page HTML.","Esto se incluirá antes de la etiqueta de cierre de cabecera en el HTML de la página."
-"Timezone","Zona horaria"
-"Title Prefix","Prefijo del tÃtulo"
-"Title Suffix","Sufijo del tÃtulo"
-"Transactional Emails","Correos electrónicos transaccionales"
-"Translate Inline","LÃnea interna de traducción"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Traducir, bloques y otros caches de salida deben ser desactivadso para las traducciones de la parte delantera y de admininstración."
-"Translations","Traducciones"
-"Two and more slashes together are not permitted in request path","No se permiten dos o más barras juntas en la linea de solicitud"
-"Unable to create directory: %s","No ha sido posible crear el directorio: %s"
-"Unable to delete store view. Please, try again later.","No se puede eliminar la vista de tienda. Vuelva a intentarlo más tarde."
-"Unable to delete store. Please, try again later.","No se ha podido borrar la tienda. Por favor, inténtelo de nuevo más tarde."
-"Unable to delete website. Please, try again later.","No se puede eliminar el sitio web. Vuelva a intentarlo más tarde."
-"Unable to proceed. Please, try again","No ha sido posible realizar el proceso. Por favor, inténtelo de nuevo."
-"Unable to proceed. Please, try again.","Imposible realizar la operación. Inténtalo de nuevo."
-"Unable to save file ""%s"" at ""%s""","No ha sido posible guardar el archivo ""%s"" en ""%s"""
-"Unable to save file: %s","No ha sido posible guardar el archivo: %s"
-"Unknown old style column type definition: {$definition}.","Definición de tipo de columna de estilo antiguo desconocida: {$definition}."
-"Unknown scope ""%s"".","Campo desconocido ""%s"""
-"Unsecure","Sin seguridad"
-"Url Options","Opciones de dirección URL"
-"Use Custom Admin Path","Usar ruta de acceso de administrador personalizada"
-"Use Custom Admin URL","Utilizar URL de administración personalizada"
-"Use HTTP Only","Utilizar sólo HTTP"
-"Use SID on Frontend","Utilizar SID en la interfaz del cliente"
-"Use Secure URLs in Admin","Utilizar direcciones URL seguras en la administración"
-"Use Secure URLs in Frontend","Utilizar direcciones URL seguras en la interfaz del cliente"
-"Use Web Server Rewrites","Utilizar reescrituras del servidor web"
-"VAT Number","Número de IVA"
-"Validate HTTP_USER_AGENT","Validar HTTP_USER_AGENT"
-"Validate HTTP_VIA","Validar HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","Validar HTTP_X_FORWARDED_FOR"
-"Validate REMOTE_ADDR","Validar REMOTE_ADDR"
-"Validation has failed.","Falló la validación."
-"Values less than 60 are ignored. Note that changes will apply after logout.","Los valores por debajo de 60 se ignoran. Tenga en cuenta que los cambios se aplicarán después de la desconexión"
-"Variable Code must be unique.","El código de variable debe ser único."
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","¡Atención! No se recomienda habilitar esta función en un entorno de producción ya que representa un potencial riesgo a la seguridad."
-"Web","Web"
-"Website","Sitio web"
-"Website Information","Información del sitio web"
-"Website","Nombre de sitio web"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","El código de la página web solo puede contener letras (a-z), números (0-9) o guiones bajos (_) y el primer carácter tiene que ser una letra"
-"Website with the same code","Sitio web con el mismo código"
-"Weekend Days","DÃas de semana"
-"Welcome Text","Texto de bienvenida"
-"Wrong file info format","Formato de información del archivo incorrecto"
-"Wrong number of arguments for %s","Número incorrecto de argumentos para %s"
-"Wrong old style column type definition: {$definition}.","Definición errónea de tipo de columna de estilo antiguo: $definition}."
-"Yes","SÃ"
-"You will have to log in after you save your custom admin path.","Tendrás que iniciar sesión después de guardar tu ruta de acceso de administrador personalizada."
"Your design change for the specified store intersects with another one, please specify another date range.","Su cambio de diseño para la tienda especificada se superpone con otro. Especifique otro rango de fecha."
-"database ""%s""","base de datos ""%s"""
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.","El código de variable debe ser único."
+"Validation has failed.","Falló la validación."
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Core/i18n/fr_FR.csv b/app/code/Magento/Core/i18n/fr_FR.csv
index 5f50d48148d..7afba82f7fe 100644
--- a/app/code/Magento/Core/i18n/fr_FR.csv
+++ b/app/code/Magento/Core/i18n/fr_FR.csv
@@ -1,380 +1,42 @@
-"%s","%s"
-"%s already exist.","%s existe déjà ."
-"%s already exists.","%s existe déjà ."
+Configuration,Configuration
"-- Please Select --","-- Veuillez sélectionner --"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">Attention !</strong> Lorsque vous utilisez CDN, dans certains cas JavaScript peut ne pas fonctionner correctement si CDN n'est pas votre sous-domaine"
-"A category object is required for determining the product request path.","Un objet de catégorie est requis pour déterminer le chemin de requête du produit."
-"Add Block Names to Hints","Ajouter des noms de bloc aux conseils"
-"Add Secret Key to URLs","Ajouter clé secrète aux URLs"
-"Add Store Code to Urls","Ajouter code boutique aux Urls"
-"Admin","Admin"
-"Admin Base URL","Admin URL base"
-"Admin User Emails","Admin courriels utilisateur"
-"Advanced","Avancé(e)"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","Après avoir sélectionné un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
-"Allow Countries","Permettre pays"
-"Allow Symlinks","Autoriser les Symlinks"
-"Allowed IPs (comma separated)","IPs permis (séparés par virgule)"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Types de fichiers autorisés : ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Tous les navigateurs ne supportent pas tous ces formats !"
-"Allows customers to stay logged in when switching between different stores.","Permettre aux clients de rester connectés lorsqu'ils passent d'une boutique à l'autre."
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Texte alternatif pour lien suivant dans pagination menu. Si vide, une image par défaut de flèche sera utilisée."
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Texte alternatif pour lien précédent dans pagination menu. Si vide, une image par défaut de flèche sera utilisée."
-"An error occurred while saving. Please review the error log.","Une erreur est survenue durant sauvegarde. Veuillez consulter le journal de bord des erreurs."
-"Anchor Text for Next","Ancrer texte pour suivant"
-"Anchor Text for Previous","Ancrer texte pour précédent"
-"Anchor symbol (#) is not supported in request path","Le symbole d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
-"Are you sure?","Etes-vous sûr ?"
-"Auto-redirect to Base URL","Redirige automatiquement vers base URL"
-"Back","Retour"
-"Backup Options","Options sauvegarde"
-"Base JavaScript URL","JavaScript base URL"
-"Base Link URL","Lien base URL"
-"Base Media URL","Média base URL"
-"Base Secure URL","URL de base sécurisée"
-"Base Skin URL","Habillage base URL"
-"Base URL","URL de base"
-"Base Unsecure URL","URL de base non sécurisée"
-"Before modifying the store view code please make sure that it is not used in index.php.","Avant de modifier le code de vue de boutique, vérifiez qu'il n'est pas utilisé dans index.php."
-"Before modifying the website code please make sure that it is not used in index.php.","Avant de modifier le code du site internet, vérifiez qu'il n'est pas utilisé dans index.php."
-"Block with name ""%s"" already exists","Un bloc avec le nom ""%s"" existe déjà "
-"Browser Capabilities Detection","Détection capacités navigateur"
-"CSS Settings","Paramètres CSS"
-"Cache Storage Management","Gestion magasin de la cache"
-"Cache storage may contain additional data. Are you sure that you want flush it?","La mémoire cache peut contenir d'autres données. Êtes-vous sûr de vouloir la supprimer ?"
-"Can not create invoice. Order was not found.","Impossible de créer la facture. La commande est introuvable."
-"Can't retrieve request object","Ne peut extraire objet de requête"
-"Can't retrieve entity config: %s","Ne peut pas récupérer la configuration de l'entité : %s"
-"Cancel","Annuler"
-"Cannot complete this operation from non-admin area.","Ne peut compléter cette opération depuis une zone non-admin."
-"Card type does not match credit card number.","Le type de la carte ne correspond pas au numéro de la carte de crédit."
-"Code","Code"
-"Controller file was loaded but class does not exist","Fichier de contrôle a été chargé mais la classe n'existe pas"
-"Cookie Domain","Cookie domaine"
-"Cookie Lifetime","Cookie durée de vie"
-"Cookie Path","Cookie chemin"
-"Cookie Restriction Mode","Mode restriction des cookies"
-"Copyright","Copyright"
-"Core","CÅ“ur"
-"Countries Options","Options pays"
-"Country","Pays"
-"Create Store","Créer boutique"
-"Create Store View","Créer vue boutique"
-"Create Website","Créer site internet"
-"Credit card number does not match credit card type.","Le numéro de la carte de crédit ne correspond pas au type de la carte de crédit."
-"Current Package Name","Nom de paquet actuel"
-"Custom Admin Path","Chemin administrateur personnalisé"
-"Custom Admin URL","URL d'administration personnalisé"
-"Custom Design","Dessin sur mesure"
-"Custom Email 1","Courriel 1 sur mesure"
-"Custom Email 2","Courriel 2 sur mesure"
"Custom Variables","Variables sur mesure"
-"Custom1 Contact Email","Courriel de contact du client1"
-"Custom1 Contact Name","Nom de contact du client1"
-"Custom2 Contact Email","Courriel de contact du client2"
-"Custom2 Contact Name","Nom de contact du client2"
-"Customer Support","Aide clientèle"
-"Dashboard","Tableau de bord"
-"Date From","Date de création"
-"Date To","Date de fin"
-"Date/time format ""%s"" is not supported.","Le format date/heure ""%s"" n'est pas pris en charge."
-"Debug","Déboguer"
-"Default","Défaut"
-"Default Country","Pays par défaut"
-"Default Description","Description par défaut"
-"Default Keywords","Mots clés par défaut"
-"Default No-route URL","URL pas de route par défaut"
-"Default Pages","Pages par défaut"
-"Default Robots","Robots par défaut"
-"Default Store","Magasin par défaut"
-"Default Store View","Vue boutique par défaut"
-"Default Title","Titre par défaut"
-"Default Web URL","URL internet par défaut"
-"Delete","Supprimer"
-"Delete Store","Supprimer le magasin"
-"Delete Store View","Supprimer la vue du magasin"
-"Delete Website","Supprimer le site"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Supprimer un %1$s ne supprimera pas les informations associées (comme les catégories, les produits, etc.) ; le %1$s ne pourra pas être restauré. Nous vous recommandons de créer une sauvegarde de la base de données avant de supprimer le %1$s."
-"Design","Design"
-"Design Change","Changement de design"
-"Developer","Développeur"
-"Developer Client Restrictions","Restrictions client développeur"
-"Disable Email Communications","Désactiver les communications par email"
-"Disable Modules Output","Désactiver les sorties des modules."
-"Display Demo Store Notice","Afficher l'avis de magasin de démonstration."
-"Duplicate Of Template Name","Dupliquer le nom du modèle."
-"Edit Design Change","Éditer les changements de design"
-"Edit Store","Éditer le magasin"
-"Edit Store View","Éditer la vue du magasin"
-"Edit Website","Éditer le site web"
-"Empty identifier field name","Nom du champ identifiant vide"
-"Empty main table name","Nom du tableau principal vide"
-"Enable Charts","Activer les graphiques"
-"Enabled","Activé"
-"Enabled for Admin","Activé pour l'administrateur"
-"Enabled for Frontend","Activer pour le frontend."
-"Environment Update Time","Heure de mise à jour de l'environnement"
-"Error in file: ""%s"" - %s","Erreur dans le fichier : ""%s"" - %s"
-"European Union Countries","Pays de l'Union Européenne"
-"Exceptions Log File Name","Nom du fichier de journalisation des exceptions."
-"Favicon Icon","Icône favicon"
-"File %s does not exist","Le fichier %s n'existe pas"
-"File %s is not readable","Le fichier %s est illisible"
-"File not found","Impossible de trouver le fichier"
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
"File system","Système de fichiers"
-"File with an extension ""%value%"" is protected and cannot be uploaded","Le fichier avec une ""%valeur%"" d'extension est protégé et ne peut être téléchargé."
-"First Day of Week","Premier jour de la semaine"
-"Flush Cache Storage","Vider le cache"
-"Flush Magento Cache","Vider le cache Magento"
-"Footer","Pied de page"
-"Forgot Password Email Sender","Mot de passe oublié ? Le recevoir par e-mail"
-"Forgot Password Email Template","Oubli du mot de passe du modèle du mail"
-"General","Général"
-"General Contact","Contact général"
-"General Contact Email","Courriel de contact général"
-"General Contact Name","Nom de contact général"
-"General Settings","Réglages généraux"
-"Global","Mondial"
-"HTML Head","En-tête HTML"
-"HTML tags are not allowed","Les balises HTML ne sont pas autorisées"
-"Header","En-tête"
-"Host","Hôte"
-"How many links to display at once.","Combien de liens afficher en une fois?"
-"ID Path for Specified Store","ID Path pour le magasin spécifié."
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Si la position du cadre courant ne couvre pas les pages extrêmes, un lien vers la position courante plus ou moins cette valeur sera rendu."
-"Incorrect credit card expiration date.","Date d'expiration de la carte incorrecte."
-"Input type ""%value%"" not found in the input types list.","Le type d'entrée ""%value%"" introuvable dans la liste des types d'entrée."
-"Invalid base url type","Type d'url de base invalide."
-"Invalid block name to set child %s: %s","Nom de bloc invalide pour l'ensemble fille %s : %s"
-"Invalid block type: %s","Type de bloc non valable : %s"
-"Invalid block: %s","Bloc invalide: %s"
-"Invalid connection","Connexion invalide"
-"Invalid layout update handle","Gérer la mise à jour invalide de disposition"
-"Invalid messages storage ""%s"" for layout messages initialization","Messages invalides mémoire ""%s"" pour l'initialisation des messages de mise en page"
-"Invalid query","Requête invalide"
-"Invalid transactional email code: ","Code email de transaction invalide:"
-"Invalid website's configuration path: %s","Chemin de configuration du site invalide: %s"
-"JavaScript Settings","Réglages javascript"
-"Layout","Disposition"
-"Leave empty for access from any location.","Laisser vide pour accéder depuis n'importe où"
-"List of stores","Liste des magasins"
-"Locale","Paramètres régionaux"
-"Locale Options","Options régionales"
-"Log Settings","Réglages de journalisation"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","En cours de journalisation de \Magento\Framework\Logger. Le fichier est situé à {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","En cours de journalisation de \Magento\Framework\Logger. Le fichier est situé à {{base_dir}}/var/log."
-"Login is Case Sensitive","Le login est sensible à la casse."
-"Logo Image","Image du logo"
-"Logo Image Alt","Image logo alt"
-"Logo Image Src","Src image logo"
-"Mail Sending Settings","Paramètres envoi courriel"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Vérifiez que URL base finit avec '/' (barre oblique), ex. http://votredomaine/magento/"
-"Manage Stores","Gérer boutiques"
-"Match expressions in the same order as displayed in the configuration.","Accorder expressions dans le même ordre qu'affichées dans la configuration."
-"Media Storage","Support de stockage"
-"Merge CSS Files","Fusionner fichiers CSS"
-"Merge JavaScript Files","Fusionner fichiers JavaScript"
-"Miscellaneous HTML","HTML divers"
-"Miscellaneous Scripts","Scripts en tous genres"
-"Model class does not exist: %s.","Classe de modèle n'existe pas: %s."
-"Model collection resource name is not defined.","Nom de ressource du modèle de collection n'est pas défini."
-"Module ""%1$s"" cannot depend on ""%2$s"".","Le module ""%$1s"" ne peut dépendre de ""%2$s""."
-"Module ""%1$s"" requires module ""%2$s"".","Le module ""%$1s"" nécessite le module ""%2$s""."
-"Name","Nom"
-"New Design Change","Nouvelle modification de conception"
-"New Store","Nouveau magasin"
-"New Store View","Vue nouvelle boutique"
-"New Website","Nouveau site internet"
-"No","Non"
-"Offloader header","Entête du transcodeur"
-"PHP SOAP extension is required.","L'extension PHP SOAP est nécessaire."
-"Package","Colis"
-"Pagination","Pagination"
-"Pagination Frame","Cadre pagination"
-"Pagination Frame Skip","Sauter cadre pagination"
-"Parent directory does not exist: %s","Le répertoire parental n'existe pas : %s"
-"Path ""%value%"" is not available and cannot be used.","Le chemin ""%value%"" est indisponible et ne peut être utilisé."
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format","Informations du format de fichiers incorrectes"
"Path ""%value%"" is protected and cannot be used.","Le chemin ""%value%"" est protégé et ne peut pas être utilisé."
+"Path ""%value%"" is not available and cannot be used.","Le chemin ""%value%"" est indisponible et ne peut être utilisé."
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","Il se peut que le chemin ""%value%"" ne contienne pas de traversée de répertoire parent (""../"", ""..\")."
-"Please define flag code.","Veuillez définir le code drapeau."
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Veuillez entrer 6 caractères ou plus. Des espaces en début ou en fin seront ignorés."
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Veuillez entrer 7 caractères ou plus. Le mot de passe doit contenir des lettres et des chiffres."
-"Please enter a number 0 or greater in this field.","Veuillez entrer un nombre égal ou supérieur à 0 dans ce champ."
-"Please enter a number 1 or greater in this field.","Veuillez saisir un nombre supérieur ou égal à 1 dans ce champ."
-"Please enter a number greater than 0 in this field.","Veuillez entrer un nombre plus grand que 0 dans ce champ."
-"Please enter a number lower than 100.","Veuillez entrer un nombre inférieur à 100."
-"Please enter a valid $ amount. For example $100.00.","Veuillez entrer un montant en $ valide. Par exemple 100 $."
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Veuillez entrer une clé d'URL valide. Par exemple, ""page-exemple"", ""page-exemple.html"" ou ""autreniveau/page-exemple""."
-"Please enter a valid URL. For example http://www.example.com or www.example.com","Veuillez saisir une adresse Internet valide. Par exemple http://www.exemple.com ou www.exemple.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Veuillez entrer une URL valide. Le protocole est nécessaire (http://, https:// ou ftp://)"
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Veuillez entrer un identifiant XML valide. Par exemple, objet_1, bloc5, id-4."
-"Please enter a valid credit card number.","Veuillez entrer un numéro de carte de crédit valide."
-"Please enter a valid credit card verification number.","Veuillez entrer un numéro de vérification de carte de crédit valide."
-"Please enter a valid date between %s and %s","Veuillez entrer une date valide entre %s et %s"
-"Please enter a valid date equal to or greater than %s","Veuillez entrer une date valide également ou supérieure à %s"
-"Please enter a valid date less than or equal to %s","Veuillez entrer une date valide inférieure ou égale à %s"
-"Please enter a valid date.","Veuillez entrer une date valide."
-"Please enter a valid day (1-%1).","Veuillez entrer un jour valide (1-%1)."
-"Please enter a valid email address. For example johndoe@domain.com.","Veuillez entrer une adresse courriel valide. Par exemple pierremaistre@domaine.com."
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Veuillez entrer un numéro de fax valide. Par exemple (123) 456-7890 ou 123-456-7890."
-"Please enter a valid full date","Veuillez entrer une date complète valide"
-"Please enter a valid month (1-12).","Veuillez entrer un mois valide (1-12)."
-"Please enter a valid number in this field.","Veuillez entrer un numéro valide dans ce champ."
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Veuillez entrer un numéro de téléphone valide. Par exemple (123) 456-7890 ou 123-456-7890."
-"Please enter a valid social security number. For example 123-45-6789.","Veuillez entrer un numéro de sécurité sociale valide. Par exemple 123-54-6789."
-"Please enter a valid year (1900-%1).","Veuillez entrer une année valide (1900-%1)."
-"Please enter a valid zip code.","Veuillez entrer un code postal valide."
-"Please enter a valid zip code. For example 90602 or 90602-1234.","Veuillez entrer un code postal valide. Par exemple 90602 ou 90602-1234."
-"Please enter issue number or start date for switch/solo card type.","Veuillez entrer le numéro de problème ou la date de début pour le type de carte Switch/Solo."
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Veuillez entrer une longueur CSS valide. Par exemple, 00Â px ou 77Â pt ou 20Â em ou 0,5Â ex ou 50Â %."
-"Please make sure your passwords match.","Veuillez vérifier que votre mot de passe fonctionne."
-"Please select State/Province.","Veuillez choisir l'état/la province."
-"Please select a file","Veuillez sélectionner un fichier"
-"Please select an option.","Veuillez sélectionner une option."
-"Please select one of the above options.","Veuillez sélectionner l'un des choix ci-dessus."
-"Please select one of the options.","Veuillez sélectionner l'une des options."
"Please set available and/or protected paths list(s) before validation.","Veuillez définir la/les liste(s) de chemins disponibles et/ou protégés avant la validation."
-"Please specify either a category or a product, or both.","Veuillez spécifier une catégorie ou un produit, ou les deux."
-"Please use letters only (a-z or A-Z) in this field.","Veuillez n'utiliser que des lettres (a-z ou A-Z) dans ce champ."
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Veuillez n'utiliser que des chiffres dans ce champ. Evitez les espaces et autres caractères tels que des points ou des virgules."
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Veuillez uniquement utiliser des lettres (a-z ou A-Z) ou des chiffres (0-9) dans ce champ. Aucune espace ou aucun autre caractère n'est autorisé."
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Veuillez uniquement utiliser des lettres (a-z ou A-Z) ou des chiffres (0-9) ou des espaces et # uniquement dans ce champ."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Veuillez n'utiliser que des lettres (a-z ou A-Z), des nombres (0-9) ou le trait pour souligner (_) dans ce champ, le premier caractère devant être obligatoirement une lettre."
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Veuillez utiliser seulement des lettres (a-z), des chiffres (0-9) ou le tiret bas (_) dans ce champ, le premier caractère doit être une lettre."
-"Please use only visible characters and spaces.","Veuillez uniquement utiliser des espaces et des caractères visibles."
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Veuillez utiliser ce format de date: dd/mm/yyyy. Par exemple 29/04/1960 pour le 29th of April, 1960."
-"Please wait, loading...","En cours de chargement, veuillez patienter..."
-"Port (25)","Port (25)"
-"Profiler","Profiler"
-"Recovery Link Expiration Interval (days)","Délai d'expiration du lien de récupération (jours)"
-"Request Path for Specified Store","Demander le chemin pour un magasin spécifique"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","Il se peut que le fichier demandé ne contienne pas de traversée de répertoire parent (notation ""../"", ""..\")"
-"Requested invalid store ""%s""","Magasin demandé non valide ""%s"""
-"Resource is not set.","La ressource n'est pas réglée."
-"Retrieve store data","Récupérer les données du magasin"
-"Retrieve store list","Récupérer la liste du magasin"
-"Return-Path Email","Email de retour"
-"Root Category","Catégorie racine"
-"Sales Representative","Représentant des ventes"
-"Sales Representative Contact Email","Courriel de contact du représentant commercial"
-"Sales Representative Contact Name","Nom de contact du représentant commercial"
-"Save","Enregistrer"
-"Save Store","Enregistrer le magasin"
-"Save Store View","Enregistrer la vue du magasin"
-"Save Website","Enregistrer le site"
-"Search Engines Optimization","Enregistrer les optimisations des moteurs"
-"Secure","Sécurisé"
-"Security","Sécurité"
-"Select Date","Sélectionner la date"
-"Select Media Database","Sélectionner base de données"
-"Sender Email","Expéditeur de l'e-mail"
-"Sender Name","Nom de l'expéditeur"
-"Services","Services"
-"Session Cookie Management","Gestion des cookies de sessions"
-"Session Lifetime (seconds)","Durée de la session (secondes)"
-"Session Validation Settings","Paramètres de validation de la session"
-"Set Return-Path","Configurer Return-Path"
-"Set as Default","Choisir par défaut"
-"Skin (Images / CSS)","Skin (Images / CSS)"
-"Sort Order","Trier la commande"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","L'heure spécifiée ""%1$s"" ne correspond pas au formatt ""%2$s""."
+"File with an extension ""%value%"" is protected and cannot be uploaded","Le fichier avec une ""%valeur%"" d'extension est protégé et ne peut être téléchargé."
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
"Start date cannot be greater than end date.","La date de début ne peut pas être après la date de fin."
-"Startup Page","Page de démarrage."
-"Status","Statut"
-"Storage Configuration for Media","Configuration du stockage pour les média"
-"Store","Magasin"
-"Store API","Interface de programmation (API) du magasin"
-"Store Contact Address","Adresse de contact du magasin"
-"Store Contact Information","Informations de contact du magasin"
-"Store Contact Phone","Téléphone du magasin"
-"Store Email Addresses","Adresse mail du magasin"
-"Store Information","Informations du magasin"
-"Store","Nom du magasin"
-"Store View","Vue du magasin"
-"Store View Information","Information de la vue du magasin"
-"Store View","Nom de visualisation du magasin"
-"Store view doesn't exist","La vue du magasin n'existe pas"
-"Store with the same code","Enregistrer avec le même code"
-"System","Système"
-"System Log File Name","Nom de fichier de journalisation système"
-"Template Path Hints","Astuces relatives au chemin du modèle"
-"Template Settings","Options du modèle"
-"Template Variables","Variables du modèle"
-"Templates","Modèles"
-"Text length does not satisfy specified text range.","La longueur du texte ne correspond pas aux attentes spécifiées."
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","Le %s saisi est invalide. Assurez vous qu'il suit le format ""http://domain.com/""."
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Le code du magasin ne peut contenir que des lettres (a-z), nombres (0-9) ou blanc souligné (_) ; le premier caractère doit être une lettre."
-"The store does not exist","Le magasin n'existe pas"
-"The store has been deleted.","Le magasin a été supprimé."
-"The store has been saved.","Le magasin a été enregistré."
-"The store view has been deleted.","La vue du magasin a été supprimée."
-"The store view has been saved","La vue du magasin a été sauvegardée."
-"The template Name must not be empty.","Le nom de modèle ne doit pas être vide."
-"The value is not within the specified range.","Cette valeur ne fait pas partie de la marge acceptée."
-"The website does not exist.","Le site internet n'existe pas."
-"The website has been deleted.","Le site internet a été effacé."
-"The website has been saved.","Le site Internet a été enregistré."
-"Themes","Thèmes"
-"This category and all its child elements","Cette catégorie et tous ces éléments dépendants"
-"This category and its child categories only","Cette catégorie et ces catégories dépendantes seulement"
-"This category and its products only","Cette catégorie et ses produits uniquement"
-"This category only","Cette catégorie uniquement"
-"This date is a required value.","Cette date est une valeur requise."
-"This is a required field.","Ceci est un champ obligatoire."
-"This store cannot be deleted.","Cette boutique ne peut être effacée."
-"This store view cannot be deleted.","Cette vue de boutique ne peut être effacée."
-"This website cannot be deleted.","Ce site Internet ne peut pas être supprimé."
-"This will be displayed just before body closing tag.","Ceci sera affiché juste avant l'étiquette de fermeture de corps."
-"This will be included before head closing tag in page HTML.","Cela sera inclus avant la balise de fermeture de l'entête de la page HTML."
-"Timezone","Fuseau horaire"
-"Title Prefix","Préfixe titre"
-"Title Suffix","Suffixe du titre"
-"Transactional Emails","Emails de transaction"
-"Translate Inline","Traduire en file"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Traductions, blocks et autres sorties doivent être désactivés pour la gestion administrateur et utilisateur en ligne."
-"Translations","Traductions"
-"Two and more slashes together are not permitted in request path","Deux slashs ou plus ne sont pas autorisés ensemble dans le répertoire"
-"Unable to create directory: %s","Impossible de créer le répertoire : %s"
-"Unable to delete store view. Please, try again later.","Incapable d'effacer la vue de boutique. Veuillez réessayer plus tard."
-"Unable to delete store. Please, try again later.","Impossible de supprimer le magasin. Veuillez réessayer plus tard."
-"Unable to delete website. Please, try again later.","Incapable d'effacer le site internet. Veuillez réessayer plus tard."
-"Unable to proceed. Please, try again","Action impossible. Veuillez réessayer plus tard"
-"Unable to proceed. Please, try again.","Impossible de continuer. S'il vous plait, essayez encore."
-"Unable to save file ""%s"" at ""%s""","Impossible de sauvegarder le fichier ""%s"" Ã ""%s"""
-"Unable to save file: %s","Impossible d'enregistrer le fichier : %s"
-"Unknown old style column type definition: {$definition}.","Définition du type de colonne de l'ancien style inconnue : {$definition}."
-"Unknown scope ""%s"".","Inconnu ""%s"""
-"Unsecure","Non sûre."
-"Url Options","Options Url"
-"Use Custom Admin Path","Utiliser un répertoire administrateur personnalisé"
-"Use Custom Admin URL","Utiliser l'URL d'administration personnalisé"
-"Use HTTP Only","Utiliser HTTP seulement"
-"Use SID on Frontend","Utiliser SID côté public"
-"Use Secure URLs in Admin","Utiliser URLs sûrs dans admin"
-"Use Secure URLs in Frontend","Utiliser URLs sûrs côté public"
-"Use Web Server Rewrites","Utiliser les réécritures du serveur Internet"
-"VAT Number","Numéro TVA"
-"Validate HTTP_USER_AGENT","Valider HTTP_USER_AGENT"
-"Validate HTTP_VIA","Valider HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","Valider HTTP_X_FAIT SUIVRE_POUR"
-"Validate REMOTE_ADDR","Valider REMOTE_ADDR"
-"Validation has failed.","Validation a échouée"
-"Values less than 60 are ignored. Note that changes will apply after logout.","Les valeurs inférieures à 60 sont ignorées. Veuillez noter que des modifications seront appliquées après la déconnexion."
-"Variable Code must be unique.","La variable code doit être unique."
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Attention ! L'activation de cette fonction n'est pas recommandée pour les environnements de production car elle représente un risque de sécurité."
-"Web","Internet"
-"Website","Site"
-"Website Information","Information site internet"
-"Website","Nom site internet"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Le code du site Internet ne peut contenir que des lettres (a-z), des chiffres (0-9) ou un tiret bas (_). Le premier caractère doit être une lettre"
-"Website with the same code","Site internet avec le même code"
-"Weekend Days","Jours du week-end"
-"Welcome Text","Texte de bienvenue"
-"Wrong file info format","Informations du format de fichiers incorrectes"
-"Wrong number of arguments for %s","Nombre d'arguments incorrect pour %s"
-"Wrong old style column type definition: {$definition}.","La définition de l'ancien style de colonne est incorrecte : {$definition}."
-"Yes","oui"
-"You will have to log in after you save your custom admin path.","Vous devrez vous connecter après avoir enregistré votre répertoire administrateur personnalisé."
"Your design change for the specified store intersects with another one, please specify another date range.","Votre changement de dessin pour la boutique spécifiée se mélange à une autre, veuillez spécifier une autre fourchette de dates."
-"database ""%s""","base de données ""%s"""
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.","La variable code doit être unique."
+"Validation has failed.","Validation a échouée"
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Core/i18n/nl_NL.csv b/app/code/Magento/Core/i18n/nl_NL.csv
index 96cdb2a5a1e..7b321e76f82 100644
--- a/app/code/Magento/Core/i18n/nl_NL.csv
+++ b/app/code/Magento/Core/i18n/nl_NL.csv
@@ -1,380 +1,42 @@
-"%s","%s"
-"%s already exist.","%s bestaan al."
-"%s already exists.","%s bestaat al."
+Configuration,Configuration
"-- Please Select --","-- Selecteer a.u.b.--"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">Waarschuwing!</strong> Als u CDN gebruikt, loopt JavaScript soms niet goed als CDN niet in uw subdomein is"
-"A category object is required for determining the product request path.","Een categorie object is vereist om product verzoek pad te bepalen."
-"Add Block Names to Hints","Voeg Namen Blokkeren toe aan Hints"
-"Add Secret Key to URLs","Voeg Geheime Toets toe aan URL's"
-"Add Store Code to Urls","Voeg Opslag Code toe aan URL's"
-"Admin","Admin"
-"Admin Base URL","Admin Base URL"
-"Admin User Emails","Admin Gebruiker E-mails"
-"Advanced","Gevorderd"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","Na het selecteren van een nieuwe media opslagplaats, druk op de synchronisatiekonp om alle media naar die locatie te brengen. Media is pas beschikbaar op de nieuwe locatie als het synchronisatieproces voltooid is."
-"Allow Countries","Sta Landen toe"
-"Allow Symlinks","Sta Symlinks toe"
-"Allowed IPs (comma separated)","Toegestane IP's (gescheiden door komm's)"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Toegestane bestandstypes: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Niet alle browsers ondersteunen deze formaten!"
-"Allows customers to stay logged in when switching between different stores.","Staat klanten toe ingelogd te blijven tijdens het switchen tussen verschillende winkels"
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternatieve tekst voor volgende link in paginatie menu. Als het leeg is, wordt vaststaande afbeelding gebruikt."
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternatieve tekst voor vorige link in paginatie menu. Als het leeg is, wordt vaststaande afbeelding gebruikt."
-"An error occurred while saving. Please review the error log.","Er is een fout opgetreden tijden het opslaan. Bekijk a.u.b. het error log."
-"Anchor Text for Next","Ankertekst voor Volgende"
-"Anchor Text for Previous","Ankertekst voor Vorige"
-"Anchor symbol (#) is not supported in request path","Ankersymbool (#) wordt niet ondersteund in gevraagd pad"
-"Are you sure?","Weet u het zeker"
-"Auto-redirect to Base URL","Stuur automatisch door naar basis URL"
-"Back","terug"
-"Backup Options","Backup opties"
-"Base JavaScript URL","Basis JavaScript URL"
-"Base Link URL","Basis link URL"
-"Base Media URL","Basis media URL"
-"Base Secure URL","Basis Veilige URL"
-"Base Skin URL","Basis thema URL"
-"Base URL","Basis URL"
-"Base Unsecure URL","Basis Onveilige URL"
-"Before modifying the store view code please make sure that it is not used in index.php.","Voordat u de winkelweergave bewerkt moet u er eerst zeker van zijn dat het niet gebruikt wordt in index.php."
-"Before modifying the website code please make sure that it is not used in index.php.","Voordat u de code van de website bewerkt, moet u er eerst zeker van zijn dat het niet gebruikt wordt in index.php."
-"Block with name ""%s"" already exists","Blokkering met de naam ""%s"" bestaat reeds."
-"Browser Capabilities Detection","Browser capabiliteiten detectie"
-"CSS Settings","CSS instellingen"
-"Cache Storage Management","Cache opslag beheer"
-"Cache storage may contain additional data. Are you sure that you want flush it?","Cache opslag kan toevoegende data bevatten. Weet u zeker dat u het wilt verwijderen?"
-"Can not create invoice. Order was not found.","Kan geen rekening maken. Bestelling is niet gevonden."
-"Can't retrieve request object","Kan gevraagde object niet vinden."
-"Can't retrieve entity config: %s","Kan geen entiteit configuratie %s verkrijgen."
-"Cancel","annuleer"
-"Cannot complete this operation from non-admin area.","Kan deze operatie vanuit geen-admin gedeelte niet voltooien."
-"Card type does not match credit card number.","Kaarttype komt niet overeen met het nummer van de credit card."
-"Code","Code"
-"Controller file was loaded but class does not exist","Beheerbestand is geladen, maar de klasse bestaat niet"
-"Cookie Domain","cookie domein"
-"Cookie Lifetime","cookie levensduur"
-"Cookie Path","cookie pad"
-"Cookie Restriction Mode","Cookie Restrictie Modus"
-"Copyright","copyright"
-"Core","Kern"
-"Countries Options","landen opties"
-"Country","Land"
-"Create Store","creëer winkel"
-"Create Store View","creëer winkelweergave"
-"Create Website","creëer website"
-"Credit card number does not match credit card type.","creditcardnummer komt niet overeen met creditcardtype"
-"Current Package Name","huidige pakketnaam"
-"Custom Admin Path","aangepast administratiepad"
-"Custom Admin URL","Aangepaste Admin URL"
-"Custom Design","Aangepast ontwerp"
-"Custom Email 1","aangepaste Email 1"
-"Custom Email 2","Aangepaste Email 2"
"Custom Variables","Aangepaste variabelen"
-"Custom1 Contact Email","Klandizie1 Contact E-mail"
-"Custom1 Contact Name","Klandizie1 Contact Naam"
-"Custom2 Contact Email","Klandizie2 Contact E-mail"
-"Custom2 Contact Name","Klandizie2 Contact Naam"
-"Customer Support","Klantenservice"
-"Dashboard","Dashboard"
-"Date From","Datum vanaf"
-"Date To","Datum tot"
-"Date/time format ""%s"" is not supported.","Datum/Tijd formaat ""%s"" wordt niet ondersteund."
-"Debug","Debug"
-"Default","standaard"
-"Default Country","Standaardland"
-"Default Description","Standaardomschrijving"
-"Default Keywords","Standaard sleutelwoorden"
-"Default No-route URL","Standaard geen-route URL"
-"Default Pages","Standaard pagina's"
-"Default Robots","Standaard robots"
-"Default Store","Standaard winkel"
-"Default Store View","Standaard winkelweergave"
-"Default Title","Standaardtitel"
-"Default Web URL","Standaard web URL"
-"Delete","Verwijder"
-"Delete Store","Standaard winkel"
-"Delete Store View","Verwijder winkelweergave"
-"Delete Website","Verwijder website"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Het verwijderen van %1$s zal niet de informatie verwijderen die geassocieerd wordt met %1$s (b.v. categorieën, producten, etc.) maar de %1$s data zal niet worden hersteld. Wij suggesteren dat u een backup maakt van de database voordat u de %1$s verwijdert."
-"Design","Ontwerp"
-"Design Change","Ontwerp verandering"
-"Developer","Ontwerper"
-"Developer Client Restrictions","Ontwerper klant restricties"
-"Disable Email Communications","zet email communicaties uit"
-"Disable Modules Output","Zet modules output uit"
-"Display Demo Store Notice","Toon demo winkel notitie"
-"Duplicate Of Template Name","Dubbele template naam"
-"Edit Design Change","Bewerk ontwerp verandering"
-"Edit Store","Bewerk winkel"
-"Edit Store View","Bewerk winkelweergave"
-"Edit Website","Bewerk website"
-"Empty identifier field name","Lege identificeerder veldnaam"
-"Empty main table name","Lege basis tabel naam."
-"Enable Charts","Stel lijsten in"
-"Enabled","Werkzaam gemaakt"
-"Enabled for Admin","Ingesteld voor administrateur"
-"Enabled for Frontend","Ingesteld voor voorkant"
-"Environment Update Time","Milieu update tijd"
-"Error in file: ""%s"" - %s","Fout in bestand ""%s""- %s"
-"European Union Countries","EU-landen"
-"Exceptions Log File Name","Uitzonderingen log bestand naam"
-"Favicon Icon","Favicon Icoon"
-"File %s does not exist","Bestand %s bestaat niet"
-"File %s is not readable","Bestand %s is niet leesbaar"
-"File not found","Bestand niet gevonden"
-"File system","Bestandssysteem"
-"File with an extension ""%value%"" is protected and cannot be uploaded","Bestand met de uitgang ""%value%"" is beschermd en kan niet worden geüpload."
-"First Day of Week","Eerste dag van de week"
-"Flush Cache Storage","Verwijder cache opslag"
-"Flush Magento Cache","Leeg Magento Cache"
-"Footer","Voet"
-"Forgot Password Email Sender","Wachtwoord vergeten e-mailverzender"
-"Forgot Password Email Template","Vergeten wachtwoord email thema"
-"General","Algemeen"
-"General Contact","Algemeen contact"
-"General Contact Email","Algemeen Contact E-mail"
-"General Contact Name","Algemeen Contact Naam"
-"General Settings","Algemene instellingen"
-"Global","Wereldwijd"
-"HTML Head","HTML head"
-"HTML tags are not allowed","HTML tags zijn niet toegestaan"
-"Header","Header"
-"Host","Host"
-"How many links to display at once.","Hoeveel links in één keer weer te geven."
-"ID Path for Specified Store","ID Pad voor Gespecificeerde Winkel"
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Als de huidige frame positie de uiterste pagina's niet dekt wordt een een link aangemaakt tot aan de huidige positie plus/minus deze waarde."
-"Incorrect credit card expiration date.","Onjuiste creditcard vervaldatum."
-"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" niet gevonden in de input type lijst."
-"Invalid base url type","Ongeldig basis url type"
-"Invalid block name to set child %s: %s","Ongeldig blok naam om child %s op te zetten: %s"
-"Invalid block type: %s","Ongeldig bloktype: %s"
-"Invalid block: %s","Ongeldig blok: %s"
-"Invalid connection","ongeldige verbinding"
-"Invalid layout update handle","Ongeldige layout update handle"
-"Invalid messages storage ""%s"" for layout messages initialization","Ongeldige berichten opgeslagen ""%s"" voor layout bericht initialisatie"
-"Invalid query","Ongeldige zoekopdracht"
-"Invalid transactional email code: ","Ongeldige transactie email code:"
-"Invalid website's configuration path: %s","Ongeldig website configuratie pad: %s"
-"JavaScript Settings","JavaScript Instellingen"
-"Layout","layout"
-"Leave empty for access from any location.","Laat leeg voor toegang vanaf iedere locatie."
-"List of stores","Lijst met winkels"
-"Locale","Lokaal"
-"Locale Options","Lokale Opties"
-"Log Settings","Log Instellingen"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging van \Magento\Framework\Logger. Bestand bevindt zich in {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging van \Magento\Framework\Logger. Bestand bevindt zich in {{base_dir}}/var/log"
-"Login is Case Sensitive","Inloggen is hoofdlettergevoelig"
-"Logo Image","Logo afbeelding"
-"Logo Image Alt","Logo afbeelding Alt"
-"Logo Image Src","Logo afbeeldingsbestand"
-"Mail Sending Settings","Email verstuur instellingen"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Verzeker u ervan dat de basis-URL eindigt met '/' (schuine streep), bijvoorbeeld http://yourdomain/magento/"
-"Manage Stores","Beheer winkels"
-"Match expressions in the same order as displayed in the configuration.","Stem expressies overeen in dezelfde volgorde als weergegeven in de configuratie"
-"Media Storage","Media Opslag"
-"Merge CSS Files","CSS Bestanden Samenvoegen"
-"Merge JavaScript Files","Voeg JavaScript bestanden samen"
-"Miscellaneous HTML","Gemengde HTML"
-"Miscellaneous Scripts","Veelsoortige Scripts"
-"Model class does not exist: %s.","Model klasse bestaat niet: %s."
-"Model collection resource name is not defined.","Model collectie bronnaam is niet gedefinieerd."
-"Module ""%1$s"" cannot depend on ""%2$s"".","Module ""%$s"" kan niet afhankelijk zijn van ""%2$s""."
-"Module ""%1$s"" requires module ""%2$s"".","Module ""%1$s"" heeft module ""%2$s"" nodig."
-"Name","Naam"
-"New Design Change","Nieuwe Ontwerpverandering"
-"New Store","Nieuwe Winkel"
-"New Store View","Nieuwe winkelweergave"
-"New Website","Nieuwe Website"
-"No","Nee"
-"Offloader header","Ontlader koptekst"
-"PHP SOAP extension is required.","PHP SOAP extensie is vereist."
-"Package","Pakket"
-"Pagination","Paginanummering"
-"Pagination Frame","Paginatie Frame"
-"Pagination Frame Skip","Paginatie Frame Skip"
-"Parent directory does not exist: %s","Hoofd pad bestaat niet: %s"
-"Path ""%value%"" is not available and cannot be used.","Pad ""%value%"" is niet beschikbaar en kan niet gebruikt worden."
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
+"File system",Bestandssysteem
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format","Verkeerde bestandsinformatiebestand"
"Path ""%value%"" is protected and cannot be used.","Pad ""%value%"" is beschermd en kan niet worden gebruikt."
+"Path ""%value%"" is not available and cannot be used.","Pad ""%value%"" is niet beschikbaar en kan niet gebruikt worden."
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","Pad ""%value%"" mag geen parent directory traversal bevatten (""../"", ""..\")."
-"Please define flag code.","Definieer a.u.b. de vlagcode"
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Voer 6 of meer karakters in a.u.b. Spaties worden genegeerd."
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Geef 7 of meer karakters in. Wachtwoord moet zowel cijfers als letters bevatten."
-"Please enter a number 0 or greater in this field.","Voer een nummer groter dan 0 in."
-"Please enter a number 1 or greater in this field.","Voer aub een nummer 1 of hoger in dit veld in."
-"Please enter a number greater than 0 in this field.","Voer a.u.b. een nummer groter dan 0 in dit veld."
-"Please enter a number lower than 100.","Voer a.u.b. een nummer beneden de 100 in dit veld."
-"Please enter a valid $ amount. For example $100.00.","Voer a.u.b. een geldig € hoeveelheid in. Bijvoorbeeld €100,00."
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Voer a.u.b. een geldige URL sleutel in. Bijvoorbeeld ""voorbeeld-pagina"", ""voorbeeld-pagina.html"" of ""eenanderniveau/voorbeeld-pagina""."
-"Please enter a valid URL. For example http://www.example.com or www.example.com","Voer a.u.b. een geldige YRL in. Bijvoorbeeld http://www.voorbeeld.com of www.voorbeeld.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Voer een geldige URL in. Protocol is vereist (http://, https:// of ftp://)"
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Voer a.u.b. een geldige XML-identificeerder in. Bijvoorbeeld iets_1, blok5, id-4."
-"Please enter a valid credit card number.","Voer a.u.b. een geldig creditcardnummer in."
-"Please enter a valid credit card verification number.","Voer a.u.b. een geldig creditcard verificatienummer in."
-"Please enter a valid date between %s and %s","Voer a.u.b. een geldige datum in tussen %s en %s"
-"Please enter a valid date equal to or greater than %s","Voer een geldige datum in groter dan of gelijk aan %s"
-"Please enter a valid date less than or equal to %s","Voer a.u.b. een geldige datum in die minder of gelijk aan %s is."
-"Please enter a valid date.","Voer a.u.b. een geldige datum in."
-"Please enter a valid day (1-%1).","Voer a.u.b. een geldige dag in (1-%1)."
-"Please enter a valid email address. For example johndoe@domain.com.","Voer a.u.b. een geldig e-mailadres in. Bijvoorbeeld johndoe@domain.com."
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Voer een geldig faxnummer in. Bijvoorbeeld (123) 456-7890 of 123-456-7890."
-"Please enter a valid full date","Voer a.u.b. een geldige, volledige datum in"
-"Please enter a valid month (1-12).","Voer een geldige maand in (1-12)."
-"Please enter a valid number in this field.","Voer in dit veld een geldig nummer in."
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Voer een geldig telefoonnummer in. Bijvoorbeeld (123) 456-7890 of 123-456-7890."
-"Please enter a valid social security number. For example 123-45-6789.","Voer a.u.b. een geldig BSN-nummer in. Bijvoorbeeld 123456789."
-"Please enter a valid year (1900-%1).","Voer een geldig jaar in (1900-%1)."
-"Please enter a valid zip code.","Voer een geldige postcode in."
-"Please enter a valid zip code. For example 90602 or 90602-1234.","Voer a.u.b. een geldige postcode in. Bijvoorbeeld 1234 AB."
-"Please enter issue number or start date for switch/solo card type.","Voer uitgavenummer in of start datum voor switch/solo kaarttype."
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Voer een geldige CSS-lengte in. Bijvoorbeeld 100px, 77pt, 20em, .5ex of 50%"
-"Please make sure your passwords match.","Let er alstublieft op dat de wachtwoorden overeenkomen."
-"Please select State/Province.","Selecteer Staat/Provincie."
-"Please select a file","Selecteer een bestand"
-"Please select an option.","Selecteer een optie."
-"Please select one of the above options.","Selecteer alstublieft een van de bovenstaande opties."
-"Please select one of the options.","Selecteer alstublieft een van de opties."
"Please set available and/or protected paths list(s) before validation.","Stel beschikbare en/of beschermde pad lijst(en) in voor validatie."
-"Please specify either a category or a product, or both.","Specificeerd a.u.b. een categorie of een product, of beide."
-"Please use letters only (a-z or A-Z) in this field.","Gebruik a.u.b. alleen letters (a-z of A-Z) in dit veld."
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Gebruik alleen getallen in dit veld. Vermijd spaties of andere tekens zoals punten of komma's."
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Gebruik alleen letters (a-z of A-Z) of nummers (0-9) in dit veld. Spaties en andere karakters zijn niet toegestaan."
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Gebruikt alleen letters (a-z of A-Z), getallen (0-9), spaties of # in dit veld."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Gelieve alleen de letters (a-z of A-Z), nummers (0-9) en/of laag streepje(_) in dit veld te gebruiken, het eerste karakter moet een letter zijn."
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Gebruikt alleen letters (a-z of A-Z), getallen (0-9) of underscore(_) in dit veld, eerste teken moet een letter zijn."
-"Please use only visible characters and spaces.","Gebruik alleen zichtbare karakters en spaties."
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Gebruik dit datumformat: dd/mm/jjjj. Bijvoorbeeld 17/03/2006 voor 17 maart 2006."
-"Please wait, loading...","Even geduld alstublieft, bezig met laden..."
-"Port (25)","Poort (25)"
-"Profiler","Profiler"
-"Recovery Link Expiration Interval (days)","Herstel Link Verloop Periode (dagen)"
-"Request Path for Specified Store","Gevraagd Pad voor Gespecificeerde Winkel"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","Opgevraagd bestand mag geen ouder-directory traverse (""../"", ""..\" notatie) bevatten"
-"Requested invalid store ""%s""","Gevraagde ongeldige winkel ""%s"""
-"Resource is not set.","Bron is niet ingesteld"
-"Retrieve store data","Winkeldata ophalen"
-"Retrieve store list","Winkellijst ophalen"
-"Return-Path Email","Return-Pad E-mail"
-"Root Category","Wortelcategorie"
-"Sales Representative","Verkoopvertegenwoordiger"
-"Sales Representative Contact Email","Handelsvertegenwoordiger Contact E-mail"
-"Sales Representative Contact Name","Handelsvertegenwoordiger Contact Naam"
-"Save","Opslaan"
-"Save Store","Bewaar Winkel"
-"Save Store View","Bewaar Winkel View"
-"Save Website","Sla website op"
-"Search Engines Optimization","Zoekmachine Optimalisatie"
-"Secure","Veilig"
-"Security","Beveiliging"
-"Select Date","Selecteer Datum"
-"Select Media Database","Selecteer media database"
-"Sender Email","Afzender Email"
-"Sender Name","Naam Afzender"
-"Services","Diensten"
-"Session Cookie Management","Sessie cookie beheer"
-"Session Lifetime (seconds)","Sessie duur (secondes)"
-"Session Validation Settings","Sessie validatie-instellingen"
-"Set Return-Path","Geef het return-path op"
-"Set as Default","Stel in als Standaard"
-"Skin (Images / CSS)","Skin (Afbeeldingen / CSS)"
-"Sort Order","Sorteer Bestelling"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","De gespecificeerde datum/tijd ""%1$s"" komt niet overeen met formaat ""%2$s""."
+"File with an extension ""%value%"" is protected and cannot be uploaded","Bestand met de uitgang ""%value%"" is beschermd en kan niet worden geüpload."
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
"Start date cannot be greater than end date.","Begin datum kan niet later zijn dan eind datum."
-"Startup Page","Startpagina"
-"Status","Status"
-"Storage Configuration for Media","Opslag Configuratie voor Media"
-"Store","Winkel"
-"Store API","Winkel API"
-"Store Contact Address","Winkel contactadres"
-"Store Contact Information","Winkel contactinformatie"
-"Store Contact Phone","Winkel contact telefoon"
-"Store Email Addresses","Winkel email adressen"
-"Store Information","Winkel Informatie"
-"Store","Winkel Naam"
-"Store View","Winkelweergave"
-"Store View Information","Winkel bekijk informatie"
-"Store View","Zie Winkel Naam"
-"Store view doesn't exist","Winkelweergave bestaat niet"
-"Store with the same code","Winkel met zelfde code"
-"System","Systeem"
-"System Log File Name","Systeem log bestandsnaam"
-"Template Path Hints","Sjabloon Pad Hints"
-"Template Settings","Thema instellingen"
-"Template Variables","Sjabloon Variabelen"
-"Templates","Sjablonen"
-"Text length does not satisfy specified text range.","Tekst lengte voldoet niet aan de vereiste tekstgebiedsvoorwaarden."
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","De %s die u invoerde is onjuist. Verzeker u er a.u.b. van dat het geschreven is in ""http://domein.com/"" formaat."
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","De winkelcode mag alleen letters (a-z), nummers (0-9) en lage streepjes bevatten (_). Het eerste teken moet een letter zijn"
-"The store does not exist","De winkel bestaat niet"
-"The store has been deleted.","De winkel is verwijderd."
-"The store has been saved.","De winkel is opgeslagen"
-"The store view has been deleted.","Het winkelzicht is verwijderd."
-"The store view has been saved","De winkelweergave is opgeslagen."
-"The template Name must not be empty.","De Sjabloon Naam mag niet leeg zijn."
-"The value is not within the specified range.","De waarde ligt niet in het toegestane gebied."
-"The website does not exist.","De website bestaat niet."
-"The website has been deleted.","De website is verwijderd."
-"The website has been saved.","De website is opgeslagen."
-"Themes","Thema's"
-"This category and all its child elements","Deze categorie en alle onderelementen"
-"This category and its child categories only","Deze categorie en de categorieën daarbinnen alleen"
-"This category and its products only","Alleen deze categorie en haar producten"
-"This category only","Alleen deze categorie"
-"This date is a required value.","Deze datum is een vereiste waarde"
-"This is a required field.","Dit is een verplicht veld."
-"This store cannot be deleted.","De winkel kan niet verwijderd worden."
-"This store view cannot be deleted.","Deze winkel kan niet verwijderd worden."
-"This website cannot be deleted.","Deze website kan niet verwijderd worden."
-"This will be displayed just before body closing tag.","Deze zullen worden vertoond, juist voor de body sluit tag."
-"This will be included before head closing tag in page HTML.","Dit zal worden ingevoegd voor de sluitingstag in de head van de HTML."
-"Timezone","Tijdzone"
-"Title Prefix","Titel vooraf"
-"Title Suffix","Titel"
-"Transactional Emails","Transactionele Emails"
-"Translate Inline","Vertaal in lijn"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Vertalingen, blokken en andere uitvoer zouden uitgeschakeld moeten zijn voor zowel front-end en administrator inline vertalingen."
-"Translations","Vertalingen"
-"Two and more slashes together are not permitted in request path","Twee of meer schuine strepen zijn niet toegestaan in gevraagde pad."
-"Unable to create directory: %s","Niet in staat om directory %s te maken"
-"Unable to delete store view. Please, try again later.","Niet instaat om het winkelzicht te verwijderen. Probeer het later nogmaals."
-"Unable to delete store. Please, try again later.","Kan de winkel niet verwijderen. Probeer het later nog eens a.u.b."
-"Unable to delete website. Please, try again later.","Niet instaat om de website te verwijderen. Probeer het later nogmaals."
-"Unable to proceed. Please, try again","Niet instaat om verder te gaan. Probeer het later nogmaals"
-"Unable to proceed. Please, try again.","Kan niet verdergaan. Probeer a.u.b. opnieuw."
-"Unable to save file ""%s"" at ""%s""","Niet in staat om bestand ""%s"" op te slaan in ""%s"""
-"Unable to save file: %s","Niet in staat om bestand: %s op te slaan"
-"Unknown old style column type definition: {$definition}.","Onbekende ouderwetse kolomtype definitie: {$definitie}."
-"Unknown scope ""%s"".","Onbekende maat ""%s""."
-"Unsecure","Onzeker"
-"Url Options","Url Opties"
-"Use Custom Admin Path","Gebruik Standaard Admin Pad"
-"Use Custom Admin URL","Gebruik Aangepaste Admin URL"
-"Use HTTP Only","Gebruik alleen HTTP"
-"Use SID on Frontend","Gebruik SID op Frontend"
-"Use Secure URLs in Admin","Gebruik zekere URLs in de administratie"
-"Use Secure URLs in Frontend","Gebruik Veilige URL's in Frontend"
-"Use Web Server Rewrites","Gebruik Web Server Rewrites"
-"VAT Number","BTW nummer"
-"Validate HTTP_USER_AGENT","Valideer HTTP_USER_AGENT"
-"Validate HTTP_VIA","Valideer HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","Valideer HTTP_X_FORWARDED_FOR"
-"Validate REMOTE_ADDR","Valideer REMOTE_ADDR"
-"Validation has failed.","Validatie is mislukt."
-"Values less than 60 are ignored. Note that changes will apply after logout.","Waarden kleiner dan 60 worden genegeerd. N.b. veranderingen worden toegepast na logout."
-"Variable Code must be unique.","Variabele Code moet uniek zijn."
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Waarschuwing! Deze instelling aanzetten is niet aanbevolen op productiemilieu's, omdat het een potentieel beveiligingsgevaar oplevert."
-"Web","Web"
-"Website","Website"
-"Website Information","Website Informatie"
-"Website","Website naam"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code mag alleen letters (a-z), nummers (0-9) of underscore(_) bevatten, het eerste karakter moet een letter zijn."
-"Website with the same code","Website met dezelfde code"
-"Weekend Days","Weekend dagen"
-"Welcome Text","Welkomsttekst"
-"Wrong file info format","Verkeerde bestandsinformatiebestand"
-"Wrong number of arguments for %s","Onjuist aantal argumenten voor %s"
-"Wrong old style column type definition: {$definition}.","Verkeerde oude stijl kolom type definitie {$definition}."
-"Yes","Ja"
-"You will have to log in after you save your custom admin path.","U zult moeten inloggen nadat u uw standaard admin pad heeft bewaard."
"Your design change for the specified store intersects with another one, please specify another date range.","Uw ontwerp verandering voor de gespecificeerde store komt in conflict met een andere, specificeer a.u.b. een andere datumrange."
-"database ""%s""","Database ""%s"""
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.","Variabele Code moet uniek zijn."
+"Validation has failed.","Validatie is mislukt."
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Core/i18n/pt_BR.csv b/app/code/Magento/Core/i18n/pt_BR.csv
index 57c573410f0..cd8f160c216 100644
--- a/app/code/Magento/Core/i18n/pt_BR.csv
+++ b/app/code/Magento/Core/i18n/pt_BR.csv
@@ -1,382 +1,42 @@
-"%s","%s"
-"%s already exist.","%s já existe."
-"%s already exists.","%s já existe."
+Configuration,Configuration
"-- Please Select --","- Por Favor Selecione -"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">Aviso!</strong> Ao usar CDN, em alguns casos JavaScript pode não funcionar corretamente se CDN não está na sua subdomÃnio"
-"A category object is required for determining the product request path.","Um objeto da categoria é necessário para determinar o caminho de solicitação do produto."
-"Add Block Names to Hints","Adicione Nomes Bloqueados a Dicas"
-"Add Secret Key to URLs","Adicione Chave Secreta a URLs"
-"Add Store Code to Urls","Adicione Código de Loja a URLs"
-"Admin","Admin"
-"Admin Base URL","Base de Administração URL"
-"Admin User Emails","E-mails do Usuário Administrador"
-"Advanced","Avançado"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","Depois de selecionar um novo local de armazenamento de mÃdia, pressione o botão Sincronizar
-para transferir todos os mÃdia para esse local. Os mÃdia não estarão disponÃveis no novo
-local até que o processo de sincronização esteja completo."
-"Allow Countries","Permitir PaÃses"
-"Allow Symlinks","Permitir Symlinks"
-"Allowed IPs (comma separated)","IPs Permitidos (separados por vÃrgula)"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Tipos de arquivo permitidos: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Nem todos os navegadores suportam todos esses formatos!"
-"Allows customers to stay logged in when switching between different stores.","Permite que os clientes permaneçam ligados enquanto alternam entre diferentes lojas."
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Texto alternativo para próximo link no menu de paginação. Se vazio, imagem de seta padrão será usada."
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Texto alternativo para link anterior no menu de paginação. Se vazio, imagem de seta padrão será usada."
-"An error occurred while saving. Please review the error log.","Ocorreu um erro ao salvar. Por favor analise o registro de erro."
-"Anchor Text for Next","Texto Âncora para Seguinte"
-"Anchor Text for Previous","Texto Âncora para Anterior"
-"Anchor symbol (#) is not supported in request path","SÃmbolo âncora (#) não é suportado no caminho pedido"
-"Are you sure?","Tem certeza?"
-"Auto-redirect to Base URL","Auto-redirecionado para URL Base"
-"Back","Voltar"
-"Backup Options","Opções de Backup"
-"Base JavaScript URL","URL JavaScript Base"
-"Base Link URL","Link URL de Base"
-"Base Media URL","URL MÃdia Base"
-"Base Secure URL","URL Base Segura"
-"Base Skin URL","URL Skin Base"
-"Base URL","URL Base"
-"Base Unsecure URL","URL Base Não Segura"
-"Before modifying the store view code please make sure that it is not used in index.php.","Antes de modificar o código de exibição da loja certifique-se que não é usado em index.php."
-"Before modifying the website code please make sure that it is not used in index.php.","Antes de modificar o código do site por favor certifique-se que não é usado em index.php."
-"Block with name ""%s"" already exists","Bloco com o nome ""%s"" já existe"
-"Browser Capabilities Detection","Deteção de Capacidades do Navegador"
-"CSS Settings","Configurações CSS"
-"Cache Storage Management","Gerenciamento de Armazenamento de Cache"
-"Cache storage may contain additional data. Are you sure that you want flush it?","Armazenamento na cache pode conter dados adicionais. Tem certeza de que deseja eliminá-lo?"
-"Can not create invoice. Order was not found.","Não é possÃvel criar fatura. Ordem não foi encontrada."
-"Can't retrieve request object","Não é possÃvel recuperar objeto do pedido"
-"Can't retrieve entity config: %s","Não é possÃvel recuperar configuração da entidade: %s"
-"Cancel","Cancelar"
-"Cannot complete this operation from non-admin area.","Não é possÃvel concluir esta operação de área não administrativa."
-"Card type does not match credit card number.","Tipo de cartão não corresponde ao número de cartão de crédito."
-"Code","Código"
-"Controller file was loaded but class does not exist","Controlador de arquivo foi carregado mas a classe não existe"
-"Cookie Domain","DomÃnio de cookie"
-"Cookie Lifetime","Duração de cookie"
-"Cookie Path","Caminho de cookie"
-"Cookie Restriction Mode","Modo de Restrição de Cookie"
-"Copyright","Direitos autorais"
-"Core","Núcleo"
-"Countries Options","Opções de paÃses"
-"Country","PaÃs"
-"Create Store","Criar loja"
-"Create Store View","Criar visualização de loja"
-"Create Website","Criar site"
-"Credit card number does not match credit card type.","O número do cartão de crédito não é compatÃvel com o tipo de cartão de crédito."
-"Current Package Name","Nome do pacote atual"
-"Custom Admin Path","Caminho personalizado de administração"
-"Custom Admin URL","URL Custom Admin"
-"Custom Design","Personalizar Design"
-"Custom Email 1","E-mail personalizado 1"
-"Custom Email 2","E-mail personalizado 2"
"Custom Variables","Variáveis de Personalização."
-"Custom1 Contact Email","Email Contato Custom1"
-"Custom1 Contact Name","Nome Contato Custom1"
-"Custom2 Contact Email","Email Contato Custom2"
-"Custom2 Contact Name","Nome Contato Custom2"
-"Customer Support","Suporte personalizado"
-"Dashboard","Painel"
-"Date From","Data Inicial"
-"Date To","Data Final"
-"Date/time format ""%s"" is not supported.","O formato de data/hora ""%s"" não é suportado."
-"Debug","Debug"
-"Default","Predefinido"
-"Default Country","PaÃs padrão"
-"Default Description","Descrição padrão"
-"Default Keywords","Palavras-chave padrão"
-"Default No-route URL","URL sem rota padrão"
-"Default Pages","Páginas padrão"
-"Default Robots","Robots padrão"
-"Default Store","Loja padrão"
-"Default Store View","Visualização padrão de loja"
-"Default Title","TÃtulo padrão"
-"Default Web URL","URL padrão de rede"
-"Delete","Excluir"
-"Delete Store","Apagar Loja"
-"Delete Store View","Apagar Visão de Loja"
-"Delete Website","Apagar Site Web"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Excluir um(a) %1$s não excluirá as informações associadas com o(a) %1$s (ex. categorias, produtos, etc.), mas o(a) %1$s não poderá ser reestabelecido. É aconselhavel criar uma base de dados de backup antes de excluir o(a) %1$s."
-"Design","Design"
-"Design Change","Alteração de design"
-"Developer","Programador"
-"Developer Client Restrictions","Restrições de cliente de programador"
-"Disable Email Communications","Desativar comunicações de e-mail"
-"Disable Modules Output","Desativar saÃda de módulos"
-"Display Demo Store Notice","Exibir demonstração de aviso de loja"
-"Duplicate Of Template Name","Nome de duplicata de modelo"
-"Edit Design Change","Editar alteração de design"
-"Edit Store","Editar loja"
-"Edit Store View","Editar visualização de loja"
-"Edit Website","Editar site"
-"Empty identifier field name","Nome do campo do identificador em branco"
-"Empty main table name","Nome da tabela principal em branco"
-"Enable Charts","Habilitar Gráficos"
-"Enabled","Ativado"
-"Enabled for Admin","Habilitado para Admin"
-"Enabled for Frontend","Habilitado para Front-end"
-"Environment Update Time","Tempo de Atualização de Ambiente"
-"Error in file: ""%s"" - %s","Erro no arquivo: ""%s"" - %s"
-"European Union Countries","PaÃses da União Europeia"
-"Exceptions Log File Name","Log de Excessão do Nome do Arquivo"
-"Favicon Icon","Ãcone do Favicon"
-"File %s does not exist","Arquivo %s não existe"
-"File %s is not readable","Arquivo %s não legÃvel"
-"File not found","Arquivo não encontrado"
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
"File system","Sistema de arquivo"
-"File with an extension ""%value%"" is protected and cannot be uploaded","O arquivo de extensão ""%value%"" está protegido, e seu upload não pode ser feito"
-"First Day of Week","Primeiro Dia da Semana"
-"Flush Cache Storage","Armazenamento do Fluxo de Cache"
-"Flush Magento Cache","Limpeza de Cache do Magento"
-"Footer","Rodapé"
-"Forgot Password Email Sender","Enviador de Email para Senha Esquecida"
-"Forgot Password Email Template","Template de Email para Senha Esquecida"
-"General","Geral"
-"General Contact","Contato Geral"
-"General Contact Email","E-mail geral de contato"
-"General Contact Name","Nome de Contato Geral"
-"General Settings","Definições Gerais"
-"Global","Global"
-"HTML Head","Cabeçalho do HTML"
-"HTML tags are not allowed","Não são permitidas tags HTML"
-"Header","Cabeçalho"
-"Host","Anfitrião"
-"How many links to display at once.","Quantos links para mostrar de uma vez."
-"ID Path for Specified Store","ID do Caminho da Loja Especificada"
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Se a posição do quadro atual não cobre o máximo de páginas, tornará o link para a posição atual mais/menos este valor."
-"Incorrect credit card expiration date.","Data de validade do cartão de crédito incorreta."
-"Input type ""%value%"" not found in the input types list.","Entrada do tipo ""%valor%"" não encontrada na lista de tipos de entrada."
-"Invalid base url type","Tipo inválido url base"
-"Invalid block name to set child %s: %s","Nome do bloco inválido para definir filho %s: %s"
-"Invalid block type: %s","Tipo de bloco inválido: %s"
-"Invalid block: %s","Bloco inválido: %s"
-"Invalid connection","Conexão inválida"
-"Invalid layout update handle","Atualização do plano identificador inválido"
-"Invalid messages storage ""%s"" for layout messages initialization","Mensagens de armazenamento ""%s"" inválidas para inicialização de mensagens do plano"
-"Invalid query","Consulta inválida"
-"Invalid transactional email code: ","Código de email transacional inválido:"
-"Invalid website's configuration path: %s","Caminho de configuração do site inválido: %s"
-"JavaScript Settings","Configurações JavaScript"
-"Layout","Layout"
-"Leave empty for access from any location.","Deixe em branco para o acesso de qualquer local."
-"List of stores","Lista de lojas"
-"Locale","Locale"
-"Locale Options","Opções Locais"
-"Log Settings","Configurações de Registro"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Registro de \Magento\Framework\Logger. Arquivo está localizado em {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Registro de \Magento\Framework\Logger. Arquivo está localizado em {{base_dir}}/var/log"
-"Login is Case Sensitive","Acesso (Login) Diferencia Maiúsculas e Minúsculas"
-"Logo Image","Imagem da Logo"
-"Logo Image Alt","Alt da Imagem do Logotipo"
-"Logo Image Src","Src da Imagem do Logotipo"
-"Mail Sending Settings","Configurações de Envio de Email"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Certifique-se que o URL base termina com '/' (barra), por exemplo http://yourdomain/magento/"
-"Manage Stores","Gerenciar Lojas"
-"Match expressions in the same order as displayed in the configuration.","Corresponder expressões na mesma ordem como mostrado na configuração."
-"Media Storage","Armazenamento de MÃdia"
-"Merge CSS Files","Fusão de Arquivos CSS"
-"Merge JavaScript Files","Fusão de Arquivos JavaScript"
-"Miscellaneous HTML","Diversos HTML"
-"Miscellaneous Scripts","Scripts Variados"
-"Model class does not exist: %s.","Classe de modelo não existe: %s."
-"Model collection resource name is not defined.","Não está definido o nome de recurso para a coleção de modelos."
-"Module ""%1$s"" cannot depend on ""%2$s"".","Módulo ""%1$s"" não pode depender de ""%2$s""."
-"Module ""%1$s"" requires module ""%2$s"".","O módulo ""%1$s"" exige o módulo ""%2$s""."
-"Name","Nome"
-"New Design Change","Nova Alteração de Design"
-"New Store","Nova Loja"
-"New Store View","Nova Visualização de Loja"
-"New Website","Novo Website"
-"No","Não"
-"Offloader header","Cabeçalho do Offloader"
-"PHP SOAP extension is required.","Extensão PHP SOAP é requerida."
-"Package","Embalagem"
-"Pagination","Paginação"
-"Pagination Frame","Quadro de Paginação"
-"Pagination Frame Skip","Pular Quadro de Paginação"
-"Parent directory does not exist: %s","Diretório principal não existe: %s"
-"Path ""%value%"" is not available and cannot be used.","Caminho ""%valor%"" não está disponÃvel e não pode ser usado."
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format","Formato de arquivo de informação errado"
"Path ""%value%"" is protected and cannot be used.","Caminho ""%valor%"" é protegido e não pode ser usado."
+"Path ""%value%"" is not available and cannot be used.","Caminho ""%valor%"" não está disponÃvel e não pode ser usado."
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","Caminho ""%valor%"" não pode incluir passagem pelo diretório principal (""../"", ""..\")."
-"Please define flag code.","Por favor defina o código bandeira."
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Por favor insira 6 ou mais caracteres. Espaços à esquerda ou à direita serão ignorados."
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Por favor insira 7 ou mais caracteres. Senha deve conter caracteres numéricos e alfabéticos."
-"Please enter a number 0 or greater in this field.","Por favor insira um número 0 ou maior neste campo."
-"Please enter a number 1 or greater in this field.","Digite o número 1 ou maior neste campo."
-"Please enter a number greater than 0 in this field.","Por favor insira um número maior que 0 neste campo."
-"Please enter a number lower than 100.","Por favor insira um número inferior a 100."
-"Please enter a valid $ amount. For example $100.00.","Por favor introduza uma quantidade válida de $. Por exemplo $100,00."
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Por favor introduza uma chave de URL válida. Por exemplo, ""exemplo-pagina"", ""exemplo-pagina.html"" ou ""outronivel/exemplo-pagina""."
-"Please enter a valid URL. For example http://www.example.com or www.example.com","Por favor insira uma URL válida. Por exemplo http://www.exemplo.com ou www.exemplo.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Por favor insira um URL válido. Protocolo é necessário (http://, https:// ou ftp://)"
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Por favor insira um identificador XML válido. Por exemplo qualquercoisa_1, bloco5, id-4."
-"Please enter a valid credit card number.","Por favor insira um número válido de cartão de crédito."
-"Please enter a valid credit card verification number.","Por favor insira um número de verificação de cartão de crédito válido."
-"Please enter a valid date between %s and %s","Por favor insira uma data válida entre %s e %s"
-"Please enter a valid date equal to or greater than %s","Por favor insira uma data válida igual ou superior a %s"
-"Please enter a valid date less than or equal to %s","Por favor insira uma data válida menor ou igual a %s"
-"Please enter a valid date.","Por favor insira uma data válida."
-"Please enter a valid day (1-%1).","Por favor insira um dia válido (1-%1)."
-"Please enter a valid email address. For example johndoe@domain.com.","Por favor insira um endereço de e-mail válido. Por exemplo joao@domain.com."
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Por favor insira um número de fax válido. Por exemplo (123) 456-7890 ou 123-456-7890."
-"Please enter a valid full date","Por favor insira uma data válida completa"
-"Please enter a valid month (1-12).","Por favor insira um mês válido (1-12)."
-"Please enter a valid number in this field.","Por favor insira um número válido neste campo."
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Por favor insira um número de telefone válido. Por exemplo (123) 456-7890 ou 123-456-7890."
-"Please enter a valid social security number. For example 123-45-6789.","Por favor insira um número válido de segurança social. Por exemplo 123-45-6789."
-"Please enter a valid year (1900-%1).","Por favor insira um ano válido (1900-%1)."
-"Please enter a valid zip code.","Por favor insira um código postal válido."
-"Please enter a valid zip code. For example 90602 or 90602-1234.","Por favor insira um código postal válido. Por exemplo 90602 ou 90602-1234."
-"Please enter issue number or start date for switch/solo card type.","Por favor insira o número de emissão ou data de inÃcio para tipo de cartão switch/solo."
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Por favor introduza um comprimento CSS válido. Por exemplo 100px ou 77pt ou 20em ou .5ex ou 50%."
-"Please make sure your passwords match.","Por favor certifique-se que suas senhas coincidem."
-"Please select State/Province.","Por favor selecione Estado/ProvÃncia."
-"Please select a file","Por favor selecione um arquivo"
-"Please select an option.","Por favor selecione uma opção."
-"Please select one of the above options.","Por favor selecione uma das opções acima."
-"Please select one of the options.","Por favor selecione uma das opções."
"Please set available and/or protected paths list(s) before validation.","Por favor defina lista(s) de caminhos disponÃveis e/ou protegidos antes da validação."
-"Please specify either a category or a product, or both.","Por favor especifique uma categoria ou um produto, ou ambos."
-"Please use letters only (a-z or A-Z) in this field.","Por favor use apenas letras (a-z ou A-Z) neste campo."
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Por favor use apenas números nesse campo. Por favor evite espaços ou outros caracteres tais como pontos ou vÃrgulas."
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) apenas neste campo. Espaços ou outros caracteres não são permitidos."
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) ou espaços e # apenas neste campo."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Por favor use somente letras (a-z ou A-Z), números (0-9) ou sublinhado (_) neste campo, e o primeiro caractere deve ser uma letra."
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Por favor use apenas letras (a-z), números (0-9) ou underscore (_) neste campo, primeiro caractere deve ser uma letra."
-"Please use only visible characters and spaces.","Por favor use somente espaços e caracteres visÃveis."
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Por favor utilize este formato de data: dd/mm/aaaa. Por exemplo 17/03/2006 para 17 de Março de 2006."
-"Please wait, loading...","Por favor aguarde, carregando..."
-"Port (25)","Porta (25)"
-"Profiler","Gerador de Perfil"
-"Recovery Link Expiration Interval (days)","PerÃdo de validade do link de recuperação (dias)"
-"Request Path for Specified Store","Solicitar Caminho para o Armazenamento Especificado"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","Arquivo solicitado pode não incluir diretório parental de passagem (""../"", ""..\" notação)"
-"Requested invalid store ""%s""","Armazenamento solicitado Inválido ""%s"""
-"Resource is not set.","Recurso não definido."
-"Retrieve store data","Recuperar dados da loja"
-"Retrieve store list","Recuperar lista da loja"
-"Return-Path Email","E-mail de Devolução"
-"Root Category","Categoria Raiz"
-"Sales Representative","Representante de Vendas"
-"Sales Representative Contact Email","E-mail de contato do representante de vendas"
-"Sales Representative Contact Name","Nome do Contato Representante de Vendas"
-"Save","Salvar"
-"Save Store","Salvar Loja"
-"Save Store View","Salvar Visualização da Loja"
-"Save Website","Salvar Website"
-"Search Engines Optimization","Otimização de Motores de Busca"
-"Secure","Seguro"
-"Security","Segurança"
-"Select Date","Selecione Data"
-"Select Media Database","Selecione a Base de Dados da MÃdia"
-"Sender Email","E-mail do remetente"
-"Sender Name","Nome do remetente"
-"Services","Serviços"
-"Session Cookie Management","Gerenciamento de Cookies"
-"Session Lifetime (seconds)","Duração da Sessão (segundos)"
-"Session Validation Settings","Ajustes de Validação de Sessão"
-"Set Return-Path","Ajustar Caminho de Retorno"
-"Set as Default","Definir como Padrão"
-"Skin (Images / CSS)","Skin (Imagens / CSS)"
-"Sort Order","Classificar pedido"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","Formato da data/hora especificada ""%1$s"" não coincidem ""%2$s""."
+"File with an extension ""%value%"" is protected and cannot be uploaded","O arquivo de extensão ""%value%"" está protegido, e seu upload não pode ser feito"
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
"Start date cannot be greater than end date.","Data de inÃcio não pode ser maior que a data do término."
-"Startup Page","Página Inicial"
-"Status","Status"
-"Storage Configuration for Media","Configuração de Armazenamento para MÃdia"
-"Store","Loja"
-"Store API","API da loja"
-"Store Contact Address","Armazenar Endereço de Catálogo"
-"Store Contact Information","Armazenar Informação de Contato"
-"Store Contact Phone","Armazenar Telefone de Contato"
-"Store Email Addresses","Armazenar Endereço de Email"
-"Store Information","Informação de Armazenamento"
-"Store","Nome da Loja"
-"Store View","Visualização da loja"
-"Store View Information","Armazenar Informação de Visualização"
-"Store View","Nome de Visualização da Loja"
-"Store view doesn't exist","Informação de visualização não existe"
-"Store with the same code","Loja com o mesmo código"
-"System","Sistema"
-"System Log File Name","Nome do Arquivo de Log do Sistema"
-"Template Path Hints","Sugestões de Modelo de Caminho"
-"Template Settings","Configurações do Template"
-"Template Variables","Variáveis de Modelo"
-"Templates","Modelos"
-"Text length does not satisfy specified text range.","Comprimento do texto não satisfaz intervalo de texto especificado."
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","O %s inserido é inválido. Certifique-se de que está no formato ""http://domÃnio.com/""."
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","O código da loja pode conter apenas letras (a-z), números (0-9) ou underscore (_), o primeiro caractere deve ser uma letra"
-"The store does not exist","A loja não existe"
-"The store has been deleted.","A loja foi eliminada."
-"The store has been saved.","A loja foi salva."
-"The store view has been deleted.","A visão da loja foi apagada."
-"The store view has been saved","A visão da loja foi salva"
-"The template Name must not be empty.","O Nome do modelo não deve estar vazio."
-"The value is not within the specified range.","O valor não está dentro do intervalo especificado."
-"The website does not exist.","O site não existe."
-"The website has been deleted.","O site foi apagado."
-"The website has been saved.","O site foi salvo."
-"Themes","Temas"
-"This category and all its child elements","Esta categoria e todos os seus elementos derivados"
-"This category and its child categories only","Apenas nesta categoria e suas categorias derivadas"
-"This category and its products only","Apenas nesta categoria e seus produtos"
-"This category only","Apenas nesta categoria"
-"This date is a required value.","Esta data é um valor necessário."
-"This is a required field.","Este é um campo obrigatório."
-"This store cannot be deleted.","Esta loja não pode ser apagada."
-"This store view cannot be deleted.","Esta vista da loja não pode ser apagada."
-"This website cannot be deleted.","Este site não pode ser apagado."
-"This will be displayed just before body closing tag.","Isto será exibido antes da marca de fecho do corpo."
-"This will be included before head closing tag in page HTML.","Isto será incluÃdo antes da marca de fecho principal na página HTML."
-"Timezone","Fuso Horário"
-"Title Prefix","Prefixo do TÃtulo"
-"Title Suffix","Sufixo do TÃtulo"
-"Transactional Emails","Emails de Transações"
-"Translate Inline","Traduzir Em Linha"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Traduzir, blocos e outras caches de saÃda devem ser desativadas para ambos os frontend e traduções em linha admin."
-"Translations","Traduções"
-"Two and more slashes together are not permitted in request path","Duas ou mais barras juntas não são permitidas no caminho pedido"
-"Unable to create directory: %s","Não é possÃvel criar diretório: %s"
-"Unable to delete store view. Please, try again later.","Não é possÃvel excluir a vista da loja. Por favor, tente novamente mais tarde."
-"Unable to delete store. Please, try again later.","Não é possÃvel apagar loja. Por favor, tente novamente mais tarde."
-"Unable to delete website. Please, try again later.","Não é possÃvel excluir site. Por favor, tente novamente mais tarde."
-"Unable to proceed. Please, try again","Não é possÃvel prosseguir. Por favor, tente novamente"
-"Unable to proceed. Please, try again.","ImpossÃvel prosseguir. Tente novamente."
-"Unable to save file ""%s"" at ""%s""","ImpossÃvel salvar arquivo ""%s"" em ""%s"""
-"Unable to save file: %s","Não foi possÃvel salvar o arquivo: %s"
-"Unknown old style column type definition: {$definition}.","Definição desconhecida de tipo de coluna estilo antigo: {$definition}."
-"Unknown scope ""%s"".","Limite ""%s"" não conhecido."
-"Unsecure","Inseguro"
-"Url Options","Opções URL"
-"Use Custom Admin Path","Use Caminho Admin Personalizado"
-"Use Custom Admin URL","Use URL do Custom Admin"
-"Use HTTP Only","Usar apenas HTTP"
-"Use SID on Frontend","Use SID no Frontend"
-"Use Secure URLs in Admin","Usar URLs Seguras no Administrador"
-"Use Secure URLs in Frontend","Use URLs seguras no Frontend"
-"Use Web Server Rewrites","Use Servidor Web Reescrito"
-"VAT Number","Número VAT"
-"Validate HTTP_USER_AGENT","Validar HTTP_USER_AGENT"
-"Validate HTTP_VIA","Validar HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","Validar HTTP_X_FORWARDED_FOR"
-"Validate REMOTE_ADDR","Validar REMOTE_ADDR"
-"Validation has failed.","Validação falhou."
-"Values less than 60 are ignored. Note that changes will apply after logout.","Valores inferiores a 60 são ignorados. Observe que as alterações serão aplicadas após sair."
-"Variable Code must be unique.","Código da Variável deve ser único."
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Aviso! Não se recomenda habilitar esta caracterÃstica em ambientes de produção porque ela representa um potencial risco de segurança."
-"Web","Web"
-"Website","Website"
-"Website Information","Informação do Site"
-"Website","Nome do Website"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Código do site pode conter apenas letras (a-z), números (0-9) ou underscore (_), o primeiro caractere deve ser uma letra"
-"Website with the same code","Site com o mesmo código"
-"Weekend Days","Dias do fim-de-semana"
-"Welcome Text","Texto de Boas-Vindas"
-"Wrong file info format","Formato de arquivo de informação errado"
-"Wrong number of arguments for %s","Número errado de argumentos para %s"
-"Wrong old style column type definition: {$definition}.","Definição errada para tipo de coluna de estilo antigo: {$definition}."
-"Yes","Sim"
-"You will have to log in after you save your custom admin path.","Você terá que entrar depois de salvar o seu caminho administrativo personalizado."
"Your design change for the specified store intersects with another one, please specify another date range.","Sua mudança de design para a loja especificada cruza com outra, por favor especifique outro intervalo de datas."
-"database ""%s""","base de dados ""%s"""
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.","Código da Variável deve ser único."
+"Validation has failed.","Validação falhou."
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Core/i18n/zh_CN.csv b/app/code/Magento/Core/i18n/zh_CN.csv
index aab39f9b533..b1066712edd 100644
--- a/app/code/Magento/Core/i18n/zh_CN.csv
+++ b/app/code/Magento/Core/i18n/zh_CN.csv
@@ -1,380 +1,42 @@
-"%s","%s"
-"%s already exist.","%s å·²å˜åœ¨ã€‚"
-"%s already exists.","%s å·²å˜åœ¨ã€‚"
+Configuration,Configuration
"-- Please Select --","-- 请选择 --"
-"<strong style=""color:red"">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","<strong style=""color:red"">è¦å‘Šï¼</strong> 在使用CDN时，æŸäº›æƒ…况下如果CDNä¸å†æ‚¨çš„å域内，JavaScriptå¯èƒ½æ— 法æ£å¸¸å·¥ä½œ"
-"A category object is required for determining the product request path.","为确定产å“申请路径，必须æ供分类对象。"
-"Add Block Names to Hints","æ·»åŠ å—å称到æ示ä¸"
-"Add Secret Key to URLs","æ·»åŠ å¯†é’¥Key到URLä¸"
-"Add Store Code to Urls","æ·»åŠ åº—é“ºä»£ç 到URLä¸"
-"Admin","管ç†å‘˜"
-"Admin Base URL","管ç†åŸºæœ¬URL"
-"Admin User Emails","管ç†ç”¨æˆ·é‚®ä»¶"
-"Advanced","高级"
-"After selecting a new media storage location, press the Synchronize button
- to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","在选择新的媒体å˜å‚¨ä½ç½®åŽï¼Œè¯·æŒ‰ä¸‹ åŒæ¥ æŒ‰é’®ä»¥ä¾¿å°†æ‰€æœ‰åª’ä½“æ–‡ä»¶ä¼ è¾“åˆ°è¯¥ä½ç½®ã€‚除éžåŒæ¥å·¥ä½œå®Œæˆï¼Œå¦åˆ™åª’ä½“æ–‡ä»¶å°†æ— æ³•é€šè¿‡æ–°ä½ç½®ä½¿ç”¨ã€‚"
-"Allow Countries","å…许的国家"
-"Allow Symlinks","å…许的符å·é“¾æŽ¥"
-"Allowed IPs (comma separated)","å…许的IP（逗å·åˆ†å‰²ï¼‰"
-"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","å…许的文件类型：ICOã€PNGã€GIFã€JPGã€JPEGã€APNG，SVG。并éžæ‰€æœ‰æµè§ˆå™¨éƒ½æ”¯æŒæ‰€æœ‰è¿™äº›æ ¼å¼ï¼"
-"Allows customers to stay logged in when switching between different stores.","å…许客户在ä¸åŒåº—铺间切æ¢æ—¶ä¿æŒç™»å½•ã€‚"
-"Alternative text for next link in pagination menu. If empty, default arrow image will used.","è½®æ¢èœå•ä¸é“¾æŽ¥æ—的候选文å—。如果为空，则使用默认的ç®å¤´å›¾ç‰‡ã€‚"
-"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","è½®æ¢èœå•ä¸ä¸Šä¸€ä¸ªé“¾æŽ¥æ—的候选文å—。如果为空，则使用默认的ç®å¤´å›¾ç‰‡ã€‚"
-"An error occurred while saving. Please review the error log.","在ä¿å˜æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚请查看错误日志。"
-"Anchor Text for Next","下一个的锚点文å—"
-"Anchor Text for Previous","上一个的锚点文å—"
-"Anchor symbol (#) is not supported in request path","锚点符å·ï¼ˆ#）ä¸èƒ½ç”¨äºŽè¯·æ±‚路径ä¸"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Auto-redirect to Base URL","自定é‡å®šå‘到基本 URL"
-"Back","返回"
-"Backup Options","备份选项"
-"Base JavaScript URL","基本 JavaScript URL"
-"Base Link URL","基本链接 URL"
-"Base Media URL","基本媒体 URL"
-"Base Secure URL","基本安全 URL"
-"Base Skin URL","基本皮肤 URL"
-"Base URL","备份URL"
-"Base Unsecure URL","基本ä¸å®‰å…¨ URL"
-"Before modifying the store view code please make sure that it is not used in index.php.","请在修改商店视图代ç å‰ï¼Œç¡®è®¤å®ƒæ²¡æœ‰åœ¨ index.php ä¸ä½¿ç”¨ã€‚"
-"Before modifying the website code please make sure that it is not used in index.php.","请在修改网站代ç å‰ï¼Œç¡®è®¤å®ƒæ²¡æœ‰åœ¨ index.php ä¸ä½¿ç”¨ã€‚"
-"Block with name ""%s"" already exists","拥有å称“%sâ€çš„区å—å·²å˜åœ¨"
-"Browser Capabilities Detection","æµè§ˆå™¨åŠŸèƒ½æ£€æµ‹"
-"CSS Settings","CSS 设置"
-"Cache Storage Management","缓å˜å˜å‚¨ç®¡ç†"
-"Cache storage may contain additional data. Are you sure that you want flush it?","缓å˜å˜å‚¨å¯èƒ½åŒ…å«é¢å¤–æ•°æ®ã€‚您确认è¦æ¸…空它å—？"
-"Can not create invoice. Order was not found.","æ— æ³•åˆ›å»ºå‘票。未找到订å•ã€‚"
-"Can't retrieve request object","æ— æ³•èŽ·å–请求对象"
-"Can't retrieve entity config: %s","æ— æ³•èŽ·å–实体é…置：%s"
-"Cancel","å–消"
-"Cannot complete this operation from non-admin area.","æ— æ³•ä»Žéžç®¡ç†å‘˜åŒºåŸŸå®Œæˆè¯¥æ“作。"
-"Card type does not match credit card number.","信用å¡ç±»åž‹ä¸Žä¿¡ç”¨å¡å·ä¸åŒ¹é…。"
-"Code","代ç "
-"Controller file was loaded but class does not exist","控制器文件已载入，但类ä¸å˜åœ¨"
-"Cookie Domain","Cookie域"
-"Cookie Lifetime","Cookie寿命"
-"Cookie Path","Cookie路径"
-"Cookie Restriction Mode","Cookie é™åˆ¶æ¨¡å¼"
-"Copyright","版æƒæ‰€æœ‰"
-"Core","æ ¸å¿ƒ"
-"Countries Options","国家选项"
-"Country","国家"
-"Create Store","创建店铺"
-"Create Store View","创建店铺视图"
-"Create Website","创建网站"
-"Credit card number does not match credit card type.","信用å¡ç¼–å·ä¸Žä¿¡ç”¨å¡ç±»åž‹ä¸åŒ¹é…。"
-"Current Package Name","当å‰åŒ…å称"
-"Custom Admin Path","自定义管ç†è·¯å¾„"
-"Custom Admin URL","è‡ªå®šä¹‰ç®¡ç† URL"
-"Custom Design","自定义设计"
-"Custom Email 1","自定义邮件1"
-"Custom Email 2","自定义邮件2"
-"Custom Variables","自定义å˜é‡"
-"Custom1 Contact Email","自定义 1 è”系邮件"
-"Custom1 Contact Name","自定义 1 è”系姓å"
-"Custom2 Contact Email","自定义 2 è”系邮件"
-"Custom2 Contact Name","自定义 2 è”系姓å"
-"Customer Support","客户支æŒ"
-"Dashboard","仪表æ¿"
-"Date From","日期自"
-"Date To","日期至"
-"Date/time format ""%s"" is not supported.","日期/æ—¶é—´æ ¼å¼ ""%s"" ä¸è¢«æ”¯æŒã€‚"
-"Debug","调试"
-"Default","默认"
-"Default Country","默认国家"
-"Default Description","默认æè¿°"
-"Default Keywords","默认关键å—"
-"Default No-route URL","默认éžè·¯ç”±URL"
-"Default Pages","默认页é¢"
-"Default Robots","默认机器人"
-"Default Store","默认店铺"
-"Default Store View","默认店铺视图"
-"Default Title","é»˜è®¤æ ‡é¢˜"
-"Default Web URL","默认Web URL"
-"Delete","åˆ é™¤"
-"Delete Store","åˆ é™¤åº—é“º"
-"Delete Store View","åˆ é™¤åº—é“ºè§†å›¾"
-"Delete Website","åˆ é™¤ç½‘ç«™"
-"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","åˆ é™¤ %1$s 并ä¸èƒ½åˆ 除关è”ç»™ %1$s çš„ä¿¡æ¯ï¼ˆä¾‹å¦‚分类ã€äº§å“ç‰ï¼‰ï¼Œä½† %1$s å°†æ— æ³•è¢«è¿˜åŽŸã€‚å»ºè®®é¦–å…ˆåˆ›å»ºæ•°æ®åº“备份，然åŽå†åˆ 除 %1$s。"
-"Design","设计"
-"Design Change","设计更改"
-"Developer","å¼€å‘人员"
-"Developer Client Restrictions","å¼€å‘人员客户端闲置"
-"Disable Email Communications","ç¦ç”¨ç”µå邮件通讯"
-"Disable Modules Output","ç¦ç”¨æ¨¡å—输出"
-"Display Demo Store Notice","显示预览店铺通知"
-"Duplicate Of Template Name","模æ¿å称副本"
-"Edit Design Change","编辑设计å˜åŠ¨"
-"Edit Store","编辑店铺"
-"Edit Store View","编辑店铺视图"
-"Edit Website","编辑网站"
-"Empty identifier field name","æ ‡è¯†ç¬¦å—段å为空"
-"Empty main table name","主表å为空"
-"Enable Charts","å¯ç”¨å›¾è¡¨"
-"Enabled","å·²å¯ç”¨"
-"Enabled for Admin","å¯ç”¨ç®¡ç†"
-"Enabled for Frontend","为å‰ç«¯å¯ç”¨"
-"Environment Update Time","环境更新时间"
-"Error in file: ""%s"" - %s","文件ä¸å‡ºé”™ï¼š""%s"" - %s"
-"European Union Countries","欧盟æˆå‘˜å›½"
-"Exceptions Log File Name","例外日志文件å"
-"Favicon Icon","Faviconå›¾æ ‡"
-"File %s does not exist","文件 %s ä¸å˜åœ¨"
-"File %s is not readable","文件 %s ä¸å¯è¯»"
-"File not found","文件未找到"
-"File system","文件系统"
-"File with an extension ""%value%"" is protected and cannot be uploaded","扩展为 ""%value%"" 的文件å—到ä¿æŠ¤ï¼Œæ— æ³•ä¸Šä¼ "
-"First Day of Week","æ¯å‘¨ç¬¬ä¸€å¤©"
-"Flush Cache Storage","清ç†ç¼“å˜å˜å‚¨"
-"Flush Magento Cache","清ç†Magento缓å˜"
-"Footer","脚注"
-"Forgot Password Email Sender","忘记密ç 电å邮件å‘é€"
-"Forgot Password Email Template","忘记密ç 邮件模æ¿"
-"General","常规"
-"General Contact","常规è”系人"
-"General Contact Email","一般è”络电å邮件"
-"General Contact Name","常规è”系人姓å"
-"General Settings","常规设置"
-"Global","å…¨çƒ"
-"HTML Head","HTML头"
-"HTML tags are not allowed","ä¸å…许使用 HTML æ ‡ç¾"
-"Header","头部"
-"Host","主机"
-"How many links to display at once.","一次显示多少链接。"
-"ID Path for Specified Store","特定商店的 ID 路径"
-"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","如果当å‰æ¡†æž¶ä½ç½®æ— 法涵盖最大的页é¢ï¼Œå°†å‘ˆçŽ°é“¾æŽ¥åˆ°å½“å‰ä½ç½®å¹¶åŠ /å‡è¯¥æ•°å€¼ã€‚"
-"Incorrect credit card expiration date.","错误的信用å¡åˆ°æœŸæ—¥ã€‚"
-"Input type ""%value%"" not found in the input types list.","输入类型“%value%â€æ— 法在输入类型列表ä¸æ‰¾åˆ°ã€‚"
-"Invalid base url type","æ— æ•ˆçš„åŸºç¡€ URL 类型"
-"Invalid block name to set child %s: %s","æ— æ•ˆçš„åŒºå—å称æ¥è®¾ç½® %s: %s"
-"Invalid block type: %s","æ— æ•ˆçš„åŒºå—类型：%s"
-"Invalid block: %s","æ— æ•ˆçš„åŒºå—：%s"
-"Invalid connection","æ— æ•ˆçš„è¿žæŽ¥"
-"Invalid layout update handle","æ— æ•ˆçš„å¸ƒå±€æ›´æ–°å¥æŸ„"
-"Invalid messages storage ""%s"" for layout messages initialization","对布局消æ¯åˆå§‹åŒ–ä¸æ— 效的消æ¯å˜å‚¨â€œ%sâ€"
-"Invalid query","æ— æ•ˆçš„æŸ¥è¯¢"
-"Invalid transactional email code: ","æ— æ•ˆçš„äº¤æ˜“ç”µå邮件代ç ："
-"Invalid website's configuration path: %s","æ— æ•ˆçš„ç½‘ç«™é…置路径：%s"
-"JavaScript Settings","JavaScript 设置"
-"Layout","布局"
-"Leave empty for access from any location.","从任何ä½ç½®è®¿é—®ç•™ç©ºã€‚"
-"List of stores","商店列表"
-"Locale","区域"
-"Locale Options","区域选项"
-"Log Settings","日志设置"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","登录自 \Magento\Framework\Logger。文件ä½äºŽ {{base_dir}}/var/log"
-"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","登录自 \Magento\Framework\Logger。文件ä½äºŽ {{base_dir}}/var/log"
-"Login is Case Sensitive","登录信æ¯å¤§å°å†™æ•æ„Ÿ"
-"Logo Image","å¾½æ ‡å›¾åƒ"
-"Logo Image Alt","å¤‡é€‰å¾½æ ‡å›¾åƒ"
-"Logo Image Src","å¾½æ ‡å›¾åƒSrc"
-"Mail Sending Settings","邮件å‘é€è®¾ç½®"
-"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","ç¡®ä¿åŸºæœ¬URL以""/""（斜线）结尾，例如http://yourdomain/magento/"
-"Manage Stores","管ç†åº—铺"
-"Match expressions in the same order as displayed in the configuration.","匹é…的表达å¼å°†ä»¥ä¸Žé…置相åŒçš„顺åºæ˜¾ç¤ºå‡ºæ¥ã€‚"
-"Media Storage","媒体å˜å‚¨"
-"Merge CSS Files","åˆå¹¶CSS文件"
-"Merge JavaScript Files","åˆå¹¶JavaScript文件"
-"Miscellaneous HTML","HTMLæ‚项"
-"Miscellaneous Scripts","æ‚项脚本"
-"Model class does not exist: %s.","模å—ç±»ä¸å˜åœ¨ï¼š%s。"
-"Model collection resource name is not defined.","模å—集åˆèµ„æºå未定义。"
-"Module ""%1$s"" cannot depend on ""%2$s"".","æ¨¡å— ""%1$s"" æ— æ³•ä¾å˜äºŽ""%2$s""。"
-"Module ""%1$s"" requires module ""%2$s"".","æ¨¡å— ""%1$s"" 需è¦æ¨¡å— ""%2$s""。"
-"Name","姓å"
-"New Design Change","新设计å˜åŠ¨"
-"New Store","新店铺"
-"New Store View","新店铺视图"
-"New Website","新网站"
-"No","å¦"
-"Offloader header","Offloader头部"
-"PHP SOAP extension is required.","è¦æ±‚ PHP SOAP 扩展。"
-"Package","包裹"
-"Pagination","è½®æ¢"
-"Pagination Frame","è½®æ¢æ¡†æž¶"
-"Pagination Frame Skip","跳过轮æ¢æ¡†æž¶"
-"Parent directory does not exist: %s","父目录ä¸å˜åœ¨ï¼š%s"
-"Path ""%value%"" is not available and cannot be used.","路径 ""%value%"" ä¸å¯ç”¨ï¼Œå› æ¤æ— 法使用。"
+"Custom Variables",自定义å˜é‡
+"Requested resource not found","Requested resource not found"
+"File %1 does not exist","File %1 does not exist"
+"File %1 is not readable","File %1 is not readable"
+"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""."
+"database ""%1""","database ""%1"""
+"Parent directory does not exist: %1","Parent directory does not exist: %1"
+"File system",文件系统
+"Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
+"Wrong file info format",错误的文件信æ¯æ ¼å¼
"Path ""%value%"" is protected and cannot be used.","路径 ""%value%"" å—ä¿æŠ¤ï¼Œæ— 法使用。"
+"Path ""%value%"" is not available and cannot be used.","路径 ""%value%"" ä¸å¯ç”¨ï¼Œå› æ¤æ— 法使用。"
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","路径 ""%value%"" å¯èƒ½ä¸åŒ…å«çˆ¶ç›®å½•é历 (""../"", ""..\")."
-"Please define flag code.","请定义旗帜代ç 。"
-"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","请输入å…个或更多å—ç¬¦ã€‚å¼€å¤´æˆ–ç»“å°¾å¤„çš„ç©ºæ ¼ä¼šè¢«å¿½ç•¥ã€‚"
-"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","请输入至少7个å—符。密ç 应包å«æ•°å—与å—æ¯ã€‚"
-"Please enter a number 0 or greater in this field.","请在该å—段ä¸è¾“入数å—0或更大值。"
-"Please enter a number 1 or greater in this field.","请在该å—段输入数å—1或更大值。"
-"Please enter a number greater than 0 in this field.","请在该å—段ä¸è¾“入大于0çš„æ•°å—。"
-"Please enter a number lower than 100.","请输入ä¸è¶…过100个数å—。"
-"Please enter a valid $ amount. For example $100.00.","请输入有效的金é¢ï¼Œä¾‹å¦‚$100.00。"
-"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","请输入有效的 URL 密钥。例如， ""example-page""ã€""example-page.html""，或 ""anotherlevel/example-page""。"
-"Please enter a valid URL. For example http://www.example.com or www.example.com","请输入有效的URL，例如http://www.example.com 或 www.example.com"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","请输入有效URL。åè®®å是必须的（http://ã€https://，或ftp://）"
-"Please enter a valid XML-identifier. For example something_1, block5, id-4.","请输入有效的XMLæ ‡è¯†ç¬¦ã€‚ä¾‹å¦‚ï¼Œç±»ä¼¼something_1ã€block5ã€id-4。"
-"Please enter a valid credit card number.","请输入有效的信用å¡å¡å·ã€‚"
-"Please enter a valid credit card verification number.","请输入有效的信用å¡éªŒè¯ç 。"
-"Please enter a valid date between %s and %s","请在 %s 与 %s 之间输入有效日期。"
-"Please enter a valid date equal to or greater than %s","请输入ç‰äºŽæˆ–大于 %s 的有效日期"
-"Please enter a valid date less than or equal to %s","请输入å°äºŽæˆ–ç‰äºŽ %s 的有效日期"
-"Please enter a valid date.","请输入有效日期"
-"Please enter a valid day (1-%1).","请输入有效天数（1-%1）。"
-"Please enter a valid email address. For example johndoe@domain.com.","请输入有效邮件地å€ã€‚例如johndoe@domain.com。"
-"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","è¯·è¾“å…¥æœ‰æ•ˆä¼ çœŸå·ç ，例如 (123) 456-7890 或 123-456-7890。"
-"Please enter a valid full date","请输入有效完整日期"
-"Please enter a valid month (1-12).","请输入有效月份（1-12）。"
-"Please enter a valid number in this field.","请在æ¤åŒºåŸŸè¾“入有效的数å—。"
-"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","请输入有效的电è¯å·ç 。例如 (123) 456-7890 或 123-456-7890。"
-"Please enter a valid social security number. For example 123-45-6789.","请输入有效社会安全å·ç ，例如123-45-6789。"
-"Please enter a valid year (1900-%1).","请输入有效年份（1900-%1）。"
-"Please enter a valid zip code.","请输入有效的邮政编ç 。"
-"Please enter a valid zip code. For example 90602 or 90602-1234.","请输入有效邮编，例如90602或90602-1234。"
-"Please enter issue number or start date for switch/solo card type.","请输入Switch/Soloç±»å¡çš„é¢å‘å·æˆ–开始日期。"
-"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","请输入有效 CSS长度。例如， 100px 或 77pt 或 20em 或 .5ex 或 50%。"
-"Please make sure your passwords match.","请确ä¿å¯†ç 匹é…。"
-"Please select State/Province.","请选择州/çœã€‚"
-"Please select a file","请选择一个文件"
-"Please select an option.","请选择一个选项。"
-"Please select one of the above options.","请选择上列选项ä¸çš„一个。"
-"Please select one of the options.","请选择下列一个选项。"
-"Please set available and/or protected paths list(s) before validation.","请设置有效并/或å—ä¿æŠ¤çš„路径列表，éšåŽå†éªŒè¯ã€‚"
-"Please specify either a category or a product, or both.","请指定分类或产å“，或两者都指定。"
-"Please use letters only (a-z or A-Z) in this field.","在该å—段ä¸è¯·åªä½¿ç”¨å—æ¯ï¼ˆa-z或A-Z）"
-"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","请在该å—段ä¸åªä½¿ç”¨æ•°å—。请ä¸è¦ä½¿ç”¨ç©ºæ ¼æˆ–其它å—符，例如å¥ç‚¹æˆ–逗å·ã€‚"
-"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","该å—段ä¸è¯·åªä½¿ç”¨å—æ¯ï¼ˆa-z 或 A-Z）或数å—（0-9），ä¸èƒ½ä½¿ç”¨ç©ºæ ¼æˆ–其它å—符。"
-"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","该å—段ä¸åªèƒ½ä½¿ç”¨å—æ¯ï¼ˆa-z 或 A-Z）或数å—（0-9ï¼‰æˆ–ç©ºæ ¼ï¼Œæˆ– # 。"
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","在æ¤å—段ä¸ï¼Œè¯·ä»…使用å—æ¯ï¼ˆa-z或A-Z）ã€æ•°å—（0-9）或下划线（_），首å—符必须为å—æ¯ã€‚"
-"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","该å—段ä¸è¯·åªä½¿ç”¨å—æ¯ï¼ˆa-z）ã€æ•°å—（0-9）以åŠä¸‹åˆ’线（_），第一个å—符应为å—æ¯ã€‚"
-"Please use only visible characters and spaces.","请åªä½¿ç”¨å¯è§å—ç¬¦å’Œç©ºæ ¼ã€‚"
-"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","è¯·ä½¿ç”¨è¿™æ ·çš„æ—¥æœŸæ ¼å¼ï¼šdd/mm/yyyy。例如17/03/2006代表2006å¹´3月17日。"
-"Please wait, loading...","请ç¨å€™ï¼Œæ£åœ¨åŠ è½½..."
-"Port (25)","端å£ï¼ˆ25）"
-"Profiler","é…置文件"
-"Recovery Link Expiration Interval (days)","æ¢å¤é“¾æŽ¥è¿‡æœŸå‘¨æœŸï¼ˆå¤©ï¼‰"
-"Request Path for Specified Store","特殊店铺的请求路径"
-"Requested file may not include parent directory traversal (""../"", ""..\" notation)","所请求的文件å¯èƒ½æ²¡æœ‰åŒ…å«åœ¨çˆ¶ç›®å½•éåŽ†ä¸ (""../"", ""..\" notation)"
-"Requested invalid store ""%s""","è¯·æ±‚äº†æ— æ•ˆåº—é“º ""%s"""
-"Resource is not set.","资æºæœªè®¾ç½®ã€‚"
-"Retrieve store data","检索商店数æ®"
-"Retrieve store list","检索商店列表"
-"Return-Path Email","返回路径邮件"
-"Root Category","æ ¹åˆ†ç±»"
-"Sales Representative","销售代表"
-"Sales Representative Contact Email","销售代表è”络电å邮件"
-"Sales Representative Contact Name","销售代表è”系人姓å"
-"Save","ä¿å˜"
-"Save Store","ä¿å˜åº—铺"
-"Save Store View","ä¿å˜åº—铺视图"
-"Save Website","ä¿å˜ç½‘ç«™"
-"Search Engines Optimization","æœç´¢å¼•æ“Žä¼˜åŒ–"
-"Secure","安全"
-"Security","安全"
-"Select Date","选择日期"
-"Select Media Database","选择媒体数æ®åº“"
-"Sender Email","å‘é€äººé‚®ä»¶"
-"Sender Name","å‘é€äººå§“å"
-"Services","æœåŠ¡"
-"Session Cookie Management","会è¯Cookie管ç†"
-"Session Lifetime (seconds)","会è¯å¯¿å‘½ï¼ˆç§’）"
-"Session Validation Settings","会è¯éªŒè¯è®¾ç½®"
-"Set Return-Path","设置返回路径"
-"Set as Default","设置为默认值"
-"Skin (Images / CSS)","皮肤（图片/CSS）"
-"Sort Order","排åºé¡ºåº"
-"Specified date/time ""%1$s"" do not match format ""%2$s"".","指定的日期/时间 ""%1$s"" ä¸ç¬¦åˆæ ¼å¼ ""%2$s""。"
-"Start date cannot be greater than end date.","开始日期ä¸èƒ½å¤§äºŽç»“æŸæ—¥æœŸã€‚"
-"Startup Page","å¯åŠ¨é¡µé¢"
-"Status","状æ€"
-"Storage Configuration for Media","媒体的å˜å‚¨é…ç½®"
-"Store","商店"
-"Store API","商店 API"
-"Store Contact Address","店铺è”系人地å€"
-"Store Contact Information","店铺è”系人信æ¯"
-"Store Contact Phone","店铺è”系人电è¯å·ç "
-"Store Email Addresses","店铺电å邮件地å€"
-"Store Information","店铺信æ¯"
-"Store","店铺å称"
-"Store View","店铺视图"
-"Store View Information","店铺视图信æ¯"
-"Store View","店铺视图å称"
-"Store view doesn't exist","店铺视图ä¸å˜åœ¨"
-"Store with the same code","具有相åŒä»£ç 的商店"
-"System","系统"
-"System Log File Name","系统日志文件å"
-"Template Path Hints","模版路径æ示"
-"Template Settings","模æ¿è®¾ç½®"
-"Template Variables","模版å˜é‡"
-"Templates","模æ¿"
-"Text length does not satisfy specified text range.","文本长度ä¸ç¬¦åˆæŒ‡å®šçš„文本长度范围。"
-"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","您输入的 %s æ— æ•ˆã€‚è¯·ç¡®ä¿ä½¿ç”¨äº†ç±»ä¼¼ ""http://domain.com/"" çš„æ ¼å¼ã€‚"
-"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","商店代ç åªå¯åŒ…å«å—æ¯ (a-z)ï¼Œæ•°å— (0-9) 或下划线 (_)，首å—符必须为å—æ¯"
-"The store does not exist","商店ä¸å˜åœ¨"
-"The store has been deleted.","å•†åº—å·²è¢«åˆ é™¤ã€‚"
-"The store has been saved.","商店已ä¿å˜ã€‚"
-"The store view has been deleted.","å•†åº—è§†å›¾å·²è¢«åˆ é™¤ã€‚"
-"The store view has been saved","商店视图已ä¿å˜"
-"The template Name must not be empty.","模æ¿å称ä¸èƒ½ä¸ºç©ºã€‚"
-"The value is not within the specified range.","数值ä¸åœ¨æŒ‡å®šèŒƒå›´å†…。"
-"The website does not exist.","网站ä¸å˜åœ¨ã€‚"
-"The website has been deleted.","ç½‘ç«™å·²è¢«åˆ é™¤ã€‚"
-"The website has been saved.","网站已ä¿å˜ã€‚"
-"Themes","主题"
-"This category and all its child elements","该类别和其全部åå…ƒç´ "
-"This category and its child categories only","仅支æŒè¯¥åˆ†ç±»ä¸Žå…¶å分类"
-"This category and its products only","仅支æŒè¯¥åˆ†ç±»ä¸Žå…¶äº§å“"
-"This category only","仅支æŒè¯¥åˆ†ç±»"
-"This date is a required value.","该日期为必需值。"
-"This is a required field.","这是必填区域。"
-"This store cannot be deleted.","è¯¥å•†åº—æ— æ³•è¢«åˆ é™¤ã€‚"
-"This store view cannot be deleted.","å•†åº—è§†å›¾æ— æ³•è¢«åˆ é™¤ã€‚"
-"This website cannot be deleted.","è¯¥ç½‘ç«™æ— æ³•è¢«åˆ é™¤ã€‚"
-"This will be displayed just before body closing tag.","这将在æ£æ–‡ç»“æŸæ ‡è®°å‰æ˜¾ç¤ºã€‚"
-"This will be included before head closing tag in page HTML.","这将在 HTML 页é¢å¤´éƒ¨ç»“æŸæ ‡è®°å‰è¢«åŒ…å«ã€‚"
-"Timezone","时区"
-"Title Prefix","æ ‡é¢˜å‰ç¼€"
-"Title Suffix","æ ‡é¢˜åŽç¼€"
-"Transactional Emails","交易邮件"
-"Translate Inline","翻译内嵌"
-"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","对于å‰ç«¯å’Œç®¡ç†å‘˜å†…嵌翻译，翻译区å—和其它输出缓å˜åº”被ç¦ç”¨ã€‚"
-"Translations","翻译"
-"Two and more slashes together are not permitted in request path","两个或更多斜æ 在请求的路径ä¸ä¸è¢«å…许"
-"Unable to create directory: %s","æ— æ³•åˆ›å»ºç›®å½•ï¼š%s"
-"Unable to delete store view. Please, try again later.","æ— æ³•åˆ é™¤å•†åº—è§†å›¾ã€‚è¯·ç¨åŽé‡è¯•ã€‚"
-"Unable to delete store. Please, try again later.","æ— æ³•åˆ é™¤å•†åº—ã€‚è¯·ç¨åŽé‡è¯•ã€‚"
-"Unable to delete website. Please, try again later.","æ— æ³•åˆ é™¤ç½‘ç«™ã€‚è¯·ç¨åŽé‡è¯•ã€‚"
-"Unable to proceed. Please, try again","æ— æ³•ç»§ç»ã€‚请é‡è¯•"
-"Unable to proceed. Please, try again.","æ— æ³•å¤„ç†ã€‚请é‡è¯•ã€‚"
-"Unable to save file ""%s"" at ""%s""","æ— æ³•ä¿å˜æ–‡ä»¶ ""%s"" ä¸çš„ ""%s"""
-"Unable to save file: %s","æ— æ³•ä¿å˜æ–‡ä»¶ï¼š%s"
-"Unknown old style column type definition: {$definition}.","未知的旧å¼åˆ—类型定义：{$definition}。"
-"Unknown scope ""%s"".","未知范围 ""%s""。"
-"Unsecure","ä¸å®‰å…¨"
-"Url Options","URL 选项"
-"Use Custom Admin Path","使用自定义管ç†å‘˜è·¯å¾„"
-"Use Custom Admin URL","ä½¿ç”¨è‡ªå®šä¹‰ç®¡ç† URL"
-"Use HTTP Only","仅使用HTTP"
-"Use SID on Frontend","在å‰ç«¯ä½¿ç”¨ SID"
-"Use Secure URLs in Admin","在管ç†ç•Œé¢ä½¿ç”¨å®‰å…¨URL"
-"Use Secure URLs in Frontend","在å‰ç«¯ä½¿ç”¨å®‰å…¨ URL"
-"Use Web Server Rewrites","使用网络æœåŠ¡å™¨é‡å†™"
-"VAT Number","VAT ç¼–å·"
-"Validate HTTP_USER_AGENT","éªŒè¯ HTTP_USER_AGENT"
-"Validate HTTP_VIA","éªŒè¯ HTTP_VIA"
-"Validate HTTP_X_FORWARDED_FOR","éªŒè¯ HTTP_X_FORWARDED_FOR"
-"Validate REMOTE_ADDR","éªŒè¯ REMOTE_ADDR"
-"Validation has failed.","验è¯å¤±è´¥ã€‚"
-"Values less than 60 are ignored. Note that changes will apply after logout.","忽略å°äºŽ60的值。请注æ„更改将在登出åŽç”Ÿæ•ˆã€‚"
-"Variable Code must be unique.","å˜é‡ä»£ç 必须是唯一的。"
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","è¦å‘Šï¼ä¸å»ºè®®åœ¨ç”Ÿäº§çŽ¯å¢ƒä¸å¯ç”¨è¯¥åŠŸèƒ½ï¼Œå› 为å¯èƒ½å¸¦æ¥æ½œåœ¨çš„安全éšæ‚£ã€‚"
-"Web","Web"
-"Website","网站"
-"Website Information","网站信æ¯"
-"Website","网站å称"
-"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","网站代ç åªèƒ½åŒ…å«å—æ¯ï¼ˆa到z）ã€æ•°å—（0到9）或下划线（_），且第一个å—符必须是å—æ¯ã€‚"
-"Website with the same code","使用相åŒä»£ç 的网站"
-"Weekend Days","周末"
-"Welcome Text","欢迎信æ¯"
-"Wrong file info format","错误的文件信æ¯æ ¼å¼"
-"Wrong number of arguments for %s","%s çš„å‚数有误"
-"Wrong old style column type definition: {$definition}.","定义的è€å¼æ 目类型有误： {$definition}。"
-"Yes","是"
-"You will have to log in after you save your custom admin path.","ä¿å˜æ‚¨çš„自定义管ç†è·¯å¾„åŽï¼Œæ‚¨éœ€è¦é‡ç™»å½•ã€‚"
-"Your design change for the specified store intersects with another one, please specify another date range.","您对指定商店设计的更改和å¦ä¸€ä¸ªæœ‰äº¤å‰ï¼Œè¯·é‡æ–°æŒ‡å®šæ—¥æœŸèŒƒå›´ã€‚"
-"database ""%s""","æ•°æ®åº“ ""%s"""
+"Please set available and/or protected paths list(s) before validation.",请设置有效并/或å—ä¿æŠ¤çš„路径列表，éšåŽå†éªŒè¯ã€‚
+"File with an extension ""%value%"" is protected and cannot be uploaded","扩展为 ""%value%"" 的文件å—到ä¿æŠ¤ï¼Œæ— æ³•ä¸Šä¼ "
+"Helper arguments should not be used in custom layout updates.","Helper arguments should not be used in custom layout updates."
+"Updater model should not be used in custom layout updates.","Updater model should not be used in custom layout updates."
+"Please correct the XML data and try again. %value%","Please correct the XML data and try again. %value%"
+"Start date cannot be greater than end date.",开始日期ä¸èƒ½å¤§äºŽç»“æŸæ—¥æœŸã€‚
+"Your design change for the specified store intersects with another one, please specify another date range.",您对指定商店设计的更改和å¦ä¸€ä¸ªæœ‰äº¤å‰ï¼Œè¯·é‡æ–°æŒ‡å®šæ—¥æœŸèŒƒå›´ã€‚
+"Unable to create directory: %1","Unable to create directory: %1"
+"Unable to save file: %1","Unable to save file: %1"
+Copy,Copy
+"Theme isn't deletable.","Theme isn't deletable."
+"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1"""
+"Variable Code must be unique.",å˜é‡ä»£ç 必须是唯一的。
+"Validation has failed.",验è¯å¤±è´¥ã€‚
+%1,%1
+"Insert Variable...","Insert Variable..."
+"System(config.xml, local.xml) and modules configuration files(config.xml).","System(config.xml, local.xml) and modules configuration files(config.xml)."
+Layouts,Layouts
+"Layout building instructions.","Layout building instructions."
+"Blocks HTML output","Blocks HTML output"
+"Page blocks HTML.","Page blocks HTML."
+"View files fallback","View files fallback"
+"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)."
+"View files pre-processing","View files pre-processing"
+"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."
diff --git a/app/code/Magento/Cron/Model/Observer.php b/app/code/Magento/Cron/Model/Observer.php
index 5fdb9035785..d48ba937359 100644
--- a/app/code/Magento/Cron/Model/Observer.php
+++ b/app/code/Magento/Cron/Model/Observer.php
@@ -223,11 +223,7 @@ class Observer
);
}
- /**
- * though running status is set in tryLockJob we must set it here because the object
- * was loaded with a pending status and will set it back to pending if we don't set it here
- */
- $schedule->setStatus(Schedule::STATUS_RUNNING)->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))->save();
+ $schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))->save();
call_user_func_array($callback, array($schedule));
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index c8666ea6545..5ab7518a420 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -257,10 +257,14 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
*/
public function tryLockJob()
{
- return $this->_getResource()->trySetJobStatusAtomic(
+ if ($this->_getResource()->trySetJobStatusAtomic(
$this->getId(),
self::STATUS_RUNNING,
self::STATUS_PENDING
- );
+ )) {
+ $this->setStatus(self::STATUS_RUNNING);
+ return true;
+ }
+ return false;
}
}
diff --git a/app/code/Magento/Cron/i18n/de_DE.csv b/app/code/Magento/Cron/i18n/de_DE.csv
index ca5bfcf9c08..ac4dc2474f6 100644
--- a/app/code/Magento/Cron/i18n/de_DE.csv
+++ b/app/code/Magento/Cron/i18n/de_DE.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 Minuten"
-"15 minutes","15 Minuten"
-"20 minutes","20 Minuten"
-"30 minutes","30 Minuten"
-"5 minutes","5 Minuten"
-"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Zeitgesteuerte Aufgaben) - alle Zeitangaben in Minuten"
-"Daily","Täglich"
-"Failure History Lifetime","Aufbewahrung des Fehlerverlaufs"
-"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Um sicher zu stellen, dass URLs, die durch Cron generiert werden, korrekt sind, achten Sie bitte darauf dass die Web > Secure and Unsecure Base URLs explizit konfiguriert sind."
-"Generate Schedules Every","Generiere Abläufe alle"
-"History Cleanup Every","Verwerfen des Verlaufs alle"
-"Hourly","Stündlich"
-"Invalid callback: %s::%s does not exist","Invalider Callback: %s::%s existiert nicht"
-"Invalid model/method definition, expecting ""model/class::method"".","Ungültige model/method-Definition, erwarte ""model/class::method""."
-"Minute Intervals","Minutenintervalle"
-"Missed if Not Run Within","Ausgelassen wenn nicht ausgeführt innerhalb von"
-"Monthly","Monatlich"
-"No callbacks found","Keine Callbacks gefunden"
-"Schedule Ahead for","Plane im Voraus für"
-"Success History Lifetime","Aufbewahrung des Verlaufs geglückter Ausführungen"
-"Too late for the schedule.","Zu spät für diese Ausführung."
-"Unable to delete the cron task.","Cron-Job kann nicht gelöscht werden."
-"Unable to save the cron expression.","Cron-Ausdruck konnte nicht gespeichert werden."
-"Unknown error.","Unbekannter Fehler."
-"Weekly","Wöchentlich"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,Täglich
+Weekly,Wöchentlich
+Monthly,Monatlich
+"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
+"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
+"Generate Schedules Every","Generate Schedules Every"
+"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
+"Success History Lifetime","Success History Lifetime"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/Cron/i18n/en_US.csv b/app/code/Magento/Cron/i18n/en_US.csv
index cd472e82524..aba3563db9b 100644
--- a/app/code/Magento/Cron/i18n/en_US.csv
+++ b/app/code/Magento/Cron/i18n/en_US.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 minutes"
-"15 minutes","15 minutes"
-"20 minutes","20 minutes"
-"30 minutes","30 minutes"
-"5 minutes","5 minutes"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,Daily
+Weekly,Weekly
+Monthly,Monthly
"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
-"Daily","Daily"
-"Failure History Lifetime","Failure History Lifetime"
"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
"Generate Schedules Every","Generate Schedules Every"
-"History Cleanup Every","History Cleanup Every"
-"Hourly","Hourly"
-"Invalid callback: %s::%s does not exist","Invalid callback: %s::%s does not exist"
-"Invalid model/method definition, expecting ""model/class::method"".","Invalid model/method definition, expecting ""model/class::method""."
-"Minute Intervals","Minute Intervals"
-"Missed if Not Run Within","Missed if Not Run Within"
-"Monthly","Monthly"
-"No callbacks found","No callbacks found"
"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
"Success History Lifetime","Success History Lifetime"
-"Too late for the schedule.","Too late for the schedule."
-"Unable to delete the cron task.","Unable to delete the cron task."
-"Unable to save the cron expression.","Unable to save the cron expression."
-"Unknown error.","Unknown error."
-"Weekly","Weekly"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/Cron/i18n/es_ES.csv b/app/code/Magento/Cron/i18n/es_ES.csv
index cd183f81c8e..bc7def1d023 100644
--- a/app/code/Magento/Cron/i18n/es_ES.csv
+++ b/app/code/Magento/Cron/i18n/es_ES.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 minutos"
-"15 minutes","15 minutos"
-"20 minutes","20 minutos"
-"30 minutes","30 minutos"
-"5 minutes","5 minutos"
-"Cron (Scheduled Tasks) - all the times are in minutes","Cron. (tareas programadas), todos los tiempos se expresan en minutos"
-"Daily","Diario"
-"Failure History Lifetime","PerÃodo de validez del historial de errores"
-"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","En el caso de las direcciones URL correctas generadas durante ejecuciones de cron, asegúrese de configurar expresamente Web > Direcciones URL básicas seguras y no seguras."
-"Generate Schedules Every","Generar programas cada"
-"History Cleanup Every","Borrar el historial cada"
-"Hourly","Cada hora"
-"Invalid callback: %s::%s does not exist","Llamada no válida: %s::%s no existe"
-"Invalid model/method definition, expecting ""model/class::method"".","Definición de modelo/método no válida, a la espera de ""model/class::method"". "
-"Minute Intervals","Intervalos en minutos"
-"Missed if Not Run Within","Falla si no se ejecuta dentro de"
-"Monthly","Mensualmente"
-"No callbacks found","No se encontraron llamadas"
-"Schedule Ahead for","Programar con anticipación"
-"Success History Lifetime","PerÃodo de validez del historial de ejecuciones correctas"
-"Too late for the schedule.","Es demasiado tarde para este programa."
-"Unable to delete the cron task.","No se ha podido borrar la tarea programada."
-"Unable to save the cron expression.","No se puede guardar la expresión de cron."
-"Unknown error.","Error desconocido."
-"Weekly","Semanalmente"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,Diario
+Weekly,Semanalmente
+Monthly,Mensualmente
+"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
+"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
+"Generate Schedules Every","Generate Schedules Every"
+"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
+"Success History Lifetime","Success History Lifetime"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/Cron/i18n/fr_FR.csv b/app/code/Magento/Cron/i18n/fr_FR.csv
index 861a8bc8b3b..edb4773c317 100644
--- a/app/code/Magento/Cron/i18n/fr_FR.csv
+++ b/app/code/Magento/Cron/i18n/fr_FR.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 minutes"
-"15 minutes","15 minutes"
-"20 minutes","20 minutes"
-"30 minutes","30 minutes"
-"5 minutes","5 minutes"
-"Cron (Scheduled Tasks) - all the times are in minutes","Cron (tâches planifiées) - tous les temps sont en minutes"
-"Daily","Tous les jours"
-"Failure History Lifetime","Historique des échecs"
-"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Pour générer des URLs correctes avec cron, veuillez vous assurer que Web > URLs de base sécurisées et non sécurisées sont définies explicitement."
-"Generate Schedules Every","Générer les horaires tous les"
-"History Cleanup Every","Nettoyer l'historique tous les"
-"Hourly","Toutes les heures"
-"Invalid callback: %s::%s does not exist","Rappel invalide : %s::%s n'existe pas"
-"Invalid model/method definition, expecting ""model/class::method"".","Définition modèle/méthode invalide. ""Modèle/classe :: méthode"" nécessaire. "
-"Minute Intervals","Intervalles d'une minute"
-"Missed if Not Run Within","Raté si non exécuté dans"
-"Monthly","Tous les mois"
-"No callbacks found","Aucun rappel trouvé"
-"Schedule Ahead for","Calendrier à venir pour"
-"Success History Lifetime","Historique des réussites"
-"Too late for the schedule.","Trop tard pour la planification"
-"Unable to delete the cron task.","Impossible de supprimer la tâche cron."
-"Unable to save the cron expression.","Impossible de sauvegarder l'expression cron."
-"Unknown error.","Erreur inconnue."
-"Weekly","Toutes les semaines"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,"Tous les jours"
+Weekly,"Toutes les semaines"
+Monthly,"Tous les mois"
+"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
+"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
+"Generate Schedules Every","Generate Schedules Every"
+"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
+"Success History Lifetime","Success History Lifetime"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/Cron/i18n/nl_NL.csv b/app/code/Magento/Cron/i18n/nl_NL.csv
index ce6bcc2889e..65f3cfafcfe 100644
--- a/app/code/Magento/Cron/i18n/nl_NL.csv
+++ b/app/code/Magento/Cron/i18n/nl_NL.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 minuten"
-"15 minutes","15 minuten"
-"20 minutes","20 minuten"
-"30 minutes","30 minuten"
-"5 minutes","5 minuten"
-"Cron (Scheduled Tasks) - all the times are in minutes","Cron (ingeplande taken) - alle tijden zijn in minuten"
-"Daily","Dagelijks"
-"Failure History Lifetime","Foute geschiedenis levenstijd"
-"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Voor correcte URLs, gegenereerd gedurende cron processen, zorgt u ervoor dat Web > zekere en onzekere basis URLs expliciet zijn ingesteld."
-"Generate Schedules Every","Maak schema's elke"
-"History Cleanup Every","geschiedenis schoonmaak elke"
-"Hourly","Ieder uur"
-"Invalid callback: %s::%s does not exist","Onjuiste callback, %s::%s bestaat niet"
-"Invalid model/method definition, expecting ""model/class::method"".","Onjuist model/methode definitie, ik verwacht ""model/class::method""."
-"Minute Intervals","1 minuut interval"
-"Missed if Not Run Within","Gemist indien geen loop van binnen"
-"Monthly","Maandelijks"
-"No callbacks found","Geen callbacks gevonden"
-"Schedule Ahead for","Plan vooruit voor"
-"Success History Lifetime","Succesgeschiedenis levensduur"
-"Too late for the schedule.","Te laat voor schema."
-"Unable to delete the cron task.","Kon de cron taak niet verwijderen."
-"Unable to save the cron expression.","Niet in staat om de cron expressie op te slaan."
-"Unknown error.","Onbekende fout."
-"Weekly","Wekelijks"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,Dagelijks
+Weekly,Wekelijks
+Monthly,Maandelijks
+"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
+"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
+"Generate Schedules Every","Generate Schedules Every"
+"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
+"Success History Lifetime","Success History Lifetime"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/Cron/i18n/pt_BR.csv b/app/code/Magento/Cron/i18n/pt_BR.csv
index 76dfa9eb34f..1b07a9f42dc 100644
--- a/app/code/Magento/Cron/i18n/pt_BR.csv
+++ b/app/code/Magento/Cron/i18n/pt_BR.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 minutos"
-"15 minutes","15 minutos"
-"20 minutes","20 minutos"
-"30 minutes","30 minutos"
-"5 minutes","5 minutos"
-"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Tarefas Agendadas) - todos os tempos são em minutos"
-"Daily","Diário"
-"Failure History Lifetime","Falha no Historial de Vida"
-"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Para corrigir URLs gerados durante a execução do cron por favor certifique-se que URLs Base de Dados Seguros e Inseguros de Rede são explicitamente definidos."
-"Generate Schedules Every","Gerar Todos os Horários"
-"History Cleanup Every","Limpar Todo o Historial"
-"Hourly","Horário"
-"Invalid callback: %s::%s does not exist","Chamada inválida: %s::%s não existe"
-"Invalid model/method definition, expecting ""model/class::method"".","Definição do modelo/método inválido, esperando ""modelo/classe::método""."
-"Minute Intervals","Intervalos de Minutos"
-"Missed if Not Run Within","Perdidos se Não Forem Executados Dentro"
-"Monthly","Mensal"
-"No callbacks found","Nenhuma chamada encontrada"
-"Schedule Ahead for","Agenda Seguinte para"
-"Success History Lifetime","Sucesso no Historial de Vida"
-"Too late for the schedule.","Tarde demais para o horário."
-"Unable to delete the cron task.","Não foi possÃvel excluir a tarefa cron."
-"Unable to save the cron expression.","ImpossÃvel salvar a expressão cron."
-"Unknown error.","Erro desconhecido."
-"Weekly","Semanalmente"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,Diário
+Weekly,Semanalmente
+Monthly,Mensal
+"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
+"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
+"Generate Schedules Every","Generate Schedules Every"
+"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
+"Success History Lifetime","Success History Lifetime"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/Cron/i18n/zh_CN.csv b/app/code/Magento/Cron/i18n/zh_CN.csv
index 16dc63cdc9e..872014a77a8 100644
--- a/app/code/Magento/Cron/i18n/zh_CN.csv
+++ b/app/code/Magento/Cron/i18n/zh_CN.csv
@@ -1,25 +1,14 @@
-"10 minutes","10 分钟"
-"15 minutes","15 分钟"
-"20 minutes","20 分钟"
-"30 minutes","30 分钟"
-"5 minutes","5 分钟"
-"Cron (Scheduled Tasks) - all the times are in minutes","Cron（计划任务） = 所有时间å‡ä»¥åˆ†é’Ÿä¸ºå•ä½"
-"Daily","æ¯å¤©"
-"Failure History Lifetime","失败历å²ç”Ÿå‘½æœŸ"
-"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","对于 cron è¿è¡Œæ—¶ç”Ÿæˆçš„æ£ç¡®çš„ URL，请确ä¿ç½‘络 > 安全和ä¸å®‰å…¨çš„基本 URL 已明确设置。"
-"Generate Schedules Every","生æˆè®¡åˆ’，æ¯"
-"History Cleanup Every","清除历å²è®°å½•ï¼Œæ¯"
-"Hourly","æ¯å°æ—¶"
-"Invalid callback: %s::%s does not exist","æ— æ•ˆçš„å›žè°ƒï¼š%s::%s ä¸å˜åœ¨"
-"Invalid model/method definition, expecting ""model/class::method"".","æ— æ•ˆçš„æ¨¡åž‹/方法定义，期望值“模型/ç±»::方法â€ã€‚"
-"Minute Intervals","分钟间隔"
-"Missed if Not Run Within","丢失，如果未è¿è¡Œåœ¨"
-"Monthly","æ¯æœˆ"
-"No callbacks found","没有找到回调"
-"Schedule Ahead for","æå‰è®¡åˆ’，为"
-"Success History Lifetime","æˆåŠŸåŽ†å²ç”Ÿå‘½æœŸ"
-"Too late for the schedule.","对计划而言过晚。"
-"Unable to delete the cron task.","æ— æ³•åˆ é™¤ Corn 任务。"
-"Unable to save the cron expression.","æ— æ³•ä¿å˜Cron表达å¼ã€‚"
-"Unknown error.","未知错误。"
-"Weekly","æ¯å‘¨"
+"We can't save the cron expression.","We can't save the cron expression."
+Daily,æ¯å¤©
+Weekly,æ¯å‘¨
+Monthly,æ¯æœˆ
+"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
+"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
+"Cron configuration options for group: ","Cron configuration options for group: "
+"Generate Schedules Every","Generate Schedules Every"
+"Schedule Ahead for","Schedule Ahead for"
+"Missed if Not Run Within","Missed if Not Run Within"
+"History Cleanup Every","History Cleanup Every"
+"Success History Lifetime","Success History Lifetime"
+"Failure History Lifetime","Failure History Lifetime"
+"Use Separate Process","Use Separate Process"
diff --git a/app/code/Magento/CurrencySymbol/i18n/de_DE.csv b/app/code/Magento/CurrencySymbol/i18n/de_DE.csv
index e9d934780f0..4164e2b05ef 100644
--- a/app/code/Magento/CurrencySymbol/i18n/de_DE.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/de_DE.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","Benutzerdefinierte Währungssymbole wurden erfolgreich angewandt."
-"Manage Currency","Währung verwalten"
+Reset,Reset
+System,System
+Import,Import
+"Save Currency Rates","Save Currency Rates"
"Manage Currency Rates","Währungskurse verwalten"
-"Rates","Kurse"
+"Import Service","Import Service"
"Save Currency Symbols","Währungssymbole speichern"
-"Symbols","Symbole"
-"System","System"
-"Use Default","Standardvorgaben verwenden"
+"Currency Symbols","Currency Symbols"
"Use Standard","Standard verwenden"
-"Use Website","Website verwenden"
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/CurrencySymbol/i18n/en_US.csv b/app/code/Magento/CurrencySymbol/i18n/en_US.csv
index 54f0641102b..6caa2d36f3e 100644
--- a/app/code/Magento/CurrencySymbol/i18n/en_US.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/en_US.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","Custom currency symbols were applied successfully."
-"Manage Currency","Manage Currency"
+Reset,Reset
+System,System
+Import,Import
+"Save Currency Rates","Save Currency Rates"
"Manage Currency Rates","Manage Currency Rates"
-"Rates","Rates"
+"Import Service","Import Service"
"Save Currency Symbols","Save Currency Symbols"
-"Symbols","Symbols"
-"System","System"
-"Use Default","Use Default"
+"Currency Symbols","Currency Symbols"
"Use Standard","Use Standard"
-"Use Website","Use Website"
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/CurrencySymbol/i18n/es_ES.csv b/app/code/Magento/CurrencySymbol/i18n/es_ES.csv
index 283cccb1b7c..42fcaaa65b0 100644
--- a/app/code/Magento/CurrencySymbol/i18n/es_ES.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/es_ES.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","Los sÃmbolos personalizados de divisas se aplicaron con éxito."
-"Manage Currency","Gestión de divisas"
+Reset,Reset
+System,Sistema
+Import,Import
+"Save Currency Rates","Save Currency Rates"
"Manage Currency Rates","Tasa de cambio de divisas"
-"Rates","Tasas"
+"Import Service","Import Service"
"Save Currency Symbols","Guardar sÃmbolos de divisas"
-"Symbols","SÃmbolos"
-"System","Sistema"
-"Use Default","Utilizar la opción por defecto"
+"Currency Symbols","Currency Symbols"
"Use Standard","Utilizar la opción estándar"
-"Use Website","Utilizar el sitio web"
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/CurrencySymbol/i18n/fr_FR.csv b/app/code/Magento/CurrencySymbol/i18n/fr_FR.csv
index 8d917abad97..4da9b1d74a8 100644
--- a/app/code/Magento/CurrencySymbol/i18n/fr_FR.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/fr_FR.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","Les symboles des devises ont été chargés avec succès."
-"Manage Currency","Gérer les devises"
+Reset,Reset
+System,Système
+Import,Import
+"Save Currency Rates","Save Currency Rates"
"Manage Currency Rates","Gérer le taux des devises"
-"Rates","Taux"
+"Import Service","Import Service"
"Save Currency Symbols","Enregistrer les symboles des devises"
-"Symbols","Symboles"
-"System","Système"
-"Use Default","Utiliser la valeur par défaut"
+"Currency Symbols","Currency Symbols"
"Use Standard","Utiliser la valeur standard"
-"Use Website","Utiliser le site web"
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/CurrencySymbol/i18n/nl_NL.csv b/app/code/Magento/CurrencySymbol/i18n/nl_NL.csv
index c55c97131a2..090d4f246d7 100644
--- a/app/code/Magento/CurrencySymbol/i18n/nl_NL.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/nl_NL.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","Klandizie muntsoort symbolen zijn succesvol toegepast."
-"Manage Currency","Beheer Muntsoort"
+Reset,Reset
+System,Systeem
+Import,Import
+"Save Currency Rates","Save Currency Rates"
"Manage Currency Rates","Beheer Wisselkoersen"
-"Rates","Tarieven"
+"Import Service","Import Service"
"Save Currency Symbols","Bewaar Muntsoort Symbolen"
-"Symbols","Symbolen"
-"System","Systeem"
-"Use Default","Gebruik Standaard"
+"Currency Symbols","Currency Symbols"
"Use Standard","Gebruik Standaard"
-"Use Website","Gebruik Website"
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/CurrencySymbol/i18n/pt_BR.csv b/app/code/Magento/CurrencySymbol/i18n/pt_BR.csv
index 96c480a18de..83f36453861 100644
--- a/app/code/Magento/CurrencySymbol/i18n/pt_BR.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/pt_BR.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","Os sÃmbolos de moeda personalizados foram aplicados com sucesso."
-"Manage Currency","Gerenciar moeda"
+Reset,Reset
+System,Sistema
+Import,Import
+"Save Currency Rates","Save Currency Rates"
"Manage Currency Rates","Gerenciar Taxas de Câmbio"
-"Rates","Valores"
+"Import Service","Import Service"
"Save Currency Symbols","Salvar sÃmbolos de moeda"
-"Symbols","SÃmbolos"
-"System","Sistema"
-"Use Default","Utilizar padrão"
+"Currency Symbols","Currency Symbols"
"Use Standard","Usar padrão"
-"Use Website","Usar Website"
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/CurrencySymbol/i18n/zh_CN.csv b/app/code/Magento/CurrencySymbol/i18n/zh_CN.csv
index 1814c407e1d..6670cfab47e 100644
--- a/app/code/Magento/CurrencySymbol/i18n/zh_CN.csv
+++ b/app/code/Magento/CurrencySymbol/i18n/zh_CN.csv
@@ -1,10 +1,20 @@
-"Custom currency symbols were applied successfully.","顾客货å¸ç¬¦å·å·²æˆåŠŸåº”用。"
-"Manage Currency","管ç†è´§å¸"
-"Manage Currency Rates","管ç†æ±‡çŽ‡"
-"Rates","费率"
-"Save Currency Symbols","ä¿å˜è´§å¸ç¬¦å·"
-"Symbols","符å·"
-"System","系统"
-"Use Default","使用默认值"
-"Use Standard","ä½¿ç”¨æ ‡å‡†"
-"Use Website","使用网站"
+Reset,Reset
+System,系统
+Import,Import
+"Save Currency Rates","Save Currency Rates"
+"Manage Currency Rates",管ç†æ±‡çŽ‡
+"Import Service","Import Service"
+"Save Currency Symbols",ä¿å˜è´§å¸ç¬¦å·
+"Currency Symbols","Currency Symbols"
+"Use Standard",ä½¿ç”¨æ ‡å‡†
+"Currency Rates","Currency Rates"
+"Please specify a correct Import Service.","Please specify a correct Import Service."
+"We can't initialize the import model.","We can't initialize the import model."
+"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
+"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
+"Please correct the input data for %1 => %2 rate","Please correct the input data for %1 => %2 rate"
+"All valid rates have been saved.","All valid rates have been saved."
+"The custom currency symbols were applied.","The custom currency symbols were applied."
+Currency,Currency
+Symbol,Symbol
+"Old rate:","Old rate:"
diff --git a/app/code/Magento/Customer/Block/Account/RegisterLink.php b/app/code/Magento/Customer/Block/Account/RegisterLink.php
index 5cf67f8b52f..46af63e9467 100644
--- a/app/code/Magento/Customer/Block/Account/RegisterLink.php
+++ b/app/code/Magento/Customer/Block/Account/RegisterLink.php
@@ -71,7 +71,9 @@ class RegisterLink extends \Magento\Framework\View\Element\Html\Link
*/
protected function _toHtml()
{
- if ($this->httpContext->getValue(\Magento\Customer\Helper\Data::CONTEXT_AUTH)) {
+ if (!$this->_customerHelper->isRegistrationAllowed()
+ || $this->httpContext->getValue(\Magento\Customer\Helper\Data::CONTEXT_AUTH)
+ ) {
return '';
}
return parent::_toHtml();
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
index d60bd0dce94..fb3f93a51fd 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
@@ -150,6 +150,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form->setUseContainer(true);
$form->setId('edit_form');
$form->setAction($this->getUrl('customer/*/save'));
+ $form->setMethod('post');
$this->setForm($form);
}
}
diff --git a/app/code/Magento/Customer/Controller/Account.php b/app/code/Magento/Customer/Controller/Account.php
index f11fb2d2366..1c2bccde378 100644
--- a/app/code/Magento/Customer/Controller/Account.php
+++ b/app/code/Magento/Customer/Controller/Account.php
@@ -397,6 +397,16 @@ class Account extends \Magento\Framework\App\Action\Action
$this->_view->renderLayout();
}
+ /**
+ * Check whether registration is allowed
+ *
+ * @return bool
+ */
+ protected function isRegistrationAllowed()
+ {
+ return $this->_customerHelperData->isRegistrationAllowed();
+ }
+
/**
* Customer register form page
*
@@ -404,7 +414,7 @@ class Account extends \Magento\Framework\App\Action\Action
*/
public function createAction()
{
- if ($this->_getSession()->isLoggedIn()) {
+ if ($this->_getSession()->isLoggedIn() || !$this->isRegistrationAllowed()) {
$this->_redirect('*/*');
return;
}
@@ -422,7 +432,7 @@ class Account extends \Magento\Framework\App\Action\Action
*/
public function createPostAction()
{
- if ($this->_getSession()->isLoggedIn()) {
+ if ($this->_getSession()->isLoggedIn() || !$this->isRegistrationAllowed()) {
$this->_redirect('*/*/');
return;
}
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index fa1e98c766b..2a17cc82d84 100755
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -198,7 +198,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
if ($lines <= 0) {
$lines = 2;
}
- $this->_streetLines[$websiteId] = min(4, $lines);
+ $this->_streetLines[$websiteId] = min($lines, 20);
}
return $this->_streetLines[$websiteId];
diff --git a/app/code/Magento/Customer/Model/Address/Converter.php b/app/code/Magento/Customer/Model/Address/Converter.php
index 50f0ddb4d8c..fa18bb3b1b9 100644
--- a/app/code/Magento/Customer/Model/Address/Converter.php
+++ b/app/code/Magento/Customer/Model/Address/Converter.php
@@ -140,13 +140,21 @@ class Converter
}
}
+ $isDefaultBilling = $addressModel->getData('is_default_billing') === null && intval($addressId)
+ ? $addressId === $defaultBillingId
+ : $addressModel->getData('is_default_billing');
+
+ $isDefaultShipping = $addressModel->getData('is_default_shipping') === null && intval($addressId)
+ ? $addressId === $defaultShippingId
+ : $addressModel->getData('is_default_shipping');
+
$this->_addressBuilder->populateWithArray(
array_merge(
$addressData,
array(
Address::KEY_STREET => $addressModel->getStreet(),
- Address::KEY_DEFAULT_BILLING => $addressId === $defaultBillingId,
- Address::KEY_DEFAULT_SHIPPING => $addressId === $defaultShippingId,
+ Address::KEY_DEFAULT_BILLING => $isDefaultBilling,
+ Address::KEY_DEFAULT_SHIPPING => $isDefaultShipping,
Address::KEY_REGION => array(
Region::KEY_REGION => $addressModel->getRegion(),
Region::KEY_REGION_ID => $addressModel->getRegionId(),
diff --git a/app/code/Magento/Customer/Service/V1/CustomerAccountService.php b/app/code/Magento/Customer/Service/V1/CustomerAccountService.php
index 1996e02832c..be9307eff68 100644
--- a/app/code/Magento/Customer/Service/V1/CustomerAccountService.php
+++ b/app/code/Magento/Customer/Service/V1/CustomerAccountService.php
@@ -499,7 +499,7 @@ class CustomerAccountService implements CustomerAccountServiceInterface
}
/**
- * (@inheritdoc)
+ * {@inheritdoc}
*/
public function searchCustomers(SearchCriteria $searchCriteria)
{
@@ -619,7 +619,7 @@ class CustomerAccountService implements CustomerAccountServiceInterface
$customerModel->save();
// FIXME: Are we using the proper template here?
$customerModel->sendPasswordResetNotificationEmail();
-
+
return true;
}
diff --git a/app/code/Magento/Customer/i18n/de_DE.csv b/app/code/Magento/Customer/i18n/de_DE.csv
index ffc2f13fe3a..d15d10fd758 100644
--- a/app/code/Magento/Customer/i18n/de_DE.csv
+++ b/app/code/Magento/Customer/i18n/de_DE.csv
@@ -1,476 +1,423 @@
-" or ","oder"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht extrahieren."
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht unter den bekannten Einträgen finden."
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) entspricht keinem Hostnamen -Schema für TLD '%tld%'."
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","%value%' ist offenbar ein DNS-Hostname mit einem Strich an einer ungültigen Stelle."
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' scheint ein DNS-Hostname zu sein, aber die angegebene Punycode-Notation konnte nicht entschlüsselt werden."
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' scheint der Name eines lokalen Netzwerks zu sein. Namen lokaler Netzwerke sind allerdings nicht erlaubt."
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' scheint eine IP-Adresse zu sein. IP-Adressen sind allerdings nicht erlaubt."
-"'%value%' does not appear to be a valid local network name","'%value%' scheint kein gültiger Name für ein lokales Netzwerk zu sein."
+All,Alle
+Cancel,Abbrechen
+"Create Order","Bestellung anlegen"
+Back,Zurück
+Product,Produktname
+Price,Preis
+Quantity,Anzahl
+ID,Produkt-ID
+SKU,SKU
+Configure,Konfigurieren
+Customers,Kunden
+"Shopping Cart",Warenkorb
+No,No
+Qty,Qty
+Action,Aktion
+Total,Gesamtbetrag
+"No item specified.","Kein Objekt angegeben."
+"Are you sure that you want to remove this item?","Sind Sie sicher, dass Sie den Eintrag überspringen wollen?"
+Edit,Bearbeiten
+Orders,Aufträge
+"New Customers","Neue Kunden"
+Customer,Kunde
+"Grand Total",Gesamtbetrag
+"Lifetime Sales",Gesamteinnahmen
+"All Store Views","Alle Ansichten des Geschäfts"
+"My Account","Mein Konto"
+"Account Information",Kontoinformationen
+"First Name",Vorname
+"Last Name",Nachname
+Email,E-Mail
+"New Password","Neues Passwort"
+"Delete File","Delete File"
+Delete,Löschen
+Save,Speichern
+Store,Shop
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,Name
+Status,Status
+"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
+"Store View",Store-Ansicht
+Type,Typ
+Submit,Senden
+"You deleted the customer.","You deleted the customer."
+"IP Address","IP Adresse"
+Order,"Bestellung #"
+"Customer View",Kundenansicht
+"Personal Information","Persönliche Informationen"
+View,Anzeigen
"* Required Fields","* Notwendige Felder"
-"ALL GROUPS","ALLE GRUPPEN"
-"Account Dashboard","Konto Dashboard"
-"Account Information","Kontoinformationen"
-"Account Sharing Options","Optionen zum Kontozugriff"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Sie müssen Ihr Konto zunächst bestätigen. Bitte überprüfen Sie Ihr Postfach, ob Sie den Bestätigungslink erhalten haben. Falls die Bestätigungsmail noch einmal gesendet werden soll, <a href=""%s"">klicken Sie bitte hier</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Sie müssen Ihr Konto zunächst bestätigen. Bitte überprüfen Sie Ihr Postfach, ob Sie den Bestätigungslink erhalten haben. Falls die Bestätigungsmail noch einmal gesendet werden soll, <a href=""%s"">klicken Sie bitte hier</a>."
-"Action","Aktion"
+Day,Tag
+Month,Monat
+Year,Jahr
+label,label
+Global,Global
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group",Kundengruppe
+"End Date","Newsletter Ende"
+"Customer Groups",Kundengruppen
+Country,Land
+State/Province,Staat/Provinz
+"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen"
+City,Stadt
+"Zip/Postal Code",Postleitzahl
+"Email Address",E-Mail-Adresse
+Company,Firma
+"VAT Number",MwSt.-Nummer
+Address,Adresse
+"Street Address","Adresse Strasse"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Passwort
+"Confirm Password","Passwort bestätigen"
+Login,Einloggen
+"Forgot Your Password?","Passwort vergessen?"
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information",Kontaktinformation
+"Log Out",Abmelden
+"Log In",Anmelden
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.","Sie sind momentan nicht für unseren Newsletter angemeldet."
+"You have not set a default shipping address.","Sie haben keine Standard-Versandadresse angegeben."
+"You have not set a default billing address.","Sie haben keine Standard-Rechnungsadresse angegeben."
+"Address Book",Adressbuch
+"Edit Address","Adresse bearbeiten"
"Add New Address","Neue Adresse hinzufügen"
+region,region
"Add New Customer","Neuen Kunden hinzufügen"
-"Add New Customer Group","Neue Kundengruppe hinzufügen"
-"Added From","Hinzugefügt von"
-"Additional Address Entries","Zusätzliche Einträge von Adressen"
-"Address","Adresse"
-"Address Book","Adressbuch"
-"Address Books","Adressbücher"
-"Address Information","Adressinformation"
-"Address Templates","Adressvorlagen (Templates)"
-"Addresses","Adressen"
-"Admin","Admin"
-"All","Alle"
-"All Store Views","Alle Ansichten des Geschäfts"
-"All countries","Alle Länder"
-"Always optional.","Immer fakultativ"
-"Amount","Summe"
-"An error occurred while deleting the address.","Beim Löschen der Adresse ist ein Fehler aufgetreten."
-"An error occurred while retrieving the option value: %s.","Ein Fehler ist aufgetreten beim Auslesen des Einstellungswerts: %s."
-"An error occurred while saving the collection, aborting. Error: %s","Ein Fehler ist beim Speichern der Sammlung aufgetreten. Abbrechen. Fehler: %s"
-"An invalid option ID is specified for %s (%s), skipping the record.","Eine ungültige Options-ID wurde für %s angegeben (%s). Eintrag wird übersprungen."
-"Approved","Bestätigt"
-"Are you sure that you want to remove this item?","Sind Sie sicher, dass Sie den Eintrag überspringen wollen?"
-"Are you sure you want to cancel adding of this address?","Sind Sie sicher, dass Sie das Hinzufügen dieser Adresse abbrechen wollen?"
-"Are you sure you want to delete this address?","Sind Sie sicher, dass Sie diese Adresse löschen wollen?"
-"Are you sure?","Sind Sie sicher?"
-"Array of Entity collections is expected.","Ein Array von Entitätssammlungen wurde erwartet."
-"Assign a Customer Group","Kundengruppe zuordnen."
-"Average Sale","Durchschnittsverkauf"
-"Back","Zurück"
-"Back - link to the previously viewed page","Zurück - Link zur vorher angeschauten Seite"
-"Back to Login","Zurück zur Anmeldung"
-"Bad request.","Fehlerhafter Aufruf."
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","Anhand der Umsatzsteuer-Identifikationsnummer gehört der Kunde in Kundengruppe %s."
-"Bill-to Name","Rechnung auf Namen"
-"Purchase Point","Gekauft von"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Wenn Sie sich anmelden, können Sie den Bezahlprozess schneller durchlaufen, mehrere Lieferadressen speichern, Ihre Bestellungen in Ihrem Konto anschauen und verfolgen und vieles mehr."
-"CSV","CSV"
-"Cancel","Abbrechen"
-"Cannot save a new password.","Neues Passwort konnte nicht gespeichert werden."
-"Cannot save address.","Adresse speichern nicht möglich."
-"Cannot save the customer.","Speichern des Kunden nicht möglich."
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Das Kundenkonto kann nicht global geteilt werden, da Kundenkonten mit den gleichen E-Mails bereits auf verschiedenen Websites existieren und nicht zusammengeführt werden können."
-"Change Account Password","Kontopasswort ändern."
-"Change Billing Address","Rechnungsadresse ändern"
-"Change Password","Passwort ändern"
-"Change Shipping Address","Versandadresse ändern"
-"City","Stadt"
-"Company","Firma"
-"Config","Konfig."
-"Configure","Konfigurieren"
-"Confirm New Password","Neues Passwort bestätigen"
-"Confirm Password","Passwort bestätigen"
-"Confirmation Link Email","Bestätigungslink-E-Mail"
-"Confirmed","Bestätigt"
-"Contact Information","Kontaktinformation"
-"Continue Shopping","Einkauf fortfahren"
-"Country","Land"
-"Create","Erstellen"
-"Create New Account Options","Neue Kontoptionen erstellen"
-"Create New Customer Account","Neues Kundenkonto erstellen"
-"Create Order","Bestellung anlegen"
-"Create an Account","Konto erstellen"
-"Create customer","Kunden erstellen"
-"Create customer address","Kundenadresse erstellen"
-"Current Password","Aktuelles Passwort"
-"Customer","Kunde"
-"Customer API","Kunden-API"
-"Customer Account Edit Form","Kundenkonto-Editierformular"
-"Customer Account Login Form","Kundenkonto-Anmeldeformular"
-"Customer Account Logout Success","Kundenkonto erfolgreich abgemeldet"
-"Customer Account Registration Form","Kundenkonto-Registrierungsformular"
-"Customer Addresses","Kundenadressen"
-"Customer Configuration","Kundenkonfiguration"
-"Customer Forgot Password Form","Kunde-Hat-Passwort-Vergessen-Formular"
-"Customer Group","Kundengruppe"
-"Customer Groups","Kundengruppen"
-"Customer Information","Konteninformation"
-"Customer Login","Kundenanmeldung"
-"Customer My Account (All Pages)","Mein Kundenkonto (alle Seiten)"
-"Customer My Account Address Book","Mein Kundenkonto Adressbuch"
-"Customer My Account Address Edit Form","Mein Kundenkonto Adresseneditierformular"
-"Customer My Account Dashboard","Mein Kundenkonto Dashboard"
-"Customer Since","Kunde Seit"
-"Customer View","Kundenansicht"
-"Customer collection expected.","Kundensammlung erwartet"
-"Customer email is required","Kunden-E-Mail-Adresse ist erforderlich"
-"Customer website ID must be specified when using the website scope","Kunden-Webseiten-Identifikation muss bei Nutzung der Seite angegeben werden"
-"Customer will stay on the current page if ""No"" is selected.","Kunden werden auf der derzeitigen Seite bleiben, wenn ""Nein"" ausgewählt ist."
-"Customers","Kunden"
-"Customers Only","Nur für Kunden"
-"Customers Section","Kundenbereich"
-"Day (DD)","DD"
-"Date","Datum"
-"Date Added","Hinzugefügt am"
-"Date of Birth","Geburtstag"
-"Day","Tag"
-"Days in Wishlist","Tage in der Wunschliste"
-"Default Addresses","Standardadressen"
-"Default Billing Address","Standard-Rechnungsadresse"
-"Default Email Domain","Standard-E-Mail-Domäne"
-"Default Group","Standardgruppe"
-"Default Shipping Address","Standard-Lieferadresse"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","Standardwert für Automatische Gruppenänderungen anhand der Umsatzsteuer-Identifikationsnummer deaktivieren"
-"Default Welcome Email","Standard-Begrüßungs-E-Mail"
-"Delete","Löschen"
-"Delete Address","Adresse löschen"
+"Save Customer","Kunden speichern"
"Delete Customer","Kunden löschen"
-"Delete Customer Group","Kundengruppe löschen"
-"Delete customer","Kunde löschen"
-"Delete customer address","Kundenadresse löschen"
-"Deleted Stores","Stores löschen"
-"Details","Details"
-"Disabled","Deaktiviert"
-"Edit","Bearbeiten"
-"Edit Account Info","Kontodaten bearbeiten"
-"Edit Account Information","Kontodaten bearbeiten"
-"Edit Address","Adresse bearbeiten"
-"Edit Address Entry","Adresseintrag bearbeiten"
-"Edit Customer Group ""%s""","Kundengruppe ""%s"" bearbeiten"
-"Edit Customer Groups","Kundengruppen bearbeiten"
-"Edit Customer's Address","Kundenadresse bearbeiten"
-"Edit Group","Gruppe bearbeiten"
-"Edit Newsletters","Newsletters bearbeiten"
-"Email","E-Mail"
-"Email Address","E-Mail-Adresse"
-"Email Sender","E-Mail-Absender"
-"Email:","E-Mail:"
-"Enable Automatic Assignment to Customer Group","Automatische Zuordnung zur Kundengruppe aktivieren"
-"Entity collection is expected.","Sammlung der Entität wird erwartet."
-"Excel XML","Excel-XML"
-"Failed to confirm customer account.","Bestätigung des Kundenkontos fehlgeschlagen."
-"Fax","Fax"
-"First Name","Vorname"
-"Forgot Email Template","E-mail Template vergessen"
-"Forgot Password","Passwort vergessen"
-"Forgot Your Password","Passwort vergessen"
-"Forgot Your Password?","Passwort vergessen?"
-"Forgot and Remind Email Sender","Erinnerungs-E-Mail Absender"
-"Form Fields Before","Vorheriges Dokumentfeld"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Von Meinem Konto Dashboard aus, können Sie einen Schnappschuss Ihrer aktuellen Kontoaktivität sehen und Ihre Kontoinformationen aktualisieren. Wählen Sie den nachfolgenden Link um Informationen zu sehen oder zu aktualisieren."
-"Gender","Geschlecht"
-"Gender is required.","Das Geschlecht muss angegeben werden."
-"General Subscription","Allgemeines Abonnement"
-"Generate Human-Friendly Customer ID","Menschenfreundliche Kunden-ID entwickeln"
-"Global","Global"
-"Grand Total","Gesamtbetrag"
-"Group","Gruppe"
-"Group Information","Guppeninformation"
-"Group Name","Guppenname"
-"Group for Invalid VAT ID","Gruppe für ungültige Umsatzsteuer-Identifikationsnummer"
-"Group for Valid VAT ID - Domestic","Gruppe für gültige Umsatzsteuer-Identifikationsnummer - Inland"
-"Group for Valid VAT ID - Intra-Union","Gruppe für gültige Umsatzsteuer-Identifikationsnummer - innerhalb der EU"
-"Guest","Gast"
-"HTML","HTML"
-"Hello, %s!","Hallo %s!"
-"ID","ID"
-"IP Address","IP Adresse"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","Wenn ein Konto mit %s verknüpft ist, erhalten Sie eine E-Mail mit einem Link für das Resetten Ihres Passworts."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","Wenn sie mit ihrer Umsatzsteuer-Identifikationsnummer bei uns registriert sind, klicken sie bitte auf <a href=""%s"">here</a> und geben sie dort ihre Rechnungsanschrift zur korrekten Berechnung der Umsatzsteuer an."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","Wenn sie mit ihrer Umsatzsteuer-Identifikationsnummer bei uns registriert sind, klicken sie bitte auf <a href=""%s"">here</a> und geben sie dort ihre Lieferanschrift zur korrekten Berechnung der Umsatzsteuer an."
-"If you believe this is an error, please contact us at %1","Sollte ihrer Meinung nach ein Fehler vorliegen, wenden sie sich bitte an uns unter %1"
-"If you have an account with us, please log in.","Wenn Sie bei uns ein Benutzerkonto besitzen, melden Sie sich bitte an."
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Ungültige Option für Attribut %s definiert (%s), Eintrag wird übersprungen."
-"Invalid attribute set specified, skipping the record.","Ungültiges Attributset definiert, Eintrag wird übersprungen."
-"Invalid billing address for (%s)","Ungültige Rechnungsanschrift für (%s)"
-"Invalid current password","Das aktuelle Passwort ist ungültig"
-"Invalid customer data","Ungültige Kundendaten"
-"Invalid email address ""%s"".","Ungültige E-Mail-Adresse ""%s""."
-"Invalid email address.","Ungültige Email-Adresse."
-"Invalid login or password.","Anmeldername oder Passwort ungültig."
-"Invalid password reset token.","Ungültiger Token für das Resetten des Passworts."
-"Invalid shipping address for (%s)","Ungültige Lieferanschrift für (%s)"
-"Invalid store specified, skipping the record.","Ungültiger Store definiert, Eintrag wird übersprungen."
-"Invalid website, skipping the record, line: %s","Ungültige Webseite, Datensatz überspringen, Zeile: %s"
-"Last Activity","Letzte Aktivität"
-"Last Subscribe Date","Zuletzt abonniert"
-"Last Date Unsubscribed","Zuletzt gekündigt"
-"Last Name","Nachname"
-"Last URL","Letzte URL"
-"Leave empty for default (15 minutes).","Für Standard (15 Minuten) leer lassen."
-"Leave empty for default (2). Valid range: 1-4","Für Standard (2) leer lassen. Gültige Werte: 1-4"
-"Lifetime Sales","Gesamteinnahmen"
-"Log In","Anmelden"
-"Log Out","Abmelden"
-"Login","Einloggen"
-"Login Information","Login Informationen"
-"Login Options","Login Optionen"
-"Login and password are required.","Login und Passwort werden benötigt."
-"Login or Create an Account","Anmelden oder Benutzerkonto erstellen"
-"Month (MM)","MM"
-"Manage Addresses","Adressen verwalten"
-"Manage Customers","Kunden verwalten"
-"Maximum length must be less then %s symbols","Die Länge darf nicht mehr als %s Zeichen betragen"
-"Missing email, skipping the record, line: %s","E-Mail fehlt, Datensatz überspringen, Zeile: %s"
-"Missing email, skipping the record.","E-Mail fehlt, überspringe Eintrag."
-"Missing first name, skipping the record, line: %s","Firmenanschrift fehlt, Datensatz überspringen, Zeile: %s"
-"Missing firstname, skipping the record.","Vorname fehlt, überspringe Eintrag."
-"Missing last name, skipping the record, line: %s","Nachname fehlt, Datensatz überspringen, Zeile: %s"
-"Missing lastname, skipping the record.","Nachname fehlt, überspringe Eintrag."
-"Missing website, skipping the record, line: %s","Webseite fehlt, Datensatz überspringen, Zeile: %s"
-"Month","Monat"
-"My Account","Mein Konto"
-"My Account Wrapper","Meine Account-Verpackung"
-"My Dashboard","Meine Startseite"
-"My Orders","Meine Bestellungen"
-"Name","Name"
-"Name and Address Options","Namen- und Adressoptionen"
-"Never","Niemals"
-"New Address","Neue Adresse"
-"New Address Entry","Neuer Adresseintrag"
+"Reset Password","Reset Password"
"New Customer","Neuer Kunde"
-"New Customer Address","Neue Kundenadresse"
-"New Customer Group","Neue Kundengruppe"
-"New Customer Groups","Neue Kundengruppen"
-"New Customers","Neue Kunden"
-"New Group","Neue Gruppe"
-"New Password","Neues Passwort"
-"New account","Neues Konto"
-"New account confirmation key","Neuer Kontobestätigungscode"
-"New account confirmed","Neues Konto bestätigt"
-"New password field cannot be empty.","Das Feld für das neue Passwort kann nicht leer sein."
-"Newsletter","Newsletter"
-"End Date","Newsletter Ende"
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select","Bitte auswählen"
+"Send Welcome Email","Willkommen eMail senden"
+"Send From","Senden von"
+"Send Welcome Email after Confirmation","Willkommen eMail nach Bestätigung senden"
+"Delete Address","Adresse löschen"
+"Edit Customer's Address","Kundenadresse bearbeiten"
+"Shopping Cart from %1","Shopping Cart from %1"
"Newsletter Information","Newsletter Information"
-"Receive Date","Newsletter empfangen"
-"Start Date","Start Date"
-"Newsletter Subscription","Newsletter abonnieren"
-"Newsletters","Newsletter"
-"No Items Found","Keine Objekte gefunden"
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed","Last Date Subscribed"
+"Last Date Unsubscribed","Zuletzt gekündigt"
"No Newsletter Found","Kein Newsletter gefunden"
-"No customer collections found","Keine Kundensammlungen gefunden"
-"No item specified.","Kein Objekt angegeben."
+"Start date","Start date"
+"Receive Date","Newsletter empfangen"
+Subject,Betreff
+Sent,Gesendet
"Not Sent","Nicht gesendet"
-"Not confirmed, can login","Nicht bestätigt, kann sich anmelden"
-"Not confirmed, cannot login","Nicht bestätigt, kann sich nicht anmelden"
-"Number of Lines in a Street Address ","Zeilenzahl in einer Postadresse"
-"Offline","Offline"
-"Online","Online"
-"Online Customers","Online-Kunden"
-"Online Customers Options","Online-Kunden-Optionen"
-"Online Minutes Interval","Online-Minuten-Intervall"
-"Order","Bestellung #"
-"Order Total","Gesamtsumme Bestellung"
-"Orders","Aufträge"
-"PDF","PDF"
-"Password","Passwort"
-"Password Management","Passwortverwaltung"
-"Password Options","Passwortoptionen"
-"Password forgotten","Passwort vergessen"
-"Password:","Passwort:"
-"Paused","Pausiert"
-"Pending","Ausstehend"
-"Per Website","Pro Webseite"
-"Personal Information","Persönliche Informationen"
-"Please enter a number 1 or greater in this field.","Bitte geben sie hier eine Zahl ein, die mindestens 1 beträgt."
-"Please enter a valid date between %s and %s at %s.","Bitte geben sie ein gültiges Datum zwischen %s und %s zu %s ein."
-"Please enter a valid date equal to or greater than %s at %s.","Bitte geben sie ein gültiges Datum gleich oder größer als %s zu %s ein."
-"Please enter a valid date less than or equal to %s at %s.","Bitte geben sie ein gültiges Datum gleich oder kleiner als %s zu %s ein."
-"Please enter the city.","Bitte geben Sie die Stadt ein."
-"Please enter the country.","Bitte geben Sie das Land ein."
-"Please enter the first name.","Bitte geben Sie den Vornamen ein."
-"Please enter the last name.","Bitte geben Sie den Nachnamen ein."
-"Please enter the state/province.","Bitte geben Sie das Bundesland an."
-"Please enter the street.","Bitte geben Sie die Straße ein."
-"Please enter the telephone number.","Bitte geben Sie die Telefonnummer ein."
-"Please enter the zip/postal code.","Bitte geben Sie die Postleitzahl an."
-"Please enter your email address below. You will receive a link to reset your password.","Bitte geben Sie Ihre Email-Adresse ein. Sie erhalten dann einen Link mit dem Sie Ihr Passwort zurücksetzen können."
-"Please enter your email below and we'll send you confirmation link for it.","Bitte geben Sie unten Ihre E-Mail-Adresse ein, und wir senden Ihnen einen Bestätigungslink."
-"Please enter your email.","Bitte geben Sie Ihre E-Mail-Adresse ein."
-"Please make sure your passwords match.","Bitte stellen Sie sicher, dass die Passwörter übereinstimmen."
-"Please select","Bitte auswählen"
-"Please select a website which contains store view","Bitte wählen sie eine Webseite mit Store-Ansicht aus"
-"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen"
-"Please, check your email for confirmation key.","Bitte überprüfen Sie Ihre E-Mails auf den Bestätigungscode."
-"Prefix Dropdown Options","Vorwahl-Auswahlboxoptionen"
-"Price","Preis"
-"Product","Produkt"
-"ID","Produkt-ID"
-"Product","Produktname"
-"Product Reviews","Produktreviews"
-"Product Tags","Produkttags"
-"Purchase On","Gekauft am"
+Sending,"Wird gesendet"
+Paused,Pausiert
+Unknown,Unbekannt
"Purchase Date","Gekauft bei"
-"Quantity","Anzahl"
+"Bill-to Name","Rechnung auf Namen"
+"Ship-to Name","Ship-to Name"
+"Order Total","Gesamtsumme Bestellung"
+"Purchase Point","Gekauft von"
+Never,Niemals
+Offline,Offline
+Online,Online
+Confirmed,Bestätigt
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.","Der Kunde hat keine Standard-Rechnungsadresse."
"Recent Orders","Letzte Bestellungen"
-"Records for %s store found.","Einträge für %s Laden gefunden."
-"Recovery Link Expiration Interval (days)","Verbleibende Gültigkeitsdauer des Wiederherstellungslinks (Tage)"
-"Redirect Customer to Account Dashboard after Logging in","Kunden nach Login zur Kontostartseite umleiten"
-"Refunded","Rückerstattet"
-"Registered Customers","Registrierte Kunden"
-"Remind Email Template","Vorlage Erinnerungsmail"
-"Remind Password","An Passwort erinnern"
-"Remove","Entfernen"
-"Require Emails Confirmation","E-Mail-Bestätigung nötig"
-"Reset a Password","Passwort zurücksetzen"
-"Retrieve address data","Adressdaten abfragen"
-"Retrieve address info","Adressinfo abfragen"
-"Retrieve customer addresses","Kundenadressen abfragen"
-"Retrieve customer data","Kundendaten abfragen"
-"Retrieve customer groups","Kundengruppen abfragen"
-"Retrieve customer info","Kundeninfo abfragen"
-"Retrieve customers","Kunden abfragen"
-"Retrieve your confirmation link here","Bestätigungslink hier anfordern"
-"Retrieve your password here","Passwort hier anfordern"
-"SKU","SKU"
-"Sales Statistics","Verkaufsstatistiken"
-"Save","Speichern"
-"Save Address","Adresse speichern"
-"Save Customer","Kunden speichern"
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment","Es gibt momentan keine Artikel im Kundenwarenkorb"
+"Shipped-to Name","Shipped-to Name"
+"Deleted Stores","Stores löschen"
+"There are no items in customer's wishlist at the moment","Momentan gibt es keine Artikel auf dem Wunschzettel des Kunden"
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
+"Customer Information",Konteninformation
+Addresses,Adressen
+Wishlist,Wunschzettel
+Newsletter,Newsletter
+"Product Reviews",Produktreviews
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries","Alle Länder"
+"Add New Customer Group","Neue Kundengruppe hinzufügen"
"Save Customer Group","Kundengruppe speichern"
-"Save Password","Passwort speichern"
-"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
-"Saved %d record(s)","%d gespeicherte(r) Eintrag/Einträge"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Semikolon (;) getrennte Werte.<br/>Setzen Sie ein Semikolon an den Anfang für eine leere erste Option.<br/>Leer lassen für ein offenes Textfeld."
-"Send From","Senden von"
-"Send Welcome Email","Willkommen eMail senden"
-"Send Welcome Email after Confirmation","Willkommen eMail nach Bestätigung senden"
-"Send auto-generated password","Automatisch generiertes Passwort senden"
-"Send confirmation link","Bestätigungslink senden"
-"Sending","Wird gesendet"
-"Sent","Gesendet"
-"Session Start Time","Startzeit der Session"
-"Set as Default Billing Address","Rechnungsadresse als Vorgabe einstellen"
-"Set as Default Shipping Address","Versandadresse als Vorgabe einstellen"
-"Share Customer Accounts","Kundenkonten gemeinsam nutzen"
-"Ship-to First Name","Versendet an Vorname"
-"Ship-to Last Name","Versendet an Nachname"
-"Shipped to Name","Versendet an Name"
-"Shopping Cart","Warenkorb"
-"Shopping Cart - %d item(s)","Einkaufswagen - %d Artikel"
-"Shopping Cart of %1$s - %2$d item(s)","Einkaufswagen von %1$s - %2$d Artikel"
-"Show Date of Birth","Geburtsdatum anzeigen"
-"Show Gender","Geschlecht anzeigen"
-"Show Middle Name (initial)","Zweiten Vornamen anzeigen (Initialen)"
-"Show Prefix","Präfix anzeigen"
-"Show Suffix","Suffix anzeigen"
-"Show Tax/VAT Number","Steuer/MwSt. Nummer anzeigen"
-"Sign Up for Newsletter","Für Newsletter eintragen"
-"Skipping import row, required field ""%s"" is not defined.","Import der Reihe wird jetzt übersprungen. Das benötigte Feld ""%s"" ist nicht definiert."
-"Skipping import row, website ""%s"" field does not exist.","Import-Zeile übersprungen, Feld für Webseite ""%s"" existiert nicht."
-"State/Province","Staat/Provinz"
-"Status","Status"
-"Store","Shop"
-"Store View","Store-Ansicht"
-"Street Address","Adresse Strasse"
-"Street Address %s","Adresse Strasse %s"
-"Subject","Betreff"
-"Submit","Senden"
-"Subscribe to Newsletter","Newsletter abonnieren"
-"Subscribed to Newsletter?","Newletter abonniert?"
-"Suffix Dropdown Options","Optionen für Suffix-Aufklappmenü"
-"Tag","Tagname"
-"Tax Calculation Based On","Steuerberechnung anhand von"
-"Tax Class","Steuerklasse"
-"Tax/VAT number","USt.ID"
-"Phone","Telefon"
-"Text","Text"
-"Text One Line","Text einzeilig"
-"Thank you for registering with %s.","Vielen Dank für Ihre Registrierung bei %s."
-"The Date of Birth is required.","Das Geburtsdatum muss angegeben werden."
-"The TAX/VAT number is required.","Die USt-IdNr. muss angegeben werden."
-"The VAT ID entered (%s) is not a valid VAT ID.","Die angegebene Umsatzsteuer-Identifikationsnummer (%s) ist nicht gültig."
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","Die angegebene Umsatzsteuer-Identifikationsnummer (%s) ist nicht gültig. Der Kunde würde in Kundengruppe %s gehören."
+"Delete Customer Group","Kundengruppe löschen"
+"New Customer Group","Neue Kundengruppe"
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
+"Group Information",Guppeninformation
+"Group Name",Guppenname
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class",Steuerklasse
+"Customers Only","Nur für Kunden"
+"Visitors Only","Nur Besucher"
+Visitor,Besucher
+"The customer is currently assigned to Customer Group %s.","Der Kunde ist derzeit Kundengruppe %s zugeordnet."
+"Would you like to change the Customer Group for this order?","Möchten sie die Kundengruppe für diese Bestellung ändern?"
"The VAT ID is valid. The current Customer Group will be used.","Umsatzsteuer-Identifikationsnummer (%s) ist nicht gültig. Aktuelle Kundengruppe wird angewandt
."
-"The account information has been saved.","Benutzerkonto Information wurde gespeichert."
-"The address does not belong to this customer.","Diese Adresse gehört nicht zu diesem Kunden."
-"The address has been deleted.","Die Adresse wurde gelöscht."
-"The address has been saved.","Die Adresse wurde gespeichert."
-"The customer ID and email did not match, skipping the record, line: %s","Kunden-ID und E-Mail stimmen nicht überein, Datensatz überspringen, Zeile: %s"
-"The customer does not have default billing address.","Der Kunde hat keine Standard-Rechnungsadresse."
-"The customer email (%s) already exists, skipping the record, line: %s","Kunden - E-Mail existiert bereits, Datensatz überspringen, Zeile: %s"
-"The customer group has been deleted.","Die Kundengruppe wurde gelöscht."
-"The customer group has been saved.","Die Kundengruppe wurde gespeichert."
-"The customer is currently assigned to Customer Group %s.","Der Kunde ist derzeit Kundengruppe %s zugeordnet."
-"The first name cannot be empty.","Der Vorname darf nicht leer sein."
-"The group ""%s"" cannot be deleted","Die Gruppe ""%s"" kann nicht gelöscht werden"
-"The last name cannot be empty.","Der Nachname darf nicht leer sein."
-"The minimum password length is %s","Die minimale Passwortlänge beträgt %s."
-"The password cannot be empty.","Das Passwort darf nicht leer sein."
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","Ihr Passwort muß aus mindest 6 Zeichen bestehen. Leerzeichen am Anfang oder Ende werden abgeschnitten."
-"The suffix that goes after name (Jr., Sr., etc.)","Das Suffix nach dem Namen (Jr., Sr., usw.)"
-"The title that goes before name (Mr., Mrs., etc.)","Die Anrede vor dem Namen (Hr., Fr., usw.)"
-"There are no items in customer's wishlist at the moment","Momentan gibt es keine Artikel auf dem Wunschzettel des Kunden"
-"There are no items in customer's shopping cart at the moment","Es gibt momentan keine Artikel im Kundenwarenkorb"
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","Es existiert schon ein Account mit dieser E-Mail-Adresse. Falls Sie sicher sein sollten, dass es Ihre E-Mail-Adresse ist, <a href=""%s"">klicken Sie hier</a>, um Ihr Passwort und Zugang zum Account zu erhalten."
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
"There was an error validating the VAT ID.","Bei der Überprüfung der Umsatzsteuer-Identifikationsnummer ist ein Fehler aufgetreten."
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Bei der Überprüfung der Umsatzsteuer-Identifikationsnummer trat ein Fehler auf. Der Kunde würde zu Kundengruppe %s gehören."
-"This account is not confirmed.","Dieses Benutzerkonto wurde nicht bestätigt."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","Dieser Account wurde noch nicht bestätigt. <a href=""%s"">Klicken Sie hier</a>, um die Bestätigungsmail noch einmal zu senden."
-"This customer email already exists","Diese Kunden-Mailadresse existiert bereits"
-"This customer has no saved addresses.","Dieser Kunde besitzt keine gespeicherten Adressen."
-"This email does not require confirmation.","Diese E-Mail erfordert keine Bestätigung."
-"This email will be sent instead of default welcome email, after account confirmation.","Diese E-Mail wird statt der Standard Willkommensnachricht nach dem Anlegen eines Benutzerkontos verschickt."
-"This is My Default %s Address","Dies ist meine Standard %s Adresse"
-"To Cart","Zum Warenkorb"
-"Total","Gesamtbetrag"
-"Type","Typ"
-"Unable to save the customer.","Speichern von Kunde nicht möglich."
-"Unknown","Unbekannt"
-"Unsubscribe from Newsletter","Vom Newsletter abmelden"
-"Update","Aktualisieren"
-"Update customer address data","Kundenadressdaten aktualisieren"
-"Update customer data","Kundendaten aktualisieren"
-"Use as My Default %s Address","Als meine Standard %s Adresse verwenden"
-"Use as My Default Billing Address","Als meine Standard-Rechnungsadresse verwenden"
-"Use as My Default Shipping Address","Als meine Standard-Versandadresse verwenden"
-"Use as my default billing address","Als meine Standard-Rechnungsadresse verwenden"
-"Use as my default shipping address","Als meine Standardlieferadresse verwenden"
-"VAT Number","MwSt.-Nummer"
-"VAT Request Date","Anfordungsdatum der Umsatzsteuer"
-"VAT Request Identifier","Anfragekennung für Umsatzsteuer"
"Validate VAT Number","Umsatzsteuer-Identifikationsnummer wird überprüft"
-"Validate on Each Transaction","Bei jeder Transaktion überprüfen"
-"Validation Error Group","Überprüfungsfehler Gruppe"
-"View","Anzeigen"
-"View Order","Bestellung ansehen"
-"Visitor","Besucher"
-"Visitors Only","Nur Besucher"
-"Website","Website"
-"Welcome Email","Willkommensnachricht"
-"Wishlist","Wunschzettel"
-"Wishlist - %d item(s)","Wunschzettel - %d Artikel"
-"Would you like to change the Customer Group for this order?","Möchten sie die Kundengruppe für diese Bestellung ändern?"
-"Wrong confirmation key.","Falscher Bestätigungsschlüssel."
+"Customer Login",Kundenanmeldung
+"Create New Customer Account","Neues Kundenkonto erstellen"
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
+"Invalid login or password.","Anmeldername oder Passwort ungültig."
+"There was an error validating the login and password.","There was an error validating the login and password."
+"Login and password are required.","Login und Passwort werden benötigt."
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.","Speichern des Kunden nicht möglich."
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
"Wrong customer account specified.","Falsches Benutzerkonto angegeben."
+"Bad request.","Fehlerhafter Aufruf."
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.","Bitte überprüfen Sie Ihre E-Mails auf den Bestätigungscode."
+"This email does not require confirmation.","Diese E-Mail erfordert keine Bestätigung."
"Wrong email.","Falsche E-Mail."
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.","Bitte geben Sie Ihre E-Mail-Adresse ein."
+"Your password reset link has expired.","Der Link für das Resetten Ihres Passworts ist abgelaufen."
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
+"New password field cannot be empty.","Das Feld für das neue Passwort kann nicht leer sein."
+"Your password has been updated.","Ihr Passwort wurde geändert."
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.","Benutzerkonto Information wurde gespeichert."
+"The address has been saved.","Die Adresse wurde gespeichert."
+"Cannot save address.","Adresse speichern nicht möglich."
+"The address has been deleted.","Die Adresse wurde gelöscht."
+"An error occurred while deleting the address.","Beim Löschen der Adresse ist ein Fehler aufgetreten."
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group","Neue Gruppe"
+"New Customer Groups","Neue Kundengruppen"
+"Edit Group","Gruppe bearbeiten"
+"Edit Customer Groups","Kundengruppen bearbeiten"
+"The customer group has been saved.","Die Kundengruppe wurde gespeichert."
+"The customer group has been deleted.","Die Kundengruppe wurde gelöscht."
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers","Kunden verwalten"
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
+"Online Customers",Online-Kunden
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
+"Please enter the first name.","Bitte geben Sie den Vornamen ein."
+"Please enter the last name.","Bitte geben Sie den Nachnamen ein."
+"Please enter the street.","Bitte geben Sie die Straße ein."
+"Please enter the city.","Bitte geben Sie die Stadt ein."
+"Please enter the telephone number.","Bitte geben Sie die Telefonnummer ein."
+"Please enter the zip/postal code.","Bitte geben Sie die Postleitzahl an."
+"Please enter the country.","Bitte geben Sie das Land ein."
+"Please enter the state/province.","Bitte geben Sie das Bundesland an."
+"Per Website","Pro Webseite"
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Das Kundenkonto kann nicht global geteilt werden, da Kundenkonten mit den gleichen E-Mails bereits auf verschiedenen Websites existieren und nicht zusammengeführt werden können."
+"This account is not confirmed.","Dieses Benutzerkonto wurde nicht bestätigt."
"Wrong transactional account email type","Falsche Girokonto E-Mail"
-"Year (YYYY)","JJJJ"
-"Year","Jahr"
-"You are currently not subscribed to any newsletter.","Sie sind momentan für keinen Newsletter angemeldet."
-"You are currently not subscribed to our newsletter.","Sie sind momentan nicht für unseren Newsletter angemeldet."
+"The first name cannot be empty.","Der Vorname darf nicht leer sein."
+"The last name cannot be empty.","Der Nachname darf nicht leer sein."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.","Das Geburtsdatum muss angegeben werden."
+"The TAX/VAT number is required.","Die USt-IdNr. muss angegeben werden."
+"Gender is required.","Das Geschlecht muss angegeben werden."
+"Invalid password reset token.","Ungültiger Token für das Resetten des Passworts."
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,Admin
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required","Kunden-E-Mail-Adresse ist erforderlich"
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope","Kunden-Webseiten-Identifikation muss bei Nutzung der Seite angegeben werden"
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses",Kundenadressen
+"Are you sure you want to delete this address?","Sind Sie sicher, dass Sie diese Adresse löschen wollen?"
+"Set as Default Billing Address","Rechnungsadresse als Vorgabe einstellen"
+"Default Billing Address",Standard-Rechnungsadresse
+"Set as Default Shipping Address","Versandadresse als Vorgabe einstellen"
+"Default Shipping Address",Standard-Lieferadresse
+"New Customer Address","Neue Kundenadresse"
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
+"Sales Statistics",Verkaufsstatistiken
+"Average Sale",Durchschnittsverkauf
+"Manage Addresses","Adressen verwalten"
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Von Meinem Konto Dashboard aus, können Sie einen Schnappschuss Ihrer aktuellen Kontoaktivität sehen und Ihre Kontoinformationen aktualisieren. Wählen Sie den nachfolgenden Link um Informationen zu sehen oder zu aktualisieren."
+"Change Password","Passwort ändern"
+Newsletters,Newsletter
"You are currently subscribed to 'General Subscription'.","Sie sind momentan für das Abo 'Allgemeines' angemeldet."
-"You are currently subscribed to our newsletter.","Sie sind momentan für unseren Newsletter angemeldet."
-"You are now logged out","Sie sind jetzt abgemeldet"
-"You have logged out and will be redirected to our homepage in 5 seconds.","Sie haben sich abgemeldet und werden innerhalb von 5 Sekunden zu unserer Startseite weitergeleitet."
-"You have no additional address entries in your address book.","Sie haben keine zusätzlichen Adresseinträge in Ihrem Adressbuch."
-"You have no additional entries in your address book.","Sie besitzen keine zusätzlichen Einträge in Ihrem Adressbuch."
+"You are currently not subscribed to any newsletter.","Sie sind momentan für keinen Newsletter angemeldet."
+"Default Addresses",Standardadressen
+"Change Billing Address","Rechnungsadresse ändern"
"You have no default billing address in your address book.","Sie haben in Ihrem Adressbuch keine Standard-Rechnungsadresse."
-"You have no default entries in your address book.","In Ihrem Adressbuch befinden sich keine Standard-Einträge."
+"Change Shipping Address","Versandadresse ändern"
"You have no default shipping address in your address book.","Sie haben in Ihrem Adressbuch keine Standard-Versandadresse."
-"You have not set a default billing address.","Sie haben keine Standard-Rechnungsadresse angegeben."
-"You have not set a default shipping address.","Sie haben keine Standard-Versandadresse angegeben."
-"You have placed no orders yet.","Sie haben noch keine Bestellung aufgegeben."
-"You have placed no products yet.","Sie haben noch keine Artikel ausgewählt."
-"You will be charged tax.","Sie sind steuerpflichtig."
-"You will not be charged tax.","Sie sind nicht steuerpflichtig."
-"Your Tax ID cannot be validated.","Ihre Umsatzsteuer-Identifikationsnummer konnte nicht überprüft werden."
-"Your VAT ID was successfully validated.","Ihre Umsatzsteuer-Identifikationsnummer wurde erfolgreich überprüft."
-"Your account balance is: %s","Ihr Kontostand beträgt: %s"
-"Your password has been updated.","Ihr Passwort wurde geändert."
-"Your password reset link has expired.","Der Link für das Resetten Ihres Passworts ist abgelaufen."
-"ZIP","Postleitzahl"
-"ZIP/Post Code","Postleitzahl"
-"Zip/Postal Code","Postleitzahl"
-"n/a","Keine Angabe"
-"or","oder"
-"register","Registrieren"
+"Additional Address Entries","Zusätzliche Einträge von Adressen"
+"You have no additional address entries in your address book.","Sie haben keine zusätzlichen Adresseinträge in Ihrem Adressbuch."
+"Use as my default billing address","Als meine Standard-Rechnungsadresse verwenden"
+"Use as my default shipping address","Als meine Standardlieferadresse verwenden"
+"Save Address","Adresse speichern"
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
+"Send confirmation link","Bestätigungslink senden"
+"Back to Login","Zurück zur Anmeldung"
+"Current Password","Aktuelles Passwort"
+"Confirm New Password","Neues Passwort bestätigen"
+"Please enter your email address below. You will receive a link to reset your password.","Bitte geben Sie Ihre Email-Adresse ein. Sie erhalten dann einen Link mit dem Sie Ihr Passwort zurücksetzen können."
+"Registered Customers","Registrierte Kunden"
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription","Allgemeines Abonnement"
+"Sign Up for Newsletter","Für Newsletter eintragen"
+"Address Information",Adressinformation
+"Login Information","Login Informationen"
+"Create account","Create account"
+"Reset a Password","Passwort zurücksetzen"
+"You have logged out and will be redirected to our homepage in 5 seconds.","Sie haben sich abgemeldet und werden innerhalb von 5 Sekunden zu unserer Startseite weitergeleitet."
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Wenn Sie sich anmelden, können Sie den Bezahlprozess schneller durchlaufen, mehrere Lieferadressen speichern, Ihre Bestellungen in Ihrem Konto anschauen und verfolgen und vieles mehr."
+"Date of Birth",Geburtstag
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,Geschlecht
+"Tax/VAT number",USt.ID
+"Subscribe to Newsletter","Newsletter abonnieren"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
+"Tax Calculation Based On","Tax Calculation Based On"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
+"Validation Error Group","Validation Error Group"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
+"Welcome Email","Welcome Email"
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,Gruppe
+"Are you sure you want to delete?","Are you sure you want to delete?"
+"Unsubscribe from Newsletter","Vom Newsletter abmelden"
+"Assign a Customer Group","Kundengruppe zuordnen."
+Phone,Telefon
+ZIP,Postleitzahl
+"Customer Since","Kunde Seit"
+n/a,"Keine Angabe"
+"Session Start Time","Startzeit der Session"
+"Last Activity","Letzte Aktivität"
+"Last URL","Letzte URL"
+"Edit Account Information","Kontodaten bearbeiten"
+"Forgot Your Password","Passwort vergessen"
+"Password forgotten","Passwort vergessen"
+"My Dashboard","Meine Startseite"
+"You are now logged out","Sie sind jetzt abgemeldet"
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 5d1ed670f52..253ebc2403d 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -1,475 +1,422 @@
-" or "," or "
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' appears to be a DNS hostname but contains a dash in an invalid position"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' appears to be a local network name but local network names are not allowed"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' appears to be an IP address, but IP addresses are not allowed"
-"'%value%' does not appear to be a valid local network name","'%value%' does not appear to be a valid local network name"
-"* Required Fields","* Required Fields"
-"ALL GROUPS","ALL GROUPS"
-"Account Dashboard","Account Dashboard"
+All,All
+Cancel,Cancel
+"Create Order","Create Order"
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Configure,Configure
+Customers,Customers
+"Shopping Cart","Shopping Cart"
+No,No
+Qty,Qty
+Action,Action
+Total,Total
+"No item specified.","No item specified."
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Edit
+Orders,Orders
+"New Customers","New Customers"
+Customer,Customer
+"Grand Total","Grand Total"
+"Lifetime Sales","Lifetime Sales"
+"All Store Views","All Store Views"
+"My Account","My Account"
"Account Information","Account Information"
-"Account Sharing Options","Account Sharing Options"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>."
-"Action","Action"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"New Password","New Password"
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,Name
+Status,Status
+"Save and Continue Edit","Save and Continue Edit"
+"Store View","Store View"
+Type,Type
+Submit,Submit
+"You deleted the customer.","You deleted the customer."
+"IP Address","IP Address"
+Order,Order
+"Customer View","Customer View"
+"Personal Information","Personal Information"
+View,View
+"* Required Fields","* Required Fields"
+Day,Day
+Month,Month
+Year,Year
+label,label
+Global,Global
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group","Customer Group"
+"End Date","End Date"
+"Customer Groups","Customer Groups"
+Country,Country
+State/Province,State/Province
+"Please select region, state or province","Please select region, state or province"
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+"Email Address","Email Address"
+Company,Company
+"VAT Number","VAT Number"
+Address,Address
+"Street Address","Street Address"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Password
+"Confirm Password","Confirm Password"
+Login,Login
+"Forgot Your Password?","Forgot Your Password?"
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information","Contact Information"
+"Log Out","Log Out"
+"Log In","Log In"
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.","You are currently not subscribed to our newsletter."
+"You have not set a default shipping address.","You have not set a default shipping address."
+"You have not set a default billing address.","You have not set a default billing address."
+"Address Book","Address Book"
+"Edit Address","Edit Address"
"Add New Address","Add New Address"
+region,region
"Add New Customer","Add New Customer"
-"Add New Customer Group","Add New Customer Group"
-"Added From","Added From"
-"Additional Address Entries","Additional Address Entries"
-"Address","Address"
-"Address Book","Address Book"
-"Address Books","Address Books"
-"Address Information","Address Information"
-"Address Templates","Address Templates"
-"Addresses","Addresses"
-"Admin","Admin"
-"All","All"
-"All Store Views","All Store Views"
-"All countries","All countries"
-"Always optional.","Always optional."
-"Amount","Amount"
-"An error occurred while deleting the address.","An error occurred while deleting the address."
-"An error occurred while retrieving the option value: %s.","An error occurred while retrieving the option value: %s."
-"An error occurred while saving the collection, aborting. Error: %s","An error occurred while saving the collection, aborting. Error: %s"
-"An invalid option ID is specified for %s (%s), skipping the record.","An invalid option ID is specified for %s (%s), skipping the record."
-"Approved","Approved"
-"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
-"Are you sure you want to cancel adding of this address?","Are you sure you want to cancel adding of this address?"
-"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
-"Are you sure?","Are you sure?"
-"Array of Entity collections is expected.","Array of Entity collections is expected."
-"Assign a Customer Group","Assign a Customer Group"
-"Average Sale","Average Sale"
-"Back","Back"
-"Back - link to the previously viewed page","Back - link to the previously viewed page"
-"Back to Login","Back to Login"
-"Bad request.","Bad request."
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","Based on the VAT ID, the customer would belong to the Customer Group %s."
+"Save Customer","Save Customer"
+"Delete Customer","Delete Customer"
+"Reset Password","Reset Password"
+"New Customer","New Customer"
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select","Please select"
+"Send Welcome Email","Send Welcome Email"
+"Send From","Send From"
+"Send Welcome Email after Confirmation","Send Welcome Email after Confirmation"
+"Delete Address","Delete Address"
+"Edit Customer's Address","Edit Customer's Address"
+"Shopping Cart from %1","Shopping Cart from %1"
+"Newsletter Information","Newsletter Information"
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed","Last Date Subscribed"
+"Last Date Unsubscribed","Last Date Unsubscribed"
+"No Newsletter Found","No Newsletter Found"
+"Start date","Start date"
+"Receive Date","Receive Date"
+Subject,Subject
+Sent,Sent
+"Not Sent","Not Sent"
+Sending,Sending
+Paused,Paused
+Unknown,Unknown
+"Purchase Date","Purchase Date"
"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
"Purchase Point","Purchase Point"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more."
-"CSV","CSV"
-"Cancel","Cancel"
-"Cannot save a new password.","Cannot save a new password."
-"Cannot save address.","Cannot save address."
-"Cannot save the customer.","Cannot save the customer."
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged."
-"Change Account Password","Change Account Password"
-"Change Billing Address","Change Billing Address"
-"Change Password","Change Password"
-"Change Shipping Address","Change Shipping Address"
-"City","City"
-"Company","Company"
-"Config","Config"
-"Configure","Configure"
-"Confirm New Password","Confirm New Password"
-"Confirm Password","Confirm Password"
-"Confirmation Link Email","Confirmation Link Email"
-"Confirmed","Confirmed"
-"Contact Information","Contact Information"
-"Continue Shopping","Continue Shopping"
-"Country","Country"
-"Create","Create"
-"Create New Account Options","Create New Account Options"
-"Create New Customer Account","Create New Customer Account"
-"Create Order","Create Order"
-"Create an Account","Create an Account"
-"Create customer","Create customer"
-"Create customer address","Create customer address"
-"Current Password","Current Password"
-"Customer","Customer"
-"Customer API","Customer API"
-"Customer Account Edit Form","Customer Account Edit Form"
-"Customer Account Login Form","Customer Account Login Form"
-"Customer Account Logout Success","Customer Account Logout Success"
-"Customer Account Registration Form","Customer Account Registration Form"
-"Customer Addresses","Customer Addresses"
-"Customer Configuration","Customer Configuration"
-"Customer Forgot Password Form","Customer Forgot Password Form"
-"Customer Group","Customer Group"
-"Customer Groups","Customer Groups"
+Never,Never
+Offline,Offline
+Online,Online
+Confirmed,Confirmed
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.","The customer does not have default billing address."
+"Recent Orders","Recent Orders"
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment","There are no items in customer's shopping cart at the moment"
+"Shipped-to Name","Shipped-to Name"
+"Deleted Stores","Deleted Stores"
+"There are no items in customer's wishlist at the moment","There are no items in customer's wishlist at the moment"
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
"Customer Information","Customer Information"
-"Customer Login","Customer Login"
-"Customer My Account (All Pages)","Customer My Account (All Pages)"
-"Customer My Account Address Book","Customer My Account Address Book"
-"Customer My Account Address Edit Form","Customer My Account Address Edit Form"
-"Customer My Account Dashboard","Customer My Account Dashboard"
-"Customer Since","Customer Since"
-"Customer View","Customer View"
-"Customer collection expected.","Customer collection expected."
-"Customer email is required","Customer email is required"
-"Customer website ID must be specified when using the website scope","Customer website ID must be specified when using the website scope"
-"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
-"Customers","Customers"
-"Customers Only","Customers Only"
-"Customers Section","Customers Section"
-"Day (DD)","DD"
-"Date","Date"
-"Date Added","Date Added"
-"Date of Birth","Date of Birth"
-"Day","Day"
-"Days in Wishlist","Days in Wishlist"
-"Default Addresses","Default Addresses"
-"Default Billing Address","Default Billing Address"
-"Default Email Domain","Default Email Domain"
-"Default Group","Default Group"
-"Default Shipping Address","Default Shipping Address"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
-"Default Welcome Email","Default Welcome Email"
-"Delete","Delete"
-"Delete Address","Delete Address"
-"Delete Customer","Delete Customer"
+Addresses,Addresses
+Wishlist,Wishlist
+Newsletter,Newsletter
+"Product Reviews","Product Reviews"
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries","All countries"
+"Add New Customer Group","Add New Customer Group"
+"Save Customer Group","Save Customer Group"
"Delete Customer Group","Delete Customer Group"
-"Delete customer","Delete customer"
-"Delete customer address","Delete customer address"
-"Deleted Stores","Deleted Stores"
-"Details","Details"
-"Disabled","Disabled"
-"Edit","Edit"
-"Edit Account Info","Edit Account Info"
-"Edit Account Information","Edit Account Information"
-"Edit Address","Edit Address"
-"Edit Address Entry","Edit Address Entry"
-"Edit Customer Group ""%s""","Edit Customer Group ""%s"""
-"Edit Customer Groups","Edit Customer Groups"
-"Edit Customer's Address","Edit Customer's Address"
-"Edit Group","Edit Group"
-"Edit Newsletters","Edit Newsletters"
-"Email","Email"
-"Email Address","Email Address"
-"Email Sender","Email Sender"
-"Email:","Email:"
-"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
-"Entity collection is expected.","Entity collection is expected."
-"Excel XML","Excel XML"
-"Failed to confirm customer account.","Failed to confirm customer account."
-"Fax","Fax"
-"First Name","First Name"
-"Forgot Email Template","Forgot Email Template"
-"Forgot Password","Forgot Password"
-"Forgot Your Password","Forgot Your Password"
-"Forgot Your Password?","Forgot Your Password?"
-"Forgot and Remind Email Sender","Forgot and Remind Email Sender"
-"Form Fields Before","Form Fields Before"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information."
-"Gender","Gender"
-"Gender is required.","Gender is required."
-"General Subscription","General Subscription"
-"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
-"Global","Global"
-"Grand Total","Grand Total"
-"Group","Group"
+"New Customer Group","New Customer Group"
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
"Group Information","Group Information"
"Group Name","Group Name"
-"Group for Invalid VAT ID","Group for Invalid VAT ID"
-"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
-"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
-"Guest","Guest"
-"HTML","HTML"
-"Hello, %s!","Hello, %s!"
-"ID","ID"
-"IP Address","IP Address"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","If there is an account associated with %s you will receive an email with a link to reset your password."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation"
-"If you believe this is an error, please contact us at %1","If you believe this is an error, please contact us at %1"
-"If you have an account with us, please log in.","If you have an account with us, please log in."
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Invalid attribute option specified for attribute %s (%s), skipping the record."
-"Invalid attribute set specified, skipping the record.","Invalid attribute set specified, skipping the record."
-"Invalid billing address for (%s)","Invalid billing address for (%s)"
-"Invalid current password","Invalid current password"
-"Invalid customer data","Invalid customer data"
-"Invalid email address ""%s"".","Invalid email address ""%s""."
-"Invalid email address.","Invalid email address."
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class","Tax Class"
+"Customers Only","Customers Only"
+"Visitors Only","Visitors Only"
+Visitor,Visitor
+"The customer is currently assigned to Customer Group %s.","The customer is currently assigned to Customer Group %s."
+"Would you like to change the Customer Group for this order?","Would you like to change the Customer Group for this order?"
+"The VAT ID is valid. The current Customer Group will be used.","The VAT ID is valid. The current Customer Group will be used."
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID.","There was an error validating the VAT ID."
+"Validate VAT Number","Validate VAT Number"
+"Customer Login","Customer Login"
+"Create New Customer Account","Create New Customer Account"
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
"Invalid login or password.","Invalid login or password."
-"Invalid password reset token.","Invalid password reset token."
-"Invalid shipping address for (%s)","Invalid shipping address for (%s)"
-"Invalid store specified, skipping the record.","Invalid store specified, skipping the record."
-"Invalid website, skipping the record, line: %s","Invalid website, skipping the record, line: %s"
-"Last Activity","Last Activity"
-"Last Subscribe Date","Last Subscribe Date"
-"Last Date Unsubscribed","Last Date Unsubscribed"
-"Last Name","Last Name"
-"Last URL","Last URL"
-"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
-"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
-"Lifetime Sales","Lifetime Sales"
-"Log In","Log In"
-"Log Out","Log Out"
-"Login","Login"
-"Login Information","Login Information"
-"Login Options","Login Options"
+"There was an error validating the login and password.","There was an error validating the login and password."
"Login and password are required.","Login and password are required."
-"Login or Create an Account","Login or Create an Account"
-"Month (MM)","MM"
-"Manage Addresses","Manage Addresses"
-"Manage Customers","Manage Customers"
-"Maximum length must be less then %s symbols","Maximum length must be less then %s symbols"
-"Missing email, skipping the record, line: %s","Missing email, skipping the record, line: %s"
-"Missing email, skipping the record.","Missing email, skipping the record."
-"Missing first name, skipping the record, line: %s","Missing first name, skipping the record, line: %s"
-"Missing firstname, skipping the record.","Missing firstname, skipping the record."
-"Missing last name, skipping the record, line: %s","Missing last name, skipping the record, line: %s"
-"Missing lastname, skipping the record.","Missing lastname, skipping the record."
-"Missing website, skipping the record, line: %s","Missing website, skipping the record, line: %s"
-"Month","Month"
-"My Account","My Account"
-"My Account Wrapper","My Account Wrapper"
-"My Dashboard","My Dashboard"
-"My Orders","My Orders"
-"Name","Name"
-"Name and Address Options","Name and Address Options"
-"Never","Never"
-"New Address","New Address"
-"New Address Entry","New Address Entry"
-"New Customer","New Customer"
-"New Customer Address","New Customer Address"
-"New Customer Group","New Customer Group"
-"New Customer Groups","New Customer Groups"
-"New Customers","New Customers"
-"New Group","New Group"
-"New Password","New Password"
-"New account","New account"
-"New account confirmation key","New account confirmation key"
-"New account confirmed","New account confirmed"
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.","Cannot save the customer."
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
+"Wrong customer account specified.","Wrong customer account specified."
+"Bad request.","Bad request."
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.","Please, check your email for confirmation key."
+"This email does not require confirmation.","This email does not require confirmation."
+"Wrong email.","Wrong email."
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.","Please enter your email."
+"Your password reset link has expired.","Your password reset link has expired."
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
"New password field cannot be empty.","New password field cannot be empty."
-"Newsletter","Newsletter"
-"End Date","End Date"
-"Newsletter Information","Newsletter Information"
-"Receive Date","Receive Date"
-"Start Date","Start Date"
-"Newsletter Subscription","Newsletter Subscription"
-"Newsletters","Newsletters"
-"No Items Found","No Items Found"
-"No Newsletter Found","No Newsletter Found"
-"No customer collections found","No customer collections found"
-"No item specified.","No item specified."
-"Not Sent","Not Sent"
-"Not confirmed, can login","Not confirmed, can login"
-"Not confirmed, cannot login","Not confirmed, cannot login"
-"Number of Lines in a Street Address ","Number of Lines in a Street Address "
-"Offline","Offline"
-"Online","Online"
+"Your password has been updated.","Your password has been updated."
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.","The account information has been saved."
+"The address has been saved.","The address has been saved."
+"Cannot save address.","Cannot save address."
+"The address has been deleted.","The address has been deleted."
+"An error occurred while deleting the address.","An error occurred while deleting the address."
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group","New Group"
+"New Customer Groups","New Customer Groups"
+"Edit Group","Edit Group"
+"Edit Customer Groups","Edit Customer Groups"
+"The customer group has been saved.","The customer group has been saved."
+"The customer group has been deleted.","The customer group has been deleted."
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers","Manage Customers"
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
"Online Customers","Online Customers"
-"Online Customers Options","Online Customers Options"
-"Online Minutes Interval","Online Minutes Interval"
-"Order","Order"
-"Order Total","Order Total"
-"Orders","Orders"
-"PDF","PDF"
-"Password","Password"
-"Password Management","Password Management"
-"Password Options","Password Options"
-"Password forgotten","Password forgotten"
-"Password:","Password:"
-"Paused","Paused"
-"Pending","Pending"
-"Per Website","Per Website"
-"Personal Information","Personal Information"
-"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
-"Please enter a valid date between %s and %s at %s.","Please enter a valid date between %s and %s at %s."
-"Please enter a valid date equal to or greater than %s at %s.","Please enter a valid date equal to or greater than %s at %s."
-"Please enter a valid date less than or equal to %s at %s.","Please enter a valid date less than or equal to %s at %s."
-"Please enter the city.","Please enter the city."
-"Please enter the country.","Please enter the country."
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
"Please enter the first name.","Please enter the first name."
"Please enter the last name.","Please enter the last name."
-"Please enter the state/province.","Please enter the state/province."
"Please enter the street.","Please enter the street."
+"Please enter the city.","Please enter the city."
"Please enter the telephone number.","Please enter the telephone number."
"Please enter the zip/postal code.","Please enter the zip/postal code."
-"Please enter your email address below. You will receive a link to reset your password.","Please enter your email address below. You will receive a link to reset your password."
-"Please enter your email below and we'll send you confirmation link for it.","Please enter your email below and we'll send you confirmation link for it."
-"Please enter your email.","Please enter your email."
-"Please make sure your passwords match.","Please make sure your passwords match."
-"Please select","Please select"
-"Please select a website which contains store view","Please select a website which contains store view"
-"Please select region, state or province","Please select region, state or province"
-"Please, check your email for confirmation key.","Please, check your email for confirmation key."
-"Prefix Dropdown Options","Prefix Dropdown Options"
-"Price","Price"
-"Product","Product"
-"ID","ID"
-"Product","Product"
-"Product Reviews","Product Reviews"
-"Product Tags","Product Tags"
-"Purchase On","Purchase On"
-"Purchase Date","Purchase Date"
-"Quantity","Quantity"
-"Recent Orders","Recent Orders"
-"Records for %s store found.","Records for %s store found."
-"Recovery Link Expiration Interval (days)","Recovery Link Expiration Interval (days)"
-"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
-"Refunded","Refunded"
-"Registered Customers","Registered Customers"
-"Remind Email Template","Remind Email Template"
-"Remind Password","Remind Password"
-"Remove","Remove"
-"Require Emails Confirmation","Require Emails Confirmation"
-"Reset a Password","Reset a Password"
-"Retrieve address data","Retrieve address data"
-"Retrieve address info","Retrieve address info"
-"Retrieve customer addresses","Retrieve customer addresses"
-"Retrieve customer data","Retrieve customer data"
-"Retrieve customer groups","Retrieve customer groups"
-"Retrieve customer info","Retrieve customer info"
-"Retrieve customers","Retrieve customers"
-"Retrieve your confirmation link here","Retrieve your confirmation link here"
-"Retrieve your password here","Retrieve your password here"
-"SKU","SKU"
+"Please enter the country.","Please enter the country."
+"Please enter the state/province.","Please enter the state/province."
+"Per Website","Per Website"
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged."
+"This account is not confirmed.","This account is not confirmed."
+"Wrong transactional account email type","Wrong transactional account email type"
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.","The Date of Birth is required."
+"The TAX/VAT number is required.","The TAX/VAT number is required."
+"Gender is required.","Gender is required."
+"Invalid password reset token.","Invalid password reset token."
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,Admin
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required","Customer email is required"
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope","Customer website ID must be specified when using the website scope"
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses","Customer Addresses"
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Set as Default Billing Address","Set as Default Billing Address"
+"Default Billing Address","Default Billing Address"
+"Set as Default Shipping Address","Set as Default Shipping Address"
+"Default Shipping Address","Default Shipping Address"
+"New Customer Address","New Customer Address"
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
"Sales Statistics","Sales Statistics"
-"Save","Save"
+"Average Sale","Average Sale"
+"Manage Addresses","Manage Addresses"
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information."
+"Change Password","Change Password"
+Newsletters,Newsletters
+"You are currently subscribed to 'General Subscription'.","You are currently subscribed to 'General Subscription'."
+"You are currently not subscribed to any newsletter.","You are currently not subscribed to any newsletter."
+"Default Addresses","Default Addresses"
+"Change Billing Address","Change Billing Address"
+"You have no default billing address in your address book.","You have no default billing address in your address book."
+"Change Shipping Address","Change Shipping Address"
+"You have no default shipping address in your address book.","You have no default shipping address in your address book."
+"Additional Address Entries","Additional Address Entries"
+"You have no additional address entries in your address book.","You have no additional address entries in your address book."
+"Use as my default billing address","Use as my default billing address"
+"Use as my default shipping address","Use as my default shipping address"
"Save Address","Save Address"
-"Save Customer","Save Customer"
-"Save Customer Group","Save Customer Group"
-"Save Password","Save Password"
-"Save and Continue Edit","Save and Continue Edit"
-"Saved %d record(s)","Saved %d record(s)"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field."
-"Send From","Send From"
-"Send Welcome Email","Send Welcome Email"
-"Send Welcome Email after Confirmation","Send Welcome Email after Confirmation"
-"Send auto-generated password","Send auto-generated password"
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
"Send confirmation link","Send confirmation link"
-"Sending","Sending"
-"Sent","Sent"
-"Session Start Time","Session Start Time"
-"Set as Default Billing Address","Set as Default Billing Address"
-"Set as Default Shipping Address","Set as Default Shipping Address"
-"Share Customer Accounts","Share Customer Accounts"
-"Ship-to First Name","Ship-to First Name"
-"Ship-to Last Name","Ship-to Last Name"
-"Shipped to Name","Shipped to Name"
-"Shopping Cart","Shopping Cart"
-"Shopping Cart - %d item(s)","Shopping Cart - %d item(s)"
-"Shopping Cart of %1$s - %2$d item(s)","Shopping Cart of %1$s - %2$d item(s)"
-"Show Date of Birth","Show Date of Birth"
-"Show Gender","Show Gender"
-"Show Middle Name (initial)","Show Middle Name (initial)"
-"Show Prefix","Show Prefix"
-"Show Suffix","Show Suffix"
-"Show Tax/VAT Number","Show Tax/VAT Number"
+"Back to Login","Back to Login"
+"Current Password","Current Password"
+"Confirm New Password","Confirm New Password"
+"Please enter your email address below. You will receive a link to reset your password.","Please enter your email address below. You will receive a link to reset your password."
+"Registered Customers","Registered Customers"
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription","General Subscription"
"Sign Up for Newsletter","Sign Up for Newsletter"
-"Skipping import row, required field ""%s"" is not defined.","Skipping import row, required field ""%s"" is not defined."
-"Skipping import row, website ""%s"" field does not exist.","Skipping import row, website ""%s"" field does not exist."
-"State/Province","State/Province"
-"Status","Status"
-"Store","Store"
-"Store View","Store View"
-"Street Address","Street Address"
-"Street Address %s","Street Address %s"
-"Subject","Subject"
-"Submit","Submit"
+"Address Information","Address Information"
+"Login Information","Login Information"
+"Create account","Create account"
+"Reset a Password","Reset a Password"
+"You have logged out and will be redirected to our homepage in 5 seconds.","You have logged out and will be redirected to our homepage in 5 seconds."
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more."
+"Date of Birth","Date of Birth"
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,Gender
+"Tax/VAT number","Tax/VAT number"
"Subscribe to Newsletter","Subscribe to Newsletter"
-"Subscribed to Newsletter?","Subscribed to Newsletter?"
-"Suffix Dropdown Options","Suffix Dropdown Options"
-"Tag","Tag"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
"Tax Calculation Based On","Tax Calculation Based On"
-"Tax Class","Tax Class"
-"Tax/VAT number","Tax/VAT number"
-"Phone","Phone"
-"Text","Text"
-"Text One Line","Text One Line"
-"Thank you for registering with %s.","Thank you for registering with %s."
-"The Date of Birth is required.","The Date of Birth is required."
-"The TAX/VAT number is required.","The TAX/VAT number is required."
-"The VAT ID entered (%s) is not a valid VAT ID.","The VAT ID entered (%s) is not a valid VAT ID."
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s."
-"The VAT ID is valid. The current Customer Group will be used.","The VAT ID is valid. The current Customer Group will be used."
-"The account information has been saved.","The account information has been saved."
-"The address does not belong to this customer.","The address does not belong to this customer."
-"The address has been deleted.","The address has been deleted."
-"The address has been saved.","The address has been saved."
-"The customer ID and email did not match, skipping the record, line: %s","The customer ID and email did not match, skipping the record, line: %s"
-"The customer does not have default billing address.","The customer does not have default billing address."
-"The customer email (%s) already exists, skipping the record, line: %s","The customer email (%s) already exists, skipping the record, line: %s"
-"The customer group has been deleted.","The customer group has been deleted."
-"The customer group has been saved.","The customer group has been saved."
-"The customer is currently assigned to Customer Group %s.","The customer is currently assigned to Customer Group %s."
-"The first name cannot be empty.","The first name cannot be empty."
-"The group ""%s"" cannot be deleted","The group ""%s"" cannot be deleted"
-"The last name cannot be empty.","The last name cannot be empty."
-"The minimum password length is %s","The minimum password length is %s"
-"The password cannot be empty.","The password cannot be empty."
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","The password must have at least 6 characters. Leading or trailing spaces will be ignored."
-"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
-"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
-"There are no items in customer's wishlist at the moment","There are no items in customer's wishlist at the moment"
-"There are no items in customer's shopping cart at the moment","There are no items in customer's shopping cart at the moment"
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account."
-"There was an error validating the VAT ID.","There was an error validating the VAT ID."
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","There was an error validating the VAT ID. The customer would belong to Customer Group %s."
-"This account is not confirmed.","This account is not confirmed."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email."
-"This customer email already exists","This customer email already exists"
-"This customer has no saved addresses.","This customer has no saved addresses."
-"This email does not require confirmation.","This email does not require confirmation."
-"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
-"This is My Default %s Address","This is My Default %s Address"
-"To Cart","To Cart"
-"Total","Total"
-"Type","Type"
-"Unable to save the customer.","Unable to save the customer."
-"Unknown","Unknown"
-"Unsubscribe from Newsletter","Unsubscribe from Newsletter"
-"Update","Update"
-"Update customer address data","Update customer address data"
-"Update customer data","Update customer data"
-"Use as My Default %s Address","Use as My Default %s Address"
-"Use as My Default Billing Address","Use as My Default Billing Address"
-"Use as My Default Shipping Address","Use as My Default Shipping Address"
-"Use as my default billing address","Use as my default billing address"
-"Use as my default shipping address","Use as my default shipping address"
-"VAT Number","VAT Number"
-"VAT Request Date","VAT Request Date"
-"VAT Request Identifier","VAT Request Identifier"
-"Validate VAT Number","Validate VAT Number"
-"Validate on Each Transaction","Validate on Each Transaction"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
"Validation Error Group","Validation Error Group"
-"View","View"
-"View Order","View Order"
-"Visitor","Visitor"
-"Visitors Only","Visitors Only"
-"Website","Website"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
"Welcome Email","Welcome Email"
-"Wishlist","Wishlist"
-"Wishlist - %d item(s)","Wishlist - %d item(s)"
-"Would you like to change the Customer Group for this order?","Would you like to change the Customer Group for this order?"
-"Wrong confirmation key.","Wrong confirmation key."
-"Wrong customer account specified.","Wrong customer account specified."
-"Wrong email.","Wrong email."
-"Wrong transactional account email type","Wrong transactional account email type"
-"Year (YYYY)","YYYY"
-"Year","Year"
-"You are currently not subscribed to any newsletter.","You are currently not subscribed to any newsletter."
-"You are currently not subscribed to our newsletter.","You are currently not subscribed to our newsletter."
-"You are currently subscribed to 'General Subscription'.","You are currently subscribed to 'General Subscription'."
-"You are currently subscribed to our newsletter.","You are currently subscribed to our newsletter."
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,Group
+"Are you sure you want to delete?","Are you sure you want to delete?"
+"Unsubscribe from Newsletter","Unsubscribe from Newsletter"
+"Assign a Customer Group","Assign a Customer Group"
+Phone,Phone
+ZIP,ZIP
+"Customer Since","Customer Since"
+n/a,n/a
+"Session Start Time","Session Start Time"
+"Last Activity","Last Activity"
+"Last URL","Last URL"
+"Edit Account Information","Edit Account Information"
+"Forgot Your Password","Forgot Your Password"
+"Password forgotten","Password forgotten"
+"My Dashboard","My Dashboard"
"You are now logged out","You are now logged out"
-"You have logged out and will be redirected to our homepage in 5 seconds.","You have logged out and will be redirected to our homepage in 5 seconds."
-"You have no additional address entries in your address book.","You have no additional address entries in your address book."
-"You have no additional entries in your address book.","You have no additional entries in your address book."
-"You have no default billing address in your address book.","You have no default billing address in your address book."
-"You have no default entries in your address book.","You have no default entries in your address book."
-"You have no default shipping address in your address book.","You have no default shipping address in your address book."
-"You have not set a default billing address.","You have not set a default billing address."
-"You have not set a default shipping address.","You have not set a default shipping address."
-"You have placed no orders yet.","You have placed no orders yet."
-"You have placed no products yet.","You have placed no products yet."
-"You will be charged tax.","You will be charged tax."
-"You will not be charged tax.","You will not be charged tax."
-"Your Tax ID cannot be validated.","Your Tax ID cannot be validated."
-"Your VAT ID was successfully validated.","Your VAT ID was successfully validated."
-"Your account balance is: %s","Your account balance is: %s"
-"Your password has been updated.","Your password has been updated."
-"Your password reset link has expired.","Your password reset link has expired."
-"ZIP","ZIP"
-"ZIP/Post Code","ZIP/Post Code"
-"Zip/Postal Code","Zip/Postal Code"
-"n/a","n/a"
-"or","or"
-"register","register"
diff --git a/app/code/Magento/Customer/i18n/es_ES.csv b/app/code/Magento/Customer/i18n/es_ES.csv
index 90db731c30f..280da69b4f9 100644
--- a/app/code/Magento/Customer/i18n/es_ES.csv
+++ b/app/code/Magento/Customer/i18n/es_ES.csv
@@ -1,475 +1,422 @@
-" or ","o bien"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser un servidor DNS pero no puede extraer la parte TLD"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser un servidor DNS pero no puede hacer coincidir en TLD con la lista"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser un servidor DNS pero no puede hacer coincidir el esquema del servidor con el TLD '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser un servidor DNS pero contiene un guión en una posición inválida"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","%value%' parece ser un nombre de servidor DNS pero no se puede descifrar la notación del Punycode introducido"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser un nombre de red local pero no se permiten los nombres de redes locales"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser una dirección IP, pero no se permiten direcciones IP"
-"'%value%' does not appear to be a valid local network name","'%value%' no parece ser un nombre válido de red local"
-"* Required Fields","* Campos Requeridos"
-"ALL GROUPS","TODOS LOS GRUPOS"
-"Account Dashboard","Panel de control de la cuenta"
+All,Todo
+Cancel,Cancelar
+"Create Order","Crear pedido"
+Back,Volver
+Product,"Nombre del producto"
+Price,Precio
+Quantity,Cantidad
+ID,"ID de Producto"
+SKU,SKU
+Configure,Configurar
+Customers,Clientes
+"Shopping Cart","Cesta de la Compra"
+No,No
+Qty,Qty
+Action,Acción
+Total,Total
+"No item specified.","No es especificaron artÃculos."
+"Are you sure that you want to remove this item?","¿Está seguro de que desea eliminar este artÃculo?"
+Edit,Editar
+Orders,Pedidos
+"New Customers","Nuevos Clientes"
+Customer,Cliente
+"Grand Total","Suma total"
+"Lifetime Sales","Ventas de por vida"
+"All Store Views","Todas las vistas de tienda"
+"My Account","Mi cuenta"
"Account Information","Información de Cuenta"
-"Account Sharing Options","Opciones de intercambio de la cuenta"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Es necesario confirmar la cuenta. Por favor, abra en su correo electrónico el enlace de confirmación. Para volver a enviar el correo electrónico de confirmación por favor, <a href=""%s"">pulse aquÃ</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Es necesario confirmar la cuenta. Por favor, abra en su correo electrónico el enlace de confirmación. Para volver a enviar el correo electrónico de confirmación por favor, <a href=""%s"">pulse aquÃ</a>."
-"Action","Acción"
+"First Name",Nombre
+"Last Name",Apellido
+Email,"Correo electrónico"
+"New Password","Nueva contraseña"
+"Delete File","Delete File"
+Delete,Eliminar
+Save,Guardar
+Store,Tienda
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,Nombre
+Status,Estado
+"Save and Continue Edit","Guardar y continuar editando"
+"Store View","Ver Tienda"
+Type,Tipo
+Submit,Enviar
+"You deleted the customer.","You deleted the customer."
+"IP Address","Dirección IP"
+Order,"Número de pedido"
+"Customer View","Vista de cliente"
+"Personal Information","Información Personal"
+View,Ver
+"* Required Fields","* Campos Requeridos"
+Day,DÃa
+Month,Mes
+Year,Año
+label,label
+Global,Global
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group","Grupo de Clientes"
+"End Date","Fin del boletÃn informativo"
+"Customer Groups","Grupos de Cliente"
+Country,PaÃs
+State/Province,Estado/Provincia
+"Please select region, state or province","Por favor, seleccionar región, estado o provincia"
+City,Ciudad
+"Zip/Postal Code","Código Postal"
+"Email Address","Dirección de email"
+Company,CompañÃa
+"VAT Number","Número de IVA"
+Address,Dirección
+"Street Address","Dirección de Calle"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Contraseña
+"Confirm Password","Confirma Contraseña"
+Login,Entrar
+"Forgot Your Password?","¿Ha olvidado la contraseña?"
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information","Información de Contacto"
+"Log Out","Fin de sesión"
+"Log In","Inicio de sesión"
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.","Actualmente no está suscrito a nuestro boletÃn informativo."
+"You have not set a default shipping address.","No ha establecido una dirección de envÃo predeterminada."
+"You have not set a default billing address.","No ha establecido una dirección de facturación predeterminada."
+"Address Book","Libreta de Direcciones"
+"Edit Address","Cambiar la dirección"
"Add New Address","Añadir Nueva Dirección"
+region,region
"Add New Customer","Agregar nuevo cliente"
-"Add New Customer Group","Agregar nuevo grupo de clientes"
-"Added From","Agregado de"
-"Additional Address Entries","Anotaciones Adicionales de Dirección"
-"Address","Dirección"
-"Address Book","Libreta de Direcciones"
-"Address Books","Libretas de direcciones"
-"Address Information","Información de Dirección"
-"Address Templates","Plantillas de direcciones"
-"Addresses","Direcciones"
-"Admin","Administrar"
-"All","Todo"
-"All Store Views","Todas las vistas de tienda"
-"All countries","Todos los paÃses"
-"Always optional.","Siempre opcional."
-"Amount","Importe"
-"An error occurred while deleting the address.","Se produjo un error al eliminar la dirección."
-"An error occurred while retrieving the option value: %s.","Se produjo un error al recuperar el valor de opción: %s."
-"An error occurred while saving the collection, aborting. Error: %s","Se produjo un error al guardar la colección. Se anulará la operación. Error: %s"
-"An invalid option ID is specified for %s (%s), skipping the record.","Se especificó un ID de opción no válido para %s (%s). Se omitirá este registro."
-"Approved","Aprobado"
-"Are you sure that you want to remove this item?","¿Está seguro de que desea eliminar este artÃculo?"
-"Are you sure you want to cancel adding of this address?","¿Está seguro de que desea cancelar el proceso de agregado de esta dirección?"
-"Are you sure you want to delete this address?","¿Estás seguro de querer borrar esta dirección?"
-"Are you sure?","¿Está seguro?"
-"Array of Entity collections is expected.","Se espera una disposición de colecciones de entidad."
-"Assign a Customer Group","Asignar un grupo de clientes"
-"Average Sale","Venta promedio"
-"Back","Volver"
-"Back - link to the previously viewed page","Atrás: enlace a la página vista anteriormente"
-"Back to Login","Volver a Conexión"
-"Bad request.","Solicitud incorrecta."
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","En base al ID del IVA, el cliente pertenece al Grupo de clientes %s."
+"Save Customer","Guardar cliente"
+"Delete Customer","Borrar cliente"
+"Reset Password","Reset Password"
+"New Customer","Nuevo cliente"
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select",Seleccione
+"Send Welcome Email","Enviar mensaje de correo electrónico de bienvenida"
+"Send From","Enviar Desde"
+"Send Welcome Email after Confirmation","Enviar mensaje de correo electrónico de bienvenida después de la confirmación"
+"Delete Address","Borrar Dirección"
+"Edit Customer's Address","Editar dirección del cliente"
+"Shopping Cart from %1","Shopping Cart from %1"
+"Newsletter Information","Información del boletÃn informativo"
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed","Last Date Subscribed"
+"Last Date Unsubscribed","Ultima fecha no suscrita"
+"No Newsletter Found","No se encontraron boletines informativos"
+"Start date","Start date"
+"Receive Date","BoletÃn informativo recibido"
+Subject,Asunto
+Sent,Enviada
+"Not Sent","No enviado"
+Sending,Enviando
+Paused,"En pausa"
+Unknown,Desconocido
+"Purchase Date","Adquirido en"
"Bill-to Name","Nombre de la factura"
+"Ship-to Name","Ship-to Name"
+"Order Total","Total del pedido"
"Purchase Point","Comprado a"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Al crear una cuenta con nuestra tienda podrás moverte más rápidamente por el proceso de pago, guardar múltiples direcciones de envÃo, ver y seguir el rastro de los pedidos de tu cuenta y más."
-"CSV","CSV"
-"Cancel","Cancelar"
-"Cannot save a new password.","No se ha podido grabar una nueva contraseña."
-"Cannot save address.","No se puede guardar la dirección."
-"Cannot save the customer.","No se puede guardar el cliente."
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","No se pueden compartir las cuentas de cliente de forma global porque existen algunas cuentas de cliente con la misma dirección de correo electrónico en varios sitios web, y no se pueden combinar."
-"Change Account Password","Cambiar contraseña de cuenta"
-"Change Billing Address","Cambiar la Dirección de Facturación"
-"Change Password","Cambiar Contraseña"
-"Change Shipping Address","Cambiar la Dirección de EnvÃo"
-"City","Ciudad"
-"Company","CompañÃa"
-"Config","Configuración"
-"Configure","Configurar"
-"Confirm New Password","Confirmar la Nueva Contraseña"
-"Confirm Password","Confirma Contraseña"
-"Confirmation Link Email","Enlace de confirmación de Email"
-"Confirmed","Confirmado"
-"Contact Information","Información de Contacto"
-"Continue Shopping","Continuar comprando"
-"Country","PaÃs"
-"Create","Crear."
-"Create New Account Options","Crear nuevas opciones de cuenta"
-"Create New Customer Account","Crear nueva cuenta de cliente"
-"Create Order","Crear pedido"
-"Create an Account","Crear una Cuenta"
-"Create customer","Crear cliente"
-"Create customer address","Crear dirección de cliente"
-"Current Password","Contraseña Actual"
-"Customer","Cliente"
-"Customer API","API del cliente"
-"Customer Account Edit Form","Formulario de Edición de Cuenta del Cliente"
-"Customer Account Login Form","Formulario de Conexión de Cuenta del Cliente"
-"Customer Account Logout Success","Desconexión correcta de la Cuenta del Cliente"
-"Customer Account Registration Form","Formulario de Registro de Cuenta del Cliente"
-"Customer Addresses","Dirección de cliente"
-"Customer Configuration","Configuración de cliente"
-"Customer Forgot Password Form","Formulario de Contraseña Olvidada del Cliente"
-"Customer Group","Grupo de Clientes"
-"Customer Groups","Grupos de Cliente"
+Never,Nunca
+Offline,"Sin conexión"
+Online,Conectado
+Confirmed,Confirmado
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.","El cliente no tiene una dirección de facturación predeterminada."
+"Recent Orders","Pedidos recientes"
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment","En este momento no hay artÃculos en el carrito de compras del cliente."
+"Shipped-to Name","Shipped-to Name"
+"Deleted Stores","Tiendas borradas"
+"There are no items in customer's wishlist at the moment","En este momento no hay artÃculos en la lista de deseos del cliente."
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
"Customer Information","Información de cliente"
-"Customer Login","Identificador de cliente"
-"Customer My Account (All Pages)","Mi Cuenta de Cliente (Todas las Páginas)"
-"Customer My Account Address Book","Libreta de Dirección de Mi Cuenta de Cliente"
-"Customer My Account Address Edit Form","Formulario de Edición de Direcciones de Mi Cuenta de Cliente"
-"Customer My Account Dashboard","Panel de Control de Mi Cuenta de Cliente"
-"Customer Since","Cliente desde"
-"Customer View","Vista de cliente"
-"Customer collection expected.","Se espera colección de clientes"
-"Customer email is required","Se requiere email del cliente"
-"Customer website ID must be specified when using the website scope","Debe especificarse la identificación de página web del cliente cuando se usa el campo de la página web"
-"Customer will stay on the current page if ""No"" is selected.","El cliente permanecerá en la página actual si se elige «No»."
-"Customers","Clientes"
-"Customers Only","Sólo clientes"
-"Customers Section","Sección de clientes."
-"Day (DD)","DD"
-"Date","Fecha"
-"Date Added","Añadido el dÃa"
-"Date of Birth","Fecha de Nacimiento"
-"Day","DÃa"
-"Days in Wishlist","DÃas en la lista de deseos"
-"Default Addresses","Dirección por Defecto"
-"Default Billing Address","Dirección de Facturación por Defecto"
-"Default Email Domain","Email predeterminado del dominio"
-"Default Group","Grupo por defecto"
-"Default Shipping Address","Dirección de EnvÃo por Defecto"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","Valor por defecto para deshabilitar los cambios automáticos de grupo en base al ID del IVA"
-"Default Welcome Email","Email de bienvenida predeterminado"
-"Delete","Eliminar"
-"Delete Address","Borrar Dirección"
-"Delete Customer","Borrar cliente"
+Addresses,Direcciones
+Wishlist,"Lista de deseos"
+Newsletter,"BoletÃn informativo"
+"Product Reviews","Opiniones de Producto"
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries","Todos los paÃses"
+"Add New Customer Group","Agregar nuevo grupo de clientes"
+"Save Customer Group","Guardar grupo de clientes"
"Delete Customer Group","Borrar grupo de cliente"
-"Delete customer","Eliminar cliente"
-"Delete customer address","Borrar dirección de cliente"
-"Deleted Stores","Tiendas borradas"
-"Details","Detalles"
-"Disabled","Deshabilitado"
-"Edit","Editar"
-"Edit Account Info","Editar información de cuenta"
-"Edit Account Information","Cambiar la información de la cuenta"
-"Edit Address","Cambiar la dirección"
-"Edit Address Entry","Cambiar el registro de la dirección"
-"Edit Customer Group ""%s""","Editar grupo de clientes ""%s"""
-"Edit Customer Groups","Editar grupos de clientes"
-"Edit Customer's Address","Editar dirección del cliente"
-"Edit Group","Editar grupo"
-"Edit Newsletters","Cambiar los boletines"
-"Email","Correo electrónico"
-"Email Address","Dirección de email"
-"Email Sender","Remitente del email"
-"Email:","Email:"
-"Enable Automatic Assignment to Customer Group","Habilitar asignación automática al grupo de clientes"
-"Entity collection is expected.","Se espera entidad de recogida."
-"Excel XML","Excel XML"
-"Failed to confirm customer account.","Falló al confirmar la cuenta de cliente."
-"Fax","Fax"
-"First Name","Nombre"
-"Forgot Email Template","Plantilla de Email olvidada"
-"Forgot Password","Olvidé la contraseña"
-"Forgot Your Password","Olvidaste Tu Contraseña"
-"Forgot Your Password?","¿Ha olvidado la contraseña?"
-"Forgot and Remind Email Sender","Emisor de dirección de correo olvidada y recordatorio"
-"Form Fields Before","Campos de Formulario Antes de"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Desde el «panel de control de mi cuenta» puede ver una instantánea de la actividad reciente en su cuenta y actualizar la información de su cuenta. Elija uno de los siguientes enlaces para ver o cambiar la información."
-"Gender","Género"
-"Gender is required.","Se requiere el género."
-"General Subscription","Suscripción general"
-"Generate Human-Friendly Customer ID","Generar ID de cliente amigable"
-"Global","Global"
-"Grand Total","Suma total"
-"Group","Grupo"
+"New Customer Group","Nuevo grupo de cliente"
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
"Group Information","Información de grupo"
"Group Name","Nombre de grupo"
-"Group for Invalid VAT ID","Grupo para ID del IVA no válido"
-"Group for Valid VAT ID - Domestic","Grupo para ID del IVA válido - Doméstico"
-"Group for Valid VAT ID - Intra-Union","Grupo para ID del IVA válido - Intraunión"
-"Guest","Invitado"
-"HTML","HTML"
-"Hello, %s!","Hola, %s:"
-"ID","Identificación"
-"IP Address","Dirección IP"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","Si hay una cuenta asociada con %s recibirás un correo electrónico con un enlace para reiniciar tu contraseña."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","Si es un cliente registrado de IVA, por favor pulse <a href=""%s"">aquÃ</a> para introducir su dirección de facturación para un cálculo correcto del IVA"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","Si es un cliente registrado de IVA, por favor pulse <a href=""%s"">aquÃ</a> para introducir su dirección de envÃo para un cálculo correcto del IVA"
-"If you believe this is an error, please contact us at %1","Si cree que es un error, por favor, contacte con nosotros en %1"
-"If you have an account with us, please log in.","Si usted tiene una cuenta con nosotros, por favor ingrese."
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Se especificó una opción de atributo no válida para el atributo %s (%s). Se omitirá el registro."
-"Invalid attribute set specified, skipping the record.","Se especificó un conjunto de atributos no válido. Se omitirá el registro."
-"Invalid billing address for (%s)","Dirección de facturación no válida para (%s)"
-"Invalid current password","Contraseña actual inválida"
-"Invalid customer data","datos de cliente inválidos"
-"Invalid email address ""%s"".","Dirección de mail ""%s"" no válida."
-"Invalid email address.","dirección de email inválida"
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class","Clase impositiva"
+"Customers Only","Sólo clientes"
+"Visitors Only","Sólo para visitantes"
+Visitor,Visitante
+"The customer is currently assigned to Customer Group %s.","El cliente está asignado actualmente al grupo de cliente %s."
+"Would you like to change the Customer Group for this order?","¿Quiere cambiar el grupo de cliente para este pedido?"
+"The VAT ID is valid. The current Customer Group will be used.","El ID de IVA no es válido. Se utilizará el Grupo de cliente actual."
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID.","Ha habido un error validando el ID de IVA."
+"Validate VAT Number","Validar número de IVA"
+"Customer Login","Identificador de cliente"
+"Create New Customer Account","Crear nueva cuenta de cliente"
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
"Invalid login or password.","usuario o contraseña inválidos."
-"Invalid password reset token.","La contraseña no es correcta, reinicia el token."
-"Invalid shipping address for (%s)","Dirección de envÃo no válida para (%s)"
-"Invalid store specified, skipping the record.","Se especificó una tienda no válida. Se omitirá el registro."
-"Invalid website, skipping the record, line: %s","Página web no válida, saltando el registro, lÃnea: %s"
-"Last Activity","Ultima actividad"
-"Last Subscribe Date","Ultima fecha suscrita"
-"Last Date Unsubscribed","Ultima fecha no suscrita"
-"Last Name","Apellido"
-"Last URL","Ultima URL"
-"Leave empty for default (15 minutes).","Dejar en blanco para tomar el valor por defecto (15 minutos)."
-"Leave empty for default (2). Valid range: 1-4","Dejar en blanco por defecto (2). Rango válido: 1-4"
-"Lifetime Sales","Ventas de por vida"
-"Log In","Inicio de sesión"
-"Log Out","Fin de sesión"
-"Login","Entrar"
-"Login Information","Información de registro"
-"Login Options","Opciones de ingreso"
+"There was an error validating the login and password.","There was an error validating the login and password."
"Login and password are required.","Se requiere identificador y contraseña."
-"Login or Create an Account","Entre o cree una cuenta"
-"Month (MM)","MM"
-"Manage Addresses","Gestionar las direcciones"
-"Manage Customers","Gestionar Clientes"
-"Maximum length must be less then %s symbols","La longitud máxima debe ser menor de %s sÃmbolos."
-"Missing email, skipping the record, line: %s","Falta la dirección de correo, saltando el registro, lÃnea: %s"
-"Missing email, skipping the record.","Falta email, saltando el registro."
-"Missing first name, skipping the record, line: %s","Falta el nombre, saltando el registro, lÃnea: %s"
-"Missing firstname, skipping the record.","Falta el nombre, saltando el registro."
-"Missing last name, skipping the record, line: %s","Falta el apellido, saltando el registro, lÃnea: %s"
-"Missing lastname, skipping the record.","Falta apellido, saltando el registro."
-"Missing website, skipping the record, line: %s","Falta la página web, saltando el registro, lÃnea: %s"
-"Month","Mes"
-"My Account","Mi cuenta"
-"My Account Wrapper","El Wrapper de mi Cuenta"
-"My Dashboard","Mi panel de control"
-"My Orders","Mis pedidos"
-"Name","Nombre"
-"Name and Address Options","Opciones de nombre y dirección"
-"Never","Nunca"
-"New Address","Nueva Dirección"
-"New Address Entry","Nueva Anotación de Dirección"
-"New Customer","Nuevo cliente"
-"New Customer Address","Nueva dirección de cliente"
-"New Customer Group","Nuevo grupo de cliente"
-"New Customer Groups","Nuevos grupos de clientes"
-"New Customers","Nuevos Clientes"
-"New Group","Nuevo grupo"
-"New Password","Nueva contraseña"
-"New account","Nueva cuenta"
-"New account confirmation key","Nueva clave de confirmación de cuenta"
-"New account confirmed","Nueva cuenta confirmada"
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.","No se puede guardar el cliente."
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
+"Wrong customer account specified.","Se especificó una cuenta de cliente incorrecta."
+"Bad request.","Solicitud incorrecta."
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.","Revise su correo electrónico y busque la clave de confirmación."
+"This email does not require confirmation.","Esta dirección de correo electrónico no necesita confirmación."
+"Wrong email.","Dirección de correo electrónico incorrecta."
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.","Introduzca su dirección de correo electrónico."
+"Your password reset link has expired.","El enlace para reiniciar la contraseña ha caducado."
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
"New password field cannot be empty.","El campo de nueva contraseña no puede estar en blanco."
-"Newsletter","BoletÃn informativo"
-"End Date","Fin del boletÃn informativo"
-"Newsletter Information","Información del boletÃn informativo"
-"Receive Date","BoletÃn informativo recibido"
-"Start Date","Inicio del boletÃn informativo"
-"Newsletter Subscription","Suscripción al boletÃn de noticias"
-"Newsletters","BoletÃn de Noticias"
-"No Items Found","No se encontraron artÃculos"
-"No Newsletter Found","No se encontraron boletines informativos"
-"No customer collections found","No se encontraron recopilaciones de clientes"
-"No item specified.","No es especificaron artÃculos."
-"Not Sent","No enviado"
-"Not confirmed, can login","Sin confirmar. Puede iniciar sesión"
-"Not confirmed, cannot login","Sin confirmar. No puede iniciar sesión"
-"Number of Lines in a Street Address ","Cantidad de lÃneas de la dirección"
-"Offline","Sin conexión"
-"Online","Conectado"
+"Your password has been updated.","Se ha actualizado su contraseña."
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.","Se guardó la información de la cuenta."
+"The address has been saved.","Se guardó la dirección."
+"Cannot save address.","No se puede guardar la dirección."
+"The address has been deleted.","Se eliminó la dirección."
+"An error occurred while deleting the address.","Se produjo un error al eliminar la dirección."
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group","Nuevo grupo"
+"New Customer Groups","Nuevos grupos de clientes"
+"Edit Group","Editar grupo"
+"Edit Customer Groups","Editar grupos de clientes"
+"The customer group has been saved.","Se guardó el grupo de clientes."
+"The customer group has been deleted.","Se eliminó el grupo de clientes."
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers","Gestionar Clientes"
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
"Online Customers","Clientes conectados"
-"Online Customers Options","Opciones de los clientes conectados"
-"Online Minutes Interval","Intervalo de minutos con conexión"
-"Order","Número de pedido"
-"Order Total","Total del pedido"
-"Orders","Pedidos"
-"PDF","PDF"
-"Password","Contraseña"
-"Password Management","Administración de contraseñas"
-"Password Options","Opciones de contraseña"
-"Password forgotten","Olvido de contraseña"
-"Password:","Contraseña:"
-"Paused","En pausa"
-"Pending","Pendiente"
-"Per Website","Por sitio web"
-"Personal Information","Información Personal"
-"Please enter a number 1 or greater in this field.","Por favor, introduzca un 1 o un número superior en este campo."
-"Please enter a valid date between %s and %s at %s.","Por favor, introduzca una fecha válida entre %s y %s en %s."
-"Please enter a valid date equal to or greater than %s at %s.","Por favor, introduzca una fecha válida igual o mayor que %s en %s."
-"Please enter a valid date less than or equal to %s at %s.","Por favor, introduzca una fecha válida menor o igual que %s en %s."
-"Please enter the city.","Por favor, introduce la ciudad."
-"Please enter the country.","Por favor, introduce el paÃs."
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
"Please enter the first name.","Por favor, introduce el nombre."
"Please enter the last name.","Por favor, introduce el apellido."
-"Please enter the state/province.","Por favor, introduce el estado/provincia."
"Please enter the street.","Por favor, introduce la calle."
+"Please enter the city.","Por favor, introduce la ciudad."
"Please enter the telephone number.","Por favor, introduce el número de teléfono."
"Please enter the zip/postal code.","Por favor, introduce el código postal."
-"Please enter your email address below. You will receive a link to reset your password.","Escriba su correo electrónico más abajo. Recibirá un enlace para restablecer su contraseña."
-"Please enter your email below and we'll send you confirmation link for it.","Introduzca su dirección de correo electrónico a continuación y le enviaremos un enlace de confirmación."
-"Please enter your email.","Introduzca su dirección de correo electrónico."
-"Please make sure your passwords match.","Por favor, asegúrate de que las contraseñas coinciden."
-"Please select","Seleccione"
-"Please select a website which contains store view","Por favor, seleccione una página web que contenga la vista de tienda"
-"Please select region, state or province","Por favor, seleccionar región, estado o provincia"
-"Please, check your email for confirmation key.","Revise su correo electrónico y busque la clave de confirmación."
-"Prefix Dropdown Options","Opciones de la lista desplegable de prefijos"
-"Price","Precio"
-"Product","Producto"
-"ID","ID de Producto"
-"Product","Nombre del producto"
-"Product Reviews","Opiniones de Producto"
-"Product Tags","Etiqueta de Producto"
-"Purchase On","Adquirido el"
-"Purchase Date","Adquirido en"
-"Quantity","Cantidad"
-"Recent Orders","Pedidos recientes"
-"Records for %s store found.","Se encontraron registros para la tienda %s."
-"Recovery Link Expiration Interval (days)","Periodo de caducidad del enlace de recuperación (dÃas)"
-"Redirect Customer to Account Dashboard after Logging in","Redirigir a los clientes al Panel de Control de la cuenta después de iniciar sesión"
-"Refunded","Reembolsado"
-"Registered Customers","Clientes Registrados"
-"Remind Email Template","Plantilla de recordatorio de correo electrónico"
-"Remind Password","Recordar contraseña"
-"Remove","Eliminar"
-"Require Emails Confirmation","Solicitar confirmación por correo electrónico"
-"Reset a Password","Restablecer contraseña"
-"Retrieve address data","Recuperar datos de la dirección"
-"Retrieve address info","Recuperar información de la dirección"
-"Retrieve customer addresses","Recuperar direcciones de los clientes"
-"Retrieve customer data","Recuperar datos de los clientes"
-"Retrieve customer groups","Recuperar grupos de clientes"
-"Retrieve customer info","Recuperar información de los clientes"
-"Retrieve customers","Recuperar clientes"
-"Retrieve your confirmation link here","Recupere aquà su enlace de confirmación"
-"Retrieve your password here","Recupere aquà su contraseña"
-"SKU","SKU"
+"Please enter the country.","Por favor, introduce el paÃs."
+"Please enter the state/province.","Por favor, introduce el estado/provincia."
+"Per Website","Por sitio web"
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","No se pueden compartir las cuentas de cliente de forma global porque existen algunas cuentas de cliente con la misma dirección de correo electrónico en varios sitios web, y no se pueden combinar."
+"This account is not confirmed.","Esta cuenta no está confirmada."
+"Wrong transactional account email type","Tipo de correo electrónico de cuenta de transacciones equivocado"
+"The first name cannot be empty.","El nombre no puede estar vacÃo."
+"The last name cannot be empty.","El apellido no puede estar vacÃo."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.","Se requiere la fecha de nacimiento."
+"The TAX/VAT number is required.","Se requiere el número de IVA."
+"Gender is required.","Se requiere el género."
+"Invalid password reset token.","La contraseña no es correcta, reinicia el token."
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,Administrar
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required","Se requiere email del cliente"
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope","Debe especificarse la identificación de página web del cliente cuando se usa el campo de la página web"
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses","Dirección de cliente"
+"Are you sure you want to delete this address?","¿Estás seguro de querer borrar esta dirección?"
+"Set as Default Billing Address","Establecer como dirección de facturación predeterminada"
+"Default Billing Address","Dirección de Facturación por Defecto"
+"Set as Default Shipping Address","Establecer como dirección de envÃo predeterminada"
+"Default Shipping Address","Dirección de EnvÃo por Defecto"
+"New Customer Address","Nueva dirección de cliente"
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
"Sales Statistics","EstadÃsticas de ventas"
-"Save","Guardar"
+"Average Sale","Venta promedio"
+"Manage Addresses","Gestionar las direcciones"
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Desde el «panel de control de mi cuenta» puede ver una instantánea de la actividad reciente en su cuenta y actualizar la información de su cuenta. Elija uno de los siguientes enlaces para ver o cambiar la información."
+"Change Password","Cambiar Contraseña"
+Newsletters,"BoletÃn de Noticias"
+"You are currently subscribed to 'General Subscription'.","Actualmente estás suscrito a 'Suscripción General'."
+"You are currently not subscribed to any newsletter.","Actualmente no estás suscrito a ningún boletÃn de noticias"
+"Default Addresses","Dirección por Defecto"
+"Change Billing Address","Cambiar la Dirección de Facturación"
+"You have no default billing address in your address book.","No tienes ninguna dirección de facturación por defecto en tu libreta de direcciones."
+"Change Shipping Address","Cambiar la Dirección de EnvÃo"
+"You have no default shipping address in your address book.","No tienes ninguna dirección de envÃo por defecto en tu libreta de direcciones."
+"Additional Address Entries","Anotaciones Adicionales de Dirección"
+"You have no additional address entries in your address book.","No tienes anotaciones adicionales de dirección en tu libreta de direcciones."
+"Use as my default billing address","Usar como mi dirección de facturación por defecto"
+"Use as my default shipping address","Utilizar como mi dirección de envÃo por defecto"
"Save Address","Guardar Dirección"
-"Save Customer","Guardar cliente"
-"Save Customer Group","Guardar grupo de clientes"
-"Save Password","Guardar Contraseña"
-"Save and Continue Edit","Guardar y continuar editando"
-"Saved %d record(s)","Registro(s) %d Guardado(s)"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Valores separados por punto y coma (;).<br/>Coloque un punto y coma al comienzo para dejar la primera opción vacÃa.<br/>Deje el primer lugar vacÃo para crear un campo de texto abierto."
-"Send From","Enviar Desde"
-"Send Welcome Email","Enviar mensaje de correo electrónico de bienvenida"
-"Send Welcome Email after Confirmation","Enviar mensaje de correo electrónico de bienvenida después de la confirmación"
-"Send auto-generated password","Enviar contraseña generada automáticame"
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
"Send confirmation link","Enviar enlace de confirmación"
-"Sending","Enviando"
-"Sent","Enviada"
-"Session Start Time","Hora de inicio de sesión"
-"Set as Default Billing Address","Establecer como dirección de facturación predeterminada"
-"Set as Default Shipping Address","Establecer como dirección de envÃo predeterminada"
-"Share Customer Accounts","Compartir cuentas de cliente"
-"Ship-to First Name","Nombre del destinatario"
-"Ship-to Last Name","Apellido del destinatario"
-"Shipped to Name","Nombre del destinatario"
-"Shopping Cart","Cesta de la Compra"
-"Shopping Cart - %d item(s)","Carrito de compras: %d artÃculos"
-"Shopping Cart of %1$s - %2$d item(s)","Carro de la compra de %1$s - %2$d artÃculo(s)"
-"Show Date of Birth","Mostrar fecha de nacimiento"
-"Show Gender","Mostrar sexo"
-"Show Middle Name (initial)","Mostrar segundo nombre (inicial)"
-"Show Prefix","Mostrar prefijo"
-"Show Suffix","Mostrar sufijo"
-"Show Tax/VAT Number","Mostrar número de IVA/impuestos"
+"Back to Login","Volver a Conexión"
+"Current Password","Contraseña Actual"
+"Confirm New Password","Confirmar la Nueva Contraseña"
+"Please enter your email address below. You will receive a link to reset your password.","Escriba su correo electrónico más abajo. Recibirá un enlace para restablecer su contraseña."
+"Registered Customers","Clientes Registrados"
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription","Suscripción general"
"Sign Up for Newsletter","Darse de Alta para BoletÃn de Noticias"
-"Skipping import row, required field ""%s"" is not defined.","Omitir la fila de importación, el campo obligatorio ""%s"" no está definido."
-"Skipping import row, website ""%s"" field does not exist.","Omitida la importación de la fila, el campo ""%s"" de la página web no existe"
-"State/Province","Estado/Provincia"
-"Status","Estado"
-"Store","Tienda"
-"Store View","Ver Tienda"
-"Street Address","Dirección de Calle"
-"Street Address %s","%s de Calle"
-"Subject","Asunto"
-"Submit","Enviar"
-"Subscribe to Newsletter","Suscribir al boletÃn informativo"
-"Subscribed to Newsletter?","¿Está suscrito al boletÃn informativo?"
-"Suffix Dropdown Options","Opciones de la lista desplegable Sufijos"
-"Tag","Nombre de la etiqueta"
-"Tax Calculation Based On","Cálculo de impuestos en base a"
-"Tax Class","Clase impositiva"
+"Address Information","Información de Dirección"
+"Login Information","Información de registro"
+"Create account","Create account"
+"Reset a Password","Restablecer contraseña"
+"You have logged out and will be redirected to our homepage in 5 seconds.","Ha cerrado sesión y será redirigido a nuestra página principal en 5 segundos."
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Al crear una cuenta con nuestra tienda podrás moverte más rápidamente por el proceso de pago, guardar múltiples direcciones de envÃo, ver y seguir el rastro de los pedidos de tu cuenta y más."
+"Date of Birth","Fecha de Nacimiento"
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,Género
"Tax/VAT number","Número de IVA/impuestos"
-"Phone","Teléfono"
-"Text","Texto"
-"Text One Line","Texto (una lÃnea)"
-"Thank you for registering with %s.","Gracias por registrarse en %s."
-"The Date of Birth is required.","Se requiere la fecha de nacimiento."
-"The TAX/VAT number is required.","Se requiere el número de IVA."
-"The VAT ID entered (%s) is not a valid VAT ID.","El ID de IVA introducido (%s) no es un ID de IVA válido."
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","El ID de IVA introducido (%s) no es un ID de IVA válido. El cliente podrÃa pertenecer al grupo de clientes %s."
-"The VAT ID is valid. The current Customer Group will be used.","El ID de IVA no es válido. Se utilizará el Grupo de cliente actual."
-"The account information has been saved.","Se guardó la información de la cuenta."
-"The address does not belong to this customer.","La dirección no pertenece a este cliente."
-"The address has been deleted.","Se eliminó la dirección."
-"The address has been saved.","Se guardó la dirección."
-"The customer ID and email did not match, skipping the record, line: %s","El ID de cliente y el correo electrónico no coinciden, saltando el registro, lÃnea: %s"
-"The customer does not have default billing address.","El cliente no tiene una dirección de facturación predeterminada."
-"The customer email (%s) already exists, skipping the record, line: %s","La dirección de correo (%s) del cliente ya existe, saltando el registro, lÃnea: %s"
-"The customer group has been deleted.","Se eliminó el grupo de clientes."
-"The customer group has been saved.","Se guardó el grupo de clientes."
-"The customer is currently assigned to Customer Group %s.","El cliente está asignado actualmente al grupo de cliente %s."
-"The first name cannot be empty.","El nombre no puede estar vacÃo."
-"The group ""%s"" cannot be deleted","El grupo ""%s"" no se puede eliminar"
-"The last name cannot be empty.","El apellido no puede estar vacÃo."
-"The minimum password length is %s","La longitud mÃnima de la contraseña es de %s"
-"The password cannot be empty.","La contraseña no puede estar vacÃa."
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","La contraseña debe tener al menos 6 caracteres. Se ignorarán los espacios antes o después."
-"The suffix that goes after name (Jr., Sr., etc.)","El sufijo que va después de nombre (padre, hijo, etc.)"
-"The title that goes before name (Mr., Mrs., etc.)","El tÃtulo que va antes del nombre (señor, señorita, etc.)"
-"There are no items in customer's wishlist at the moment","En este momento no hay artÃculos en la lista de deseos del cliente."
-"There are no items in customer's shopping cart at the moment","En este momento no hay artÃculos en el carrito de compras del cliente."
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","Ya existe una cuenta con esta dirección de correo electrónico. Si está seguro de que esa es su dirección de correo electrónico, <a href=""%s"">pulse aquÃ</a> para conseguir su contraseña y acceder a su cuenta."
-"There was an error validating the VAT ID.","Ha habido un error validando el ID de IVA."
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Ha habido un error validando el ID de IVA. El cliente podrÃa pertenecer al grupo de cliente %s."
-"This account is not confirmed.","Esta cuenta no está confirmada."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","Esta cuenta no está confirmada. <a href=""%s"">Pulse aquÃ</a> para volver a enviar el correo electrónico de confirmación."
-"This customer email already exists","Este correo electrónico de cliente ya existe"
-"This customer has no saved addresses.","Este cliente no tiene direcciones guardadas."
-"This email does not require confirmation.","Esta dirección de correo electrónico no necesita confirmación."
-"This email will be sent instead of default welcome email, after account confirmation.","Se enviará este mensaje de correo electrónico en lugar del mensaje de bienvenida predeterminado, después de la confirmación de la cuenta."
-"This is My Default %s Address","Esta es mi %s Dirección por Defecto"
-"To Cart","Al carrito"
-"Total","Total"
-"Type","Tipo"
-"Unable to save the customer.","No se puede guardar el cliente."
-"Unknown","Desconocido"
+"Subscribe to Newsletter","Suscribir al boletÃn informativo"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
+"Tax Calculation Based On","Tax Calculation Based On"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
+"Validation Error Group","Validation Error Group"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
+"Welcome Email","Welcome Email"
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,Grupo
+"Are you sure you want to delete?","Are you sure you want to delete?"
"Unsubscribe from Newsletter","Cancelar suscripción al boletÃn informativo"
-"Update","Actualización"
-"Update customer address data","Actualizar datos de dirección del cliente"
-"Update customer data","Actualizar datos del cliente"
-"Use as My Default %s Address","Utilizar como mi %s Dirección por Defecto"
-"Use as My Default Billing Address","Utilizar como mi dirección de facturación por defecto"
-"Use as My Default Shipping Address","Utilizar como mi dirección de envÃo por defecto"
-"Use as my default billing address","Usar como mi dirección de facturación por defecto"
-"Use as my default shipping address","Utilizar como mi dirección de envÃo por defecto"
-"VAT Number","Número de IVA"
-"VAT Request Date","Fecha de petición de IVA"
-"VAT Request Identifier","Identificador de petición de IVA"
-"Validate VAT Number","Validar número de IVA"
-"Validate on Each Transaction","Validar en cada transacción"
-"Validation Error Group","Grupo de error de validación"
-"View","Ver"
-"View Order","Ver Pedido"
-"Visitor","Visitante"
-"Visitors Only","Sólo para visitantes"
-"Website","Sitio web"
-"Welcome Email","Mensaje de correo electrónico de bienvenida"
-"Wishlist","Lista de deseos"
-"Wishlist - %d item(s)","Lista de deseos: %d artÃculos"
-"Would you like to change the Customer Group for this order?","¿Quiere cambiar el grupo de cliente para este pedido?"
-"Wrong confirmation key.","Clave de confirmación incorrecta."
-"Wrong customer account specified.","Se especificó una cuenta de cliente incorrecta."
-"Wrong email.","Dirección de correo electrónico incorrecta."
-"Wrong transactional account email type","Tipo de correo electrónico de cuenta de transacciones equivocado"
-"Year (YYYY)","AAAA"
-"Year","Año"
-"You are currently not subscribed to any newsletter.","Actualmente no estás suscrito a ningún boletÃn de noticias"
-"You are currently not subscribed to our newsletter.","Actualmente no está suscrito a nuestro boletÃn informativo."
-"You are currently subscribed to 'General Subscription'.","Actualmente estás suscrito a 'Suscripción General'."
-"You are currently subscribed to our newsletter.","Actualmente estás suscrito a nuestro boletÃn de noticias"
+"Assign a Customer Group","Asignar un grupo de clientes"
+Phone,Teléfono
+ZIP,"Código postal"
+"Customer Since","Cliente desde"
+n/a,n/d
+"Session Start Time","Hora de inicio de sesión"
+"Last Activity","Ultima actividad"
+"Last URL","Ultima URL"
+"Edit Account Information","Cambiar la información de la cuenta"
+"Forgot Your Password","Olvidaste Tu Contraseña"
+"Password forgotten","Olvido de contraseña"
+"My Dashboard","Mi panel de control"
"You are now logged out","Ha cerrado sesión."
-"You have logged out and will be redirected to our homepage in 5 seconds.","Ha cerrado sesión y será redirigido a nuestra página principal en 5 segundos."
-"You have no additional address entries in your address book.","No tienes anotaciones adicionales de dirección en tu libreta de direcciones."
-"You have no additional entries in your address book.","No tiene más entradas en su libreta de direcciones."
-"You have no default billing address in your address book.","No tienes ninguna dirección de facturación por defecto en tu libreta de direcciones."
-"You have no default entries in your address book.","No tiene entradas predeterminadas en su libreta de direcciones."
-"You have no default shipping address in your address book.","No tienes ninguna dirección de envÃo por defecto en tu libreta de direcciones."
-"You have not set a default billing address.","No ha establecido una dirección de facturación predeterminada."
-"You have not set a default shipping address.","No ha establecido una dirección de envÃo predeterminada."
-"You have placed no orders yet.","Aún no ha hecho pedidos."
-"You have placed no products yet.","Aún no ha ingresado productos."
-"You will be charged tax.","Se le cargarán los impuestos."
-"You will not be charged tax.","No se le cargarán los impuestos."
-"Your Tax ID cannot be validated.","Su ID de impuestos no se ha podido validar."
-"Your VAT ID was successfully validated.","Su ID de IVA se ha validado correctamente."
-"Your account balance is: %s","El saldo de su cuenta es: %s"
-"Your password has been updated.","Se ha actualizado su contraseña."
-"Your password reset link has expired.","El enlace para reiniciar la contraseña ha caducado."
-"ZIP","Código postal"
-"ZIP/Post Code","Código postal"
-"Zip/Postal Code","Código Postal"
-"n/a","n/d"
-"or","o bien"
-"register","registro"
diff --git a/app/code/Magento/Customer/i18n/fr_FR.csv b/app/code/Magento/Customer/i18n/fr_FR.csv
index db7052701e8..964670fab0a 100644
--- a/app/code/Magento/Customer/i18n/fr_FR.csv
+++ b/app/code/Magento/Customer/i18n/fr_FR.csv
@@ -1,475 +1,422 @@
-" or ","ou"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","""%s"" semble être un nom de DNS, mais il est impossible d'en extraire TLD"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' semble être un nom de DNS, mais il est impossible de trouver une correspondance dans la liste TLD"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' semble être un nom de DNS, mais impossible de trouver une correspondance avec le schéma TLD"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' semble être un nom de DNS, mais contient un / à un emplacement invalide."
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' semble être un nom de DNS mais la notation ne peut être décodée"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' semble être le nom d'un réseau local, mais les noms de réseaux locaux ne sont pas autorisés."
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' semble être une adresse IP, mais les adresses IP ne sont pas autorisées."
-"'%value%' does not appear to be a valid local network name","'%value%' ne semble pas être un nom de réseau local valide"
-"* Required Fields","* Champs obligatoires"
-"ALL GROUPS","TOUS LES GROUPES"
-"Account Dashboard","Espace de travail du compte"
+All,Tous
+Cancel,Annuler
+"Create Order","Créer une commande"
+Back,Retour
+Product,"Nom du produit"
+Price,Prix
+Quantity,Qté
+ID,"Identifiant du produit"
+SKU,SKU
+Configure,Configurer
+Customers,Clients
+"Shopping Cart",Panier
+No,No
+Qty,Qty
+Action,Action
+Total,Total
+"No item specified.","Pas d'objet spécifié"
+"Are you sure that you want to remove this item?","Etes-vous sûr de vouloir supprimer cet objet ?"
+Edit,Modifier
+Orders,Commandes
+"New Customers","Nouveaux utilisateurs"
+Customer,Client
+"Grand Total","Total final"
+"Lifetime Sales","Ventes à vie"
+"All Store Views","Toutes les vues de la boutique"
+"My Account","Mon compte"
"Account Information","Informations du compte"
-"Account Sharing Options","Options de partage du compte"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Confirmation du compte requise. Veuillez vérifier vos emails pour le lien de confirmation. Pour renvoyer l'email de confirmation, veuillez <a href=""%s"">cliquer ici</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Confirmation du compte requise. Veuillez vérifier vos emails pour le lien de confirmation. Pour renvoyer l'email de confirmation, veuillez <a href=""%s"">cliquer ici</a>."
-"Action","Action"
+"First Name",Prénom
+"Last Name",Nom
+Email,Email
+"New Password","Nouveau mot de passe"
+"Delete File","Delete File"
+Delete,Supprimer
+Save,Enregistrer
+Store,Magasin
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,Nom
+Status,Statut
+"Save and Continue Edit","Sauvegarder et continuer l'édition"
+"Store View","Vue du magasin"
+Type,Type
+Submit,Soumettre
+"You deleted the customer.","You deleted the customer."
+"IP Address","Adresse IP"
+Order,"Commande n°"
+"Customer View","Voir le client"
+"Personal Information","Information personnelle"
+View,Vue
+"* Required Fields","* Champs obligatoires"
+Day,Jour
+Month,Mois
+Year,Année
+label,label
+Global,Global
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group","Groupe du client"
+"End Date","Fin de la lettre d'informations"
+"Customer Groups","Groupes de clients"
+Country,Pays
+State/Province,Etat/pays
+"Please select region, state or province","Veuillez sélectionner la région, l'état et le pays"
+City,Ville
+"Zip/Postal Code","Code postal"
+"Email Address","Adresse email"
+Company,Société
+"VAT Number","Numéro TVA"
+Address,Adresse
+"Street Address","Adresse postale"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,"Mot de passe"
+"Confirm Password","Confirmez le mot de passe"
+Login,Identifiant
+"Forgot Your Password?","Mot de passe oublié?"
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information","Informations de contact"
+"Log Out",Déconnexion
+"Log In",Connexion
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.","Vous n'êtes pas actuellement abonné à notre lettre d'informations."
+"You have not set a default shipping address.","Vous n'avez pas défini d'adresse de facturation par défaut."
+"You have not set a default billing address.","Vous n'avez pas défini d'adresse de facturation par défaut."
+"Address Book","Carnet d'adresses"
+"Edit Address","Éditer l'adresse"
"Add New Address","Ajouter une nouvelle adresse"
+region,region
"Add New Customer","Ajouter un nouvel utilisateur"
-"Add New Customer Group","Ajouter un nouveau groupe d'utilisateurs"
-"Added From","Ajouté depuis"
-"Additional Address Entries","Adresses supplémentaires"
-"Address","Adresse"
-"Address Book","Carnet d'adresses"
-"Address Books","Carnets d'adresses"
-"Address Information","Informations de l'adresse"
-"Address Templates","Modèles d'adresses"
-"Addresses","Adresses"
-"Admin","Admin"
-"All","Tous"
-"All Store Views","Toutes les vues de la boutique"
-"All countries","Tous les pays"
-"Always optional.","Toujours optionnel"
-"Amount","Montant"
-"An error occurred while deleting the address.","Une erreur est survenue lors de la suppression de l'adresse."
-"An error occurred while retrieving the option value: %s.","Une erreur est survenue lors de la récupération de la valeur de l'option : %s."
-"An error occurred while saving the collection, aborting. Error: %s","Une erreur est survenue lors de l'enregistrement de la collection, annulation. Erreur : %s."
-"An invalid option ID is specified for %s (%s), skipping the record.","Un identifiant d'option invalide est spécifié pour %s (%s), ignorer."
-"Approved","Approuvé"
-"Are you sure that you want to remove this item?","Etes-vous sûr de vouloir supprimer cet objet ?"
-"Are you sure you want to cancel adding of this address?","Etes-vous sûr de vouloir annuler l'ajout de cette adresse ?"
-"Are you sure you want to delete this address?","Etes-vous sûr de vouloir supprimer cette adresse ?"
-"Are you sure?","Etes-vous sûr ?"
-"Array of Entity collections is expected.","Un tableau des entités de collections est attendu."
-"Assign a Customer Group","Assigner un nouveau groupe d'utilisateurs"
-"Average Sale","Vente moyenne"
-"Back","Retour"
-"Back - link to the previously viewed page","Retour - lien vers la page visionnée précédemment"
-"Back to Login","Retour à la connexion"
-"Bad request.","Requête invalide."
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","D'après le numéro de TVA, le client appartiendrait au Groupe de clients %s."
+"Save Customer","Enregistrer le client"
+"Delete Customer","Supprimer le client"
+"Reset Password","Reset Password"
+"New Customer","Nouvel utilisateur"
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select","Veuillez sélectionner"
+"Send Welcome Email","Envoyer l'e-mail de bienvenue"
+"Send From","Envoyer depuis"
+"Send Welcome Email after Confirmation","Envoyer l'e-mail de bienvenue après confirmation"
+"Delete Address","Supprimer l'adresse"
+"Edit Customer's Address","Éditer l'adresse du client"
+"Shopping Cart from %1","Shopping Cart from %1"
+"Newsletter Information","Information de la lettre"
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed","Last Date Subscribed"
+"Last Date Unsubscribed","Dernière date de désinscription"
+"No Newsletter Found","Aucune lettre d'information trouvée"
+"Start date","Start date"
+"Receive Date","Lettre d'informations reçue"
+Subject,Sujet
+Sent,Envoyé
+"Not Sent","Non envoyé"
+Sending,Envoi
+Paused,"En pause"
+Unknown,Inconnu
+"Purchase Date","Commandé via"
"Bill-to Name","Facture au nom"
+"Ship-to Name","Ship-to Name"
+"Order Total","Total de la commande"
"Purchase Point","Acheté à "
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","En créant un compte avec notre boutique, vous serez capable de procéder aux achats plus rapidement, d'ajouter plusieurs adresses d'expédition, de voir et suivre vos commandes sur votre compte et plus encore."
-"CSV","CSV"
-"Cancel","Annuler"
-"Cannot save a new password.","Impossible d'enregistrer un nouveau mot de passe."
-"Cannot save address.","Impossible d'enregistrer l'adresse."
-"Cannot save the customer.","Impossible d'enregistrer le client."
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Impossible de partager les comptes des clients globalement car certains comptes avec les mêmes adresses e-mail existent sur plusieurs sites Web et ne peuvent pas être fusionnés."
-"Change Account Password","Modifier le mot de passe du compte"
-"Change Billing Address","Changer l'adresse de facturation"
-"Change Password","Modifier le mot de passe"
-"Change Shipping Address","Modifier l'adresse d'expédition"
-"City","Ville"
-"Company","Société"
-"Config","Config"
-"Configure","Configurer"
-"Confirm New Password","Confirmer le nouveau mot de passe"
-"Confirm Password","Confirmez le mot de passe"
-"Confirmation Link Email","E-mail de confirmation"
-"Confirmed","Confirmé"
-"Contact Information","Informations de contact"
-"Continue Shopping","Continuer les achats"
-"Country","Pays"
-"Create","Créer"
-"Create New Account Options","Créer Nouveau Compte Options"
-"Create New Customer Account","Créer un nouveau compte client"
-"Create Order","Créer une commande"
-"Create an Account","Créer un compte"
-"Create customer","Créer un client"
-"Create customer address","Créer l'adresse du client"
-"Current Password","Mot de passe actuel"
-"Customer","Client"
-"Customer API","API utilisateur"
-"Customer Account Edit Form","Formulaire de modification du compte client"
-"Customer Account Login Form","Formulaire de connexion client"
-"Customer Account Logout Success","Déconnexion du client effectuée"
-"Customer Account Registration Form","Formulaire d'inscription compte client"
-"Customer Addresses","Adresses du client"
-"Customer Configuration","Configuration client"
-"Customer Forgot Password Form","Formulaire d'oubli de mot de passe client"
-"Customer Group","Groupe du client"
-"Customer Groups","Groupes de clients"
+Never,Jamais
+Offline,"Hors ligne"
+Online,"En ligne"
+Confirmed,Confirmé
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.","L'utilisateur ne dispose pas d'une adresse de facturation par défaut."
+"Recent Orders","Commandes récentes"
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment","Il n'y a pas d'objets dans le panier d'utilisateur"
+"Shipped-to Name","Shipped-to Name"
+"Deleted Stores","Magasins supprimés"
+"There are no items in customer's wishlist at the moment","Il n'y a pas d'objets dans la liste de voeux de l'utilisateur"
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
"Customer Information","Information sur le client"
-"Customer Login","Login du client"
-"Customer My Account (All Pages)","Mon compte client (toutes les pages)"
-"Customer My Account Address Book","Mon compte client carnet d'adresses"
-"Customer My Account Address Edit Form","Mon compte client formulaire de modification d'adresse"
-"Customer My Account Dashboard","Mon compte client tableau de bord"
-"Customer Since","Client depuis"
-"Customer View","Voir le client"
-"Customer collection expected.","La collection du client est attendue."
-"Customer email is required","L'adresse courriel du client est nécessaire"
-"Customer website ID must be specified when using the website scope","L'identification du client sur le site web doit être indiqué lors de l'utilisation du site"
-"Customer will stay on the current page if ""No"" is selected.","Les utilisateurs resteront sur la page actuelle si ""Non"" est sélectionné"
-"Customers","Clients"
-"Customers Only","Clients seulement"
-"Customers Section","Section clients"
-"Day (DD)","DD"
-"Date","Date"
-"Date Added","Date ajoutée"
-"Date of Birth","Date de naissance"
-"Day","Jour"
-"Days in Wishlist","Jours dans la liste de cadeaux"
-"Default Addresses","Adresses par défaut"
-"Default Billing Address","Adresse de facturation par défaut"
-"Default Email Domain","Domaine de l'e-mail par défaut"
-"Default Group","Groupe par défaut"
-"Default Shipping Address","Adresse d'expédition par défaut"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","Valeur par défaut de désactivation des modifications automatiques de groupe selon le numéro de TVA"
-"Default Welcome Email","E-mail de bienvenue par défaut"
-"Delete","Supprimer"
-"Delete Address","Supprimer l'adresse"
-"Delete Customer","Supprimer le client"
+Addresses,Adresses
+Wishlist,"Liste de cadeaux"
+Newsletter,Newsletter
+"Product Reviews","Avis sur le produit"
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries","Tous les pays"
+"Add New Customer Group","Ajouter un nouveau groupe d'utilisateurs"
+"Save Customer Group","Enregistrer le groupe de clients"
"Delete Customer Group","Supprimer le groupe de client"
-"Delete customer","Supprimer l'utilisateur"
-"Delete customer address","Supprimer l'adresse du client"
-"Deleted Stores","Magasins supprimés"
-"Details","Détails"
-"Disabled","Désactivé"
-"Edit","Modifier"
-"Edit Account Info","Éditer les informations du compte"
-"Edit Account Information","Éditer les informations du compte"
-"Edit Address","Éditer l'adresse"
-"Edit Address Entry","Éditer l'entrée adresse"
-"Edit Customer Group ""%s""","Modifier le groupe utilisateur ""%s"""
-"Edit Customer Groups","Éditer les groupes de clients"
-"Edit Customer's Address","Éditer l'adresse du client"
-"Edit Group","Éditer le groupe"
-"Edit Newsletters","Éditer les newsletters"
-"Email","Email"
-"Email Address","Adresse email"
-"Email Sender","Expéditeur de l'email"
-"Email:","Email :"
-"Enable Automatic Assignment to Customer Group","Activer l'affectation automatique à un Groupe de clients"
-"Entity collection is expected.","Une collection d'entité est attendue"
-"Excel XML","Excel XML"
-"Failed to confirm customer account.","Échec de la confirmation du compte client."
-"Fax","Fax"
-"First Name","Prénom"
-"Forgot Email Template","Modèle du mail oublié"
-"Forgot Password","Mot de passe oublié"
-"Forgot Your Password","Mot de passe oublié"
-"Forgot Your Password?","Mot de passe oublié?"
-"Forgot and Remind Email Sender","Envoyer un e-mail de rappel en cas d'oubli"
-"Form Fields Before","Champs des formulaires avant"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Vous pouvez avoir un aperçu de votre activité récente dans le tableau de bord de votre compte. Vous pouvez également mettre à jour les informations de votre compte. Sélectionner un lien ci-dessous pour voir ou éditer vos informations."
-"Gender","Genre"
-"Gender is required.","Le genre est requis."
-"General Subscription","Abonnement général"
-"Generate Human-Friendly Customer ID","Générer un ID client intelligible"
-"Global","Global"
-"Grand Total","Total final"
-"Group","Groupe"
+"New Customer Group","Nouveau groupe d'utilisateurs"
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
"Group Information","Informations sur le groupe"
"Group Name","Nom du groupe"
-"Group for Invalid VAT ID","Groupe pour numéro de TVA non valide"
-"Group for Valid VAT ID - Domestic","Groupe pour numéro de TVA valide - National"
-"Group for Valid VAT ID - Intra-Union","Groupe pour numéro de TVA valide - Intra-Union"
-"Guest","Invité"
-"HTML","HTML"
-"Hello, %s!","Bonjour %s!"
-"ID","ID"
-"IP Address","Adresse IP"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","S'il y a un compte associé à %s, vous recevrez un courriel contenant un lien pour réinitialiser votre mot de passe."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","Si vous êtes un client assujetti à la TVA enregistré, veuillez cliquer <a href=""%s"">ici</a> pour saisir votre adresse de facturation afin de calculer la TVA exacte"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","Si vous êtes un client assujetti à la TVA enregistré, veuillez cliquer <a href=""%s"">ici</a> pour saisir votre adresse de livraison afin de calculer la TVA exacte"
-"If you believe this is an error, please contact us at %1","Si vous pensez qu'il s'agit d'une erreur, veuillez nous contacter au %1"
-"If you have an account with us, please log in.","Si vous avez un compte chez nous, identifiez-vous."
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Option d'attribut invalide spécifiée pour l'attribut %s (%s), enregistrement sauté."
-"Invalid attribute set specified, skipping the record.","Ensemble d'attributs spécifiés invalide, enregistrement sauté."
-"Invalid billing address for (%s)","Adresse de facturation non valide pour (%s)"
-"Invalid current password","Mot de passe invalide"
-"Invalid customer data","Données client invalides"
-"Invalid email address ""%s"".","Adresse email invalide ""%s"""
-"Invalid email address.","Adresse mail invalide"
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class","Classe d'impôt"
+"Customers Only","Clients seulement"
+"Visitors Only","Visiteurs uniquement"
+Visitor,Visiteur
+"The customer is currently assigned to Customer Group %s.","Le client appartient actuellement au Groupe de clients %s."
+"Would you like to change the Customer Group for this order?","Souhaitez-vous modifier le Groupe de clients pour cette commande ?"
+"The VAT ID is valid. The current Customer Group will be used.","Le numéro de TVA est valide. Le Groupe de clients en cours va être utilisé."
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID.","Une erreur est apparue lors de la validation du numéro de TVA."
+"Validate VAT Number","Valider le numéro de TVA"
+"Customer Login","Login du client"
+"Create New Customer Account","Créer un nouveau compte client"
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
"Invalid login or password.","Login ou mot de passe invalide"
-"Invalid password reset token.","Preuve de réinitialisation de mot de passe invalide."
-"Invalid shipping address for (%s)","Adresse de livraison non valide pour (%s)"
-"Invalid store specified, skipping the record.","Magasin spécifié invalide, enregistrement sauté."
-"Invalid website, skipping the record, line: %s","Site Internet non valide, enregistrement ignoré, ligne : %s"
-"Last Activity","Dernière activité"
-"Last Subscribe Date","Dernière date d'inscription"
-"Last Date Unsubscribed","Dernière date de désinscription"
-"Last Name","Nom"
-"Last URL","Dernier lien"
-"Leave empty for default (15 minutes).","Laisser vide par défaut (15 minutes)"
-"Leave empty for default (2). Valid range: 1-4","Laisser vide par défaut (2). Valeurs valides de 1 à 4."
-"Lifetime Sales","Ventes à vie"
-"Log In","Connexion"
-"Log Out","Déconnexion"
-"Login","Identifiant"
-"Login Information","Information de connexion"
-"Login Options","Options d'identification"
+"There was an error validating the login and password.","There was an error validating the login and password."
"Login and password are required.","Le nom d'utilisateur et le mot de passe sont requis."
-"Login or Create an Account","Connectez-vous ou créez un compte"
-"Month (MM)","MM"
-"Manage Addresses","Gérer les adresses"
-"Manage Customers","Gérer les utilisateurs"
-"Maximum length must be less then %s symbols","La longueur maximale doit être inférieure à %s symboles"
-"Missing email, skipping the record, line: %s","Adresse e-mail manquante, enregistrement ignoré, ligne : %s"
-"Missing email, skipping the record.","Adresses manquante, ignorer."
-"Missing first name, skipping the record, line: %s","Prénom manquant, enregistrement ignoré, ligne : %s"
-"Missing firstname, skipping the record.","Prénom manquant, ignorer."
-"Missing last name, skipping the record, line: %s","Nom manquant, enregistrement ignoré, ligne : %s"
-"Missing lastname, skipping the record.","Nom de famille manquant, ignorer."
-"Missing website, skipping the record, line: %s","Site Internet manquant, enregistrement ignoré, ligne : %s"
-"Month","Mois"
-"My Account","Mon compte"
-"My Account Wrapper","Mon compte"
-"My Dashboard","Mon espace de travail"
-"My Orders","Mes commades"
-"Name","Nom"
-"Name and Address Options","Options du nom et de l'adresse"
-"Never","Jamais"
-"New Address","Nouvelle adresse"
-"New Address Entry","Nouvelle entrée d'adresse"
-"New Customer","Nouvel utilisateur"
-"New Customer Address","Nouvelle adresse utilisateur"
-"New Customer Group","Nouveau groupe d'utilisateurs"
-"New Customer Groups","Nouveaux groupes d'utilistateurs"
-"New Customers","Nouveaux utilisateurs"
-"New Group","Nouveau groupe"
-"New Password","Nouveau mot de passe"
-"New account","Nouveau compte"
-"New account confirmation key","Nouvelle clé de confirmation du compte"
-"New account confirmed","Nouveau compte confirmé"
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.","Impossible d'enregistrer le client."
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
+"Wrong customer account specified.","Mauvais compte utilisateur."
+"Bad request.","Requête invalide."
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.","Veuillez vérifier vos emails pour la clé de confirmation."
+"This email does not require confirmation.","Cet email ne nécessite pas de confirmation."
+"Wrong email.","Mauvaise adresse email."
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.","Veuillez entrer votre adresse email."
+"Your password reset link has expired.","Votre lien de réinitialisation de mot de passe a expiré."
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
"New password field cannot be empty.","Le champ nouveau mot de passe ne peut pas être vide."
-"Newsletter","Newsletter"
-"End Date","Fin de la lettre d'informations"
-"Newsletter Information","Information de la lettre"
-"Receive Date","Lettre d'informations reçue"
-"Start Date","Début de la lettre d'information"
-"Newsletter Subscription","Abonnement à la newsletter"
-"Newsletters","Lettres d'information"
-"No Items Found","Pas d'objet trouvé"
-"No Newsletter Found","Aucune lettre d'information trouvée"
-"No customer collections found","Aucune collection d'utilisateur"
-"No item specified.","Pas d'objet spécifié"
-"Not Sent","Non envoyé"
-"Not confirmed, can login","Non confirmé, peut se connecter"
-"Not confirmed, cannot login","Non confirmé, ne peut pas se connecter"
-"Number of Lines in a Street Address ","Nombre de lignes dans l'adresse"
-"Offline","Hors ligne"
-"Online","En ligne"
+"Your password has been updated.","Votre mot de passe a été mis à jour."
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.","Les informations du compte ont été sauvegardées."
+"The address has been saved.","L'adresse a été enregistrée."
+"Cannot save address.","Impossible d'enregistrer l'adresse."
+"The address has been deleted.","Cette adresse a été supprimée."
+"An error occurred while deleting the address.","Une erreur est survenue lors de la suppression de l'adresse."
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group","Nouveau groupe"
+"New Customer Groups","Nouveaux groupes d'utilistateurs"
+"Edit Group","Éditer le groupe"
+"Edit Customer Groups","Éditer les groupes de clients"
+"The customer group has been saved.","Le groupe d'utilisateurs a été enregistré."
+"The customer group has been deleted.","Le groupe d'utilisateurs a été supprimé."
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers","Gérer les utilisateurs"
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
"Online Customers","Utilisateurs en ligne"
-"Online Customers Options","Options des utilisateurs en ligne"
-"Online Minutes Interval","Intervalle des minutes en ligne"
-"Order","Commande n°"
-"Order Total","Total de la commande"
-"Orders","Commandes"
-"PDF","PDF"
-"Password","Mot de passe"
-"Password Management","Gestion du mot de passe"
-"Password Options","Option du mot de passe"
-"Password forgotten","Mot de passe oublié"
-"Password:","Mot de passe :"
-"Paused","En pause"
-"Pending","En cours"
-"Per Website","Par site web"
-"Personal Information","Information personnelle"
-"Please enter a number 1 or greater in this field.","Veuillez saisir un nombre supérieur ou égal à 1 dans ce champ."
-"Please enter a valid date between %s and %s at %s.","Veuillez saisir une date valide entre le %s et le %s à la ligne %s."
-"Please enter a valid date equal to or greater than %s at %s.","Veuillez saisir une date valide supérieure ou égale au %s à la ligne %s."
-"Please enter a valid date less than or equal to %s at %s.","Veuillez saisir une date valide inférieure ou égale au %s à la ligne %s."
-"Please enter the city.","Veuillez saisir la ville."
-"Please enter the country.","Veuillez saisir le pays."
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
"Please enter the first name.","Veuillez saisir le prénom."
"Please enter the last name.","Veuillez saisir le nom de famille."
-"Please enter the state/province.","Veuillez entrer l'état/la région."
"Please enter the street.","Veuillez saisir la ville."
+"Please enter the city.","Veuillez saisir la ville."
"Please enter the telephone number.","Veuillez saisir le numéro de téléphone."
"Please enter the zip/postal code.","Veuillez saisir le code postal."
-"Please enter your email address below. You will receive a link to reset your password.","Veuillez entrer votre adresse e-mail ci dessous. Vous allez recevoir un lien pour réinitialiser votre mot de passe."
-"Please enter your email below and we'll send you confirmation link for it.","Veuillez entrer votre adresse email ci-dessous et nous vous enverrons un lien de confirmation."
-"Please enter your email.","Veuillez entrer votre adresse email."
-"Please make sure your passwords match.","Veillez à ce que vos mots de passe correspondent."
-"Please select","Veuillez sélectionner"
-"Please select a website which contains store view","Veuillez sélectionner un site Internet contenant une vue du magasin"
-"Please select region, state or province","Veuillez sélectionner la région, l'état et le pays"
-"Please, check your email for confirmation key.","Veuillez vérifier vos emails pour la clé de confirmation."
-"Prefix Dropdown Options","Options de préfixe"
-"Price","Prix"
-"Product","Produit"
-"ID","Identifiant du produit"
-"Product","Nom du produit"
-"Product Reviews","Avis sur le produit"
-"Product Tags","Étiquettes des produits"
-"Purchase On","Commander via"
-"Purchase Date","Commandé via"
-"Quantity","Qté"
-"Recent Orders","Commandes récentes"
-"Records for %s store found.","Enregistrements pour %s boutiques trouvés."
-"Recovery Link Expiration Interval (days)","Délai d'expiration du lien de récupération (jours)"
-"Redirect Customer to Account Dashboard after Logging in","Rediriger l'utilisateur vers son tableau de bord après la connexioin"
-"Refunded","Remboursé"
-"Registered Customers","Utilisateurs enregistrés"
-"Remind Email Template","Modèle d'e-mail de rappel"
-"Remind Password","Rappeler le mot de passe"
-"Remove","Supprimer"
-"Require Emails Confirmation","Nécessaire confirmation par email"
-"Reset a Password","Réinitialiser un mot de passe"
-"Retrieve address data","Récupérer les données de l'adresse"
-"Retrieve address info","Récupérer les informations de l'adresse"
-"Retrieve customer addresses","Récupérer les adresses des utilisateurs"
-"Retrieve customer data","Récupérer les données de l'utilisateur"
-"Retrieve customer groups","Récupérer les groupes utilisateurs"
-"Retrieve customer info","Récupérer les infos de l'utilisateur"
-"Retrieve customers","Récupérer les utilisateurs"
-"Retrieve your confirmation link here","Récupérer votre lien de confirmation ici"
-"Retrieve your password here","Récupérer votre mot de passe ici"
-"SKU","SKU"
+"Please enter the country.","Veuillez saisir le pays."
+"Please enter the state/province.","Veuillez entrer l'état/la région."
+"Per Website","Par site web"
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Impossible de partager les comptes des clients globalement car certains comptes avec les mêmes adresses e-mail existent sur plusieurs sites Web et ne peuvent pas être fusionnés."
+"This account is not confirmed.","Ce compte n'est pas confirmé."
+"Wrong transactional account email type","Mauvais type d'email pour le compte de transaction"
+"The first name cannot be empty.","Le prénom ne peut être vide."
+"The last name cannot be empty.","Le nom de famille ne peut être vide."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.","La date de naissance est requise."
+"The TAX/VAT number is required.","Le numéro TAX/VAT est requis."
+"Gender is required.","Le genre est requis."
+"Invalid password reset token.","Preuve de réinitialisation de mot de passe invalide."
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,Admin
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required","L'adresse courriel du client est nécessaire"
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope","L'identification du client sur le site web doit être indiqué lors de l'utilisation du site"
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses","Adresses du client"
+"Are you sure you want to delete this address?","Etes-vous sûr de vouloir supprimer cette adresse ?"
+"Set as Default Billing Address","Définir comme adresse de facturation par défaut"
+"Default Billing Address","Adresse de facturation par défaut"
+"Set as Default Shipping Address","Définir comme adresse d'expédition par défaut"
+"Default Shipping Address","Adresse d'expédition par défaut"
+"New Customer Address","Nouvelle adresse utilisateur"
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
"Sales Statistics","Statistiques de vente"
-"Save","Enregistrer"
+"Average Sale","Vente moyenne"
+"Manage Addresses","Gérer les adresses"
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Vous pouvez avoir un aperçu de votre activité récente dans le tableau de bord de votre compte. Vous pouvez également mettre à jour les informations de votre compte. Sélectionner un lien ci-dessous pour voir ou éditer vos informations."
+"Change Password","Modifier le mot de passe"
+Newsletters,"Lettres d'information"
+"You are currently subscribed to 'General Subscription'.","Vous êtes actuellement abonné à no ""Souscription générale"""
+"You are currently not subscribed to any newsletter.","Vous n'êtes actuellement abonné à aucune lettre d'informations."
+"Default Addresses","Adresses par défaut"
+"Change Billing Address","Changer l'adresse de facturation"
+"You have no default billing address in your address book.","Vous n'avez pas d'adresse de facturation par défaut dans votre carnet d'adresses."
+"Change Shipping Address","Modifier l'adresse d'expédition"
+"You have no default shipping address in your address book.","Vous n'avez pas d'adresse d'expédition par défaut dans votre carnet d'adresses."
+"Additional Address Entries","Adresses supplémentaires"
+"You have no additional address entries in your address book.","Vous n'avez pas d'entrées supplémentaires dans votre carnet d'adresses."
+"Use as my default billing address","Utiliser comme mon adresse de facturation par défaut."
+"Use as my default shipping address","À utiliser comme mon adresse de livraison par défaut"
"Save Address","Enregister l'adresse"
-"Save Customer","Enregistrer le client"
-"Save Customer Group","Enregistrer le groupe de clients"
-"Save Password","Enregistrer le mot de passe"
-"Save and Continue Edit","Sauvegarder et continuer l'édition"
-"Saved %d record(s)","Sauvegardé %d enregistrement(s)"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Valeurs séparées par des points-virgules (;).<br/>Mettre le point-virgule au début pour que la première option soit vide.<br/>Laisser vide pour que le champ de texte soit ouvert."
-"Send From","Envoyer depuis"
-"Send Welcome Email","Envoyer l'e-mail de bienvenue"
-"Send Welcome Email after Confirmation","Envoyer l'e-mail de bienvenue après confirmation"
-"Send auto-generated password","Envoyer un mot de passe généré automatiquement"
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
"Send confirmation link","Envoyer le lien de confirmation"
-"Sending","Envoi"
-"Sent","Envoyé"
-"Session Start Time","Heure de début de session"
-"Set as Default Billing Address","Définir comme adresse de facturation par défaut"
-"Set as Default Shipping Address","Définir comme adresse d'expédition par défaut"
-"Share Customer Accounts","Partager les comptes client"
-"Ship-to First Name","Expédié à Prénom"
-"Ship-to Last Name","Expédié à Nom de famille"
-"Shipped to Name","Expédié à Nom"
-"Shopping Cart","Panier"
-"Shopping Cart - %d item(s)","Panier - %d article(s)"
-"Shopping Cart of %1$s - %2$d item(s)","Panier de %1$s - %2$d objet(s)"
-"Show Date of Birth","Montrer la date de naissance"
-"Show Gender","Montrer le genre"
-"Show Middle Name (initial)","Montrer le deuxième prénom (initial)"
-"Show Prefix","Montrer le préfixe"
-"Show Suffix","Montrer le suffixe"
-"Show Tax/VAT Number","Montrer le numéro de taxe/TVA"
+"Back to Login","Retour à la connexion"
+"Current Password","Mot de passe actuel"
+"Confirm New Password","Confirmer le nouveau mot de passe"
+"Please enter your email address below. You will receive a link to reset your password.","Veuillez entrer votre adresse e-mail ci dessous. Vous allez recevoir un lien pour réinitialiser votre mot de passe."
+"Registered Customers","Utilisateurs enregistrés"
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription","Abonnement général"
"Sign Up for Newsletter","S'inscrire à la newsletter"
-"Skipping import row, required field ""%s"" is not defined.","Sauter la ligne d'importation, le champ requis ""%s"" n'est pas défini."
-"Skipping import row, website ""%s"" field does not exist.","Ignorer la ligne importation, le champ site web ""%s"" n'existe pas."
-"State/Province","Etat/pays"
-"Status","Statut"
-"Store","Magasin"
-"Store View","Vue du magasin"
-"Street Address","Adresse postale"
-"Street Address %s","Rue %s"
-"Subject","Sujet"
-"Submit","Soumettre"
-"Subscribe to Newsletter","S'inscrire à la newsletter"
-"Subscribed to Newsletter?","Inscrit à la newsletter ?"
-"Suffix Dropdown Options","Option de la liste déroulante de suffixe"
-"Tag","Nom de l'étiquette"
-"Tax Calculation Based On","Calcul des taxes selon"
-"Tax Class","Classe d'impôt"
+"Address Information","Informations de l'adresse"
+"Login Information","Information de connexion"
+"Create account","Create account"
+"Reset a Password","Réinitialiser un mot de passe"
+"You have logged out and will be redirected to our homepage in 5 seconds.","Vous êtes déconnecté et serez redirigé vers notre page d'accueil dans 5 secondes."
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","En créant un compte avec notre boutique, vous serez capable de procéder aux achats plus rapidement, d'ajouter plusieurs adresses d'expédition, de voir et suivre vos commandes sur votre compte et plus encore."
+"Date of Birth","Date de naissance"
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,Genre
"Tax/VAT number","Numéro TVA"
-"Phone","Téléphone"
-"Text","Texte"
-"Text One Line","Texte une ligne"
-"Thank you for registering with %s.","Merci de vous être inscrit à %s."
-"The Date of Birth is required.","La date de naissance est requise."
-"The TAX/VAT number is required.","Le numéro TAX/VAT est requis."
-"The VAT ID entered (%s) is not a valid VAT ID.","Le numéro de TVA saisi (%s) n'est pas un numéro de TVA valide."
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","Le numéro de TVA saisi (%s) n'est pas un numéro de TVA valide. Le client appartiendrait au Groupe de clients %s."
-"The VAT ID is valid. The current Customer Group will be used.","Le numéro de TVA est valide. Le Groupe de clients en cours va être utilisé."
-"The account information has been saved.","Les informations du compte ont été sauvegardées."
-"The address does not belong to this customer.","Cette adresse n'appartient pas à cet utilisateur."
-"The address has been deleted.","Cette adresse a été supprimée."
-"The address has been saved.","L'adresse a été enregistrée."
-"The customer ID and email did not match, skipping the record, line: %s","L'identifiant client et l'e-mail ne correspondent pas, enregistrement ignoré, ligne : %s"
-"The customer does not have default billing address.","L'utilisateur ne dispose pas d'une adresse de facturation par défaut."
-"The customer email (%s) already exists, skipping the record, line: %s","L'adresse e-mail du client existe déjà , enregistrement ignoré, ligne : %s"
-"The customer group has been deleted.","Le groupe d'utilisateurs a été supprimé."
-"The customer group has been saved.","Le groupe d'utilisateurs a été enregistré."
-"The customer is currently assigned to Customer Group %s.","Le client appartient actuellement au Groupe de clients %s."
-"The first name cannot be empty.","Le prénom ne peut être vide."
-"The group ""%s"" cannot be deleted","Le groupe ""%s"" ne peut pas être supprimé"
-"The last name cannot be empty.","Le nom de famille ne peut être vide."
-"The minimum password length is %s","La longueur minimale du mot de passe est %s"
-"The password cannot be empty.","Le mot de passe ne peut être vide."
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","Le mot de passe doit contenir au moins 6 caractères. Les espaces seront ignorés."
-"The suffix that goes after name (Jr., Sr., etc.)","Le suffixe suivant le nom (Jr, Sr, etc)"
-"The title that goes before name (Mr., Mrs., etc.)","Le titre qui va avant le nom (M, Mme, Mlle, etc)"
-"There are no items in customer's wishlist at the moment","Il n'y a pas d'objets dans la liste de voeux de l'utilisateur"
-"There are no items in customer's shopping cart at the moment","Il n'y a pas d'objets dans le panier d'utilisateur"
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","Il y a déjà un compte avec cette adresse email. Si vous êtes sûr qu'il s'agit de votre adresse email, <a href=""%s"">cliquez ici</a> pour obtenir votre mot de passe et accéder à votre compte."
-"There was an error validating the VAT ID.","Une erreur est apparue lors de la validation du numéro de TVA."
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Une erreur est apparue lors de la validation du numéro de TVA. Le client appartiendrait au Groupe de clients %s."
-"This account is not confirmed.","Ce compte n'est pas confirmé."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","Ce compte n'est pas confirmé. <a href=""%s"">Cliquez ici</a> pour renvoyer un mail de confirmation."
-"This customer email already exists","Cette adresse d'utilisateur existe déjà ."
-"This customer has no saved addresses.","Cet utilisateur n'a aucune adresse enregistrée."
-"This email does not require confirmation.","Cet email ne nécessite pas de confirmation."
-"This email will be sent instead of default welcome email, after account confirmation.","Cet email sera envoyé au lieu du message de bienvenue par défaut, après la confirmation du compte."
-"This is My Default %s Address","Il s'agit de mon adresse par défaut %s"
-"To Cart","Vers le panier"
-"Total","Total"
-"Type","Type"
-"Unable to save the customer.","Impossible d'enregistrer l'utilisateur."
-"Unknown","Inconnu"
+"Subscribe to Newsletter","S'inscrire à la newsletter"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
+"Tax Calculation Based On","Tax Calculation Based On"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
+"Validation Error Group","Validation Error Group"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
+"Welcome Email","Welcome Email"
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,Groupe
+"Are you sure you want to delete?","Are you sure you want to delete?"
"Unsubscribe from Newsletter","Se désinscrire de la lettre d'informations"
-"Update","Mise à jour"
-"Update customer address data","Mettre à jour l'adresse de l'utilisateur"
-"Update customer data","Mettre à jour les données de l'utilisateur"
-"Use as My Default %s Address","Utiliser comme mon adresse par défaut %s"
-"Use as My Default Billing Address","Utiliser comme mon adresse de facturation par défaut"
-"Use as My Default Shipping Address","Utiliser comme mon adresse d'expédition par défaut"
-"Use as my default billing address","Utiliser comme mon adresse de facturation par défaut."
-"Use as my default shipping address","À utiliser comme mon adresse de livraison par défaut"
-"VAT Number","Numéro TVA"
-"VAT Request Date","Date de demande de la TVA"
-"VAT Request Identifier","Identifiant de demande de la TVA"
-"Validate VAT Number","Valider le numéro de TVA"
-"Validate on Each Transaction","Valider chaque transaction"
-"Validation Error Group","Groupe d'erreur de validation"
-"View","Vue"
-"View Order","Voir la commande"
-"Visitor","Visiteur"
-"Visitors Only","Visiteurs uniquement"
-"Website","Site"
-"Welcome Email","Email de bienvenue"
-"Wishlist","Liste de cadeaux"
-"Wishlist - %d item(s)","Liste de voeux - %d objets"
-"Would you like to change the Customer Group for this order?","Souhaitez-vous modifier le Groupe de clients pour cette commande ?"
-"Wrong confirmation key.","Clé de confirmation erronée."
-"Wrong customer account specified.","Mauvais compte utilisateur."
-"Wrong email.","Mauvaise adresse email."
-"Wrong transactional account email type","Mauvais type d'email pour le compte de transaction"
-"Year (YYYY)","AAAA"
-"Year","Année"
-"You are currently not subscribed to any newsletter.","Vous n'êtes actuellement abonné à aucune lettre d'informations."
-"You are currently not subscribed to our newsletter.","Vous n'êtes pas actuellement abonné à notre lettre d'informations."
-"You are currently subscribed to 'General Subscription'.","Vous êtes actuellement abonné à no ""Souscription générale"""
-"You are currently subscribed to our newsletter.","Vous êtes actuellement abonné à notre lettre d'informations."
+"Assign a Customer Group","Assigner un nouveau groupe d'utilisateurs"
+Phone,Téléphone
+ZIP,ZIP
+"Customer Since","Client depuis"
+n/a,n/a
+"Session Start Time","Heure de début de session"
+"Last Activity","Dernière activité"
+"Last URL","Dernier lien"
+"Edit Account Information","Éditer les informations du compte"
+"Forgot Your Password","Mot de passe oublié"
+"Password forgotten","Mot de passe oublié"
+"My Dashboard","Mon espace de travail"
"You are now logged out","Vous êtes maintenant déconnecté."
-"You have logged out and will be redirected to our homepage in 5 seconds.","Vous êtes déconnecté et serez redirigé vers notre page d'accueil dans 5 secondes."
-"You have no additional address entries in your address book.","Vous n'avez pas d'entrées supplémentaires dans votre carnet d'adresses."
-"You have no additional entries in your address book.","Vous n'avez pas d'entrées supplémentaires dans votre carnet d'adresses."
-"You have no default billing address in your address book.","Vous n'avez pas d'adresse de facturation par défaut dans votre carnet d'adresses."
-"You have no default entries in your address book.","Vous n'avez pas d'adresses par défaut dans votre carnet d'adresses."
-"You have no default shipping address in your address book.","Vous n'avez pas d'adresse d'expédition par défaut dans votre carnet d'adresses."
-"You have not set a default billing address.","Vous n'avez pas défini d'adresse de facturation par défaut."
-"You have not set a default shipping address.","Vous n'avez pas défini d'adresse de facturation par défaut."
-"You have placed no orders yet.","Vous n'avez placé aucune commande."
-"You have placed no products yet.","Vous n'avez placé aucun produit."
-"You will be charged tax.","Vous devrez payer des taxes."
-"You will not be charged tax.","Vous n'aurez pas de taxe à payer."
-"Your Tax ID cannot be validated.","Votre numéro d'identification fiscale ne peut pas être validé."
-"Your VAT ID was successfully validated.","Votre numéro de TVA a bien été validé."
-"Your account balance is: %s","La balance de votre compte est : %s"
-"Your password has been updated.","Votre mot de passe a été mis à jour."
-"Your password reset link has expired.","Votre lien de réinitialisation de mot de passe a expiré."
-"ZIP","ZIP"
-"ZIP/Post Code","Code postal"
-"Zip/Postal Code","Code postal"
-"n/a","n/a"
-"or","ou"
-"register","s'enregistrer"
diff --git a/app/code/Magento/Customer/i18n/nl_NL.csv b/app/code/Magento/Customer/i18n/nl_NL.csv
index 1fd9221d659..79218e61829 100644
--- a/app/code/Magento/Customer/i18n/nl_NL.csv
+++ b/app/code/Magento/Customer/i18n/nl_NL.csv
@@ -1,475 +1,422 @@
-" or ","of"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' lijkt een DNS hostnaam te zijn maar kan geen TLD deel eruit halen."
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' lijkt een DNS hostnaam te zijn maar komt niet overeen met de TLD in de eigen bekende lijst."
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' lijkt een DNS hostnaam te zijn maar kan niet overeenkomen met de hostnaam voor het TLD schema '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' lijkt een DNS hostnaam te zijn maar bevat een liggende streep op een ongeldige positie"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' lijkt een DNS hostnaam te zijn maar de gegeven punycode kan niet worden gedecodeerd"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' lijkt een lokale netwerk naam te zijn maar, lokale netwerk namen zijn niet toegestaan"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' lijkt een IP adres te zijn, maar IP adressen zijn niet toegestaan"
-"'%value%' does not appear to be a valid local network name","'%value%' blijkt geen geldige lokale netwerk naam te zijn"
+All,Alles
+Cancel,Annuleren
+"Create Order","Maak Bestelling Aan"
+Back,Terug
+Product,Productnaam
+Price,Prijs
+Quantity,Hoeveelheid
+ID,"Product Identificatie"
+SKU,SKU
+Configure,Configureren
+Customers,Klanten
+"Shopping Cart",Winkelmandje
+No,No
+Qty,Qty
+Action,Actie
+Total,Totaal
+"No item specified.","Geen artikel gespecificeerd."
+"Are you sure that you want to remove this item?","Weet u zeker dat u dit item wilt verwijderen?"
+Edit,Bewerken
+Orders,Bestellingen
+"New Customers","Nieuwe Klanten"
+Customer,Klant
+"Grand Total",Totaal
+"Lifetime Sales","Lifetime Verkopen"
+"All Store Views","Alle Winkelbezichtigingen"
+"My Account","Mijn account"
+"Account Information",Accountinformatie
+"First Name",Voornaam
+"Last Name",Achternaam
+Email,Email
+"New Password","Nieuw Wachtwoord"
+"Delete File","Delete File"
+Delete,Verwijderen
+Save,Opslaan
+Store,Winkel
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,Naam
+Status,Status
+"Save and Continue Edit","Opslaan en doorgaan met bewerken"
+"Store View","Aanblik winkel"
+Type,Type
+Submit,Bevestig
+"You deleted the customer.","You deleted the customer."
+"IP Address","IP Adres"
+Order,"Bestelling #"
+"Customer View","Klant View"
+"Personal Information","Persoonlijke Informatie"
+View,Bekijk
"* Required Fields","* Vereiste velden"
-"ALL GROUPS","ALLE GROEPEN"
-"Account Dashboard","Account dashboard"
-"Account Information","Accountinformatie"
-"Account Sharing Options","Account deelopties"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Account bevestiging is vereist. Controleert u uw e-mail voor de bevestigingslink. Om de bevestiging e-mail opnieuw te sturen <a href=""%s"">klik hier</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Account bevestiging is vereist. Controleert u uw e-mail voor de bevestigingslink. Om de bevestiging e-mail opnieuw te sturen <a href=""%s"">klik hier</a>."
-"Action","Actie"
+Day,Dag
+Month,Maand
+Year,Jaar
+label,label
+Global,Wereldwijd
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group",Klantgroep
+"End Date","Nieuwsbrief Eind"
+"Customer Groups",Klantgroepen
+Country,Land
+State/Province,Staat/Provincie
+"Please select region, state or province","Selecteer a.u.b. uw provincie"
+City,Stad
+"Zip/Postal Code",Zip/Postcode
+"Email Address",e-mailadres
+Company,Bedrijf
+"VAT Number","BTW nummer"
+Address,Adres
+"Street Address","Adres straat"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Wachtwoord
+"Confirm Password","Bevestig wachtwoord"
+Login,"Log in"
+"Forgot Your Password?","Uw Wachtwoord Vergeten?"
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information","Contact Informatie"
+"Log Out",Uitloggen
+"Log In",Inloggen
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.","U staat niet ingeschreven voor onze nieuwsbrief."
+"You have not set a default shipping address.","U heeft geen standaard verzendingsadres ingesteld."
+"You have not set a default billing address.","U heeft geen standaard facturatieadres ingesteld."
+"Address Book",Adresboek
+"Edit Address","Adres bewerken"
"Add New Address","Nieuw adres toevoegen"
+region,region
"Add New Customer","Nieuwe klant toevoegen"
-"Add New Customer Group","Nieuwe klantengroep toevoegen"
-"Added From","Toegevoegd Vanuit"
-"Additional Address Entries","Verdere adresregels"
-"Address","Adres"
-"Address Book","Adresboek"
-"Address Books","Adresboeken"
-"Address Information","Adresgegevens"
-"Address Templates","Adrestemplates"
-"Addresses","Adressen"
-"Admin","Admin"
-"All","Alles"
-"All Store Views","Alle Winkelbezichtigingen"
-"All countries","Alle landen"
-"Always optional.","Altijd optioneel."
-"Amount","Aantal"
-"An error occurred while deleting the address.","Een fout heeft plaats gevonden tijdens het verwijderen van het adres."
-"An error occurred while retrieving the option value: %s.","Er is een fout opgetreden bij het ophalen van de optie waarde: %s."
-"An error occurred while saving the collection, aborting. Error: %s","Er is een fout opgetreden bij het opslaan van de collectie, afbreken. Fout: %s"
-"An invalid option ID is specified for %s (%s), skipping the record.","Een ongeldige optie ID is gespecificeerd voor %s (%s), het record overslaan."
-"Approved","Goed Gekeurd"
-"Are you sure that you want to remove this item?","Weet u zeker dat u dit item wilt verwijderen?"
-"Are you sure you want to cancel adding of this address?","Weet u zeker dat u het toevoegen van dit adres wilt annuleren?"
-"Are you sure you want to delete this address?","Weet u zeker dat u dit adres wilt verwijderen?"
-"Are you sure?","Weet u het zeker?"
-"Array of Entity collections is expected.","Array van Entiteitencollecties wordt verwacht."
-"Assign a Customer Group","Wijs een Klantgroep Toe"
-"Average Sale","Gemiddelde Verkoop"
-"Back","Terug"
-"Back - link to the previously viewed page","Terug - link naar de hiervoor bekeken pagina"
-"Back to Login","Terug naar Inloggen"
-"Bad request.","Slecht verzoek."
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","Gebasseerd op het BTW nr., behoort de klant tot de Klanten Groep %s."
+"Save Customer","Sla klant op"
+"Delete Customer","Verwijder Klant"
+"Reset Password","Reset Password"
+"New Customer","Nieuwe Klant"
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select",Selecteer
+"Send Welcome Email","Verzend Welkomstemail"
+"Send From","Verzend Van"
+"Send Welcome Email after Confirmation","Stuur een Welkomst E-mail na Confirmatie"
+"Delete Address","Verwijder Adres"
+"Edit Customer's Address","Bewerk Klant Adres"
+"Shopping Cart from %1","Shopping Cart from %1"
+"Newsletter Information","Nieuwsbrief Informatie"
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed","Last Date Subscribed"
+"Last Date Unsubscribed","Laatste Niet Ingeschreven Datum"
+"No Newsletter Found","Geen Nieuwsbrief Gevonden"
+"Start date","Start date"
+"Receive Date","Nieuwsbrief Ontvangen"
+Subject,Onderwerp
+Sent,Verzonden
+"Not Sent","Niet verstuurd"
+Sending,Verzenden
+Paused,Gepauzeerd
+Unknown,Onbekend
+"Purchase Date","Gekocht bij"
"Bill-to Name","Bon op naam"
+"Ship-to Name","Ship-to Name"
+"Order Total","Totaal Bestelling"
"Purchase Point","Gekocht van"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Door een account aan te maken bij onze winkel, kunt u sneller afrekenen, meerdere verzendadressen opgeven, uw bestellingen bekijken en tracken en meer."
-"CSV","CSV"
-"Cancel","Annuleren"
-"Cannot save a new password.","Kan geen nieuw wachtwoord opslaan."
-"Cannot save address.","Kan adres niet opslaan."
-"Cannot save the customer.","Kan klant niet opslaan."
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Kan klantaccounts niet globaal delen omdat sommige klantaccounts met dezelfde emails op meerdere websites bestaan en daarom niet samengevoegd kunnen worden."
-"Change Account Password","Verander Account Wachtwoord"
-"Change Billing Address","Wijzig Factureeradres"
-"Change Password","Verander wachtwoord"
-"Change Shipping Address","Verander Verzendingsadres"
-"City","Stad"
-"Company","Bedrijf"
-"Config","Configuratie"
-"Configure","Configureren"
-"Confirm New Password","Bevestig nieuw wachtwoord"
-"Confirm Password","Bevestig wachtwoord"
-"Confirmation Link Email","Bevestigingslink Email"
-"Confirmed","Bevestigd"
-"Contact Information","Contact Informatie"
-"Continue Shopping","Ga door met Winkelen"
-"Country","Land"
-"Create","Maak aan"
-"Create New Account Options","Maak Nieuwe Account Opties Aan"
-"Create New Customer Account","Maak Nieuwe Klantaccount Aan"
-"Create Order","Maak Bestelling Aan"
-"Create an Account","Een account aanmaken"
-"Create customer","Creëer klant"
-"Create customer address","Creëer klant adres"
-"Current Password","Huidig wachtwoord"
-"Customer","Klant"
-"Customer API","Klanten API"
-"Customer Account Edit Form","Klant Account Wijzigingsformulier"
-"Customer Account Login Form","Klant Account Login Formulier"
-"Customer Account Logout Success","Klant Account Logout Succes"
-"Customer Account Registration Form","Klant Account Registratieformulier"
-"Customer Addresses","Klant adres"
-"Customer Configuration","Klant Configuratie"
-"Customer Forgot Password Form","Klant Wachtwoord Vergeten Formulier"
-"Customer Group","Klantgroep"
-"Customer Groups","Klantgroepen"
-"Customer Information","Klantinformatie"
-"Customer Login","Klant Login"
-"Customer My Account (All Pages)","Klant Mijn Account (Alle Pagina's)"
-"Customer My Account Address Book","Klant Mijn Account Adresboek"
-"Customer My Account Address Edit Form","Klant Mijn Account Adres Wijzigingsformulier"
-"Customer My Account Dashboard","Klant Mijn Account Dashboard"
-"Customer Since","Klant sinds"
-"Customer View","Klant View"
-"Customer collection expected.","Klant collectie verwacht."
-"Customer email is required","Klant e-mail is vereist"
-"Customer website ID must be specified when using the website scope","Klant website ID moet worden gespecificeerd bij het gebruik van de website scope"
-"Customer will stay on the current page if ""No"" is selected.","Klant blijft op de huidige pagina indien ""No"" word geselecteerd."
-"Customers","Klanten"
-"Customers Only","Alleen klanten"
-"Customers Section","Klantensectie"
-"Day (DD)","DD"
-"Date","Datum"
-"Date Added","Datum Toegevoegd"
-"Date of Birth","Geboortedatum"
-"Day","Dag"
-"Days in Wishlist","Dagen in Wensenlijst"
-"Default Addresses","Vaststaand Adres"
-"Default Billing Address","Standaard betalingsadres"
-"Default Email Domain","Vaststaand E-mail Domein"
-"Default Group","Vaststaande Groep"
-"Default Shipping Address","Standaard verzendingsadres"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","Standaard Waarde voor het Uitschakelen van Automatische Groepswijzigingen Gebasseerd op BTW nr."
-"Default Welcome Email","Vaststaande Welkomst E-mail"
-"Delete","Verwijderen"
-"Delete Address","Verwijder Adres"
-"Delete Customer","Verwijder Klant"
-"Delete Customer Group","Verwijder Klantgroep"
-"Delete customer","Klant verwijderen"
-"Delete customer address","Verwijder Klant adres"
+Never,Nooit
+Offline,Offline
+Online,Online
+Confirmed,Bevestigd
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.","De klant heeft geen facturatieadres."
+"Recent Orders","Recente Bestellingen"
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment","Er zitten momenteel geen items in het winkelwagentje van de klant"
+"Shipped-to Name","Shipped-to Name"
"Deleted Stores","Verwijderde Winkels"
-"Details","Details"
-"Disabled","Uitgeschakeld"
-"Edit","Bewerken"
-"Edit Account Info","Bewerk Account Info"
-"Edit Account Information","Bewerk Account Informatie"
-"Edit Address","Adres bewerken"
-"Edit Address Entry","Bewerk Adres Ingave"
-"Edit Customer Group ""%s""","Klantengroep wijzigen ""%s"""
-"Edit Customer Groups","Bewerk Klantgroepen"
-"Edit Customer's Address","Bewerk Klant Adres"
-"Edit Group","Bewerk Groep"
-"Edit Newsletters","Bewerk Nieuwsbrieven"
-"Email","Email"
-"Email Address","e-mailadres"
-"Email Sender","E-mail Verzender"
-"Email:","E-mail"
-"Enable Automatic Assignment to Customer Group","Schakel Automatische Toewijzing in voor Klanten Groep"
-"Entity collection is expected.","Eenheid collectie wordt verwacht"
-"Excel XML","Excel XML"
-"Failed to confirm customer account.","Bevestiging van klantaccount mislukt."
-"Fax","Fax"
-"First Name","Voornaam"
-"Forgot Email Template","Email Template Vergeten"
-"Forgot Password","Wachtwoord vergeten"
-"Forgot Your Password","Uw Wachtwoord Vergeten"
-"Forgot Your Password?","Uw Wachtwoord Vergeten?"
-"Forgot and Remind Email Sender","Vergeet en Herinner Email Zender"
-"Form Fields Before","Formulier Velden Voor"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Vanaf uw Mijn Account Dashboard heeft u de mogelijkheid om een momentopname van uw recentelijke accountactiviteit te bekijken en uw accountgegevens te updaten. Selecteer een link hieronder om gegevens te bekijken of te bewerken."
-"Gender","Geslacht"
-"Gender is required.","Geslacht is verplicht"
-"General Subscription","Algemeen Abonnement"
-"Generate Human-Friendly Customer ID","Genereer een prettig te gebruiken Klant-ID"
-"Global","Wereldwijd"
-"Grand Total","Totaal"
-"Group","Groep"
+"There are no items in customer's wishlist at the moment","Er staan momenteel geen items op het verlanglijstje van de klant"
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
+"Customer Information",Klantinformatie
+Addresses,Adressen
+Wishlist,Verlanglijst
+Newsletter,Nieuwsbrief
+"Product Reviews",Productbeoordelingen
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries","Alle landen"
+"Add New Customer Group","Nieuwe klantengroep toevoegen"
+"Save Customer Group","Sla Klantgroep Op"
+"Delete Customer Group","Verwijder Klantgroep"
+"New Customer Group","Nieuwe Klanten Groep"
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
"Group Information","Groep Informatie"
"Group Name","Groep Naam"
-"Group for Invalid VAT ID","Groep voor Ongeldig BTW nr."
-"Group for Valid VAT ID - Domestic","Groep voor Geldig BTW nr. - Intern"
-"Group for Valid VAT ID - Intra-Union","Groep voor Geldig BTW nr. - Intra-Unie"
-"Guest","Gast"
-"HTML","HTML"
-"Hello, %s!","Hallo, %s!"
-"ID","ID"
-"IP Address","IP Adres"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","Als er een rekening geassocieerd is met %s ontvangt u een email met een link om uw wachtwoord te herstellen."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","Als u een BTW geregistreerde klant bent, klik aub <a href=""%s"">here</a> om uw factuur adres in te voeren voor de juiste BTW berekening"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","Als u een BTW geregistreerde klant bent, klik aub <a href=""%s"">here</a> om uw post adres in te voeren voor de juiste BTW berekening"
-"If you believe this is an error, please contact us at %1","Als u gelooft dat fit een fout is, contacteer ons dan aub via %1"
-"If you have an account with us, please log in.","Als u een account bij ons heeft, logt u dan alstublieft in."
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Onjuist attribuut optie gekozen voor attribuut %s (%s), record wordt overgeslagen."
-"Invalid attribute set specified, skipping the record.","Ongeldige reeks kenmerken gespecificeerd, vermelding wordt overgeslagen"
-"Invalid billing address for (%s)","Ongeldig factuur adres voor (%s)"
-"Invalid current password","Huidige wachtwoord incorrect"
-"Invalid customer data","Ongeldige klantdata"
-"Invalid email address ""%s"".","Ongeldig e-mailadres ""%s""."
-"Invalid email address.","Ongeldig e-mailadres."
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class","BTW Klasse"
+"Customers Only","Alleen klanten"
+"Visitors Only","Alleen bezoekers"
+Visitor,Bezoeker
+"The customer is currently assigned to Customer Group %s.","De klant is op het moment toegewezen aan Klant Groep %s."
+"Would you like to change the Customer Group for this order?","Wilt u de Klant Groep voor deze order veranderen?"
+"The VAT ID is valid. The current Customer Group will be used.","Het BTW nr. is geldig. De huidige Klant Groep wordt gebruikt."
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID.","Er is een fout opgetreden bij het valideren van uw BTW nr."
+"Validate VAT Number","Geldig BTW nr."
+"Customer Login","Klant Login"
+"Create New Customer Account","Maak Nieuwe Klantaccount Aan"
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
"Invalid login or password.","Ongeldige login of wachtwoord"
-"Invalid password reset token.","Ongeldige wachtwoord herstel token"
-"Invalid shipping address for (%s)","Ongeldig post adres voor (%s)"
-"Invalid store specified, skipping the record.","Ongeldige winkel gespecificeerd, record wordt overgeslagen."
-"Invalid website, skipping the record, line: %s","Ongeldige website, overslaan van de data, lijn: %s"
-"Last Activity","Laatste Activiteit"
-"Last Subscribe Date","Laatste Ingeschreven Datum"
-"Last Date Unsubscribed","Laatste Niet Ingeschreven Datum"
-"Last Name","Achternaam"
-"Last URL","Laatste URL"
-"Leave empty for default (15 minutes).","Laat leeg voor standaard (15 minuten)."
-"Leave empty for default (2). Valid range: 1-4","Laat leeg voor standaard (2). Toegestane hoeveelheid: 1-4"
-"Lifetime Sales","Lifetime Verkopen"
-"Log In","Inloggen"
-"Log Out","Uitloggen"
-"Login","Log in"
-"Login Information","Log in Gegevens"
-"Login Options","Login Opties"
+"There was an error validating the login and password.","There was an error validating the login and password."
"Login and password are required.","Login en wachtwoord zijn noodzakelijk."
-"Login or Create an Account","Log in of Maak een Account aan"
-"Month (MM)","MM"
-"Manage Addresses","Beheer Adressen"
-"Manage Customers","Beheer Klanten"
-"Maximum length must be less then %s symbols","Maximale lengte moet minder zijn als %s symbolen"
-"Missing email, skipping the record, line: %s","Geen email, overslaan van de data, lijn: %s"
-"Missing email, skipping the record.","Geen e-mail adres, sla bestand over."
-"Missing first name, skipping the record, line: %s","Geen voornaam, overslaan van de data, lijn: %s"
-"Missing firstname, skipping the record.","Voornaam ontbreekt, sla record over."
-"Missing last name, skipping the record, line: %s","Geen achternaam, overslaan van de data, lijn: %s"
-"Missing lastname, skipping the record.","Achternaam ontbreekt, sla record over."
-"Missing website, skipping the record, line: %s","Geen website, overslaan van de data, lijn: %s"
-"Month","Maand"
-"My Account","Mijn account"
-"My Account Wrapper","Mijn Account Wrapper"
-"My Dashboard","Mijn Dashboard"
-"My Orders","Mijn bestellingen"
-"Name","Naam"
-"Name and Address Options","Naam en Adres Opties"
-"Never","Nooit"
-"New Address","Nieuw Adres"
-"New Address Entry","Nieuw Adres Ingave"
-"New Customer","Nieuwe Klant"
-"New Customer Address","Nieuwe Klant Adres"
-"New Customer Group","Nieuwe Klanten Groep"
-"New Customer Groups","Nieuwe Klantgroepen"
-"New Customers","Nieuwe Klanten"
-"New Group","Nieuwe Groep"
-"New Password","Nieuw Wachtwoord"
-"New account","Nieuw account"
-"New account confirmation key","Nieuwe account bevestigingskey"
-"New account confirmed","Nieuw account bevestigd"
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.","Kan klant niet opslaan."
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
+"Wrong customer account specified.","Verkeerde klantaccount opgegeven."
+"Bad request.","Slecht verzoek."
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.","Check a.u.b. uw e-mail voor de bevestigingskey."
+"This email does not require confirmation.","Deze e-mail behoeft geen confirmatie."
+"Wrong email.","Verkeerde email."
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.","Geef u e-mail in a.u.b."
+"Your password reset link has expired.","Uw wachtwoord herstel link is verlopen."
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
"New password field cannot be empty.","Nieuw wachtwoord veld mag niet leeg zijn"
-"Newsletter","Nieuwsbrief"
-"End Date","Nieuwsbrief Eind"
-"Newsletter Information","Nieuwsbrief Informatie"
-"Receive Date","Nieuwsbrief Ontvangen"
-"Start Date","Nieuwsbrief Begin"
-"Newsletter Subscription","Nieuwsbrief abonnement"
-"Newsletters","Nieuwsbrief"
-"No Items Found","Geen Artikelen Gevonden"
-"No Newsletter Found","Geen Nieuwsbrief Gevonden"
-"No customer collections found","Geen klanten collecties gevonden"
-"No item specified.","Geen artikel gespecificeerd."
-"Not Sent","Niet verstuurd"
-"Not confirmed, can login","Niet bevestigd, u kunt inloggen"
-"Not confirmed, cannot login","Niet bevestigd, kan niet inloggen."
-"Number of Lines in a Street Address ","Aantal regels van een adres"
-"Offline","Offline"
-"Online","Online"
+"Your password has been updated.","Uw wachtwoord is geupdate."
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.","De accountinformatie is opgeslagen."
+"The address has been saved.","Het adres is niet opgeslagen."
+"Cannot save address.","Kan adres niet opslaan."
+"The address has been deleted.","Het adres is verwijderd."
+"An error occurred while deleting the address.","Een fout heeft plaats gevonden tijdens het verwijderen van het adres."
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group","Nieuwe Groep"
+"New Customer Groups","Nieuwe Klantgroepen"
+"Edit Group","Bewerk Groep"
+"Edit Customer Groups","Bewerk Klantgroepen"
+"The customer group has been saved.","De klanten groep is opgeslagen."
+"The customer group has been deleted.","De klantgroep is verwijderd."
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers","Beheer Klanten"
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
"Online Customers","Online Klanten"
-"Online Customers Options","Online Klanten Opties"
-"Online Minutes Interval","Online Minuten Interval"
-"Order","Bestelling #"
-"Order Total","Totaal Bestelling"
-"Orders","Bestellingen"
-"PDF","PDF"
-"Password","Wachtwoord"
-"Password Management","Wachtwoord Beheer"
-"Password Options","Wachtwoord Opties"
-"Password forgotten","Wachtwoord vergeten"
-"Password:","Wachtwoord:"
-"Paused","Gepauzeerd"
-"Pending","In afwachting"
-"Per Website","Per Website"
-"Personal Information","Persoonlijke Informatie"
-"Please enter a number 1 or greater in this field.","Voer aub een nummer 1 of hoger in dit veld in."
-"Please enter a valid date between %s and %s at %s.","Voer aub een geldige datum in tussen %s en %s op %s."
-"Please enter a valid date equal to or greater than %s at %s.","Voer aub een geldige datum in gelijk aan of later dan %s op %s."
-"Please enter a valid date less than or equal to %s at %s.","Voer aub een geldige datum in eerder dan of gelijk aan %s op %s."
-"Please enter the city.","Vul alstublieft de stad in."
-"Please enter the country.","Vul alstublieft het land in."
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
"Please enter the first name.","Vul alstublieft de voornaam in."
"Please enter the last name.","Vul alstublieft de achternaam in."
-"Please enter the state/province.","Vul alstublieft de staat/provincie in."
"Please enter the street.","Vul alstublieft de straat in."
+"Please enter the city.","Vul alstublieft de stad in."
"Please enter the telephone number.","Vul alstublieft het telefoonnummer in."
"Please enter the zip/postal code.","Vul alstublieft de postcode in."
-"Please enter your email address below. You will receive a link to reset your password.","Voer hieronder uw e-mailadres in. U ontvangt een link waarmee u uw wachtwoord opnieuw kunt instellen."
-"Please enter your email below and we'll send you confirmation link for it.","Gelieve uw e-mailadres hieronder in te vullen en wij zullen uw een confirmatie link sturen."
-"Please enter your email.","Geef u e-mail in a.u.b."
-"Please make sure your passwords match.","Let er alstublieft op dat de wachtwoorden overeenkomen."
-"Please select","Selecteer"
-"Please select a website which contains store view","Selecteer aub een website dat een winkel zicht bevat"
-"Please select region, state or province","Selecteer a.u.b. uw provincie"
-"Please, check your email for confirmation key.","Check a.u.b. uw e-mail voor de bevestigingskey."
-"Prefix Dropdown Options","Voorvoegsel Keuzelijst Opties"
-"Price","Prijs"
-"Product","Product"
-"ID","Product Identificatie"
-"Product","Productnaam"
-"Product Reviews","Productbeoordelingen"
-"Product Tags","Productlabels"
-"Purchase On","Kopen op"
-"Purchase Date","Gekocht bij"
-"Quantity","Hoeveelheid"
-"Recent Orders","Recente Bestellingen"
-"Records for %s store found.","Archieven voor %s winkel gevonden."
-"Recovery Link Expiration Interval (days)","Herstel Link Verloop Periode (dagen)"
-"Redirect Customer to Account Dashboard after Logging in","Leid Klant naar Account Dashboard na Inloggen"
-"Refunded","Terugbetaald"
-"Registered Customers","Geregistreerde Klanten"
-"Remind Email Template","Herinner Email Voorbeeld"
-"Remind Password","Herinner Wachtwoord"
-"Remove","Verwijderen"
-"Require Emails Confirmation","Benodigd E-mail Confirmatie"
-"Reset a Password","Wachtwoord opnieuw instellen"
-"Retrieve address data","Haal adresgegevens terug"
-"Retrieve address info","Haal adresinfo terug"
-"Retrieve customer addresses","Haal klant adres op"
-"Retrieve customer data","Haal klantgegevens terug"
-"Retrieve customer groups","Haal klantengroep op"
-"Retrieve customer info","Haal klant informatie op"
-"Retrieve customers","Haal klanten op"
-"Retrieve your confirmation link here","Haal uw bevestigingslink hier terug"
-"Retrieve your password here","Haal uw wachtwoord hier op"
-"SKU","SKU"
-"Sales Statistics","Verkoopstatistieken"
-"Save","Opslaan"
-"Save Address","Sla adres op"
-"Save Customer","Sla klant op"
-"Save Customer Group","Sla Klantgroep Op"
-"Save Password","Sla Wachtwoord Op"
-"Save and Continue Edit","Opslaan en doorgaan met bewerken"
-"Saved %d record(s)","%d archief(ven) opgeslagen"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Puntcomma (;) gescheiden waarden.<br/>Zet een puntkomma in het begin voor een lege eerste waarde.<br/>Laat leeg voor een open tekstveld."
-"Send From","Verzend Van"
-"Send Welcome Email","Verzend Welkomstemail"
-"Send Welcome Email after Confirmation","Stuur een Welkomst E-mail na Confirmatie"
-"Send auto-generated password","Stuur een automatisch gegenereerd wachtwoord"
-"Send confirmation link","Verzend bevestigingslink"
-"Sending","Verzenden"
-"Sent","Verzonden"
-"Session Start Time","Sessie Start Tijd"
+"Please enter the country.","Vul alstublieft het land in."
+"Please enter the state/province.","Vul alstublieft de staat/provincie in."
+"Per Website","Per Website"
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Kan klantaccounts niet globaal delen omdat sommige klantaccounts met dezelfde emails op meerdere websites bestaan en daarom niet samengevoegd kunnen worden."
+"This account is not confirmed.","Deze account is niet bevestigd."
+"Wrong transactional account email type","Verkeerde transactionele account e-mail soort"
+"The first name cannot be empty.","De voornaam kan niet leeg gelaten worden."
+"The last name cannot be empty.","Achternaam kan niet leeg gelaten worden."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.","De Geboortedatum is verplicht."
+"The TAX/VAT number is required.","Het BTW/belastingnummer is verplicht."
+"Gender is required.","Geslacht is verplicht"
+"Invalid password reset token.","Ongeldige wachtwoord herstel token"
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,Admin
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required","Klant e-mail is vereist"
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope","Klant website ID moet worden gespecificeerd bij het gebruik van de website scope"
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses","Klant adres"
+"Are you sure you want to delete this address?","Weet u zeker dat u dit adres wilt verwijderen?"
"Set as Default Billing Address","Stel in als Standaard Factureeradres"
+"Default Billing Address","Standaard betalingsadres"
"Set as Default Shipping Address","Stel in als Standaard Afleveradres"
-"Share Customer Accounts","Deel Klanten Accounts"
-"Ship-to First Name","Verzonden naar Voornaam"
-"Ship-to Last Name","Verzonden naar Achternaam"
-"Shipped to Name","Verzonden naar Naam"
-"Shopping Cart","Winkelmandje"
-"Shopping Cart - %d item(s)","Winkel Wagen - %d artikel(en)"
-"Shopping Cart of %1$s - %2$d item(s)","Winkelwagen van %1$s - %2$d voorwerp(en)"
-"Show Date of Birth","Geboortedatum tonen"
-"Show Gender","Geslacht tonen"
-"Show Middle Name (initial)","Laat Midden Naam Zien (Initieel)"
-"Show Prefix","Voorvoegsel tonen"
-"Show Suffix","Achtervoegsel tonen"
-"Show Tax/VAT Number","Laat Belasting/VAT Nummer Zien"
+"Default Shipping Address","Standaard verzendingsadres"
+"New Customer Address","Nieuwe Klant Adres"
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
+"Sales Statistics",Verkoopstatistieken
+"Average Sale","Gemiddelde Verkoop"
+"Manage Addresses","Beheer Adressen"
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Vanaf uw Mijn Account Dashboard heeft u de mogelijkheid om een momentopname van uw recentelijke accountactiviteit te bekijken en uw accountgegevens te updaten. Selecteer een link hieronder om gegevens te bekijken of te bewerken."
+"Change Password","Verander wachtwoord"
+Newsletters,Nieuwsbrief
+"You are currently subscribed to 'General Subscription'.","U staat ingeschreven op ""Algemene Abonnement"""
+"You are currently not subscribed to any newsletter.","U staat niet ingeschreven voor enige nieuwsbrief."
+"Default Addresses","Vaststaand Adres"
+"Change Billing Address","Wijzig Factureeradres"
+"You have no default billing address in your address book.","U heeft geen standaard factuuradres in uw adresboek staan."
+"Change Shipping Address","Verander Verzendingsadres"
+"You have no default shipping address in your address book.","U heeft geen standaard verzendingsadres in uw adresboek staan."
+"Additional Address Entries","Verdere adresregels"
+"You have no additional address entries in your address book.","U heeft geen additionele adresvermeldingen in uw adresboek staan."
+"Use as my default billing address","Gebruiken als mijn standaard factuuradres"
+"Use as my default shipping address","Gebruik als mijn standaard verzendadres"
+"Save Address","Sla adres op"
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
+"Send confirmation link","Verzend bevestigingslink"
+"Back to Login","Terug naar Inloggen"
+"Current Password","Huidig wachtwoord"
+"Confirm New Password","Bevestig nieuw wachtwoord"
+"Please enter your email address below. You will receive a link to reset your password.","Voer hieronder uw e-mailadres in. U ontvangt een link waarmee u uw wachtwoord opnieuw kunt instellen."
+"Registered Customers","Geregistreerde Klanten"
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription","Algemeen Abonnement"
"Sign Up for Newsletter","Schrijf in voor Nieuwsbrief"
-"Skipping import row, required field ""%s"" is not defined.","Sla import rij over, gevraagd veld ""%s"" is onbekend."
-"Skipping import row, website ""%s"" field does not exist.","Import rij overgeslagen, website ""%s"" veld bestaat niet."
-"State/Province","Staat/Provincie"
-"Status","Status"
-"Store","Winkel"
-"Store View","Aanblik winkel"
-"Street Address","Adres straat"
-"Street Address %s","Straatnaam en huisnummer %s"
-"Subject","Onderwerp"
-"Submit","Bevestig"
-"Subscribe to Newsletter","Aanmelden voor nieuwsbrief"
-"Subscribed to Newsletter?","Aangemeld voor de nieuwsbrief?"
-"Suffix Dropdown Options","Achtervoegsel dropdown opties"
-"Tag","Tag Naam"
-"Tax Calculation Based On","Belasting Berekening Gebaseerd Op"
-"Tax Class","BTW Klasse"
+"Address Information",Adresgegevens
+"Login Information","Log in Gegevens"
+"Create account","Create account"
+"Reset a Password","Wachtwoord opnieuw instellen"
+"You have logged out and will be redirected to our homepage in 5 seconds.","U bent uitgelogd en zult doorverwezen worden naar onze webpagina in 5 seconden."
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Door een account aan te maken bij onze winkel, kunt u sneller afrekenen, meerdere verzendadressen opgeven, uw bestellingen bekijken en tracken en meer."
+"Date of Birth",Geboortedatum
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,Geslacht
"Tax/VAT number","Belasting/VAT nummer"
-"Phone","Telefoon"
-"Text","Tekst"
-"Text One Line","Tekst Een Regel"
-"Thank you for registering with %s.","Bedankt voor het registeren op %s."
-"The Date of Birth is required.","De Geboortedatum is verplicht."
-"The TAX/VAT number is required.","Het BTW/belastingnummer is verplicht."
-"The VAT ID entered (%s) is not a valid VAT ID.","Het ingevoerde BTW nr. (%s) is geen geldig BTW nr."
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","Het ingevoerde BTW nr. (%s) is geen geldig BTW nr. De klant zou behoren tot Klant Groep %s."
-"The VAT ID is valid. The current Customer Group will be used.","Het BTW nr. is geldig. De huidige Klant Groep wordt gebruikt."
-"The account information has been saved.","De accountinformatie is opgeslagen."
-"The address does not belong to this customer.","Dit adres is niet het adres van deze klant."
-"The address has been deleted.","Het adres is verwijderd."
-"The address has been saved.","Het adres is niet opgeslagen."
-"The customer ID and email did not match, skipping the record, line: %s","De klant ID en email komen niet overeen, overslaan van de data, lijn: %s"
-"The customer does not have default billing address.","De klant heeft geen facturatieadres."
-"The customer email (%s) already exists, skipping the record, line: %s","De klant email (%s) bestaat al, overslaan van de data, lijn: %s"
-"The customer group has been deleted.","De klantgroep is verwijderd."
-"The customer group has been saved.","De klanten groep is opgeslagen."
-"The customer is currently assigned to Customer Group %s.","De klant is op het moment toegewezen aan Klant Groep %s."
-"The first name cannot be empty.","De voornaam kan niet leeg gelaten worden."
-"The group ""%s"" cannot be deleted","De groep ""%s"" kan niet verwijderd worden"
-"The last name cannot be empty.","Achternaam kan niet leeg gelaten worden."
-"The minimum password length is %s","Minimumlengte van het wachtwoord is %s"
-"The password cannot be empty.","Het wachtwoord kan niet leeg gelaten worden."
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","Het wachtwoord moet ten minste 6 tekens lang zijn. Voorloop of volg spaties worden genegeerd."
-"The suffix that goes after name (Jr., Sr., etc.)","Het achtervoegsel dat achter naam komt (Jr., Sr., etc.)"
-"The title that goes before name (Mr., Mrs., etc.)","De titel staat voor de naam (Mr., Mrs., e.d.)"
-"There are no items in customer's wishlist at the moment","Er staan momenteel geen items op het verlanglijstje van de klant"
-"There are no items in customer's shopping cart at the moment","Er zitten momenteel geen items in het winkelwagentje van de klant"
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","Er is al een account met dit e-mail adres. Indien u zeker weet dat dit uw e-mail adres is, <a href=""%s"">klik hier</a> om uw wachtwoord te ontvangen en toegang te krijgen tot uw account."
-"There was an error validating the VAT ID.","Er is een fout opgetreden bij het valideren van uw BTW nr."
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Er is een fout opgetreden bij het valideren van uw BTW nr. De klant zou behoren tot Klant Groep %s."
-"This account is not confirmed.","Deze account is niet bevestigd."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","Deze account is niet bevestigd. <a href=""%s"">Klik hier</a>om de bevestigingsmail opnieuw te sturen."
-"This customer email already exists","Dit klanten e-mail adres bestaat al"
-"This customer has no saved addresses.","Deze klant heeft geen opgeslagen adressen."
-"This email does not require confirmation.","Deze e-mail behoeft geen confirmatie."
-"This email will be sent instead of default welcome email, after account confirmation.","Deze email zal in plaats van de standaard welkomstemail worden verzonden, na bevestiging van de account."
-"This is My Default %s Address","Dit is Mijn Standaard %s Adres"
-"To Cart","Naar Winkelwagentje"
-"Total","Totaal"
-"Type","Type"
-"Unable to save the customer.","Niet instaat om de klant op te slaan."
-"Unknown","Onbekend"
+"Subscribe to Newsletter","Aanmelden voor nieuwsbrief"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
+"Tax Calculation Based On","Tax Calculation Based On"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
+"Validation Error Group","Validation Error Group"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
+"Welcome Email","Welcome Email"
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,Groep
+"Are you sure you want to delete?","Are you sure you want to delete?"
"Unsubscribe from Newsletter","Afmelden van nieuwsbrief"
-"Update","Update"
-"Update customer address data","Update klant adres informatie"
-"Update customer data","Klantgegevens bijwerken"
-"Use as My Default %s Address","Gebruik als Mijn Standaard %s Adres"
-"Use as My Default Billing Address","Als mijn standaard betalingsadres gebruiken"
-"Use as My Default Shipping Address","Gebruik als Mijn Standaard Afleveradres"
-"Use as my default billing address","Gebruiken als mijn standaard factuuradres"
-"Use as my default shipping address","Gebruik als mijn standaard verzendadres"
-"VAT Number","BTW nummer"
-"VAT Request Date","BTW aanvraag Datum"
-"VAT Request Identifier","BTW Aanvraag Identificatie"
-"Validate VAT Number","Geldig BTW nr."
-"Validate on Each Transaction","Valideer bij Elke Transactie"
-"Validation Error Group","Validatie Fout Groep"
-"View","Bekijk"
-"View Order","Bestelling bekijken"
-"Visitor","Bezoeker"
-"Visitors Only","Alleen bezoekers"
-"Website","Website"
-"Welcome Email","Welkomst E-mail"
-"Wishlist","Verlanglijst"
-"Wishlist - %d item(s)","Wensenlijst - %d artikel(en)"
-"Would you like to change the Customer Group for this order?","Wilt u de Klant Groep voor deze order veranderen?"
-"Wrong confirmation key.","Verkeerde confirmatie sleutel."
-"Wrong customer account specified.","Verkeerde klantaccount opgegeven."
-"Wrong email.","Verkeerde email."
-"Wrong transactional account email type","Verkeerde transactionele account e-mail soort"
-"Year (YYYY)","YYYY"
-"Year","Jaar"
-"You are currently not subscribed to any newsletter.","U staat niet ingeschreven voor enige nieuwsbrief."
-"You are currently not subscribed to our newsletter.","U staat niet ingeschreven voor onze nieuwsbrief."
-"You are currently subscribed to 'General Subscription'.","U staat ingeschreven op ""Algemene Abonnement"""
-"You are currently subscribed to our newsletter.","U bent momenteel geabonneerd op onze nieuwsbrief."
+"Assign a Customer Group","Wijs een Klantgroep Toe"
+Phone,Telefoon
+ZIP,Postcode
+"Customer Since","Klant sinds"
+n/a,n.v.t.
+"Session Start Time","Sessie Start Tijd"
+"Last Activity","Laatste Activiteit"
+"Last URL","Laatste URL"
+"Edit Account Information","Bewerk Account Informatie"
+"Forgot Your Password","Uw Wachtwoord Vergeten"
+"Password forgotten","Wachtwoord vergeten"
+"My Dashboard","Mijn Dashboard"
"You are now logged out","U bent nu uitgelogd"
-"You have logged out and will be redirected to our homepage in 5 seconds.","U bent uitgelogd en zult doorverwezen worden naar onze webpagina in 5 seconden."
-"You have no additional address entries in your address book.","U heeft geen additionele adresvermeldingen in uw adresboek staan."
-"You have no additional entries in your address book.","U heeft geen additionele inzendingen in uw adressenlijst."
-"You have no default billing address in your address book.","U heeft geen standaard factuuradres in uw adresboek staan."
-"You have no default entries in your address book.","U heeft geen standaard inzendingen in uw adressenlijst."
-"You have no default shipping address in your address book.","U heeft geen standaard verzendingsadres in uw adresboek staan."
-"You have not set a default billing address.","U heeft geen standaard facturatieadres ingesteld."
-"You have not set a default shipping address.","U heeft geen standaard verzendingsadres ingesteld."
-"You have placed no orders yet.","U heeft nog geen bestellingen geplaatst."
-"You have placed no products yet.","U heeft nog geen producten geplaatst."
-"You will be charged tax.","U wordt belasting berekend."
-"You will not be charged tax.","Er wordt u geen belasting berekend."
-"Your Tax ID cannot be validated.","Uw Belasting ID kan niet gevalideerd worden."
-"Your VAT ID was successfully validated.","Uw BTW nr. is succesvol gevalideerd."
-"Your account balance is: %s","Uw account balans is: %s"
-"Your password has been updated.","Uw wachtwoord is geupdate."
-"Your password reset link has expired.","Uw wachtwoord herstel link is verlopen."
-"ZIP","Postcode"
-"ZIP/Post Code","ZIP/Postcode"
-"Zip/Postal Code","Zip/Postcode"
-"n/a","n.v.t."
-"or","of"
-"register","Registreer"
diff --git a/app/code/Magento/Customer/i18n/pt_BR.csv b/app/code/Magento/Customer/i18n/pt_BR.csv
index 33e8c1c08cc..45246b543db 100644
--- a/app/code/Magento/Customer/i18n/pt_BR.csv
+++ b/app/code/Magento/Customer/i18n/pt_BR.csv
@@ -1,475 +1,422 @@
-" or ","ou"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser um nome de alojamento DNS mas não pode extrair parte TLD"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser um nome de alojamento DNS mas não consegue encontrar TLD contra a lista conhecida"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser um nome de alojamento DNS mas não pode ser comparado contra o esquema nome de alojamento para TLD '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser um nome de alojamento DNS mas contém um traço em uma posição inválida"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' parece ser um DNS de alojamento mas a notação punycode dada não pode ser descodificada"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser um nome de rede local mas nomes de rede local não são permitidos"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser um endereço IP, mas endereços IP não são permitidos"
-"'%value%' does not appear to be a valid local network name","'%value%' não parece ser um nome de rede local válido"
-"* Required Fields","* Campos obrigatórios"
-"ALL GROUPS","TODOS OS GRUPOS"
-"Account Dashboard","Painel de Conta"
+All,Todos
+Cancel,Cancelar
+"Create Order","Criar Pedido"
+Back,Voltar
+Product,"Nome do produto"
+Price,Preço
+Quantity,Quant.
+ID,"ID do Produto"
+SKU,"Unidade de Manutenção de Estoque"
+Configure,Configurar
+Customers,Clientes
+"Shopping Cart","Carrinho de compras"
+No,No
+Qty,Qty
+Action,Ação
+Total,Total
+"No item specified.","Nenhum item especificado."
+"Are you sure that you want to remove this item?","Tem certeza de que deseja remover este item?"
+Edit,Editar
+Orders,Ordens
+"New Customers","Novos clientes"
+Customer,Cliente
+"Grand Total","Total geral"
+"Lifetime Sales","Vendas de Vida Inteira"
+"All Store Views","Todas as Visualizações da Loja"
+"My Account","Minha Conta"
"Account Information","Informações da Conta"
-"Account Sharing Options","Opções de Compartilhamento de Conta"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Confirmação da conta é necessária. Por favor, verifique seu email para o link de confirmação. Para reenviar email de confirmação, por favor <a href=""%s"">clique aqui</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Confirmação da conta é necessária. Por favor, verifique seu email para o link de confirmação. Para reenviar o email de confirmação, por favor <a href=""%s"">clique aqui</a>."
-"Action","Ação"
+"First Name","Primeiro nome"
+"Last Name","Último nome"
+Email,E-mail
+"New Password","Nova senha"
+"Delete File","Delete File"
+Delete,Excluir
+Save,Salvar
+Store,Loja
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,Nome
+Status,Status
+"Save and Continue Edit","Salvar e continuar a editar"
+"Store View","Visualização da loja"
+Type,Tipo
+Submit,Enviar
+"You deleted the customer.","You deleted the customer."
+"IP Address","Endereço de IP"
+Order,"Ordem #"
+"Customer View","Visualização do cliente"
+"Personal Information","Informações pessoais"
+View,Ver
+"* Required Fields","* Campos obrigatórios"
+Day,Dia
+Month,Mês
+Year,Ano
+label,label
+Global,Global
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group","Grupo de Clientes"
+"End Date","Final de boletim informativo"
+"Customer Groups","Grupos do cliente"
+Country,PaÃs
+State/Province,Estado/ProvÃncia
+"Please select region, state or province","Selecione a região, estado ou provÃncia"
+City,Cidade
+"Zip/Postal Code","Zip/Código Postal"
+"Email Address","Endereço de e-mail"
+Company,Companhia
+"VAT Number","Número VAT"
+Address,Endereço
+"Street Address","Endereço da rua"
+"Street Address %1","Street Address %1"
+Telephone,Telephone
+Fax,Fax
+Password,Senha
+"Confirm Password","Confirmar a senha"
+Login,Conectar-se
+"Forgot Your Password?","Esqueceu a senha?"
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information","Informações de contato"
+"Log Out",Sair
+"Log In",Entrar
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.","Você ainda não assinou o nosso boletim informativo."
+"You have not set a default shipping address.","Você não definiu um endereço de envio."
+"You have not set a default billing address.","Você não configurou um endereço de faturamento padrão."
+"Address Book","Livro de Endereços"
+"Edit Address","Editar endereço"
"Add New Address","Adicionar Novo Endereço"
+region,region
"Add New Customer","Adicionar Novo Cliente"
-"Add New Customer Group","Adicionar Novo Grupo de Clientes"
-"Added From","Adicionado De"
-"Additional Address Entries","Entradas Adicionais de Endereço"
-"Address","Endereço"
-"Address Book","Livro de Endereços"
-"Address Books","Livros de Endereço"
-"Address Information","Informações de Endereço"
-"Address Templates","Modelos de Endereço"
-"Addresses","Endereços"
-"Admin","Admin"
-"All","Todos"
-"All Store Views","Todas as Visualizações da Loja"
-"All countries","Todos os paÃses"
-"Always optional.","Sempre opcional."
-"Amount","Valor"
-"An error occurred while deleting the address.","Ocorreu um erro enquanto apagando este endereço."
-"An error occurred while retrieving the option value: %s.","Ocorreu um erro ao recuperar o valor da opção: %s."
-"An error occurred while saving the collection, aborting. Error: %s","Ocorreu um erro ao salvar a coleção, abortando. Erro: %s"
-"An invalid option ID is specified for %s (%s), skipping the record.","Um ID de opção inválido é especificado para %s (%s), ignorando o registro."
-"Approved","Aprovado"
-"Are you sure that you want to remove this item?","Tem certeza de que deseja remover este item?"
-"Are you sure you want to cancel adding of this address?","Você tem certeza que quer cancelar a adição deste endereço?"
-"Are you sure you want to delete this address?","Tem certeza de que deseja excluir este endereço?"
-"Are you sure?","Tem certeza?"
-"Array of Entity collections is expected.","Variedade de coleções de Entidades é esperado."
-"Assign a Customer Group","Atribuir um Grupo de Clientes"
-"Average Sale","Venda Média"
-"Back","Voltar"
-"Back - link to the previously viewed page","Voltar - link para a página anteriormente visualizada"
-"Back to Login","Voltar à Entrada"
-"Bad request.","Mau pedido."
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","Com base na ID do VAT, o cliente pertence ao Grupo de clientes %s."
+"Save Customer","Salvar cliente"
+"Delete Customer","Excluir Cliente"
+"Reset Password","Reset Password"
+"New Customer","Novo Cliente"
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select","Favor selecionar"
+"Send Welcome Email","Enviar e-mail de boas-vindas"
+"Send From","Enviar De"
+"Send Welcome Email after Confirmation","Enviar e-mail de boas-vindas após confirmação"
+"Delete Address","Apagar endereço"
+"Edit Customer's Address","Editar o endereço do cliente"
+"Shopping Cart from %1","Shopping Cart from %1"
+"Newsletter Information","Informações de boletim à imprensa"
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed","Last Date Subscribed"
+"Last Date Unsubscribed","Última Data de Cancelamento"
+"No Newsletter Found","Nenhum boletim informativo foi encontrado"
+"Start date","Start date"
+"Receive Date","Boletim informativo recebido"
+Subject,Assunto
+Sent,Enviado
+"Not Sent","Não Enviado"
+Sending,Enviando
+Paused,Parado.
+Unknown,Desconhecido
+"Purchase Date","Comprados Na"
"Bill-to Name","Faturar para Nome"
+"Ship-to Name","Ship-to Name"
+"Order Total","Total do Pedido"
"Purchase Point","Comprado De"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Ao criar uma conta na nossa loja, você será capaz de se mover através do processo de compra mais rapidamente, armazenar múltiplos endereços de envio, ver e rastrear seus pedidos em sua conta e muito mais."
-"CSV","CSV"
-"Cancel","Cancelar"
-"Cannot save a new password.","Não foi possÃvel salvar uma nova senha."
-"Cannot save address.","Não é possÃvel salvar endereços."
-"Cannot save the customer.","Não é possÃvel salvar o cliente."
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Não é possÃvel compartilhar contas de clientes globalmente porque alguns clientes existem em vários sites com mesmas contas de email e não podem ser misturados."
-"Change Account Password","Alterar a Senha da Conta"
-"Change Billing Address","Alterar o endereço de faturamento"
-"Change Password","Alterar senha"
-"Change Shipping Address","Alterar endereço de remessa"
-"City","Cidade"
-"Company","Companhia"
-"Config","Config"
-"Configure","Configurar"
-"Confirm New Password","Confirmar a nova senha"
-"Confirm Password","Confirmar a senha"
-"Confirmation Link Email","Email de Link de Confirmação"
-"Confirmed","Confirmado"
-"Contact Information","Informações de contato"
-"Continue Shopping","Continuar Comprando"
-"Country","PaÃs"
-"Create","Criar"
-"Create New Account Options","Criar Novas Opções de Conta"
-"Create New Customer Account","Criar Nova Conta de Cliente"
-"Create Order","Criar Pedido"
-"Create an Account","Criar uma conta"
-"Create customer","Criar cliente"
-"Create customer address","Criar endereço de cliente"
-"Current Password","Senha atual"
-"Customer","Cliente"
-"Customer API","API de cliente"
-"Customer Account Edit Form","Editar formulário da conta do cliente"
-"Customer Account Login Form","Formulário de login da conta do cliente"
-"Customer Account Logout Success","SaÃda com sucesso da conta do cliente"
-"Customer Account Registration Form","Formulário de registro da conta do cliente"
-"Customer Addresses","Endereços do cliente"
-"Customer Configuration","Configuração do cliente"
-"Customer Forgot Password Form","Formulário Esqueceu a senha do cliente"
-"Customer Group","Grupo de Clientes"
-"Customer Groups","Grupos do cliente"
+Never,Nunca
+Offline,Offline
+Online,Online
+Confirmed,Confirmado
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.","O cliente não tem endereço de cobrança predefinido."
+"Recent Orders","Pedidos Recentes"
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment","Não há itens no carrinho de compras do cliente no momento"
+"Shipped-to Name","Shipped-to Name"
+"Deleted Stores","Excluir Lojas"
+"There are no items in customer's wishlist at the moment","No momento não há itens na lista de desejos do cliente"
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
"Customer Information","Dados do Cliente"
-"Customer Login","Login do cliente"
-"Customer My Account (All Pages)","Minha conta do cliente (Todas as páginas)"
-"Customer My Account Address Book","Livro de endereço da Minha conta do cliente"
-"Customer My Account Address Edit Form","Formulário de editar endereço da Minha conta do cliente"
-"Customer My Account Dashboard","Painel da Minha conta do cliente"
-"Customer Since","Cliente desde"
-"Customer View","Visualização do cliente"
-"Customer collection expected.","É esperada a coleta do cliente."
-"Customer email is required","É necessário o e-mail do cliente"
-"Customer website ID must be specified when using the website scope","O ID do site do cliente deve ser especificado ao utilizar o escopo do site"
-"Customer will stay on the current page if ""No"" is selected.","O cliente irá permanecer na página atual se ""Não"" for selecionado."
-"Customers","Clientes"
-"Customers Only","Apenas Clientes"
-"Customers Section","Seção de Clientes"
-"Day (DD)","DD"
-"Date","Data"
-"Date Added","Data de Adição"
-"Date of Birth","Data de aniversário"
-"Day","Dia"
-"Days in Wishlist","Dias na Lista de Desejos"
-"Default Addresses","Endereço padrão"
-"Default Billing Address","Endereço padrão de faturamento"
-"Default Email Domain","DomÃnio de E-Mail Padrão"
-"Default Group","Grupo Padrão"
-"Default Shipping Address","Endereço padrão de entrega"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","Valor padrão para alterações automáticas desativadas de grupos com base na ID de VAT"
-"Default Welcome Email","E-Mail de Boas-Vindas Padrão"
-"Delete","Excluir"
-"Delete Address","Apagar endereço"
-"Delete Customer","Excluir Cliente"
+Addresses,Endereços
+Wishlist,"Lista de presentes"
+Newsletter,Newsletter
+"Product Reviews","Comentários sobre Produto"
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries","Todos os paÃses"
+"Add New Customer Group","Adicionar Novo Grupo de Clientes"
+"Save Customer Group","Salvar grupo de cliente"
"Delete Customer Group","Excluir Grupo de Clientes"
-"Delete customer","Excluir cliente"
-"Delete customer address","Excluir endereço do cliente"
-"Deleted Stores","Excluir Lojas"
-"Details","Detalhes"
-"Disabled","Desativado"
-"Edit","Editar"
-"Edit Account Info","Editar Informações da Conta"
-"Edit Account Information","Editar informações da conta"
-"Edit Address","Editar endereço"
-"Edit Address Entry","Editar entrada de endereço"
-"Edit Customer Group ""%s""","Editar grupo de cliente ""%s"""
-"Edit Customer Groups","Editar grupos de cliente"
-"Edit Customer's Address","Editar o endereço do cliente"
-"Edit Group","Editar grupo"
-"Edit Newsletters","Editar boletins informativos"
-"Email","E-mail"
-"Email Address","Endereço de e-mail"
-"Email Sender","Remetente do e-mail:"
-"Email:","E-mail:"
-"Enable Automatic Assignment to Customer Group","Ativar atribuição automática a um grupo de clientes"
-"Entity collection is expected.","É esperada a coleta da entidade."
-"Excel XML","Excel XML"
-"Failed to confirm customer account.","Erro ao tentar confirmar a conta do cliente."
-"Fax","Fax"
-"First Name","Primeiro nome"
-"Forgot Email Template","Esqueceu o modelo do e-mail"
-"Forgot Password","Esqueceu a Senha?"
-"Forgot Your Password","Esqueceu a senha"
-"Forgot Your Password?","Esqueceu a senha?"
-"Forgot and Remind Email Sender","Rementente de email lembrete e esquecimento"
-"Form Fields Before","Campos do formulário antes"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","No Painel da Minha Conta é possÃvel visualizar um resumo das atividades recentes da sua conta e atualizar as informações da conta. Selecione o link abaixo para visualizar ou editar as informações."
-"Gender","Sexo"
-"Gender is required.","Sexo necessário"
-"General Subscription","Assinatura geral"
-"Generate Human-Friendly Customer ID","Gerar ID de Cliente Humano-Amigável"
-"Global","Global"
-"Grand Total","Total geral"
-"Group","Grupo"
+"New Customer Group","Novo grupo de cliente"
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
"Group Information","Informação de Grupo"
"Group Name","Nome de Grupo"
-"Group for Invalid VAT ID","Grupo para ID de VAT inválida."
-"Group for Valid VAT ID - Domestic","Grupo para ID de VAT válida - Doméstico"
-"Group for Valid VAT ID - Intra-Union","Grupo para ID de VAT válida - Intra-União"
-"Guest","Convidado"
-"HTML","HTML"
-"Hello, %s!","Olá, %s!"
-"ID","Identidade"
-"IP Address","Endereço de IP"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","Se houver uma conta associada a %s você receberá um email com um link para reconfigurar a sua senha."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","Se você é um cliente com VAT registrado, por favor, clique em <a href=""%s"">here</a> para inserir o seu endereço de cobrança para cálculo de VAT."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","Se você é um cliente com VAT registrado, por favor, clique em <a href=""%s"">here</a> para inserir o seu endereço de envio para cálculo de VAT."
-"If you believe this is an error, please contact us at %1","Se você considera isso um erro, entre em contato conosco em %1"
-"If you have an account with us, please log in.","Se você possui uma conta conosco, por favor, faça seu login"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","Opção de atributo inválida para atributo %s (%s). Saltando o registro."
-"Invalid attribute set specified, skipping the record.","Conjunto especificado de atributo inválido, ignorando o registro."
-"Invalid billing address for (%s)","Endereço de cobrança inválido para (%s)"
-"Invalid current password","Senha atual inválida"
-"Invalid customer data","Dados do cliente inválidos"
-"Invalid email address ""%s"".","Endereço de email inválido ""%s""."
-"Invalid email address.","Endereço de e-mail inválido."
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class","Classe de Impostos"
+"Customers Only","Apenas Clientes"
+"Visitors Only","Apenas visitantes"
+Visitor,Visitante
+"The customer is currently assigned to Customer Group %s.","O cliente está atualmente atribuÃdo ao grupo de clientes %s."
+"Would you like to change the Customer Group for this order?","Gostaria de alterar o grupo de cliente para este pedido?"
+"The VAT ID is valid. The current Customer Group will be used.","A ID de VAT é válida. O grupo de clientes atual será usado."
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID.","Ocorreu um erro ao validar a ID do VAT."
+"Validate VAT Number","Validar número de VAT"
+"Customer Login","Login do cliente"
+"Create New Customer Account","Criar Nova Conta de Cliente"
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
"Invalid login or password.","Acesso ou senha inválida."
-"Invalid password reset token.","Senha inválida reconfigure vale."
-"Invalid shipping address for (%s)","Endereço de envio inválido para (%s)"
-"Invalid store specified, skipping the record.","Loja especificada inválida, ignorando o registro."
-"Invalid website, skipping the record, line: %s","Website inválido, ignorar registro, linha: %s"
-"Last Activity","Última atividade"
-"Last Subscribe Date","Última Data de Assinatura"
-"Last Date Unsubscribed","Última Data de Cancelamento"
-"Last Name","Último nome"
-"Last URL","Último URL"
-"Leave empty for default (15 minutes).","Deixar em branco por padrão (15 minutos)."
-"Leave empty for default (2). Valid range: 1-4","Deixar em branco por padrão (2). Intervalo válido: 1-4"
-"Lifetime Sales","Vendas de Vida Inteira"
-"Log In","Entrar"
-"Log Out","Sair"
-"Login","Conectar-se"
-"Login Information","Informações de login"
-"Login Options","Opções de Acesso"
+"There was an error validating the login and password.","There was an error validating the login and password."
"Login and password are required.","Acesso e senha são obrigatórios."
-"Login or Create an Account","Conectar-se ou criar conta"
-"Month (MM)","MM"
-"Manage Addresses","Gerenciar endereços"
-"Manage Customers","Gerenciar clientes"
-"Maximum length must be less then %s symbols","O comprimento máximo deve ser menos que %s sÃmbolos."
-"Missing email, skipping the record, line: %s","Falta o email, ignorar registro, linha: %s"
-"Missing email, skipping the record.","Erro de e-mail, pular o registro"
-"Missing first name, skipping the record, line: %s","Falta o primeiro nome, ignorar registro, linha: %s"
-"Missing firstname, skipping the record.","Faltando nome próprio, ignorando o registro."
-"Missing last name, skipping the record, line: %s","Falta o último nome, ignorar registro, linha: %s"
-"Missing lastname, skipping the record.","Faltando apelido, ignorando o registro."
-"Missing website, skipping the record, line: %s","Falta o website, ignorar registro, linha: %s"
-"Month","Mês"
-"My Account","Minha Conta"
-"My Account Wrapper","Envoltório da Minha Conta"
-"My Dashboard","Meu Painel"
-"My Orders","Meus Pedidos"
-"Name","Nome"
-"Name and Address Options","Opções de Nome e Endereço"
-"Never","Nunca"
-"New Address","Novo Endereço"
-"New Address Entry","Nova entrada de endereço"
-"New Customer","Novo Cliente"
-"New Customer Address","Endereço do Novo Cliente"
-"New Customer Group","Novo grupo de cliente"
-"New Customer Groups","Grupos do Novo Cliente"
-"New Customers","Novos clientes"
-"New Group","Novo Grupo"
-"New Password","Nova senha"
-"New account","Nova conta"
-"New account confirmation key","Chave de confirmação da nova conta"
-"New account confirmed","Nova conta confirmada"
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.","Não é possÃvel salvar o cliente."
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
+"Wrong customer account specified.","Conta especificada de cliente errada."
+"Bad request.","Mau pedido."
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.","Por favor, verifique seu email para a chave de confirmação."
+"This email does not require confirmation.","Este email não requer confirmação."
+"Wrong email.","E-mail errado."
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.","Por favor insira seu email."
+"Your password reset link has expired.","Seu link de configuração de senha expirou."
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
"New password field cannot be empty.","O campo de preenchimento de nova senha não pode ser deixado em branco."
-"Newsletter","Newsletter"
-"End Date","Final de boletim informativo"
-"Newsletter Information","Informações de boletim à imprensa"
-"Receive Date","Boletim informativo recebido"
-"Start Date","InÃcio do boletim à imprensa"
-"Newsletter Subscription","Assinatura do boletim informativo"
-"Newsletters","Boletins informativos"
-"No Items Found","Nenhum item encontrado"
-"No Newsletter Found","Nenhum boletim informativo foi encontrado"
-"No customer collections found","Nenhuma coleção de cliente encontrada"
-"No item specified.","Nenhum item especificado."
-"Not Sent","Não Enviado"
-"Not confirmed, can login","Não confirmado, pode fazer o login"
-"Not confirmed, cannot login","Não confirmado, não é possÃvel conectar-se"
-"Number of Lines in a Street Address ","Número de linhas em um endereço de rua"
-"Offline","Offline"
-"Online","Online"
+"Your password has been updated.","A sua senha foi atualizada."
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.","As informações da conta foram salvas."
+"The address has been saved.","O endereço foi salvo."
+"Cannot save address.","Não é possÃvel salvar endereços."
+"The address has been deleted.","O endereço foi apagado."
+"An error occurred while deleting the address.","Ocorreu um erro enquanto apagando este endereço."
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group","Novo Grupo"
+"New Customer Groups","Grupos do Novo Cliente"
+"Edit Group","Editar grupo"
+"Edit Customer Groups","Editar grupos de cliente"
+"The customer group has been saved.","O grupo de clientes foi salvo."
+"The customer group has been deleted.","O grupo de clientes foi apagado."
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers","Gerenciar clientes"
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
"Online Customers","Clientes Conectados"
-"Online Customers Options","Opções de clientes online"
-"Online Minutes Interval","Invervalo de minutos online"
-"Order","Ordem #"
-"Order Total","Total do Pedido"
-"Orders","Ordens"
-"PDF","PDF"
-"Password","Senha"
-"Password Management","Gerenciamento de senha"
-"Password Options","Opções de Senha"
-"Password forgotten","Senha esquecida"
-"Password:","Senha:"
-"Paused","Parado."
-"Pending","Pendente"
-"Per Website","Por Site Web"
-"Personal Information","Informações pessoais"
-"Please enter a number 1 or greater in this field.","Digite o número 1 ou maior neste campo."
-"Please enter a valid date between %s and %s at %s.","Digite uma data válida entre %s e %s em %s."
-"Please enter a valid date equal to or greater than %s at %s.","Digite uma data válida igual ou maior que %s em %s."
-"Please enter a valid date less than or equal to %s at %s.","Digite uma data válida menor que ou igual a %s em %s."
-"Please enter the city.","Insira a cidade."
-"Please enter the country.","Insira o paÃs."
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
"Please enter the first name.","Por favor informe o primeiro nome."
"Please enter the last name.","Por favor informe o último nome."
-"Please enter the state/province.","Insira o estado."
"Please enter the street.","Insira a rua."
+"Please enter the city.","Insira a cidade."
"Please enter the telephone number.","Insira o número de telefone."
"Please enter the zip/postal code.","Insira o CEP."
-"Please enter your email address below. You will receive a link to reset your password.","Por favor informe o seu endereço de e-mail abaixo. Você receberá um link para redefinir sua senha."
-"Please enter your email below and we'll send you confirmation link for it.","Digite seu e-mail abaixo e enviaremos o link de confirmação."
-"Please enter your email.","Por favor insira seu email."
-"Please make sure your passwords match.","Por favor certifique-se que suas senhas coincidem."
-"Please select","Favor selecionar"
-"Please select a website which contains store view","Selecione o website que contém visualização de loja"
-"Please select region, state or province","Selecione a região, estado ou provÃncia"
-"Please, check your email for confirmation key.","Por favor, verifique seu email para a chave de confirmação."
-"Prefix Dropdown Options","Lista de opções de prefixo"
-"Price","Preço"
-"Product","Produto"
-"ID","ID do Produto"
-"Product","Nome do produto"
-"Product Reviews","Comentários sobre Produto"
-"Product Tags","Etiquetas de Produto"
-"Purchase On","Compra Em"
-"Purchase Date","Comprados Na"
-"Quantity","Quant."
-"Recent Orders","Pedidos Recentes"
-"Records for %s store found.","Registros para loja %s encontrados."
-"Recovery Link Expiration Interval (days)","PerÃdo de validade do link de recuperação (dias)"
-"Redirect Customer to Account Dashboard after Logging in","Redirecione Cliente para o Painel de Conta após a Acessar"
-"Refunded","Reembolsado"
-"Registered Customers","Clientes cadastrados"
-"Remind Email Template","Modelo de email lembrete"
-"Remind Password","Lembrar senha"
-"Remove","Remover"
-"Require Emails Confirmation","Confirmação de e-mail obrigatória"
-"Reset a Password","Redefinir uma senha"
-"Retrieve address data","Recupere dados de endereço"
-"Retrieve address info","Recupere informação de endereço"
-"Retrieve customer addresses","Recuperar endereço do cliente"
-"Retrieve customer data","Recupere dados do cliente"
-"Retrieve customer groups","Recuperar grupos do cliente"
-"Retrieve customer info","Recuperar informações do cliente"
-"Retrieve customers","Recuperar clientes"
-"Retrieve your confirmation link here","Recupere aqui o seu link de confirmação"
-"Retrieve your password here","Recupere sua senha aqui"
-"SKU","Unidade de Manutenção de Estoque"
+"Please enter the country.","Insira o paÃs."
+"Please enter the state/province.","Insira o estado."
+"Per Website","Por Site Web"
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Não é possÃvel compartilhar contas de clientes globalmente porque alguns clientes existem em vários sites com mesmas contas de email e não podem ser misturados."
+"This account is not confirmed.","Essa conta não está confirmada."
+"Wrong transactional account email type","O tipo de e-mail de conta transacional está errado"
+"The first name cannot be empty.","O primeiro nome não pode ficar vazio."
+"The last name cannot be empty.","O último nome não pode ficar vazio."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.","Necessária a data de nascimento."
+"The TAX/VAT number is required.","Necessário o número de VAT/TAX."
+"Gender is required.","Sexo necessário"
+"Invalid password reset token.","Senha inválida reconfigure vale."
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,Admin
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required","É necessário o e-mail do cliente"
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope","O ID do site do cliente deve ser especificado ao utilizar o escopo do site"
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses","Endereços do cliente"
+"Are you sure you want to delete this address?","Tem certeza de que deseja excluir este endereço?"
+"Set as Default Billing Address","Definir como endereço padrão de faturamento"
+"Default Billing Address","Endereço padrão de faturamento"
+"Set as Default Shipping Address","Ajustar como endereço de entrega padrão"
+"Default Shipping Address","Endereço padrão de entrega"
+"New Customer Address","Endereço do Novo Cliente"
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
"Sales Statistics","EstatÃsticas de vendas"
-"Save","Salvar"
+"Average Sale","Venda Média"
+"Manage Addresses","Gerenciar endereços"
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","No Painel da Minha Conta é possÃvel visualizar um resumo das atividades recentes da sua conta e atualizar as informações da conta. Selecione o link abaixo para visualizar ou editar as informações."
+"Change Password","Alterar senha"
+Newsletters,"Boletins informativos"
+"You are currently subscribed to 'General Subscription'.","Você está atualmente inscrito em ""Assinatura Geral""."
+"You are currently not subscribed to any newsletter.","Você não está inscrito em nenhum boletim informativo."
+"Default Addresses","Endereço padrão"
+"Change Billing Address","Alterar o endereço de faturamento"
+"You have no default billing address in your address book.","Você não tem endereço de cobrança padrão no seu livro de endereços."
+"Change Shipping Address","Alterar endereço de remessa"
+"You have no default shipping address in your address book.","Você não tem endereço de entrega padrão no seu livro de endereços."
+"Additional Address Entries","Entradas Adicionais de Endereço"
+"You have no additional address entries in your address book.","Você não tem nenhuma entrada de endereço adicional no seu livro de endereços."
+"Use as my default billing address","Use como meu endereço de cobrança padrão"
+"Use as my default shipping address","Use como meu endereço de entrega padrão"
"Save Address","Salvar endereço"
-"Save Customer","Salvar cliente"
-"Save Customer Group","Salvar grupo de cliente"
-"Save Password","Salvar senha"
-"Save and Continue Edit","Salvar e continuar a editar"
-"Saved %d record(s)","%d registro(s) salvo(s)"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Valores separados por ponto e vÃrgula (;).<br/>Coloque ponto e vÃrgula no inÃcio para definir como vazia a primeira opção.<br/>Deixe em brando para abrir campo de texto."
-"Send From","Enviar De"
-"Send Welcome Email","Enviar e-mail de boas-vindas"
-"Send Welcome Email after Confirmation","Enviar e-mail de boas-vindas após confirmação"
-"Send auto-generated password","Enviar senha gerada automaticamente"
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
"Send confirmation link","Enviar link de confirmação"
-"Sending","Enviando"
-"Sent","Enviado"
-"Session Start Time","Horário de inÃcio da sessão"
-"Set as Default Billing Address","Definir como endereço padrão de faturamento"
-"Set as Default Shipping Address","Ajustar como endereço de entrega padrão"
-"Share Customer Accounts","Compartilhar contas do cliente"
-"Ship-to First Name","Enviado para o primeiro nome"
-"Ship-to Last Name","Enviado para o último nome"
-"Shipped to Name","Enviado para o nome"
-"Shopping Cart","Carrinho de compras"
-"Shopping Cart - %d item(s)","Carrinho de compras - %d item(ns)"
-"Shopping Cart of %1$s - %2$d item(s)","Carrinho de compras de %1$s - %2$d item(ns)"
-"Show Date of Birth","Exibir a data de aniversário"
-"Show Gender","Exibir o gênero"
-"Show Middle Name (initial)","Exibir nome do meio (inicial)"
-"Show Prefix","Exibir o prefixo"
-"Show Suffix","Exibir o sufixo"
-"Show Tax/VAT Number","Exibir número fiscal"
+"Back to Login","Voltar à Entrada"
+"Current Password","Senha atual"
+"Confirm New Password","Confirmar a nova senha"
+"Please enter your email address below. You will receive a link to reset your password.","Por favor informe o seu endereço de e-mail abaixo. Você receberá um link para redefinir sua senha."
+"Registered Customers","Clientes cadastrados"
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription","Assinatura geral"
"Sign Up for Newsletter","Assinar o boletim informativo"
-"Skipping import row, required field ""%s"" is not defined.","Ignorar linha de importação, campo ""%s"" exigido não está definido."
-"Skipping import row, website ""%s"" field does not exist.","Pular a fileira de importação, o campo ""%s"" do site não existe."
-"State/Province","Estado/ProvÃncia"
-"Status","Status"
-"Store","Loja"
-"Store View","Visualização da loja"
-"Street Address","Endereço da rua"
-"Street Address %s","Endereço da Rua %s"
-"Subject","Assunto"
-"Submit","Enviar"
-"Subscribe to Newsletter","Assinar o Boletim Informativo"
-"Subscribed to Newsletter?","Já assinou o boletim informativo?"
-"Suffix Dropdown Options","Opções de Sufixo Pendente"
-"Tag","Nome de Marca"
-"Tax Calculation Based On","Cálculo da Taxa Baseado em"
-"Tax Class","Classe de Impostos"
+"Address Information","Informações de Endereço"
+"Login Information","Informações de login"
+"Create account","Create account"
+"Reset a Password","Redefinir uma senha"
+"You have logged out and will be redirected to our homepage in 5 seconds.","Você se desconectou e será redirecionado para a nossa página inicial em 5 segundos."
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Ao criar uma conta na nossa loja, você será capaz de se mover através do processo de compra mais rapidamente, armazenar múltiplos endereços de envio, ver e rastrear seus pedidos em sua conta e muito mais."
+"Date of Birth","Data de aniversário"
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,Sexo
"Tax/VAT number","Número de Taxas/IVA"
-"Phone","Telefone"
-"Text","Texto"
-"Text One Line","Texto Uma Linha"
-"Thank you for registering with %s.","Obrigado por se registar com %s."
-"The Date of Birth is required.","Necessária a data de nascimento."
-"The TAX/VAT number is required.","Necessário o número de VAT/TAX."
-"The VAT ID entered (%s) is not a valid VAT ID.","A ID de VAT inserida (%s) não é uma ID de VAT válida."
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","A ID de VAT inserida (%s) não é uma ID de VAT válida. O cliente pertenceria o Grupo de clientes %s."
-"The VAT ID is valid. The current Customer Group will be used.","A ID de VAT é válida. O grupo de clientes atual será usado."
-"The account information has been saved.","As informações da conta foram salvas."
-"The address does not belong to this customer.","O endereço não pertence a este cliente."
-"The address has been deleted.","O endereço foi apagado."
-"The address has been saved.","O endereço foi salvo."
-"The customer ID and email did not match, skipping the record, line: %s","A ID e o email de cliente não correspondem,"
-"The customer does not have default billing address.","O cliente não tem endereço de cobrança predefinido."
-"The customer email (%s) already exists, skipping the record, line: %s","O emal de cliente (%s) já existe, ignorar o registro, linha: %s"
-"The customer group has been deleted.","O grupo de clientes foi apagado."
-"The customer group has been saved.","O grupo de clientes foi salvo."
-"The customer is currently assigned to Customer Group %s.","O cliente está atualmente atribuÃdo ao grupo de clientes %s."
-"The first name cannot be empty.","O primeiro nome não pode ficar vazio."
-"The group ""%s"" cannot be deleted","O grupo ""%s"" não pode ser apagado"
-"The last name cannot be empty.","O último nome não pode ficar vazio."
-"The minimum password length is %s","O comprimento mÃnimo da senha é %s."
-"The password cannot be empty.","A senha não pode ficar vazia."
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","A senha deve ter pelo menos 6 caracteres. Espaços à esquerda ou à direita serão ignorados."
-"The suffix that goes after name (Jr., Sr., etc.)","O sufixo que vai atrás do nome (Jr., Sr., etc.)"
-"The title that goes before name (Mr., Mrs., etc.)","O tÃtulo que vai antes do nome (Sr., Sra., etc.)"
-"There are no items in customer's wishlist at the moment","No momento não há itens na lista de desejos do cliente"
-"There are no items in customer's shopping cart at the moment","Não há itens no carrinho de compras do cliente no momento"
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","Já existe uma conta com este endereço de email. Se você tem certeza que é o seu endereço de email, <a href=""%s"">clique aqui</a> para obter a sua senha e acessar sua conta."
-"There was an error validating the VAT ID.","Ocorreu um erro ao validar a ID do VAT."
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Ocorreu um erro ao validar a ID do VAT. O cliente pertenceria ao grupo de clientes %s."
-"This account is not confirmed.","Essa conta não está confirmada."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","Essa conta não está confirmada. <a href=""%s"">Clique aqui</a> para reenviar email de confirmação."
-"This customer email already exists","Este email do cliente já existe"
-"This customer has no saved addresses.","Este cliente não tem endereços guardados."
-"This email does not require confirmation.","Este email não requer confirmação."
-"This email will be sent instead of default welcome email, after account confirmation.","Este e-mail será enviado ao invés do e-mail predefinido de boas vindas, após a confirmação da conta."
-"This is My Default %s Address","Este é o Meu Endereço %s Padrão"
-"To Cart","Para Carrinho"
-"Total","Total"
-"Type","Tipo"
-"Unable to save the customer.","Não foi possÃvel salvar o cliente."
-"Unknown","Desconhecido"
+"Subscribe to Newsletter","Assinar o Boletim Informativo"
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
+"Tax Calculation Based On","Tax Calculation Based On"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
+"Validation Error Group","Validation Error Group"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
+"Welcome Email","Welcome Email"
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,Grupo
+"Are you sure you want to delete?","Are you sure you want to delete?"
"Unsubscribe from Newsletter","Cancelar a assinatura do boletim informativo"
-"Update","Atualizar"
-"Update customer address data","Atualizar os dados de endereço do cliente"
-"Update customer data","Atualizar dados do cliente"
-"Use as My Default %s Address","Use como Meu Endereço %s Padrão"
-"Use as My Default Billing Address","Utilizar como endereço padrão de faturamento"
-"Use as My Default Shipping Address","Use como Meu Endereço de Entrega Predefinido"
-"Use as my default billing address","Use como meu endereço de cobrança padrão"
-"Use as my default shipping address","Use como meu endereço de entrega padrão"
-"VAT Number","Número VAT"
-"VAT Request Date","Data de solicitação de VAT"
-"VAT Request Identifier","Identificador de solicitação de VAT"
-"Validate VAT Number","Validar número de VAT"
-"Validate on Each Transaction","Validar em cada transação"
-"Validation Error Group","Validar grupo de erro"
-"View","Ver"
-"View Order","Ver Solicitação"
-"Visitor","Visitante"
-"Visitors Only","Apenas visitantes"
-"Website","Website"
-"Welcome Email","E-mail de boas-vindas"
-"Wishlist","Lista de presentes"
-"Wishlist - %d item(s)","Lista de presentes - %d item(ns)"
-"Would you like to change the Customer Group for this order?","Gostaria de alterar o grupo de cliente para este pedido?"
-"Wrong confirmation key.","A chave de confirmação está errada."
-"Wrong customer account specified.","Conta especificada de cliente errada."
-"Wrong email.","E-mail errado."
-"Wrong transactional account email type","O tipo de e-mail de conta transacional está errado"
-"Year (YYYY)","AAAA"
-"Year","Ano"
-"You are currently not subscribed to any newsletter.","Você não está inscrito em nenhum boletim informativo."
-"You are currently not subscribed to our newsletter.","Você ainda não assinou o nosso boletim informativo."
-"You are currently subscribed to 'General Subscription'.","Você está atualmente inscrito em ""Assinatura Geral""."
-"You are currently subscribed to our newsletter.","Você está atualmente inscrito em nosso boletim informativo."
+"Assign a Customer Group","Atribuir um Grupo de Clientes"
+Phone,Telefone
+ZIP,CEP
+"Customer Since","Cliente desde"
+n/a,n/d
+"Session Start Time","Horário de inÃcio da sessão"
+"Last Activity","Última atividade"
+"Last URL","Último URL"
+"Edit Account Information","Editar informações da conta"
+"Forgot Your Password","Esqueceu a senha"
+"Password forgotten","Senha esquecida"
+"My Dashboard","Meu Painel"
"You are now logged out","Agora você está desconectado"
-"You have logged out and will be redirected to our homepage in 5 seconds.","Você se desconectou e será redirecionado para a nossa página inicial em 5 segundos."
-"You have no additional address entries in your address book.","Você não tem nenhuma entrada de endereço adicional no seu livro de endereços."
-"You have no additional entries in your address book.","Você não tem entradas adicionais em seu livro de endereços."
-"You have no default billing address in your address book.","Você não tem endereço de cobrança padrão no seu livro de endereços."
-"You have no default entries in your address book.","Você não tem entradas padrão em seu livro de endereços."
-"You have no default shipping address in your address book.","Você não tem endereço de entrega padrão no seu livro de endereços."
-"You have not set a default billing address.","Você não configurou um endereço de faturamento padrão."
-"You have not set a default shipping address.","Você não definiu um endereço de envio."
-"You have placed no orders yet.","Você ainda não fez pedidos."
-"You have placed no products yet.","Você ainda não colocou nenhum produto."
-"You will be charged tax.","Imposto devido."
-"You will not be charged tax.","Não é devido imposto."
-"Your Tax ID cannot be validated.","Sua ID de imposto não pode ser validada."
-"Your VAT ID was successfully validated.","Sua ID de VAT foi validada com sucesso."
-"Your account balance is: %s","O saldo da sua conta é: %s"
-"Your password has been updated.","A sua senha foi atualizada."
-"Your password reset link has expired.","Seu link de configuração de senha expirou."
-"ZIP","CEP"
-"ZIP/Post Code","Código Postal"
-"Zip/Postal Code","Zip/Código Postal"
-"n/a","n/d"
-"or","ou"
-"register","registrar"
diff --git a/app/code/Magento/Customer/i18n/zh_CN.csv b/app/code/Magento/Customer/i18n/zh_CN.csv
index 4f523757b4f..f359f3e759b 100644
--- a/app/code/Magento/Customer/i18n/zh_CN.csv
+++ b/app/code/Magento/Customer/i18n/zh_CN.csv
@@ -1,475 +1,422 @@
-" or ","或"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","“%value%†似乎是一个 DNS 主机åï¼Œä½†æ— æ³•æå– TLD 部分"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","“%value%†似乎是一个 DNS 主机åï¼Œä½†æ— æ³•ä¸Žå·²çŸ¥åˆ—è¡¨åŒ¹é… TLD"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","“%value%†似乎是一个 DNS 主机åï¼Œä½†æ— æ³•ä¸Ž TLD “%tld%†的主机å模å¼ç›¸åŒ¹é…。"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","“%value%†似乎是一个 DNS 主机åï¼Œä½†åœ¨æ— æ•ˆä½ç½®åŒ…å«ç ´æŠ˜å·"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' 似乎是 DNS 主机åï¼Œä½†æ— æ³•å¯¹æŒ‡å®šçš„ Punycode符å·è§£ç "
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' 似乎是本地网络å称，æ¤å¤„ä¸èƒ½ä½¿ç”¨æœ¬åœ°ç½‘络å称"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' 似乎是 IP 地å€ï¼Œæ¤å¤„ä¸èƒ½ä½¿ç”¨ IP 地å€"
-"'%value%' does not appear to be a valid local network name","'%value%' 似乎ä¸æ˜¯æœ‰æ•ˆçš„本地网络å"
-"* Required Fields","*å¿…è¦å—段"
-"ALL GROUPS","所有群组"
-"Account Dashboard","账户显示æ¿"
-"Account Information","å¸æˆ·ä¿¡æ¯"
-"Account Sharing Options","账户分享选项"
-"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","å¸æˆ·ä¿¡æ¯æ˜¯å¿…须的。请使用您电å邮件ä¸çš„确认链接。è¦é‡æ–°å‘é€ç¡®è®¤ç”µå邮件，请 <a href=""%s"">点击这里</a>。"
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","å¸æˆ·ä¿¡æ¯æ˜¯å¿…须的。请使用您电å邮件ä¸çš„确认链接。è¦é‡æ–°å‘é€ç¡®è®¤ç”µå邮件，请 <a href=""%s"">点击这里</a>。"
-"Action","æ“作"
-"Add New Address","æ·»åŠ æ–°åœ°å€"
-"Add New Customer","æ·»åŠ æ–°å®¢æˆ·"
-"Add New Customer Group","æ·»åŠ æ–°å®¢æˆ·ç¾¤ç»„"
-"Added From","å·²æ·»åŠ ï¼Œæ¥è‡ª"
-"Additional Address Entries","é¢å¤–地å€è¡Œ"
-"Address","地å€"
-"Address Book","地å€è–„"
-"Address Books","地å€ç°¿"
-"Address Information","地å€ä¿¡æ¯"
-"Address Templates","地å€æ¨¡æ¿"
-"Addresses","地å€"
-"Admin","管ç†å‘˜"
-"All","全部"
-"All Store Views","所有店铺视图"
-"All countries","所有国家"
-"Always optional.","总是å¯é€‰ã€‚"
-"Amount","æ•°é‡"
-"An error occurred while deleting the address.","åˆ é™¤è¯¥åœ°å€æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"An error occurred while retrieving the option value: %s.","获å–选项值 %s æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"An error occurred while saving the collection, aborting. Error: %s","ä¿å˜é›†åˆæ—¶é‡åˆ°äº†é”™è¯¯ï¼Œæ£åœ¨å¿½ç•¥ï¼Œé”™è¯¯å·ï¼š%s"
-"An invalid option ID is specified for %s (%s), skipping the record.","%s (%s)ä¸ºæ— æ•ˆçš„é€‰é¡¹ID，跳过æ¤è®°å½•ã€‚"
-"Approved","已批准"
-"Are you sure that you want to remove this item?","您是å¦ç¡®è®¤è¦åˆ 除该内容？"
-"Are you sure you want to cancel adding of this address?","您是å¦ç¡®è®¤è¦å–æ¶ˆæ·»åŠ è¯¥åœ°å€ï¼Ÿ"
-"Are you sure you want to delete this address?","您是å¦ç¡®è®¤è¦åˆ 除该地å€ï¼Ÿ"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Array of Entity collections is expected.","预期获得实体集åˆé˜µåˆ—。"
-"Assign a Customer Group","分é…客户组"
-"Average Sale","å¹³å‡é”€å”®"
-"Back","返回"
-"Back - link to the previously viewed page","返回 - 链接到上一个看过的页é¢"
-"Back to Login","返回到登录界é¢"
-"Bad request.","请求有误。"
-"Based on the VAT ID, the customer would belong to the Customer Group %s.","æ ¹æ® VAT ID æ¥çœ‹ï¼Œè¯¥å®¢æˆ·åº”该属于客户群体 %s。"
-"Bill to Name","记账姓å"
-"Bought From","è´è‡ª"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","通过在我们的店铺ä¸åˆ›å»ºå¸æˆ·ï¼Œæ‚¨å°†èƒ½ç”¨æ›´å¿«é€Ÿåº¦ç»“账，ä¿å˜å¤šä¸ªé€è´§åœ°å€ï¼Œå¹¶å¯åœ¨æ‚¨çš„å¸æˆ·ä¸æŸ¥çœ‹å¹¶è¿½è¸ªæ‚¨çš„订å•ï¼Œè¿˜æœ‰æ›´å¤šåŠŸèƒ½ã€‚"
-"CSV","CSV"
-"Cancel","å–消"
-"Cannot save a new password.","æ— æ³•ä¿å˜æ–°å¯†ç 。"
-"Cannot save address.","æ— æ³•ä¿å˜åœ°å€ã€‚"
-"Cannot save the customer.","æ— æ³•ä¿å˜å®¢æˆ·ã€‚"
-"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","æ— æ³•å…¨å±€åˆ†äº«å®¢æˆ·å¸æˆ·ï¼Œå› 为æŸäº›å®¢æˆ·çš„å¸æˆ·æ‰€ç”¨çš„邮件地å€åœ¨å¤šä¸ªç½‘站是相åŒçš„ï¼Œæ— æ³•åˆå¹¶ã€‚"
-"Change Account Password","更改å¸æˆ·å¯†ç "
-"Change Billing Address","更改账å•åœ°å€"
-"Change Password","更改密ç "
-"Change Shipping Address","更改é€è´§åœ°å€"
-"City","城市"
-"Company","å…¬å¸"
-"Config","é…ç½®"
-"Configure","é…ç½®"
-"Confirm New Password","确认新密ç "
-"Confirm Password","确认密ç "
-"Confirmation Link Email","确认链接邮件"
-"Confirmed","已确认"
-"Contact Information","è”系信æ¯"
-"Continue Shopping","继ç»è´ç‰©"
-"Country","国家"
-"Create","创建"
-"Create New Account Options","创建新å¸æˆ·é€‰é¡¹"
-"Create New Customer Account","创建新客户å¸æˆ·"
-"Create Order","创建订å•"
-"Create an Account","创建å¸æˆ·"
-"Create customer","创建客户"
-"Create customer address","创建客户地å€"
-"Current Password","当å‰å¯†ç "
-"Customer","客户"
-"Customer API","自定义 API"
-"Customer Account Edit Form","客户å¸æˆ·ç¼–辑表å•"
-"Customer Account Login Form","客户å¸æˆ·ç™»å½•è¡¨å•"
-"Customer Account Logout Success","客户å¸æˆ·æ³¨é”€æˆåŠŸ"
-"Customer Account Registration Form","客户账户注册自"
-"Customer Addresses","客户地å€"
-"Customer Configuration","客户é…ç½®"
-"Customer Forgot Password Form","客户忘记密ç 表å•"
-"Customer Group","客户组"
-"Customer Groups","客户组"
-"Customer Information","客户信æ¯"
-"Customer Login","客户登录"
-"Customer My Account (All Pages)","客户我的å¸æˆ·ï¼ˆæ‰€æœ‰é¡µé¢ï¼‰"
-"Customer My Account Address Book","客户我的å¸æˆ·åœ°å€ç°¿"
-"Customer My Account Address Edit Form","客户我的å¸æˆ·åœ°å€ç¼–辑表å•"
-"Customer My Account Dashboard","客户我的å¸æˆ·ä»ªè¡¨æ¿"
-"Customer Since","å®¢æˆ·åŠ å…¥æ—¥æœŸ"
-"Customer View","客户视图"
-"Customer collection expected.","预期的客户集åˆã€‚"
-"Customer email is required","需è¦å®¢æˆ·é‚®ä»¶"
-"Customer website ID must be specified when using the website scope","使用网站范围时必须指定客户网站ID"
-"Customer will stay on the current page if ""No"" is selected.","如果选择“å¦â€ï¼Œå®¢æˆ·å°†åœç•™åœ¨å½“å‰é¡µé¢ã€‚"
-"Customers","客户"
-"Customers Only","ä»…é™å®¢æˆ·"
-"Customers Section","客户区域"
-"Day (DD)","DD"
-"Date","日期"
-"Date Added","æ·»åŠ æ—¥æœŸ"
-"Date of Birth","出生日期"
-"Day","天"
-"Days in Wishlist","ä½äºŽæ„¿æœ›æ¸…å•çš„天数"
-"Default Addresses","默认地å€"
-"Default Billing Address","默认账å•åœ°å€"
-"Default Email Domain","默认邮件域"
-"Default Group","默认组"
-"Default Shipping Address","默认é€è´§åœ°å€"
-"Default Value for Disable Automatic Group Changes Based on VAT ID","ç¦ç”¨æ ¹æ® VAT ID 自动分é…顾客组å˜åŠ¨çš„默认值"
-"Default Welcome Email","默认欢迎邮件"
-"Delete","åˆ é™¤"
-"Delete Address","åˆ é™¤åœ°å€"
-"Delete Customer","åˆ é™¤å®¢æˆ·"
-"Delete Customer Group","åˆ é™¤å®¢æˆ·ç»„"
-"Delete customer","åˆ é™¤å®¢æˆ·"
-"Delete customer address","åˆ é™¤å®¢æˆ·åœ°å€"
-"Deleted Stores","åˆ é™¤åº—é“º"
-"Details","详情"
-"Disabled","å·²ç¦ç”¨"
-"Edit","编辑"
-"Edit Account Info","编辑å¸æˆ·ä¿¡æ¯"
-"Edit Account Information","修改å¸æˆ·ä¿¡æ¯"
-"Edit Address","编辑地å€"
-"Edit Address Entry","编辑地å€é¡¹"
-"Edit Customer Group ""%s""","编辑客户组 ""%s"""
-"Edit Customer Groups","编辑客户组"
-"Edit Customer's Address","编辑客户的地å€"
-"Edit Group","编辑组"
-"Edit Newsletters","编辑新闻邮件"
-"Email","电å邮件"
-"Email Address","编辑电å邮件地å€"
-"Email Sender","电å邮件å‘é€äºº"
-"Email:","电å邮件："
-"Enable Automatic Assignment to Customer Group","å¯ç”¨é¡¾å®¢ç¾¤ä½“的自动分é…"
-"Entity collection is expected.","预期为实体集åˆã€‚"
-"Excel XML","Excel XML"
-"Failed to confirm customer account.","确认客户å¸æˆ·å¤±è´¥ã€‚"
-"Fax","ä¼ çœŸ"
-"First Name","åå—"
-"Forgot Email Template","忘记邮件模æ¿"
-"Forgot Password","忘记密ç "
-"Forgot Your Password","忘记您的密ç "
-"Forgot Your Password?","忘记您的密ç ？"
-"Forgot and Remind Email Sender","忘记并æ醒邮件å‘é€è€…"
-"Form Fields Before","表å•å—段，先于"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","在您的我的å¸æˆ·ä»ªè¡¨æ¿ä¸ï¼Œæ‚¨å¯ä»¥æŸ¥çœ‹æœ€è¿‘å¸æˆ·æ´»åŠ¨çš„快照，并更新å¸æˆ·ä¿¡æ¯ã€‚选择下é¢çš„链接以查看或修改信æ¯ã€‚"
-"Gender","性别"
-"Gender is required.","需æ供性别信æ¯ã€‚"
-"General Subscription","常规订阅"
-"Generate Human-Friendly Customer ID","生æˆäººæ€§åŒ–客户 ID"
-"Global","å…¨çƒ"
-"Grand Total","总计"
-"Group","分组"
-"Group Information","群组信æ¯"
-"Group Name","群组å称"
-"Group for Invalid VAT ID","æ— æ•ˆ VAT ID 组"
-"Group for Valid VAT ID - Domestic","æ— æ•ˆ VAT ID 组 - 国内"
-"Group for Valid VAT ID - Intra-Union","有效 VAT ID 组 - è”邦内"
-"Guest","æ¥å®¾"
-"HTML","HTML"
-"Hello, %s!","您好， %sï¼"
-"ID","ID"
-"IP Address","IP地å€"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","如果有关è”ç»™ %s çš„è´¦æˆ·ï¼Œä½ å°†æ”¶åˆ°ä¸€å°åŒ…å«é‡è®¾å¯†ç 链接的电å邮件。"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","å¦‚æžœä½ æ˜¯å·²æ³¨å†Œçš„ VAT 顾客，请点击 <a href=""%s"">这里</a> 输入å¸å•åœ°å€ï¼Œä»¥å‡†ç¡®è®¡ç®— VAT"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","å¦‚æžœä½ æ˜¯å·²æ³¨å†Œçš„ VAT 顾客，请点击<a href=""%s"">这里</a>输入å‘货地å€ï¼Œä»¥å‡†ç¡®è®¡ç®— VAT"
-"If you believe this is an error, please contact us at %s","å¦‚æžœä½ è§‰å¾—æœ‰é”™è¯¯ï¼Œè¯·è”系我们 %s"
-"If you have an account with us, please log in.","如果您拥有账户，请登录。"
-"Invalid attribute option specified for attribute %s (%s), skipping the record.","为属性 %s (%s) æŒ‡å®šçš„å±žæ€§é€‰é¡¹æ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid attribute set specified, skipping the record.","æŒ‡å®šçš„å±žæ€§é›†æ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid billing address for (%s)","(%s) çš„å¸å•åœ°å€æ— 效"
-"Invalid current password","当å‰å¯†ç æ— æ•ˆ"
-"Invalid customer data","客户数æ®æ— 效"
-"Invalid email address ""%s"".","电åé‚®ä»¶åœ°å€ ""%s"" æ— æ•ˆã€‚"
-"Invalid email address.","邮件地å€æ— 效。"
-"Invalid login or password.","æ— æ•ˆçš„ç™»å½•å或密ç 。"
-"Invalid password reset token.","æ— æ•ˆçš„å¯†ç é‡è®¾ä»¤ç‰Œã€‚"
-"Invalid shipping address for (%s)","(%s) çš„å‘货地å€æ— 效"
-"Invalid store specified, skipping the record.","æŒ‡å®šçš„åº—é“ºæ— æ•ˆï¼Œæ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Invalid website, skipping the record, line: %s","ç½‘ç«™æ— æ•ˆï¼Œè·³è¿‡è¯¥è®°å½•ï¼Œè¡Œï¼š%s"
-"Last Activity","上次活动"
-"Last Date Subscribed","上次订阅的日期"
-"Last Date Unsubscribed","上次退订的日期"
-"Last Name","姓æ°"
-"Last URL","最åŽä¸€ä¸ªURL"
-"Leave empty for default (15 minutes).","留空å¯ä½¿ç”¨é»˜è®¤å€¼ï¼ˆ15分钟）。"
-"Leave empty for default (2). Valid range: 1-4","留空å¯ä½¿ç”¨é»˜è®¤å€¼ï¼ˆ2）.有效范围：1-4"
-"Lifetime Sales","终生销售"
-"Log In","登录"
-"Log Out","注销"
-"Login","登录"
-"Login Information","登录信æ¯"
-"Login Options","登录选项"
-"Login and password are required.","需è¦ç™»å½•å’Œå¯†ç 。"
-"Login or Create an Account","登录或创建å¸æˆ·"
-"Month (MM)","MM"
-"Manage Addresses","管ç†åœ°å€"
-"Manage Customers","管ç†å®¢æˆ·"
-"Maximum length must be less then %s symbols","最大长度ä¸èƒ½è¶…过 %s 个å—符"
-"Missing email, skipping the record, line: %s","电å邮件丢失，跳过该记录，行：%s"
-"Missing email, skipping the record.","邮件缺失，æ£åœ¨è·³è¿‡è¯¥è®°å½•ã€‚"
-"Missing first name, skipping the record, line: %s","åå—丢失，跳过该记录，行：%s"
-"Missing firstname, skipping the record.","缺少åå—，跳过记录。"
-"Missing last name, skipping the record, line: %s","姓æ°ä¸¢å¤±ï¼Œè·³è¿‡è¯¥è®°å½•ï¼Œè¡Œï¼š%s"
-"Missing lastname, skipping the record.","缺少姓æ°ï¼Œè·³è¿‡è®°å½•ã€‚"
-"Missing website, skipping the record, line: %s","网站丢失，跳过该记录，行：%s"
-"Month","月"
-"My Account","我的å¸æˆ·"
-"My Account Wrapper","我的å¸æˆ·åŒ…装"
-"My Dashboard","我的仪表æ¿"
-"My Orders","我的订å•"
-"Name","姓å"
-"Name and Address Options","åå—和地å€é€‰é¡¹"
-"Never","æ°¸ä¸"
-"New Address","新地å€"
-"New Address Entry","新地å€é¡¹"
-"New Customer","新顾客"
-"New Customer Address","新建客户地å€"
-"New Customer Group","新客户组"
-"New Customer Groups","新建客户组"
-"New Customers","新客户"
-"New Group","新组"
-"New Password","新密ç "
-"New account","æ–°å¸æˆ·"
-"New account confirmation key","新建客户确认密钥"
-"New account confirmed","æ–°å¸æˆ·å·²ç¡®è®¤"
-"New password field cannot be empty.","新密ç å—段ä¸èƒ½ä¸ºç©ºã€‚"
-"Newsletter","新闻邮件"
-"Newsletter Finish","新闻邮件结æŸ"
-"Newsletter Information","新闻邮件信æ¯"
-"Newsletter Received","新闻邮件已收到"
-"Newsletter Start","新闻邮件开始"
-"Newsletter Subscription","新闻邮件订阅"
-"Newsletters","新闻邮件"
-"No Items Found","未找到项目"
-"No Newsletter Found","未找到新闻邮件"
-"No customer collections found","未找到客户集åˆ"
-"No item specified.","未指定项目"
-"Not Sent","未å‘é€"
-"Not confirmed, can login","未确认，å¯ç™»å½•"
-"Not confirmed, cannot login","æœªç¡®è®¤ï¼Œæ— æ³•ç™»é™†"
-"Number of Lines in a Street Address ","è¡—é“地å€çš„行数"
-"Offline","离线"
-"Online","在线"
-"Online Customers","在线客户"
-"Online Customers Options","在线客户选项"
-"Online Minutes Interval","在线分钟数间隔"
-"Order #","è®¢å• #"
-"Order Total","订å•æ€»æ•°"
-"Orders","订å•"
-"PDF","PDF"
-"Password","密ç "
-"Password Management","密ç 管ç†"
-"Password Options","密ç 选项"
-"Password forgotten","密ç 忘记"
-"Password:","密ç ："
-"Paused","已暂åœ"
-"Pending","挂起"
-"Per Website","æ¯ç½‘ç«™"
-"Personal Information","个人信æ¯"
-"Please enter a number 1 or greater in this field.","请在该å—段输入数å—1或更大值。"
-"Please enter a valid date between %s and %s at %s.","请在%s输入介于%s 与 %s 之间的有效日期。"
-"Please enter a valid date equal to or greater than %s at %s.","请在 %s 输入ç‰äºŽæˆ–大于 %s 的有效日期。"
-"Please enter a valid date less than or equal to %s at %s.","请在 %s 输入å°äºŽæˆ–ç‰äºŽ %s 的有效日期。"
-"Please enter the city.","请输入城市。"
-"Please enter the country.","请输入国家。"
-"Please enter the first name.","请输入åå—。"
-"Please enter the last name.","请输入姓æ°ã€‚"
-"Please enter the state/province.","请输入州/çœã€‚"
-"Please enter the street.","请输入街é“。"
-"Please enter the telephone number.","请输入电è¯å·ç 。"
-"Please enter the zip/postal code.","请输入邮编。"
-"Please enter your email address below. You will receive a link to reset your password.","请在下é¢è¾“å…¥ä½ çš„ç”µå邮件地å€ã€‚ä½ å°†æ”¶åˆ°ä¸€ä¸ªé‡ç½®å¯†ç 的链接。"
-"Please enter your email below and we'll send you confirmation link for it.","请在下é¢è¾“入您的邮件地å€ï¼Œæˆ‘们将å‘é€ç¡®è®¤é“¾æŽ¥ã€‚"
-"Please enter your email.","请输入您的电å邮件。"
-"Please make sure your passwords match.","请确ä¿å¯†ç 匹é…。"
-"Please select","请选择"
-"Please select a website which contains store view","请选择包å«è¯¥åº—铺视图的网站"
-"Please select region, state or province","请选择地区ã€å·žï¼Œæˆ–çœ"
-"Please, check your email for confirmation key.","请检查您的电å邮件以获å–确认密钥。"
-"Prefix Dropdown Options","å‰ç¼€ä¸‹æ‹‰èœå•é€‰é¡¹"
-"Price","ä»·æ ¼"
-"Product","产å“"
-"Product ID","äº§å“ ID"
-"Product Name","产å“å"
-"Product Reviews","产å“评测"
-"Product Tags","产å“æ ‡ç¾"
-"Purchase On","è´ä¹°æ—¶é—´ï¼š"
-"Purchased At","è´ä¹°åœ°ç‚¹ï¼š"
-"Qty","æ•°é‡"
-"Recent Orders","近期订å•"
-"Records for %s store found.","%s 店铺的记录已找到。"
-"Recovery Link Expiration Period (days)","æ¢å¤é“¾æŽ¥è¿‡æœŸå‘¨æœŸï¼ˆå¤©ï¼‰"
-"Redirect Customer to Account Dashboard after Logging in","登录åŽï¼Œé‡å®šå‘客户到账户显示æ¿"
-"Refunded","å·²å˜å‚¨"
-"Registered Customers","已注册的客户"
-"Remind Email Template","æ醒邮件模æ¿"
-"Remind Password","æ醒密ç "
-"Remove","åˆ é™¤"
-"Require Emails Confirmation","需è¦ç¡®è®¤ç”µå邮件"
-"Reset a Password","é‡ç½®å¯†ç "
-"Retrieve address data","获å–地å€æ•°æ®"
-"Retrieve address info","获å–地å€ä¿¡æ¯"
-"Retrieve customer addresses","获å–客户地å€"
-"Retrieve customer data","获å–用户数æ®"
-"Retrieve customer groups","获å–客户组"
-"Retrieve customer info","获å–客户信æ¯"
-"Retrieve customers","获å–客户ã€"
-"Retrieve your confirmation link here","在这里获å–您的确认链接"
-"Retrieve your password here","在这里获å–您的密ç "
-"SKU","SKU"
-"Sales Statistics","销售数æ®ç»Ÿè®¡"
-"Save","ä¿å˜"
-"Save Address","ä¿å˜åœ°å€"
-"Save Customer","ä¿å˜å®¢æˆ·"
-"Save Customer Group","ä¿å˜å®¢æˆ·ç¾¤ç»„"
-"Save Password","ä¿å˜å¯†ç "
-"Save and Continue Edit","ä¿å˜å¹¶ç»§ç»ç¼–辑"
-"Saved %d record(s)","å·²ä¿å˜ %s æ¡è®°å½•"
-"Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","用分å·ï¼ˆ;）分隔值。<br/>将分å·æ”¾åœ¨ç¬¬ä¸€ä¸ªé€‰é¡¹å‰é¢çš„空白处。<br/>对于打开文å—çš„å—段请留空。"
-"Send From","å‘é€è‡ª"
-"Send Welcome Email","å‘é€æ¬¢è¿Žé‚®ä»¶"
-"Send Welcome Email after Confirmation","在确认åŽå‘é€æ¬¢è¿Žé‚®ä»¶"
-"Send auto-generated password","å‘é€è‡ªåŠ¨ç”Ÿæˆçš„密ç "
-"Send confirmation link","å‘é€ç¡®è®¤é“¾æŽ¥"
-"Sending","æ£åœ¨å‘é€"
-"Sent","å·²å‘é€"
-"Session Start Time","会è¯å¼€å§‹æ—¶é—´"
-"Set as Default Billing Address","设置为默认账å•åœ°å€"
-"Set as Default Shipping Address","设置为默认è¿é€åœ°å€"
-"Share Customer Accounts","分享客户账户"
-"Shipped to First Name","è¿é€è‡³åå—"
-"Shipped to Last Name","å‘é€ç»™å§“æ°"
-"Shipped to Name","è¿é€è‡³å§“å"
-"Shopping Cart","è´ç‰©è½¦"
-"Shopping Cart - %d item(s)","è´ç‰©è½¦ - %d 个项目"
-"Shopping Cart of %1$s - %2$d item(s)","è´ç‰©è½¦åŒ…å« %1$s - %2$d 件商å“"
-"Show Date of Birth","显示出生日期"
-"Show Gender","显示性别"
-"Show Middle Name (initial)","显示ä¸é—´å（åˆå§‹ï¼‰"
-"Show Prefix","显示å‰ç¼€"
-"Show Suffix","显示åŽç¼€"
-"Show Tax/VAT Number","显示税/增值税å·ç "
-"Sign Up for Newsletter","订阅新闻邮件"
-"Skipping import row, required field ""%s"" is not defined.","跳过导入的行，必须的 ""%s"" å—段未定义。"
-"Skipping import row, website ""%s"" field does not exist.","跳过导入的行，网站 ""%s"" å—段ä¸å˜åœ¨ã€‚"
-"State/Province","å·ž/çœ"
-"Status","状æ€"
-"Store","商店"
-"Store View","店铺视图"
-"Street Address","è¡—é“地å€"
-"Street Address %s","è¡—é“åœ°å€ %s"
-"Subject","主题"
-"Submit","æ交"
-"Subscribe to Newsletter","订阅到新闻通讯"
-"Subscribed to Newsletter?","是å¦è®¢é˜…新闻邮件？"
-"Suffix Dropdown Options","åŽç¼€ä¸‹æ‹‰èœå•é€‰é¡¹"
-"Tag Name","æ ‡ç¾å称"
-"Tax Calculation Based On","税金的计算基于"
-"Tax Class","税率"
-"Tax/VAT number","税/增值税å·ç "
-"Telephone","电è¯"
-"Text","æ–‡å—"
-"Text One Line","一行文å—"
-"Thank you for registering with %s.","感谢您注册 %s。"
-"The Date of Birth is required.","需æ供生日。"
-"The TAX/VAT number is required.","需æä¾› TAX/VAT å·ç 。"
-"The VAT ID entered (%s) is not a valid VAT ID.","输入的 VAT ID (%s) ä¸æ˜¯æœ‰æ•ˆçš„ VAT ID。"
-"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","输入的 VAT ID (%s) ä¸æ˜¯æœ‰æ•ˆçš„ VAT ID。该顾客应属于顾客群体 %s。"
-"The VAT ID is valid. The current Customer Group will be used.","VAT ID 有效。将使用当å‰çš„顾客群体。"
-"The account information has been saved.","å¸æˆ·ä¿¡æ¯å·²ä¿å˜ã€‚"
-"The address does not belong to this customer.","该地å€ä¸è¾“å…¥æ¤ç”¨æˆ·ã€‚"
-"The address has been deleted.","地å€å·²åˆ 除。"
-"The address has been saved.","地å€å·²ä¿å˜ã€‚"
-"The customer ID and email did not match, skipping the record, line: %s","顾客 ID 与电å邮件ä¸åŒ¹é…，跳过该记录，行：%s"
-"The customer does not have default billing address.","客户未设置默认账å•åœ°å€ã€‚"
-"The customer email (%s) already exists, skipping the record, line: %s","顾客邮件（%s）已ç»å˜åœ¨ï¼Œè·³è¿‡è¯¥è®°å½•ï¼Œè¡Œï¼š%s"
-"The customer group has been deleted.","å®¢æˆ·ç»„å·²åˆ é™¤ã€‚"
-"The customer group has been saved.","客户群组已ä¿å˜ã€‚"
+All,全部
+Cancel,å–消
+"Create Order",创建订å•
+Back,返回
+Product,产å“
+Price,ä»·æ ¼
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Configure,é…ç½®
+Customers,客户
+"Shopping Cart",è´ç‰©è½¦
+No,No
+Qty,æ•°é‡
+Action,æ“作
+Total,总数
+"No item specified.",未指定项目
+"Are you sure that you want to remove this item?",您是å¦ç¡®è®¤è¦åˆ 除该内容？
+Edit,编辑
+Orders,订å•
+"New Customers",新客户
+Customer,客户
+"Grand Total",总计
+"Lifetime Sales",终生销售
+"All Store Views",所有店铺视图
+"My Account",我的å¸æˆ·
+"Account Information",å¸æˆ·ä¿¡æ¯
+"First Name",åå—
+"Last Name",姓æ°
+Email,电å邮件
+"New Password",新密ç
+"Delete File","Delete File"
+Delete,åˆ é™¤
+Save,ä¿å˜
+Store,商店
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+"Web Site","Web Site"
+Name,姓å
+Status,状æ€
+"Save and Continue Edit",ä¿å˜å¹¶ç»§ç»ç¼–辑
+"Store View",店铺视图
+Type,类型
+Submit,æ交
+"You deleted the customer.","You deleted the customer."
+"IP Address",IP地å€
+Order,Order
+"Customer View",客户视图
+"Personal Information",个人信æ¯
+View,查看
+"* Required Fields",*å¿…è¦å—段
+Day,天
+Month,月
+Year,å¹´
+label,label
+Global,å…¨çƒ
+Change,Change
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Customer Group",客户组
+"End Date","End Date"
+"Customer Groups",客户组
+Country,国家
+State/Province,å·ž/çœ
+"Please select region, state or province",请选择地区ã€å·žï¼Œæˆ–çœ
+City,城市
+"Zip/Postal Code",邮政编ç
+"Email Address",编辑电å邮件地å€
+Company,å…¬å¸
+"VAT Number","VAT ç¼–å·"
+Address,地å€
+"Street Address",è¡—é“地å€
+"Street Address %1","Street Address %1"
+Telephone,电è¯
+Fax,ä¼ çœŸ
+Password,密ç
+"Confirm Password",确认密ç
+Login,登录
+"Forgot Your Password?",忘记您的密ç ？
+Register,Register
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Contact Information",è”系信æ¯
+"Log Out",注销
+"Log In",登录
+"You subscribe to our newsletter.","You subscribe to our newsletter."
+"You are currently not subscribed to our newsletter.",您目å‰æ²¡æœ‰è®¢é˜…我们的时事通讯。
+"You have not set a default shipping address.",您尚未设置默认的è¿é€åœ°å€ã€‚
+"You have not set a default billing address.",您还没有设置默认的账å•åœ°å€ã€‚
+"Address Book",地å€è–„
+"Edit Address",编辑地å€
+"Add New Address",æ·»åŠ æ–°åœ°å€
+region,region
+"Add New Customer",æ·»åŠ æ–°å®¢æˆ·
+"Save Customer",ä¿å˜å®¢æˆ·
+"Delete Customer",åˆ é™¤å®¢æˆ·
+"Reset Password","Reset Password"
+"New Customer",新顾客
+"or ","or "
+" Send auto-generated password"," Send auto-generated password"
+"Please select",请选择
+"Send Welcome Email",å‘é€æ¬¢è¿Žé‚®ä»¶
+"Send From",å‘é€è‡ª
+"Send Welcome Email after Confirmation",在确认åŽå‘é€æ¬¢è¿Žé‚®ä»¶
+"Delete Address",åˆ é™¤åœ°å€
+"Edit Customer's Address",编辑客户的地å€
+"Shopping Cart from %1","Shopping Cart from %1"
+"Newsletter Information",新闻邮件信æ¯
+"Subscribed to Newsletter","Subscribed to Newsletter"
+"Last Date Subscribed",上次订阅的日期
+"Last Date Unsubscribed",上次退订的日期
+"No Newsletter Found",未找到新闻邮件
+"Start date","Start date"
+"Receive Date","Receive Date"
+Subject,主题
+Sent,å·²å‘é€
+"Not Sent",未å‘é€
+Sending,æ£åœ¨å‘é€
+Paused,已暂åœ
+Unknown,未知
+"Purchase Date","Purchase Date"
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total",订å•æ€»æ•°
+"Purchase Point","Purchase Point"
+Never,æ°¸ä¸
+Offline,离线
+Online,在线
+Confirmed,已确认
+"Confirmation Required","Confirmation Required"
+"Confirmation Not Required","Confirmation Not Required"
+Indeterminate,Indeterminate
+"The customer does not have default billing address.",客户未设置默认账å•åœ°å€ã€‚
+"Recent Orders",近期订å•
+"Shopping Cart - %1 item(s)","Shopping Cart - %1 item(s)"
+"Shopping Cart of %1 - %2 item(s)","Shopping Cart of %1 - %2 item(s)"
+"Wishlist - %1 item(s)","Wishlist - %1 item(s)"
+"There are no items in customer's shopping cart at the moment",客户的è´ç‰©è½¦ä¸ç›®å‰æ²¡å†…容
+"Shipped-to Name","Shipped-to Name"
+"Deleted Stores",åˆ é™¤åº—é“º
+"There are no items in customer's wishlist at the moment",客户的愿望清å•ä¸ç›®å‰æ²¡å†…容
+"Add Locale","Add Locale"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
+"Customer Information",客户信æ¯
+Addresses,地å€
+Wishlist,愿望清å•
+Newsletter,新闻邮件
+"Product Reviews",产å“评测
+Download,Download
+"Delete Image","Delete Image"
+"View Full Size","View Full Size"
+"All countries",所有国家
+"Add New Customer Group",æ·»åŠ æ–°å®¢æˆ·ç¾¤ç»„
+"Save Customer Group",ä¿å˜å®¢æˆ·ç¾¤ç»„
+"Delete Customer Group",åˆ é™¤å®¢æˆ·ç»„
+"New Customer Group",新客户组
+"Edit Customer Group ""%1""","Edit Customer Group ""%1"""
+"Group Information",群组信æ¯
+"Group Name",群组å称
+"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols"
+"Tax Class",税率
+"Customers Only",ä»…é™å®¢æˆ·
+"Visitors Only",ä»…é™è®¿å®¢
+Visitor,访客
"The customer is currently assigned to Customer Group %s.","该顾客被分é…到顾客群体 %s。"
-"The first name cannot be empty.","åå—ä¸èƒ½ä¸ºç©ºã€‚"
-"The group ""%s"" cannot be deleted","组 ""%s"" æ— æ³•åˆ é™¤"
-"The last name cannot be empty.","姓æ°ä¸èƒ½ä¸ºç©ºã€‚"
-"The minimum password length is %s","密ç 长度最å°å€¼ä¸º %s"
-"The password cannot be empty.","密ç ä¸èƒ½ä¸ºç©ºã€‚"
-"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","密ç 必须包å«è‡³å°‘ 6 个å—符。å‰å¯¼æˆ–å°¾éšç©ºæ ¼å°†è¢«å¿½ç•¥ã€‚"
-"The suffix that goes after name (Jr., Sr., etc.)","åå—åŽé¢çš„åŽç¼€ï¼ˆJr.ã€Sr.ç‰ï¼‰"
-"The title that goes before name (Mr., Mrs., etc.)","姓åå‰ç§°è°“（先生ã€å¥³å£«ç‰ï¼‰"
-"There are no items in customer's wishlist at the moment","客户的愿望清å•ä¸ç›®å‰æ²¡å†…容"
-"There are no items in customer's shopping cart at the moment","客户的è´ç‰©è½¦ä¸ç›®å‰æ²¡å†…容"
-"There is already an account with this email address. If you are sure that it is your email address, <a href=""%s"">click here</a> to get your password and access your account.","已有å¸æˆ·ä½¿ç”¨è¯¥ç”µå邮件地å€ã€‚如果您确认这是您自己的电å邮件地å€ï¼Œè¯· <a href=""%s"">点击这里</a> 获å–您的密ç 并访问å¸æˆ·ã€‚"
+"Would you like to change the Customer Group for this order?",ä½ æ˜¯å¦æƒ³æ›´æ”¹è¯¥è®¢å•çš„顾客群体？
+"The VAT ID is valid. The current Customer Group will be used.","VAT ID 有效。将使用当å‰çš„顾客群体。"
+"Based on the VAT ID, ' 'the customer would belong to the Customer Group %s.","Based on the VAT ID, ' 'the customer would belong to the Customer Group %s."
+"The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s.","The VAT ID entered (%s) is not a valid VAT ID. ' 'The customer would belong to Customer Group %s."
+"There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s.","There was an error validating the VAT ID. ' 'The customer would belong to Customer Group %s."
"There was an error validating the VAT ID.","éªŒè¯ VAT ID 时出错。"
-"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","éªŒè¯ VAT ID 时出错。该顾客å¯å±žäºŽé¡¾å®¢ç¾¤ä½“ %s。"
-"This account is not confirmed.","该å¸æˆ·å°šæœªç¡®è®¤ã€‚"
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","该å¸æˆ·å°šæœªç¡®è®¤ã€‚请 <a href=""%s"">å•å‡»è¿™é‡Œ</a> é‡æ–°å‘é€ç¡®è®¤ç”µå邮件。"
-"This customer email already exists","该客户电å邮件地å€å·²å˜åœ¨"
-"This customer has no saved addresses.","该客户没有ä¿å˜çš„密ç 。"
-"This email does not require confirmation.","该电å邮件ä¸éœ€è¦ç¡®è®¤ã€‚"
-"This email will be sent instead of default welcome email, after account confirmation.","在确认å¸æˆ·åŽï¼Œè¯¥é‚®ä»¶å°†ä»£æ›¿é»˜è®¤æ¬¢è¿Žé‚®ä»¶å‘é€ã€‚"
-"This is My Default %s Address","这是我的默认 %s 地å€"
-"To Cart","到è´ç‰©è½¦"
-"Total","总数"
-"Type","类型"
-"Unable to save the customer.","æ— æ³•ä¿å˜åˆ°å®¢æˆ·ã€‚"
-"Unknown","未知"
-"Unsubscribe from Newsletter","退订新闻邮件"
-"Update","æ›´æ–°"
-"Update customer address data","更新客户地å€æ•°æ®"
-"Update customer data","更新客户数æ®"
-"Use as My Default %s Address","使用并作为我的默认 %s 地å€"
-"Use as My Default Billing Address","用作我的默认账å•åœ°å€"
-"Use as My Default Shipping Address","用作我的默认è¿é€åœ°å€"
-"Use as my default billing address","使用并作为我的默认账å•åœ°å€"
-"Use as my default shipping address","使用并作为我的默认è¿é€åœ°å€"
-"VAT Number","VAT ç¼–å·"
-"VAT Request Date","VAT 请求日期"
-"VAT Request Identifier","VAT ç”³è¯·æ ‡è¯†ç¬¦"
"Validate VAT Number","éªŒè¯ VAT å·ç "
-"Validate on Each Transaction","æ¯æ¬¡äº¤æ˜“都验è¯"
-"Validation Error Group","验è¯é”™è¯¯ç»„"
-"View","查看"
-"View Order","查看订å•"
-"Visitor","访客"
-"Visitors Only","ä»…é™è®¿å®¢"
-"Website","网站"
-"Welcome Email","欢迎邮件"
-"Wishlist","愿望清å•"
-"Wishlist - %d item(s)","æ„¿æœ›æ¸…å• - %d 个项目"
-"Would you like to change the Customer Group for this order?","ä½ æ˜¯å¦æƒ³æ›´æ”¹è¯¥è®¢å•çš„顾客群体？"
-"Wrong confirmation key.","错误的确认密钥。"
-"Wrong customer account specified.","指定的客户å¸æˆ·æœ‰è¯¯ã€‚"
-"Wrong email.","邮件有误。"
-"Wrong transactional account email type","错误的交易账户电å邮件类型"
-"Year (YYYY)","YYYY"
-"Year","å¹´"
-"You are currently not subscribed to any newsletter.","您当å‰æ²¡æœ‰è®¢é˜…任何新闻通讯。"
-"You are currently not subscribed to our newsletter.","您目å‰æ²¡æœ‰è®¢é˜…我们的时事通讯。"
-"You are currently subscribed to 'General Subscription'.","您当å‰å·²è®¢é˜…“常规订阅â€ã€‚"
-"You are currently subscribed to our newsletter.","您当å‰å·²è®¢é˜…我们的新闻通讯。"
-"You are now logged out","您已注销"
-"You have logged out and will be redirected to our homepage in 5 seconds.","您已退出，5秒钟内会回到首页。"
-"You have no additional address entries in your address book.","您的地å€è–„ä¸æ²¡æœ‰é¢å¤–的地å€æ¡ç›®ã€‚"
-"You have no additional entries in your address book.","您的地å€ç°¿é‡Œæœ‰æ²¡æœ‰é¢å¤–çš„æ¡ç›®ã€‚"
-"You have no default billing address in your address book.","您的地å€è–„ä¸æ²¡æœ‰é»˜è®¤è´¦å•åœ°å€ã€‚"
-"You have no default entries in your address book.","您的地å€è–„里没有默认的æ¡ç›®ã€‚"
-"You have no default shipping address in your address book.","您的地å€è–„ä¸æ²¡æœ‰é»˜è®¤è¿é€åœ°å€ã€‚"
-"You have not set a default billing address.","您还没有设置默认的账å•åœ°å€ã€‚"
-"You have not set a default shipping address.","您尚未设置默认的è¿é€åœ°å€ã€‚"
-"You have placed no orders yet.","您还没下过订å•ã€‚"
-"You have placed no products yet.","您尚未放置产å“。"
-"You will be charged tax.","ä½ å°†è¢«æ”¶ç¨Žã€‚"
-"You will not be charged tax.","ä½ ä¸éœ€è¦äº¤ç¨Žã€‚"
-"Your Tax ID cannot be validated.","ä½ çš„çº³ç¨Ž ID æ— æ³•éªŒè¯ã€‚"
-"Your VAT ID was successfully validated.","ä½ çš„ VAT ID å·²æˆåŠŸéªŒè¯ã€‚"
-"Your account balance is: %s","您的账户余é¢ä¸ºï¼š%s"
-"Your password has been updated.","ä½ çš„å¯†ç 已更新。"
-"Your password reset link has expired.","ä½ çš„å¯†ç é‡è®¾é“¾æŽ¥å·²è¿‡æœŸã€‚"
-"ZIP","邮编"
-"ZIP/Post Code","邮政编ç "
-"Zip/Postal Code","邮政编ç "
-"n/a","ä¸å¯ç”¨"
-"or","或"
-"register","注册"
+"Customer Login",客户登录
+"Create New Customer Account",创建新客户å¸æˆ·
+"This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email.","This account is not confirmed.' ' <a href=""%1"">Click here</a> to resend confirmation email."
+"Invalid login or password.",æ— æ•ˆçš„ç™»å½•å或密ç 。
+"There was an error validating the login and password.","There was an error validating the login and password."
+"Login and password are required.",需è¦ç™»å½•å’Œå¯†ç 。
+"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>."
+"There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account."
+"Cannot save the customer.",æ— æ³•ä¿å˜å®¢æˆ·ã€‚
+"Thank you for registering with %1.","Thank you for registering with %1."
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation"
+"If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation"
+"Wrong customer account specified.",指定的客户å¸æˆ·æœ‰è¯¯ã€‚
+"Bad request.",请求有误。
+"This confirmation key is invalid or has expired.","This confirmation key is invalid or has expired."
+"There was an error confirming the account","There was an error confirming the account"
+"Please, check your email for confirmation key.",请检查您的电å邮件以获å–确认密钥。
+"This email does not require confirmation.",该电å邮件ä¸éœ€è¦ç¡®è®¤ã€‚
+"Wrong email.",邮件有误。
+"Please correct the email address.","Please correct the email address."
+"Unable to send password reset email.","Unable to send password reset email."
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Please enter your email.",请输入您的电å邮件。
+"Your password reset link has expired.",ä½ çš„å¯†ç é‡è®¾é“¾æŽ¥å·²è¿‡æœŸã€‚
+"New Password and Confirm New Password values didn't match.","New Password and Confirm New Password values didn't match."
+"New password field cannot be empty.",新密ç å—段ä¸èƒ½ä¸ºç©ºã€‚
+"Your password has been updated.",ä½ çš„å¯†ç 已更新。
+"There was an error saving the new password.","There was an error saving the new password."
+"A problem was encountered trying to change password.","A problem was encountered trying to change password."
+"Confirm your new password","Confirm your new password"
+"Invalid input","Invalid input"
+"The account information has been saved.",å¸æˆ·ä¿¡æ¯å·²ä¿å˜ã€‚
+"The address has been saved.",地å€å·²ä¿å˜ã€‚
+"Cannot save address.",æ— æ³•ä¿å˜åœ°å€ã€‚
+"The address has been deleted.",地å€å·²åˆ 除。
+"An error occurred while deleting the address.",åˆ é™¤è¯¥åœ°å€æ—¶é‡åˆ°äº†é”™è¯¯ã€‚
+"No customer ID defined.","No customer ID defined."
+"Please correct the quote items and try again.","Please correct the quote items and try again."
+"New Group",新组
+"New Customer Groups",新建客户组
+"Edit Group",编辑组
+"Edit Customer Groups",编辑客户组
+"The customer group has been saved.",客户群组已ä¿å˜ã€‚
+"The customer group has been deleted.",å®¢æˆ·ç»„å·²åˆ é™¤ã€‚
+"The customer group no longer exists.","The customer group no longer exists."
+"Manage Customers",管ç†å®¢æˆ·
+"An error occurred while editing the customer.","An error occurred while editing the customer."
+"You saved the customer.","You saved the customer."
+"An error occurred while saving the customer.","An error occurred while saving the customer."
+"Customer will receive an email with a link to reset password.","Customer will receive an email with a link to reset password."
+"An error occurred while resetting customer password.","An error occurred while resetting customer password."
+"A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted."
+"Please select customer(s).","Please select customer(s)."
+"Customers Now Online","Customers Now Online"
+"Online Customers",在线客户
+"No wishlist item ID is defined.","No wishlist item ID is defined."
+"Please load the wish list item.","Please load the wish list item."
+"PHP SOAP extension is required.","PHP SOAP extension is required."
+"Please enter the first name.",请输入åå—。
+"Please enter the last name.",请输入姓æ°ã€‚
+"Please enter the street.",请输入街é“。
+"Please enter the city.",请输入城市。
+"Please enter the telephone number.",请输入电è¯å·ç 。
+"Please enter the zip/postal code.",请输入邮编。
+"Please enter the country.",请输入国家。
+"Please enter the state/province.",请输入州/çœã€‚
+"Per Website",æ¯ç½‘ç«™
+"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.",æ— æ³•å…¨å±€åˆ†äº«å®¢æˆ·å¸æˆ·ï¼Œå› 为æŸäº›å®¢æˆ·çš„å¸æˆ·æ‰€ç”¨çš„邮件地å€åœ¨å¤šä¸ªç½‘站是相åŒçš„ï¼Œæ— æ³•åˆå¹¶ã€‚
+"This account is not confirmed.",该å¸æˆ·å°šæœªç¡®è®¤ã€‚
+"Wrong transactional account email type",错误的交易账户电å邮件类型
+"The first name cannot be empty.",åå—ä¸èƒ½ä¸ºç©ºã€‚
+"The last name cannot be empty.",姓æ°ä¸èƒ½ä¸ºç©ºã€‚
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"The Date of Birth is required.",需æ供生日。
+"The TAX/VAT number is required.","需æä¾› TAX/VAT å·ç 。"
+"Gender is required.",需æ供性别信æ¯ã€‚
+"Invalid password reset token.",æ— æ•ˆçš„å¯†ç é‡è®¾ä»¤ç‰Œã€‚
+"The password must have at least %1 characters.","The password must have at least %1 characters."
+"The password can not begin or end with a space.","The password can not begin or end with a space."
+Admin,管ç†å‘˜
+"Attribute object is undefined","Attribute object is undefined"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" is not a valid image format.","""%1"" is not a valid image format."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Customer email is required",需è¦å®¢æˆ·é‚®ä»¶
+"Customer with the same email already exists in associated website.","Customer with the same email already exists in associated website."
+"Customer website ID must be specified when using the website scope",使用网站范围时必须指定客户网站ID
+"The group ""%1"" cannot be deleted","The group ""%1"" cannot be deleted"
+"Password doesn't match for this account.","Password doesn't match for this account."
+"Customer Group already exists.","Customer Group already exists."
+"VAT Number is Invalid","VAT Number is Invalid"
+"VAT Number is Valid","VAT Number is Valid"
+"Customer Addresses",客户地å€
+"Are you sure you want to delete this address?",您是å¦ç¡®è®¤è¦åˆ 除该地å€ï¼Ÿ
+"Set as Default Billing Address",设置为默认账å•åœ°å€
+"Default Billing Address",默认账å•åœ°å€
+"Set as Default Shipping Address",设置为默认è¿é€åœ°å€
+"Default Shipping Address",默认é€è´§åœ°å€
+"New Customer Address",新建客户地å€
+"Last Logged In:","Last Logged In:"
+"Last Logged In (%1):","Last Logged In (%1):"
+"Confirmed email:","Confirmed email:"
+"Account Created on:","Account Created on:"
+"Account Created on (%1):","Account Created on (%1):"
+"Account Created in:","Account Created in:"
+"Customer Group:","Customer Group:"
+"Sales Statistics",销售数æ®ç»Ÿè®¡
+"Average Sale",å¹³å‡é”€å”®
+"Manage Addresses",管ç†åœ°å€
+"Hello, %1!","Hello, %1!"
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.",在您的我的å¸æˆ·ä»ªè¡¨æ¿ä¸ï¼Œæ‚¨å¯ä»¥æŸ¥çœ‹æœ€è¿‘å¸æˆ·æ´»åŠ¨çš„快照，并更新å¸æˆ·ä¿¡æ¯ã€‚选择下é¢çš„链接以查看或修改信æ¯ã€‚
+"Change Password",更改密ç
+Newsletters,新闻邮件
+"You are currently subscribed to 'General Subscription'.",您当å‰å·²è®¢é˜…“常规订阅â€ã€‚
+"You are currently not subscribed to any newsletter.",您当å‰æ²¡æœ‰è®¢é˜…任何新闻通讯。
+"Default Addresses",默认地å€
+"Change Billing Address",更改账å•åœ°å€
+"You have no default billing address in your address book.",您的地å€è–„ä¸æ²¡æœ‰é»˜è®¤è´¦å•åœ°å€ã€‚
+"Change Shipping Address",更改é€è´§åœ°å€
+"You have no default shipping address in your address book.",您的地å€è–„ä¸æ²¡æœ‰é»˜è®¤è¿é€åœ°å€ã€‚
+"Additional Address Entries",é¢å¤–地å€è¡Œ
+"You have no additional address entries in your address book.",您的地å€è–„ä¸æ²¡æœ‰é¢å¤–的地å€æ¡ç›®ã€‚
+"Use as my default billing address",使用并作为我的默认账å•åœ°å€
+"Use as my default shipping address",使用并作为我的默认è¿é€åœ°å€
+"Save Address",ä¿å˜åœ°å€
+"Go back","Go back"
+"Please enter your email below and we will send you the confirmation link for it.","Please enter your email below and we will send you the confirmation link for it."
+"Send confirmation link",å‘é€ç¡®è®¤é“¾æŽ¥
+"Back to Login",返回到登录界é¢
+"Current Password",当å‰å¯†ç
+"Confirm New Password",确认新密ç
+"Please enter your email address below. You will receive a link to reset your password.",请在下é¢è¾“å…¥ä½ çš„ç”µå邮件地å€ã€‚ä½ å°†æ”¶åˆ°ä¸€ä¸ªé‡ç½®å¯†ç 的链接。
+"Registered Customers",已注册的客户
+"If you have an account with us, log in using your email address.","If you have an account with us, log in using your email address."
+"Subscription option","Subscription option"
+"General Subscription",常规订阅
+"Sign Up for Newsletter",订阅新闻邮件
+"Address Information",地å€ä¿¡æ¯
+"Login Information",登录信æ¯
+"Create account","Create account"
+"Reset a Password",é‡ç½®å¯†ç
+"You have logged out and will be redirected to our homepage in 5 seconds.",您已退出，5秒钟内会回到首页。
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.",通过在我们的店铺ä¸åˆ›å»ºå¸æˆ·ï¼Œæ‚¨å°†èƒ½ç”¨æ›´å¿«é€Ÿåº¦ç»“账，ä¿å˜å¤šä¸ªé€è´§åœ°å€ï¼Œå¹¶å¯åœ¨æ‚¨çš„å¸æˆ·ä¸æŸ¥çœ‹å¹¶è¿½è¸ªæ‚¨çš„订å•ï¼Œè¿˜æœ‰æ›´å¤šåŠŸèƒ½ã€‚
+"Date of Birth",出生日期
+DD,DD
+MM,MM
+YYYY,YYYY
+Gender,性别
+"Tax/VAT number",税/增值税å·ç
+"Subscribe to Newsletter",订阅到新闻通讯
+"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
+"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
+"Email Sender","Email Sender"
+"Customer Configuration","Customer Configuration"
+"Account Sharing Options","Account Sharing Options"
+"Share Customer Accounts","Share Customer Accounts"
+"Online Customers Options","Online Customers Options"
+"Online Minutes Interval","Online Minutes Interval"
+"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
+"Create New Account Options","Create New Account Options"
+"Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
+"Tax Calculation Based On","Tax Calculation Based On"
+"Default Group","Default Group"
+"Group for Valid VAT ID - Domestic","Group for Valid VAT ID - Domestic"
+"Group for Valid VAT ID - Intra-Union","Group for Valid VAT ID - Intra-Union"
+"Group for Invalid VAT ID","Group for Invalid VAT ID"
+"Validation Error Group","Validation Error Group"
+"Validate on Each Transaction","Validate on Each Transaction"
+"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
+"Default Email Domain","Default Email Domain"
+"Default Welcome Email","Default Welcome Email"
+"Require Emails Confirmation","Require Emails Confirmation"
+"Confirmation Link Email","Confirmation Link Email"
+"Welcome Email","Welcome Email"
+"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
+"Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
+"Password Options","Password Options"
+"Forgot Email Template","Forgot Email Template"
+"Remind Email Template","Remind Email Template"
+"Reset Password Template","Reset Password Template"
+"Password Template Email Sender","Password Template Email Sender"
+"Name and Address Options","Name and Address Options"
+"Number of Lines in a Street Address","Number of Lines in a Street Address"
+"Leave empty for default (2). Valid range: 1-4","Leave empty for default (2). Valid range: 1-4"
+"Show Prefix","Show Prefix"
+"The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
+"Prefix Dropdown Options","Prefix Dropdown Options"
+"
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ ","
+ Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+ "
+"Show Middle Name (initial)","Show Middle Name (initial)"
+"Always optional.","Always optional."
+"Show Suffix","Show Suffix"
+"The suffix that goes after name (Jr., Sr., etc.)","The suffix that goes after name (Jr., Sr., etc.)"
+"Suffix Dropdown Options","Suffix Dropdown Options"
+"Show Date of Birth","Show Date of Birth"
+"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show Gender","Show Gender"
+"Login Options","Login Options"
+"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
+"Customer will stay on the current page if ""No"" is selected.","Customer will stay on the current page if ""No"" is selected."
+"Address Templates","Address Templates"
+Group,分组
+"Are you sure you want to delete?","Are you sure you want to delete?"
+"Unsubscribe from Newsletter",退订新闻邮件
+"Assign a Customer Group",分é…客户组
+Phone,Phone
+ZIP,邮编
+"Customer Since",å®¢æˆ·åŠ å…¥æ—¥æœŸ
+n/a,ä¸å¯ç”¨
+"Session Start Time",会è¯å¼€å§‹æ—¶é—´
+"Last Activity",上次活动
+"Last URL",最åŽä¸€ä¸ªURL
+"Edit Account Information",修改å¸æˆ·ä¿¡æ¯
+"Forgot Your Password",忘记您的密ç
+"Password forgotten",密ç 忘记
+"My Dashboard",我的仪表æ¿
+"You are now logged out",您已注销
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index adcd00e88b0..d9b66676627 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -30,7 +30,7 @@
<argument name="class" xsi:type="string">account</argument>
</action>
</referenceBlock>
- <referenceContainer name="left">
+ <referenceContainer name="sidebar.main">
<block class="Magento\Framework\View\Element\Html\Links" name="customer_account_navigation" before="-" template="Magento_Customer::account/navigation.phtml">
<block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-account-link">
<arguments>
@@ -52,5 +52,4 @@
</block>
</block>
</referenceContainer>
- <move element="catalog.compare.sidebar" destination="left"/>
</layout>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index cf03bf61b6e..583d8de113e 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -28,7 +28,7 @@ if ($this->isLoggedIn()) {
$dataPostParam = sprintf(" data-post='%s'", $this->getPostParams());
}
?>
-<li>
+<li class="authorization-link">
<a <?php echo $this->getLinkAttributes(); ?><?php echo $dataPostParam; ?>>
<?php echo $this->escapeHtml($this->getLabel()); ?>
</a>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
index 241998216e7..d0dbc9741ed 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="secondary"><a class="action back" href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a></div>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 2bde8891dcb..f1b08dcae13 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -94,7 +94,7 @@
</div>
</div>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="primary">
<button type="button" role="add-address" title="<?php echo __('Add New Address') ?>" class="action primary add"><span><?php echo __('Add New Address') ?></span></button>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 134e5aaf64e..e33005da720 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -133,7 +133,7 @@
<input type="hidden" name="default_shipping" value="1">
<?php endif; ?>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action save primary" data-action="save-address" title="<?php echo __('Save Address') ?>">
<span><?php echo __('Save Address') ?></span>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
index 63f046caf50..b1e4fccaf69 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
@@ -32,7 +32,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action send primary"><span><?php echo __('Send confirmation link') ?></span></button>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index 2a07ade97d9..a66afc07a49 100755
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -74,7 +74,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action save primary" title="<?php echo __('Save') ?>"><span><?php echo __('Save') ?></span></button>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
index 3786402cb31..d000fde0500 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
@@ -37,7 +37,7 @@
</div>
<?php echo $this->getChildHtml('form_additional_info'); ?>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action submit primary"><span><?php echo __('Submit') ?></span></button>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
index 0969ca466a6..26f711f7c40 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -56,7 +56,7 @@
</div>
</div>
<?php echo $this->getChildHtml('form_additional_info'); ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php echo __('Login') ?></span></button></div>
<div class="secondary"><a class="action remind" href="<?php echo $this->getForgotPasswordUrl() ?>"><span><?php echo __('Forgot Your Password?') ?></span></a></div>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
index fce200384c1..66643d94ef1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
@@ -34,7 +34,7 @@
<?php /* Extensions placeholder */ ?>
<?php echo $this->getChildHtml('customer.form.newsletter.extra')?>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary"><button type="submit" title="<?php echo __('Save') ?>" class="action save primary"><span><?php echo __('Save') ?></span></button></div>
<div class="secondary"><a class="action back" href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a></div>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 53ec046147a..ddbc6c2b163 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -163,7 +163,7 @@
</div>
<?php echo $this->getChildHtml('form_additional_info'); ?>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action submit primary" title="<?php echo __('Create account') ?>"><span><?php echo __('Create account') ?></span></button>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
index dc401a3bdd0..07d43f9c4af 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -43,7 +43,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" title="<?php echo __('Reset a Password'); ?>" class="action submit primary"><span><?php echo __('Reset a Password'); ?></span></button>
</div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
index 64dae95d6ef..e43da44ee92 100644
--- a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
@@ -34,7 +34,7 @@
<div class="title"><strong><?php echo __('New Customers') ?></strong></div>
<div class="content">
<p><?php echo __('By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.') ?></p>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<a href="<?php echo $this->getCreateAccountUrl() ?>" class="action create primary"><span><?php echo __('Register') ?></span></a>
</div>
diff --git a/app/code/Magento/CustomerImportExport/i18n/de_DE.csv b/app/code/Magento/CustomerImportExport/i18n/de_DE.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/de_DE.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/CustomerImportExport/i18n/en_US.csv b/app/code/Magento/CustomerImportExport/i18n/en_US.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/en_US.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/CustomerImportExport/i18n/es_ES.csv b/app/code/Magento/CustomerImportExport/i18n/es_ES.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/es_ES.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/CustomerImportExport/i18n/fr_FR.csv b/app/code/Magento/CustomerImportExport/i18n/fr_FR.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/fr_FR.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/CustomerImportExport/i18n/nl_NL.csv b/app/code/Magento/CustomerImportExport/i18n/nl_NL.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/nl_NL.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/CustomerImportExport/i18n/pt_BR.csv b/app/code/Magento/CustomerImportExport/i18n/pt_BR.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/pt_BR.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/CustomerImportExport/i18n/zh_CN.csv b/app/code/Magento/CustomerImportExport/i18n/zh_CN.csv
new file mode 100644
index 00000000000..d1c02bb98f9
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/i18n/zh_CN.csv
@@ -0,0 +1,17 @@
+"Website is not specified","Website is not specified"
+"E-mail is not specified","E-mail is not specified"
+"Invalid value in website column","Invalid value in website column"
+"E-mail is invalid","E-mail is invalid"
+"Required attribute '%s' has an empty value","Required attribute '%s' has an empty value"
+"Customer with such email and website code doesn't exist","Customer with such email and website code doesn't exist"
+"Customer address id column is not specified","Customer address id column is not specified"
+"Customer address for such customer doesn't exist","Customer address for such customer doesn't exist"
+"Region is invalid","Region is invalid"
+"Row with such email, website and address id combination was already found.","Row with such email, website and address id combination was already found."
+"E-mail is duplicated in import file","E-mail is duplicated in import file"
+"Orphan rows that will be skipped due default row errors","Orphan rows that will be skipped due default row errors"
+"Invalid value in Store column (store does not exists?)","Invalid value in Store column (store does not exists?)"
+"E-mail and website combination is not found","E-mail and website combination is not found"
+"Invalid password length","Invalid password length"
+CSV,CSV
+"Excel XML","Excel XML"
diff --git a/app/code/Magento/DesignEditor/README.md b/app/code/Magento/DesignEditor/README.md
new file mode 100644
index 00000000000..19009d24e4b
--- /dev/null
+++ b/app/code/Magento/DesignEditor/README.md
@@ -0,0 +1 @@
+The Design Editor module provides a way to manage and edit look and feel of a theme using UI.
\ No newline at end of file
diff --git a/app/code/Magento/DesignEditor/etc/di.xml b/app/code/Magento/DesignEditor/etc/di.xml
index 1cc3fe387a1..4caf200ef89 100644
--- a/app/code/Magento/DesignEditor/etc/di.xml
+++ b/app/code/Magento/DesignEditor/etc/di.xml
@@ -27,6 +27,7 @@
<type name="Magento\DesignEditor\Controller\Varien\Router\Standard">
<arguments>
<argument name="routerId" xsi:type="string">vde</argument>
+ <argument name="session" xsi:type="object">Magento\Backend\Model\Auth\Session\Proxy</argument>
</arguments>
</type>
<type name="Magento\Theme\Model\CopyService">
@@ -57,4 +58,9 @@
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
+ <type name="Magento\DesignEditor\Model\State">
+ <arguments>
+ <argument name="backendSession" xsi:type="object">Magento\Backend\Model\Session\Proxy</argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/code/Magento/DesignEditor/i18n/de_DE.csv b/app/code/Magento/DesignEditor/i18n/de_DE.csv
new file mode 100644
index 00000000000..b309255de95
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/de_DE.csv
@@ -0,0 +1,148 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
diff --git a/app/code/Magento/DesignEditor/i18n/en_US.csv b/app/code/Magento/DesignEditor/i18n/en_US.csv
new file mode 100644
index 00000000000..083a151433e
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/en_US.csv
@@ -0,0 +1,149 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
diff --git a/app/code/Magento/DesignEditor/i18n/es_ES.csv b/app/code/Magento/DesignEditor/i18n/es_ES.csv
new file mode 100644
index 00000000000..b309255de95
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/es_ES.csv
@@ -0,0 +1,148 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
diff --git a/app/code/Magento/DesignEditor/i18n/fr_FR.csv b/app/code/Magento/DesignEditor/i18n/fr_FR.csv
new file mode 100644
index 00000000000..b309255de95
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/fr_FR.csv
@@ -0,0 +1,148 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
diff --git a/app/code/Magento/DesignEditor/i18n/nl_NL.csv b/app/code/Magento/DesignEditor/i18n/nl_NL.csv
new file mode 100644
index 00000000000..b309255de95
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/nl_NL.csv
@@ -0,0 +1,148 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
diff --git a/app/code/Magento/DesignEditor/i18n/pt_BR.csv b/app/code/Magento/DesignEditor/i18n/pt_BR.csv
new file mode 100644
index 00000000000..b309255de95
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/pt_BR.csv
@@ -0,0 +1,148 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
diff --git a/app/code/Magento/DesignEditor/i18n/zh_CN.csv b/app/code/Magento/DesignEditor/i18n/zh_CN.csv
new file mode 100644
index 00000000000..b309255de95
--- /dev/null
+++ b/app/code/Magento/DesignEditor/i18n/zh_CN.csv
@@ -0,0 +1,148 @@
+Remove,Remove
+Cancel,Cancel
+Back,Back
+No,No
+Edit,Edit
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+Error,Error
+title,title
+"Magento Admin Panel","Magento Admin Panel"
+"Please wait...","Please wait..."
+Loading...,Loading...
+OK,OK
+"Collapse All","Collapse All"
+"Expand All","Expand All"
+"Delete Folder","Delete Folder"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+Folder,Folder
+"Store Designer","Store Designer"
+"Element ""%1"" is not found in ""%2"".","Element ""%1"" is not found in ""%2""."
+"Component of the type ""%1"" is not found between elements of ""%2""","Component of the type ""%1"" is not found between elements of ""%2"""
+"Restore last saved version of theme","Restore last saved version of theme"
+"Restore theme defaults","Restore theme defaults"
+"Do you want to restore the version saved at %1?","Do you want to restore the version saved at %1?"
+"Restore Theme Version","Restore Theme Version"
+"Do you want to restore the theme defaults?","Do you want to restore the theme defaults?"
+"Restore Theme Defaults","Restore Theme Defaults"
+Assign,Assign
+"Save & Assign","Save & Assign"
+"You changed the design of your live store. Are you sure you want to do that?","You changed the design of your live store. Are you sure you want to do that?"
+"Are you sure you want to change the theme of your live store?","Are you sure you want to change the theme of your live store?"
+"Are you sure you want this theme to replace your current theme?","Are you sure you want this theme to replace your current theme?"
+"Do you want to use this theme in your live store?","Do you want to use this theme in your live store?"
+"Quick Styles","Quick Styles"
+Block,Block
+Settings,Settings
+Advanced,Advanced
+CSS,CSS
+JS,JS
+"Custom CSS","Custom CSS"
+"Image Sizing","Image Sizing"
+"Sorry, but you cannot resize images for this theme.","Sorry, but you cannot resize images for this theme."
+"Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file.","Please enter values for height and width.' ' Use the chain icon if you want height and width to match.' ' Be sure to see how it looks in your store.' ' You may need to update your custom CSS file."
+Update,Update
+"Add white borders to images that are smaller than the container.","Add white borders to images that are smaller than the container."
+"If an image is too big,' ' we automatically make it smaller and add white borders to fill the container.","If an image is too big,' ' we automatically make it smaller and add white borders to fill the container."
+"Reset to Original","Reset to Original"
+"Select JS Files to Upload","Select JS Files to Upload"
+"These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?","These JavaScript files may change the appearance of your live store(s).' ' Are you sure you want to do this?"
+"Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible.","Are you sure you want to delete this JavaScript file?' ' The changes to your theme will not be reversible."
+"Custom javascript files","Custom javascript files"
+"CSS Editor ","CSS Editor "
+Header,Header
+Backgrounds,Backgrounds
+"Buttons & Icons","Buttons & Icons"
+"Tips & Messages","Tips & Messages"
+Fonts,Fonts
+"We found an invalid block of class ""%1"". Please define the required properties.","We found an invalid block of class ""%1"". Please define the required properties."
+Duplicate,Duplicate
+"You chose a new theme for your live store. Click ""OK"" to replace your current theme.","You chose a new theme for your live store. Click ""OK"" to replace your current theme."
+"You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes.""","You chose a theme for your new store. Click ""OK"" to go live. You can always modify or switch themes in ""My Customizations"" and ""Available Themes."""
+"Assign to a Store View","Assign to a Store View"
+"Assign New Theme","Assign New Theme"
+"Themes Assigned to Store Views","Themes Assigned to Store Views"
+"Available Themes","Available Themes"
+"Themes Not Assigned to Store Views","Themes Not Assigned to Store Views"
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Delete %1 Theme","Delete %1 Theme"
+"My Customizations","My Customizations"
+"Sorry, but we can't load the theme list.","Sorry, but we can't load the theme list."
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"You assigned a new theme to your store view.","You assigned a new theme to your store view."
+"You assigned a theme to your live store.","You assigned a theme to your live store."
+"This theme is not assigned.","This theme is not assigned."
+"Sorry, but you can't edit theme ""%1"".","Sorry, but you can't edit theme ""%1""."
+"This theme is not saved.","This theme is not saved."
+"You updated your live store.","You updated your live store."
+"You saved updates to this theme.","You saved updates to this theme."
+"Copy of [%1]","Copy of [%1]"
+"You saved a duplicate copy of this theme in ""My Customizations.""","You saved a duplicate copy of this theme in ""My Customizations."""
+"You cannot duplicate this theme.","You cannot duplicate this theme."
+"Theme ""%1"" is not editable.","Theme ""%1"" is not editable."
+"Theme ""%1"" reverted to last saved state","Theme ""%1"" reverted to last saved state"
+"Theme ""%1"" reverted to last default state","Theme ""%1"" reverted to last default state"
+"Unknown error","Unknown error"
+"We can't find this theme.","We can't find this theme."
+"We can't load the list of themes.","We can't load the list of themes."
+"You updated the custom.css file.","You updated the custom.css file."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"You updated the %1 file.","You updated the %1 file."
+"We can't save the custom css file.","We can't save the custom css file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"We saved the image sizes.","We saved the image sizes."
+"We can't save image sizes.","We can't save image sizes."
+"Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG).","Something went wrong uploading the image.' ' Please check the file format and try again (JPEG, GIF, or PNG)."
+"The file can't be found or edited.","The file can't be found or edited."
+"This theme is not assigned to a store view #%1.","This theme is not assigned to a store view #%1."
+"Sorry, but you cannot edit these theme styles.","Sorry, but you cannot edit these theme styles."
+"We can't find theme ""%1"".","We can't find theme ""%1""."
+"Wrong theme type set as editable","Wrong theme type set as editable"
+"Theme has not been set","Theme has not been set"
+"Upload an Image","Upload an Image"
+"Please assign this theme to a store view and upload your store logo.","Please assign this theme to a store view and upload your store logo."
+"Upload a Logo","Upload a Logo"
+"Close Panel","Close Panel"
+"Page Text","Page Text"
+"Variable Text","Variable Text"
+"Alternative Text","Alternative Text"
+"Toggle Page Text","Toggle Page Text"
+"(Hold down button for options)","(Hold down button for options)"
+"Edit Text","Edit Text"
+"Close Message","Close Message"
+"Update the CSS code to overwrite the default styles or upload your own CSS file.","Update the CSS code to overwrite the default styles or upload your own CSS file."
+"Upload File","Upload File"
+"Upload Custom CSS","Upload Custom CSS"
+"Download File","Download File"
+"Image Assets","Image Assets"
+"Font Assets","Font Assets"
+"Add Files","Add Files"
+"Drag and drop files to reorder them.","Drag and drop files to reorder them."
+"We found no javascript files.","We found no javascript files."
+"Files Uploaded","Files Uploaded"
+"Insert file","Insert file"
+"Delete file","Delete file"
+"Browse Files","Browse Files"
+"Upload Files","Upload Files"
+"Create Folder","Create Folder"
+"Edit Theme Name","Edit Theme Name"
+"Assigned to: ","Assigned to: "
+"There are no customized themes.","There are no customized themes."
+"Choose the store views you want to update.","Choose the store views you want to update."
+"Edit Theme","Edit Theme"
+"When you edit a theme, we save it as a unique version in ""My Customizations.""","When you edit a theme, we save it as a unique version in ""My Customizations."""
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"We could not detect a size.","We could not detect a size."
diff --git a/app/code/Magento/Dhl/i18n/de_DE.csv b/app/code/Magento/Dhl/i18n/de_DE.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/de_DE.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Dhl/i18n/en_US.csv b/app/code/Magento/Dhl/i18n/en_US.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/en_US.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Dhl/i18n/es_ES.csv b/app/code/Magento/Dhl/i18n/es_ES.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/es_ES.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Dhl/i18n/fr_FR.csv b/app/code/Magento/Dhl/i18n/fr_FR.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/fr_FR.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Dhl/i18n/nl_NL.csv b/app/code/Magento/Dhl/i18n/nl_NL.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/nl_NL.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Dhl/i18n/pt_BR.csv b/app/code/Magento/Dhl/i18n/pt_BR.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/pt_BR.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Dhl/i18n/zh_CN.csv b/app/code/Magento/Dhl/i18n/zh_CN.csv
new file mode 100644
index 00000000000..296ef09b6b8
--- /dev/null
+++ b/app/code/Magento/Dhl/i18n/zh_CN.csv
@@ -0,0 +1,79 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exceeds %1 %2 to ensure accurate calculation of shipping charges."
+"Wrong Content Type","Wrong Content Type"
+Pounds,Pounds
+Kilograms,Kilograms
+Inches,Inches
+Centimeters,Centimeters
+inch,inch
+cm,cm
+Height,Height
+Depth,Depth
+Width,Width
+Regular,Regular
+Specific,Specific
+"Easy shop","Easy shop"
+Sprintline,Sprintline
+Secureline,Secureline
+"Express easy","Express easy"
+Europack,Europack
+"Break bulk express","Break bulk express"
+"Medical express","Medical express"
+"Express worldwide","Express worldwide"
+"Express 9:00","Express 9:00"
+"Express 10:30","Express 10:30"
+"Domestic economy select","Domestic economy select"
+"Economy select","Economy select"
+"Break bulk economy","Break bulk economy"
+"Domestic express","Domestic express"
+Others,Others
+"Globalmail business","Globalmail business"
+"Same day","Same day"
+"Express 12:00","Express 12:00"
+"Express envelope","Express envelope"
+"Customer services","Customer services"
+Jetline,Jetline
+"Freight worldwide","Freight worldwide"
+"Jumbo box","Jumbo box"
+"DHL service is not available at %s date","DHL service is not available at %s date"
+"The response is in wrong format.","The response is in wrong format."
+"Error #%1 : %2","Error #%1 : %2"
+"We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency).","We had to skip DHL method %1 because we couldn't find exchange rate %2 (Base Currency)."
+"Zero shipping charge for '%1'","Zero shipping charge for '%1'"
+DHL,DHL
+"Cannot identify measure unit for %1","Cannot identify measure unit for %1"
+"Cannot identify weight unit for %1","Cannot identify weight unit for %1"
+"There is no items in this order","There is no items in this order"
+"Please, specify origin country","Please, specify origin country"
+Documents,Documents
+"Non Documents","Non Documents"
+"Height, width and length should be equal or greater than %1","Height, width and length should be equal or greater than %1"
+"Wrong Region","Wrong Region"
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Response is in the wrong format","Response is in the wrong format"
+"No packages for request","No packages for request"
+"Non documents","Non documents"
+Size,Size
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Access ID","Access ID"
+"Account Number","Account Number"
+"Content Type","Content Type"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
+"Handling Fee","Handling Fee"
+"Divide Order Weight","Divide Order Weight"
+"This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","This allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
diff --git a/app/code/Magento/Directory/i18n/de_DE.csv b/app/code/Magento/Directory/i18n/de_DE.csv
index b6c8aa2a10f..5672c2d46fa 100644
--- a/app/code/Magento/Directory/i18n/de_DE.csv
+++ b/app/code/Magento/Directory/i18n/de_DE.csv
@@ -1,50 +1,42 @@
-"-- Please select --","-Bitte wählen -"
-"Allowed Currencies","Zulässige Währungen"
-"Base Currency","Basiswährung"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","Die Basiswährung wird für alle Online-Transaktionen verwendet. Der Spielraum richtet sich nach dem Spielraum des Katalogpreises (""Katalog"" > ""Preis"" > ""Spielraum Katalogpreis"")."
-"Can't convert rate from ""%s-%s"".","Rate kann nicht von ""%s-%s"" konvertiert werden.
-
-
-
-"
-"Cannot retrieve rate from %s.","Kurs von %s kann nicht abgefragt werden."
-"Connection Timeout in Seconds","Verbindungstimeout in Sekunden"
-"Continue »","» fortsetzen;"
-"Country","Land"
-"Country API","Land API"
-"Country and Format Type combination should be unique","Die Kombination aus Land und Formattyp sollte unverwechselbar sein"
-"Currency","Währung"
-"Currency Options","Währung Optionen"
-"Currency Setup","Währung Setup"
-"Currency Update Warnings","Währung Aktualisierung Warnungen"
-"Default Display Currency","Angezeigte Standardwährung"
-"Directory","Verzeichnis"
-"Display not required State","Anzeige nicht erforderlich Status"
-"Enabled","Aktiviert"
-"Error Email Recipient","Fehler E-Mail Empfänger"
-"Error Email Sender","Fehler E-Mail Absender"
-"Error Email Template","Fehler E-Mail Vorlage"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,"Bundesstaat/ Provinz"
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,Währung
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
"FATAL ERROR:","SCHWERWIEGENER FEHLER:"
-"Frequency","Frequenz"
-"Installed Currencies","Installierte Währungen"
-"Invalid Import Service specified.","Ungültiger Importservice gewählt."
-"Invalid country code: %s","Ungültiger Länder-Code: %s"
-"Invalid rates received","Ungültige Kurse erhalten"
-"Invalid target currency.","Ungültige Zielwährung."
-"List of countries","Länderverzeichnis"
-"List of regions in specified country","Liste der Regionen in einem gewählten Land"
-"Postal Code is Optional for the following countries","Für folgende Länder ist die Postleitzahl optional"
-"Region","Region"
-"Region API","Region API"
-"Scheduled Import Settings","Geplanter Import Einstellungen"
-"Select Your Currency","Wählen Sie Ihr Land aus"
-"Service","Service"
-"Start Time","Startzeit"
-"State is required for","Status ist erforderlich für"
-"State/Province","Bundesstaat/ Provinz"
-"States Options","Status-Optionen"
-"Unable to initialize the import model.","Import-Model konnte nicht initialisiert werden."
-"Undefined rate from ""%s-%s"".","Nicht definierter Satz von ""%s-%s""."
-"WARNING:","WARNUNG:"
-"Webservicex","Webservicex"
-"Your current currency is: %s","Ihre aktuelle Währung ist: %s"
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,WARNUNG:
+"Please correct the country code: %1.","Please correct the country code: %1."
+"Country and Format Type combination should be unique","Die Kombination aus Land und Formattyp sollte unverwechselbar sein"
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
+"Currency Setup","Currency Setup"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
+"Default Display Currency","Default Display Currency"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+Service,Service
+"Installed Currencies","Installed Currencies"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Directory/i18n/en_US.csv b/app/code/Magento/Directory/i18n/en_US.csv
index 378254779cf..404b8cbe445 100644
--- a/app/code/Magento/Directory/i18n/en_US.csv
+++ b/app/code/Magento/Directory/i18n/en_US.csv
@@ -1,47 +1,42 @@
-"-- Please select --","-- Please select --"
-"Allowed Currencies","Allowed Currencies"
-"Base Currency","Base Currency"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"")."
-"Can't convert rate from ""%s-%s"".","Can't convert rate from ""%s-%s""."
-"Cannot retrieve rate from %s.","Cannot retrieve rate from %s."
-"Connection Timeout in Seconds","Connection Timeout in Seconds"
-"Continue »","Continue »"
-"Country","Country"
-"Country API","Country API"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,State/Province
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,Currency
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
+"FATAL ERROR:","FATAL ERROR:"
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,WARNING:
+"Please correct the country code: %1.","Please correct the country code: %1."
"Country and Format Type combination should be unique","Country and Format Type combination should be unique"
-"Currency","Currency"
-"Currency Options","Currency Options"
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
"Currency Setup","Currency Setup"
-"Currency Update Warnings","Currency Update Warnings"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
"Default Display Currency","Default Display Currency"
-"Directory","Directory"
-"Display not required State","Display not required State"
-"Enabled","Enabled"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
"Error Email Recipient","Error Email Recipient"
"Error Email Sender","Error Email Sender"
"Error Email Template","Error Email Template"
-"FATAL ERROR:","FATAL ERROR:"
-"Frequency","Frequency"
+Service,Service
"Installed Currencies","Installed Currencies"
-"Invalid Import Service specified.","Invalid Import Service specified."
-"Invalid country code: %s","Invalid country code: %s"
-"Invalid rates received","Invalid rates received"
-"Invalid target currency.","Invalid target currency."
-"List of countries","List of countries"
-"List of regions in specified country","List of regions in specified country"
-"Postal Code is Optional for the following countries","Postal Code is Optional for the following countries"
-"Region","Region"
-"Region API","Region API"
-"Scheduled Import Settings","Scheduled Import Settings"
-"Select Your Currency","Select Your Currency"
-"Service","Service"
-"Start Time","Start Time"
-"State is required for","State is required for"
-"State/Province","State/Province"
-"States Options","States Options"
-"Strikeiron Email Update Warnings","Strikeiron Email Update Warnings"
-"Unable to initialize the import model.","Unable to initialize the import model."
-"Undefined rate from ""%s-%s"".","Undefined rate from ""%s-%s""."
-"WARNING:","WARNING:"
-"Webservicex","Webservicex"
-"Your current currency is: %s","Your current currency is: %s"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Directory/i18n/es_ES.csv b/app/code/Magento/Directory/i18n/es_ES.csv
index 877e6e69984..e6edc540222 100644
--- a/app/code/Magento/Directory/i18n/es_ES.csv
+++ b/app/code/Magento/Directory/i18n/es_ES.csv
@@ -1,46 +1,42 @@
-"-- Please select --","-- Por favor seleccione --"
-"Allowed Currencies","Divisas permitidas"
-"Base Currency","Divisa base"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","La divisa base se utiliza en todas las transacciones de pago en lÃnea. El alcance queda definido por el alcance del precio del catálogo ((""Catálogo"" > ""Precio"" > ""Alcance del Precio del Catálogo"")."
-"Can't convert rate from ""%s-%s"".","No se puede convertir la tarifa de ""%s-%s""."
-"Cannot retrieve rate from %s.","No se puede obtener el tipo de cambio de %s."
-"Connection Timeout in Seconds","Plazo de expiración de la conexión en segundos"
-"Continue »","Seguir >"
-"Country","PaÃs"
-"Country API","API de paÃs"
-"Country and Format Type combination should be unique","La combinación de tipo de formato y paÃs debe ser única"
-"Currency","Divisa"
-"Currency Options","Opciones de divisas"
-"Currency Setup","Configuración de divisas"
-"Currency Update Warnings","Avisos de actualización de divisas"
-"Default Display Currency","Divisa para mostrar por omisión"
-"Directory","Directorio"
-"Display not required State","Mostrar Estado no necesario"
-"Enabled","Habilitado"
-"Error Email Recipient","Error en el destinatario del mensaje"
-"Error Email Sender","Error en el remitente del mensaje"
-"Error Email Template","Error en la plantilla del mensaje"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,Estado/Provincia
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,Divisa
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
"FATAL ERROR:","ERROR FATAL:"
-"Frequency","Frecuencia"
-"Installed Currencies","Divisas instaladas"
-"Invalid Import Service specified.","Ha indicado un servicio de importación incorrecto."
-"Invalid country code: %s","Código de divisa incorrecto: %s"
-"Invalid rates received","Se han recibido tipos de cambio incorrectos"
-"Invalid target currency.","Divisa final incorrecta."
-"List of countries","Lista de paÃses"
-"List of regions in specified country","Lista de regiones del paÃs indicado"
-"Postal Code is Optional for the following countries","El código postal es opcional para los paÃses siguientes"
-"Region","Región"
-"Region API","API de región"
-"Scheduled Import Settings","Configuración de la importación programada"
-"Select Your Currency","Elija su divisa"
-"Service","Servicio"
-"Start Time","Tiempo de inicio."
-"State is required for","Se necesita el Estado para"
-"State/Province","Estado/Provincia"
-"States Options","Opciones de Estados"
-"Unable to initialize the import model.","No se puede inicializar el modelo de importación"
-"Undefined rate from ""%s-%s"".","Tipo de cambio de ""%s-%s"" sin definir."
-"WARNING:","AVISO:"
-"Webservicex","Webservicex"
-"Your current currency is: %s","Su divisa actual es: %s"
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,AVISO:
+"Please correct the country code: %1.","Please correct the country code: %1."
+"Country and Format Type combination should be unique","La combinación de tipo de formato y paÃs debe ser única"
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
+"Currency Setup","Currency Setup"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
+"Default Display Currency","Default Display Currency"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+Service,Service
+"Installed Currencies","Installed Currencies"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Directory/i18n/fr_FR.csv b/app/code/Magento/Directory/i18n/fr_FR.csv
index ce5d4b714cc..b5f66c26efd 100644
--- a/app/code/Magento/Directory/i18n/fr_FR.csv
+++ b/app/code/Magento/Directory/i18n/fr_FR.csv
@@ -1,46 +1,42 @@
-"-- Please select --","-- Veuillez sélectionner --"
-"Allowed Currencies","Devises autorisées"
-"Base Currency","Devise de base"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","La monnaie de base est utilisée pour tous les paiements en ligne. Le champ est défini par l'étendue des prix du catalogue"
-"Can't convert rate from ""%s-%s"".","Impossible de convertir le taux depuis « %s-%s ». "
-"Cannot retrieve rate from %s.","Ne peut extraire taux du %s."
-"Connection Timeout in Seconds","Interruption connexion en secondes"
-"Continue »","Continue »"
-"Country","Pays"
-"Country API","API Pays"
-"Country and Format Type combination should be unique","Pays et combinaison de type de format devrait être unique"
-"Currency","Devise"
-"Currency Options","Options devise"
-"Currency Setup","Mise en place devise"
-"Currency Update Warnings","Mises en garde mise à jour devise"
-"Default Display Currency","Devise affichée par défaut"
-"Directory","Répertoire"
-"Display not required State","Etat non requis"
-"Enabled","Activé"
-"Error Email Recipient","Erreur de destinataire courriel"
-"Error Email Sender","Erreur d'expéditeur courriel"
-"Error Email Template","Erreur de modèle de courriel"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,État/province
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,Devise
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
"FATAL ERROR:","ERREUR FATALE:"
-"Frequency","Fréquence"
-"Installed Currencies","Devises en place"
-"Invalid Import Service specified.","Service d'import invalide spécifié."
-"Invalid country code: %s","Mauvais code pays: %s"
-"Invalid rates received","Taux invalides reçus"
-"Invalid target currency.","Devise cible invalide."
-"List of countries","Liste de pays"
-"List of regions in specified country","Liste de régions dans le pays spécifié"
-"Postal Code is Optional for the following countries","Code postal optionnel pour les pays suivants"
-"Region","Région"
-"Region API","API Région"
-"Scheduled Import Settings","Paramètres import programmé"
-"Select Your Currency","Sélectionnez votre devise"
-"Service","Service"
-"Start Time","Heure commencement"
-"State is required for","L'Etat est requis pour"
-"State/Province","État/province"
-"States Options","Options d'Etat"
-"Unable to initialize the import model.","Ne peut initialiser le modèle d'import."
-"Undefined rate from ""%s-%s"".","Taux non défini de ""%s-%s""."
-"WARNING:","AVERTISSEMENT:"
-"Webservicex","Webservicex"
-"Your current currency is: %s","Votre devise actuelle est: %s"
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,AVERTISSEMENT:
+"Please correct the country code: %1.","Please correct the country code: %1."
+"Country and Format Type combination should be unique","Pays et combinaison de type de format devrait être unique"
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
+"Currency Setup","Currency Setup"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
+"Default Display Currency","Default Display Currency"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+Service,Service
+"Installed Currencies","Installed Currencies"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Directory/i18n/nl_NL.csv b/app/code/Magento/Directory/i18n/nl_NL.csv
index d50f01f2ad0..2e035054ada 100644
--- a/app/code/Magento/Directory/i18n/nl_NL.csv
+++ b/app/code/Magento/Directory/i18n/nl_NL.csv
@@ -1,46 +1,42 @@
-"-- Please select --","-- Selecteer a.u.b. --"
-"Allowed Currencies","Toegestane Munteenheden"
-"Base Currency","Basis Munteenheid"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","Basis munteenheid wordt gebruikt voor alle online betalingstransacties. Reikwijdte is gedefinieerd door de catalogus prijsreikwijdte (""Catalogus"" > ""Prijs"" > ""Catalogus prijsreikwijdte"")."
-"Can't convert rate from ""%s-%s"".","Kan tarief niet omzetten van ""%s-%s""."
-"Cannot retrieve rate from %s.","Kan koers niet terughalen van %s."
-"Connection Timeout in Seconds","Connectie Timeout in Secondes"
-"Continue »","Ga verder »"
-"Country","Land"
-"Country API","Land API"
-"Country and Format Type combination should be unique","Land en Format Type combinatie behoren uniek te zijn"
-"Currency","Munteenheid"
-"Currency Options","Munteenheid Opties"
-"Currency Setup","Munteenheid Setup"
-"Currency Update Warnings","Munteenheid Update Waarschuwing"
-"Default Display Currency","Standaard Weergave Munteindheid"
-"Directory","Directory"
-"Display not required State","Weergave niet benodigd Fase"
-"Enabled","Aan"
-"Error Email Recipient","Foutmelding Email Ontvanger"
-"Error Email Sender","Foutmelding Email Verstuurder"
-"Error Email Template","Foutmelding Email Template"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,Staat/Provincie
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,Munteenheid
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
"FATAL ERROR:","FATALE FOUTMELDING:"
-"Frequency","Frequentie"
-"Installed Currencies","Geïnstalleerde Munteenheden"
-"Invalid Import Service specified.","Ongeldige Import Service aangegeven."
-"Invalid country code: %s","Ongeldige landen code: %s"
-"Invalid rates received","Ongeldige tarieven ontvangen"
-"Invalid target currency.","Ongeldige doelvaluta."
-"List of countries","Lijst van landen"
-"List of regions in specified country","Lijst van regio's in het gespecificeerde land"
-"Postal Code is Optional for the following countries","Postcode is Optioneel voor de volgende landen"
-"Region","Regio"
-"Region API","Regio API"
-"Scheduled Import Settings","Geplande Import Instellingen"
-"Select Your Currency","Selecteer Uw Valuta"
-"Service","Service"
-"Start Time","Begintijd"
-"State is required for","Fase is benodigd voor"
-"State/Province","Staat/Provincie"
-"States Options","Fase Opties"
-"Unable to initialize the import model.","Kan het importmodel niet initialiseren."
-"Undefined rate from ""%s-%s"".","Niet gedefinieerde koers van ""%s-%s""."
-"WARNING:","WAARSCHUWING:"
-"Webservicex","Webservicex"
-"Your current currency is: %s","Uw huidige valuta is %s"
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,WAARSCHUWING:
+"Please correct the country code: %1.","Please correct the country code: %1."
+"Country and Format Type combination should be unique","Land en Format Type combinatie behoren uniek te zijn"
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
+"Currency Setup","Currency Setup"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
+"Default Display Currency","Default Display Currency"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+Service,Service
+"Installed Currencies","Installed Currencies"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Directory/i18n/pt_BR.csv b/app/code/Magento/Directory/i18n/pt_BR.csv
index 4cd0b3dd4a2..e40bfbf2f8c 100644
--- a/app/code/Magento/Directory/i18n/pt_BR.csv
+++ b/app/code/Magento/Directory/i18n/pt_BR.csv
@@ -1,46 +1,42 @@
-"-- Please select --","-- Selecione --"
-"Allowed Currencies","Moedas Permitidas"
-"Base Currency","Moeda Padrão"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","A Moeda Padrão é usada em todas as transações de pagamento online. O escopo é definido pelo escopo do preço de catálogo (""Catálogo"" > ""Preço"" > ""Escopo do Preço de Catálogo"")."
-"Can't convert rate from ""%s-%s"".","Não é possÃvel converter taxa de ""%s-%s""."
-"Cannot retrieve rate from %s.","Não foi possÃvel recuperar a taxa do %s."
-"Connection Timeout in Seconds","Duração da Conexão em Segundos"
-"Continue »","Continuar »"
-"Country","PaÃs"
-"Country API","API do paÃs"
-"Country and Format Type combination should be unique","A combinação do tipo de formato e paÃs devem ser única"
-"Currency","Moeda"
-"Currency Options","Opções de Moeda"
-"Currency Setup","Configuração de Moeda"
-"Currency Update Warnings","Alertas de Atualização de Moeda"
-"Default Display Currency","Visualizar Moeda Padrão"
-"Directory","Diretório"
-"Display not required State","Exibição não requerida Estado"
-"Enabled","Ativado"
-"Error Email Recipient","Erro de Destinatário de Email"
-"Error Email Sender","Erro de Remetente de Email"
-"Error Email Template","Erro de Template de Email"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,Estado/ProvÃncia
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,Moeda
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
"FATAL ERROR:","ERRO CRÃTICO:"
-"Frequency","Freqüência"
-"Installed Currencies","Moedas Instaladas"
-"Invalid Import Service specified.","Importação de Serviço Especificado Inválido."
-"Invalid country code: %s","Código do paÃs inválido: %s"
-"Invalid rates received","Valores recebidos inválidos"
-"Invalid target currency.","Moeda de destino inválida."
-"List of countries","Lista de paÃses"
-"List of regions in specified country","Lista de regiões no paÃs especificado"
-"Postal Code is Optional for the following countries","Código Postal é Opcional nos seguintes paÃses"
-"Region","Região"
-"Region API","API da região"
-"Scheduled Import Settings","Configurações de Importação Programadas"
-"Select Your Currency","Selecione sua moeda"
-"Service","Serviço"
-"Start Time","Tempo de InÃcio"
-"State is required for","O estado é requerido para"
-"State/Province","Estado/ProvÃncia"
-"States Options","Opções de estados"
-"Unable to initialize the import model.","Não foi possÃvel inicializar o modelo importado."
-"Undefined rate from ""%s-%s"".","Taxa indefinida de ""%s-%s""."
-"WARNING:","ATENÇÃO:"
-"Webservicex","Webservicex"
-"Your current currency is: %s","Sua moeda atual é: %s"
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,ATENÇÃO:
+"Please correct the country code: %1.","Please correct the country code: %1."
+"Country and Format Type combination should be unique","A combinação do tipo de formato e paÃs devem ser única"
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
+"Currency Setup","Currency Setup"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
+"Default Display Currency","Default Display Currency"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+Service,Service
+"Installed Currencies","Installed Currencies"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Directory/i18n/zh_CN.csv b/app/code/Magento/Directory/i18n/zh_CN.csv
index 3650a4d73c1..1197be467ba 100644
--- a/app/code/Magento/Directory/i18n/zh_CN.csv
+++ b/app/code/Magento/Directory/i18n/zh_CN.csv
@@ -1,46 +1,42 @@
-"-- Please select --","--请选择--"
-"Allowed Currencies","å…许的货å¸"
-"Base Currency","基准货å¸"
-"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","基准货å¸å°†è¢«æ‰€æœ‰åœ¨çº¿æ”¯ä»˜äº¤æ˜“æ‰€ä½¿ç”¨ã€‚èŒƒå›´åˆ™æ˜¯ç”±åˆ†ç±»ä»·æ ¼èŒƒå›´ (""分类"" > ""ä»·æ ¼"" > ""åˆ†ç±»ä»·æ ¼èŒƒå›´"")决定的。"
-"Can't convert rate from ""%s-%s"".","æ— æ³•æ‰§è¡Œ ""%s-%s"" 费率转æ¢ã€‚"
-"Cannot retrieve rate from %s.","æ— æ³•ä»Ž %s 获å–费率。"
-"Connection Timeout in Seconds","连接超时的秒数"
-"Continue »","ç»§ç» »"
-"Country","国家"
-"Country API","国家API"
-"Country and Format Type combination should be unique","å›½å®¶å’Œæ ¼å¼ç±»åž‹çš„组åˆå¿…须是唯一的"
-"Currency","å¸ç§"
-"Currency Options","è´§å¸é€‰é¡¹"
-"Currency Setup","å¸ç§è®¾ç½®"
-"Currency Update Warnings","è´§å¸æ›´æ–°è¦å‘Š"
-"Default Display Currency","默认显示的å¸ç§"
-"Directory","目录"
-"Display not required State","显示ä¸éœ€è¦çš„å·ž"
-"Enabled","å·²å¯ç”¨"
-"Error Email Recipient","邮件接收有误"
-"Error Email Sender","邮件å‘é€æœ‰è¯¯"
-"Error Email Template","邮件模æ¿æœ‰è¯¯"
-"FATAL ERROR:","致命错误："
-"Frequency","频率"
-"Installed Currencies","已安装的å¸ç§"
-"Invalid Import Service specified.","指定的导入æœåŠ¡æ— 效。"
-"Invalid country code: %s","æ— æ•ˆçš„å›½å®¶ä»£ç ：%s"
-"Invalid rates received","æ”¶åˆ°çš„è´¹çŽ‡æ— æ•ˆ"
-"Invalid target currency.","ç›®æ ‡å¸ç§æ— 效。"
-"List of countries","国家列表"
-"List of regions in specified country","所指定国家ä¸çš„地区列表"
-"Postal Code is Optional for the following countries","下列国家的邮编是å¯é€‰çš„"
-"Region","地区"
-"Region API","地区API"
-"Scheduled Import Settings","计划的导入设置"
-"Select Your Currency","选择您的å¸ç§"
-"Service","æœåŠ¡"
-"Start Time","开始时间"
-"State is required for","需è¦å°†å·žä¿¡æ¯ç”¨äºŽ"
-"State/Province","å·ž/çœ"
-"States Options","州选项"
-"Unable to initialize the import model.","æ— æ³•åˆå§‹åŒ–导入模å—。"
-"Undefined rate from ""%s-%s"".","未定义的费率 ""%s-%s""。"
-"WARNING:","è¦å‘Šï¼š"
-"Webservicex","WebæœåŠ¡"
-"Your current currency is: %s","您的当å‰å¸ç§ä¸ºï¼š%s"
+"--Please Select--","--Please Select--"
+Enabled,Enabled
+label,label
+State/Province,å·ž/çœ
+Continue,Continue
+"We can't initialize the import model.","We can't initialize the import model."
+Currency,å¸ç§
+"Please correct the target currency.","Please correct the target currency."
+"Undefined rate from ""%1-%2"".","Undefined rate from ""%1-%2""."
+"We can't retrieve a rate from %1.","We can't retrieve a rate from %1."
+"FATAL ERROR:",致命错误：
+"Please specify the correct Import Service.","Please specify the correct Import Service."
+WARNING:,è¦å‘Šï¼š
+"Please correct the country code: %1.","Please correct the country code: %1."
+"Country and Format Type combination should be unique",å›½å®¶å’Œæ ¼å¼ç±»åž‹çš„组åˆå¿…须是唯一的
+"Please correct the rates received","Please correct the rates received"
+"--Please select--","--Please select--"
+"Your current currency is: %1.","Your current currency is: %1."
+"Start Time","Start Time"
+Frequency,Frequency
+"Currency Setup","Currency Setup"
+"Currency Options","Currency Options"
+"Base Currency","Base Currency"
+"
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ ","
+ Base currency is used for all online payment transactions. If you have more than one store view, the base currency scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").
+ "
+"Default Display Currency","Default Display Currency"
+"Allowed Currencies","Allowed Currencies"
+Webservicex,Webservicex
+"Connection Timeout in Seconds","Connection Timeout in Seconds"
+"Scheduled Import Settings","Scheduled Import Settings"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+Service,Service
+"Installed Currencies","Installed Currencies"
+"Zip/Postal Code is Optional for","Zip/Postal Code is Optional for"
+"State Options","State Options"
+"State is Required for","State is Required for"
+"Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
diff --git a/app/code/Magento/Downloadable/i18n/de_DE.csv b/app/code/Magento/Downloadable/i18n/de_DE.csv
index 3bb2638c649..f2ef5fe3e89 100644
--- a/app/code/Magento/Downloadable/i18n/de_DE.csv
+++ b/app/code/Magento/Downloadable/i18n/de_DE.csv
@@ -1,91 +1,88 @@
-"Add","Hinzufügen"
-"Add New Row","Neue Zeile hinzufügen"
-"Add links and samples to downloadable product","Links und Beispiele zum herunterladbaren Produkt hinzufügen"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Alphanumerische Zeichen, Bindestriche und Unterstriche werden für Dateinamen empfohlen. Unangemessene Zeichen werden durch '_' ersetzt."
-"An error occurred while getting requested content. Please contact the store owner.","Beim Laden des angeforderten Inhalts ist ein Fehler aufgetreten. Bitte kontaktieren Sie den Shopbesitzer."
-"An error occurred while getting the requested content.","Beim Laden des angeforderten Inhalts ist ein Fehler aufgetreten."
-"An error occurred while getting the requested content. Please contact the store owner.","Beim Laden des angeforderten Inhalts ist ein Fehler aufgetreten. Bitte kontaktieren Sie den Shopbesitzer."
-"An error occurred while saving the file(s).","Beim Speichern der Datei(en) ist ein Fehler aufgetreten."
-"Availability:","Verfügbarkeit:"
-"Back","Zurück"
-"Canceled","Storniert"
-"Cannot connect to remote host, error: %s.","Verbindung zu Remote Host kann nicht aufgebaut werden, Fehler: %s."
-"Catalog Product View (Downloadable)","Katalog Produktansicht (Herunterladbar)"
-"Category API","Kategorie API"
-"Customer My Account Downloadable Items","Kunde Mein Konto Herunterladbare Artikel"
-"Date","Datum"
-"Default Link Title","Standard Linktitel"
-"Default Maximum Number of Downloads","Standard Maximumanzahl von Downloads"
-"Default Sample Title","Standard Beispietitel"
-"Delete","Löschen"
-"Disable Guest Checkout if Cart Contains Downloadable Items","Gastcheckout deaktivieren wenn Warenkorb Herunterladbare Artikel enthält"
-"Downloadable Information","Herunterladbare Informationen"
-"Downloadable Product","Herunterladbares Produkt"
-"Downloadable Product Options","Herunterladbare Produktoptionen"
-"Downloadable Product Section","Herunterladbarer Produktbereich"
-"Edit","Bearbeiten"
-"Edit item parameters","Artikelangaben ändern"
+Back,Zurück
+Price,Preis
+SKU,SKU
+Qty,Qty
"Excl. Tax","Steuer weglassen"
-"File","Datei"
-"From:","Von:"
-"Gift Message","Geschenkmitteilung"
-"Go to <a href=""%s"">My Downloadable Products</a>","Gehen Sie zu <a href=""%s"">Meine Download Produke</a>"
-"Guest checkout will only work with shareable.","Gastcheckout funktioniert nur wenn mitbenutzbar."
-"In stock","Auf Lager"
+Total,Total
"Incl. Tax","Steuer inkludieren"
-"Invalid download URL host.","Ungültiger Download URL Host."
-"Invalid download URL scheme.","Ungültiges Download URL Schema."
-"Invalid download link type.","Ungültiger Downloadlinktyp."
-"Invoiced","In Rechnung gestellt."
-"Links can be purchased separately","Links können separat gekauft werden."
-"List","Liste"
-"Max. Downloads","Max. Downloads"
-"Message:","Nachricht:"
-"Move","Verschieben"
-"My Downloadable Products","Meine herunterladbaren Produkte"
-"Open Links in New Window","Links in neuem Fenster öffnen"
-"Order","Bestellung #"
-"Order Item Status to Enable Downloads","Bestellungsartikelstatus zu Downloads aktivieren"
-"Order id cannot be null","Order-ID kann nicht Null sein"
-"Order item id cannot be null","Order-Artikel-ID kann nicht Null sein"
-"Ordered","Bestellt"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,Datei
+"Edit item parameters","Artikelangaben ändern"
+Edit,Bearbeiten
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,Löschen
+Status,Status
+"Sort Order",Sortierreihenfolge
+Title,Titel
+"Browse Files...","Browse Files..."
+"Use Default Value","Standardwert verwenden"
+Ordered,Bestellt
+Invoiced,"In Rechnung gestellt."
+Shipped,Versandt
+Refunded,Rückerstattet
+Canceled,Storniert
+From:,Von:
+To:,An:
+Availability,Availability
+"In stock","Auf Lager"
"Out of stock","Nicht lieferbar"
-"Pending","Ausstehend"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","Bitte melden Sie sich an um Ihr Produkt herunterzuladen oder zu kaufen <a href=""%s"">%s</a>."
+"Gift Message",Geschenkmitteilung
+Message:,Nachricht:
+"Add New Row","Neue Zeile hinzufügen"
+"See price before order confirmation.","Preis vor Bestellbestätigung ansehen."
+"What's this?","Was ist das?"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,Datum
+"Upload Files","Upload Files"
+"Downloadable Information","Herunterladbare Informationen"
+Samples,Samples
+Links,Links
+Unlimited,Unbegrenzt
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
+"My Downloadable Products","Meine herunterladbaren Produkte"
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
"Please log in to download your product.","Bitte melden Sie sich an um das Produkt herunterzuladen."
+"The link has expired.","Der Link ist abgelaufen."
+"The link is not available.","Der Link ist nicht verfügbar."
"Please set resource file and link type.","Bitte setzten Sie Ressourcendatei und Linktyp."
+"Invalid download link type.","Ungültiger Downloadlinktyp."
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null","Order-ID kann nicht Null sein"
+"Order item id cannot be null","Order-Artikel-ID kann nicht Null sein"
"Please specify product link(s).","Bitte spezifizieren Sie Produktlink(s)."
-"Price","Preis"
-"Product downloadable links","Produkt-Download Links"
-"Quantity","Anzahl"
-"Refunded","Rückerstattet"
+attachment,Anhang
+inline,Inline
+Pending,Ausstehend
+sample,Probe
+"Links can be purchased separately","Links können separat gekauft werden."
+"Max. Downloads","Max. Downloads"
+Shareable,Mitbenutzbar
+Sample,Beispiel
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Alphanumerische Zeichen, Bindestriche und Unterstriche werden für Dateinamen empfohlen. Unangemessene Zeichen werden durch '_' ersetzt."
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
"Remaining Downloads","Ãœbrige Downloads"
-"Remove","Löschen"
-"Remove Item","Artikel entfernen"
-"Remove links and samples from downloadable product","Links und Beispiele vom herunterladbaren Produkt entfernen"
-"Requested link does not exist.","Angeforderter Link existiert nicht."
-"Retrieve links and samples list from downloadable product","Links und Beispielliste vom herunterladbaren Produkt abrufen"
-"Sample","Beispiel"
-"See price before order confirmation.","Preis vor Bestellbestätigung ansehen."
-"Shareable","Mitbenutzbar"
-"Shipped","Versandt"
-"Sort Order","Sortierreihenfolge"
-"Start Download","Download starten"
-"Status","Status"
-"The file does not exist.","Die Datei existiert nicht."
-"The link has expired.","Der Link ist abgelaufen."
-"The link is not available.","Der Link ist nicht verfügbar."
-"There are files that were selected but not uploaded yet. Please upload or remove them first","Einige Dateien wurden ausgewählt aber noch nicht hochgeladen. Bitte laden Sie sie erst hoch oder entfernen Sie sie."
-"Title","Titel"
-"To:","An:"
-"U","U"
-"Unlimited","Unbegrenzt"
-"Use Content-Disposition","Verwenden Sie Content-Disposition"
-"Use Default Value","Standardwert verwenden"
"View Order","Bestellung ansehen"
-"What's this?","Was ist das?"
+"Start Download","Download starten"
"You have not purchased any downloadable products yet.","Sie haben noch keine herunterladbaren Produkte gekauft."
-"attachment","Anhang"
-"download","Download"
-"inline","Inline"
-"sample","Probe"
+download,Download
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/i18n/en_US.csv b/app/code/Magento/Downloadable/i18n/en_US.csv
index fb01a8cd48a..98719bb6bf4 100644
--- a/app/code/Magento/Downloadable/i18n/en_US.csv
+++ b/app/code/Magento/Downloadable/i18n/en_US.csv
@@ -1,91 +1,88 @@
-"Add","Add"
-"Add New Row","Add New Row"
-"Add links and samples to downloadable product","Add links and samples to downloadable product"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'."
-"An error occurred while getting requested content. Please contact the store owner.","An error occurred while getting requested content. Please contact the store owner."
-"An error occurred while getting the requested content.","An error occurred while getting the requested content."
-"An error occurred while getting the requested content. Please contact the store owner.","An error occurred while getting the requested content. Please contact the store owner."
-"An error occurred while saving the file(s).","An error occurred while saving the file(s)."
-"Availability:","Availability:"
-"Back","Back"
-"Canceled","Canceled"
-"Cannot connect to remote host, error: %s.","Cannot connect to remote host, error: %s."
-"Catalog Product View (Downloadable)","Catalog Product View (Downloadable)"
-"Category API","Category API"
-"Customer My Account Downloadable Items","Customer My Account Downloadable Items"
-"Date","Date"
-"Default Link Title","Default Link Title"
-"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
-"Default Sample Title","Default Sample Title"
-"Delete","Delete"
-"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
-"Downloadable Information","Downloadable Information"
-"Downloadable Product","Downloadable Product"
-"Downloadable Product Options","Downloadable Product Options"
-"Downloadable Product Section","Downloadable Product Section"
-"Edit","Edit"
-"Edit item parameters","Edit item parameters"
+Back,Back
+Price,Price
+SKU,SKU
+Qty,Qty
"Excl. Tax","Excl. Tax"
-"File","File"
-"From:","From:"
-"Gift Message","Gift Message"
-"Go to <a href=""%s"">My Downloadable Products</a>","Go to <a href=""%s"">My Downloadable Products</a>"
-"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
-"In stock","In stock"
+Total,Total
"Incl. Tax","Incl. Tax"
-"Invalid download URL host.","Invalid download URL host."
-"Invalid download URL scheme.","Invalid download URL scheme."
-"Invalid download link type.","Invalid download link type."
-"Invoiced","Invoiced"
-"Links can be purchased separately","Links can be purchased separately"
-"List","List"
-"Max. Downloads","Max. Downloads"
-"Message:","Message:"
-"Move","Move"
-"My Downloadable Products","My Downloadable Products"
-"Open Links in New Window","Open Links in New Window"
-"Order","Order"
-"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
-"Order id cannot be null","Order id cannot be null"
-"Order item id cannot be null","Order item id cannot be null"
-"Ordered","Ordered"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,File
+"Edit item parameters","Edit item parameters"
+Edit,Edit
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,Delete
+Status,Status
+"Sort Order","Sort Order"
+Title,Title
+"Browse Files...","Browse Files..."
+"Use Default Value","Use Default Value"
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+From:,From:
+To:,To:
+Availability,Availability
+"In stock","In stock"
"Out of stock","Out of stock"
-"Pending","Pending"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","Please log in to download your product or purchase <a href=""%s"">%s</a>."
+"Gift Message","Gift Message"
+Message:,Message:
+"Add New Row","Add New Row"
+"See price before order confirmation.","See price before order confirmation."
+"What's this?","What's this?"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,Date
+"Upload Files","Upload Files"
+"Downloadable Information","Downloadable Information"
+Samples,Samples
+Links,Links
+Unlimited,Unlimited
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
+"My Downloadable Products","My Downloadable Products"
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
"Please log in to download your product.","Please log in to download your product."
+"The link has expired.","The link has expired."
+"The link is not available.","The link is not available."
"Please set resource file and link type.","Please set resource file and link type."
+"Invalid download link type.","Invalid download link type."
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null","Order id cannot be null"
+"Order item id cannot be null","Order item id cannot be null"
"Please specify product link(s).","Please specify product link(s)."
-"Price","Price"
-"Product downloadable links","Product downloadable links"
-"Quantity","Quantity"
-"Refunded","Refunded"
+attachment,attachment
+inline,inline
+Pending,Pending
+sample,sample
+"Links can be purchased separately","Links can be purchased separately"
+"Max. Downloads","Max. Downloads"
+Shareable,Shareable
+Sample,Sample
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'."
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
"Remaining Downloads","Remaining Downloads"
-"Remove","Remove"
-"Remove Item","Remove Item"
-"Remove links and samples from downloadable product","Remove links and samples from downloadable product"
-"Requested link does not exist.","Requested link does not exist."
-"Retrieve links and samples list from downloadable product","Retrieve links and samples list from downloadable product"
-"Sample","Sample"
-"See price before order confirmation.","See price before order confirmation."
-"Shareable","Shareable"
-"Shipped","Shipped"
-"Sort Order","Sort Order"
-"Start Download","Start Download"
-"Status","Status"
-"The file does not exist.","The file does not exist."
-"The link has expired.","The link has expired."
-"The link is not available.","The link is not available."
-"There are files that were selected but not uploaded yet. Please upload or remove them first","There are files that were selected but not uploaded yet. Please upload or remove them first"
-"Title","Title"
-"To:","To:"
-"U","U"
-"Unlimited","Unlimited"
-"Use Content-Disposition","Use Content-Disposition"
-"Use Default Value","Use Default Value"
"View Order","View Order"
-"What's this?","What's this?"
+"Start Download","Start Download"
"You have not purchased any downloadable products yet.","You have not purchased any downloadable products yet."
-"attachment","attachment"
-"download","download"
-"inline","inline"
-"sample","sample"
+download,download
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/i18n/es_ES.csv b/app/code/Magento/Downloadable/i18n/es_ES.csv
index f63ec45bbdd..f45ca171ca9 100644
--- a/app/code/Magento/Downloadable/i18n/es_ES.csv
+++ b/app/code/Magento/Downloadable/i18n/es_ES.csv
@@ -1,91 +1,88 @@
-"Add","Añadir"
-"Add New Row","Agregar nueva fila"
-"Add links and samples to downloadable product","Añadir enlaces y muestras al producto de descarga"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Se recomiendan los caracteres alfanuméricos, guión y guión bajo para los nombres de fichero. Los caracteres incorrectos se reemplazarán con '_'."
-"An error occurred while getting requested content. Please contact the store owner.","Ocurrió un error mientras se recibÃa el contenido solicitado. Por favor, póngase en contacto con el propietario de la tienda."
-"An error occurred while getting the requested content.","Ocurrió un error mientras se recibÃa el contenido solicitado."
-"An error occurred while getting the requested content. Please contact the store owner.","Ocurrió un error mientras se recibÃa el contenido solicitado. Por favor, póngase en contacto con el propietario de la tienda."
-"An error occurred while saving the file(s).","Ocurrió un error mientras se guardaba(n) el(los) fichero(s)."
-"Availability:","Disponibilidad:"
-"Back","Volver"
-"Canceled","Cancelado"
-"Cannot connect to remote host, error: %s.","No se puede conectar con el servidor remoto, error: %s."
-"Catalog Product View (Downloadable)","Vista de los Productos en Catálogo (Descargable)"
-"Category API","CategorÃa API"
-"Customer My Account Downloadable Items","Cliente Mi Cuenta ArtÃculos Descargables"
-"Date","Fecha"
-"Default Link Title","TÃtulo de Enlace por Defecto"
-"Default Maximum Number of Downloads","Número Máximo de Descargas por Defecto"
-"Default Sample Title","TÃtulo de Muestra por Defecto"
-"Delete","Eliminar"
-"Disable Guest Checkout if Cart Contains Downloadable Items","Inutilizar la Facturación del Cliente si el Carrito Contiene ArtÃculos Descargables"
-"Downloadable Information","Información Descargable"
-"Downloadable Product","Producto Descargable"
-"Downloadable Product Options","Opciones de Producto Descargable"
-"Downloadable Product Section","Sección de producto de descarga"
-"Edit","Editar"
-"Edit item parameters","Editar parámetros del artÃculo"
+Back,Volver
+Price,Precio
+SKU,SKU
+Qty,Qty
"Excl. Tax","Impuestos no incluidos"
-"File","Fichero"
-"From:","Desde:"
-"Gift Message","Mensaje de Regalo"
-"Go to <a href=""%s"">My Downloadable Products</a>","Vaya a <a href=""%s"">Mis productos descargables</a>"
-"Guest checkout will only work with shareable.","La facturación de cliente sólo funcionará si se puede compartir"
-"In stock","En stock"
+Total,Total
"Incl. Tax","Impuestos incluidos"
-"Invalid download URL host.","Servidor de URL de descarga no válido."
-"Invalid download URL scheme.","Esquema de URL de descarga no válido."
-"Invalid download link type.","Tipo de enlace de descarga no válido."
-"Invoiced","Facturado"
-"Links can be purchased separately","Los enlaces pueden adquirirse por separado"
-"List","Lista"
-"Max. Downloads","Máximo de Descargas"
-"Message:","Mensaje:"
-"Move","Mover"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,Fichero
+"Edit item parameters","Editar parámetros del artÃculo"
+Edit,Editar
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,Eliminar
+Status,Estado
+"Sort Order","Ordenar Pedido"
+Title,TÃtulo
+"Browse Files...","Browse Files..."
+"Use Default Value","Usar Valor por Defecto"
+Ordered,Pedido
+Invoiced,Facturado
+Shipped,Enviado
+Refunded,Reembolsado
+Canceled,Cancelado
+From:,Desde:
+To:,A:
+Availability,Availability
+"In stock","En stock"
+"Out of stock",Agotado
+"Gift Message","Mensaje de Regalo"
+Message:,Mensaje:
+"Add New Row","Agregar nueva fila"
+"See price before order confirmation.","Ver precio antes de la confirmación del pedido."
+"What's this?","¿Qué es esto?"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,Fecha
+"Upload Files","Upload Files"
+"Downloadable Information","Información Descargable"
+Samples,Samples
+Links,Links
+Unlimited,Ilimitado
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
"My Downloadable Products","Mis Productos Descargables"
-"Open Links in New Window","Abrir Enlaces en una Nueva Ventana"
-"Order","Número de pedido"
-"Order Item Status to Enable Downloads","Pedir Situación del ArtÃculo para Permitir las Descargas"
-"Order id cannot be null","El ID del pedido no puede ser nulo"
-"Order item id cannot be null","El ID del artÃculo del pedido no puede ser nulo"
-"Ordered","Pedido"
-"Out of stock","Agotado"
-"Pending","Pendiente"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","Por favor, acceda a su cuenta para descargar su producto o compra <a href=""%s"">%s</a>."
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
"Please log in to download your product.","Por favor, entre en el sistema para descargar su producto."
+"The link has expired.","El enlace ha caducado."
+"The link is not available.","En enlace no está disponible."
"Please set resource file and link type.","Por favor, asigne el fichero de recurso y el tipo de enlace."
+"Invalid download link type.","Tipo de enlace de descarga no válido."
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null","El ID del pedido no puede ser nulo"
+"Order item id cannot be null","El ID del artÃculo del pedido no puede ser nulo"
"Please specify product link(s).","Por favor, especifique el(los) enlace(s) de producto."
-"Price","Precio"
-"Product downloadable links","Enlaces de descarga de productos"
-"Quantity","Cantidad"
-"Refunded","Reembolsado"
+attachment,"documento adjunto"
+inline,"en lÃnea"
+Pending,Pendiente
+sample,muestra
+"Links can be purchased separately","Los enlaces pueden adquirirse por separado"
+"Max. Downloads","Máximo de Descargas"
+Shareable,"Se puede compartir"
+Sample,muestra
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Se recomiendan los caracteres alfanuméricos, guión y guión bajo para los nombres de fichero. Los caracteres incorrectos se reemplazarán con '_'."
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
"Remaining Downloads","Descargas Pendientes"
-"Remove","Borrar"
-"Remove Item","Eliminar ArtÃculo"
-"Remove links and samples from downloadable product","Eliminar los enlaces y las muestras del producto de descarga"
-"Requested link does not exist.","El enlace solicitado no existe."
-"Retrieve links and samples list from downloadable product","Recupere la lista de enlaces y muestras del producto de descarga"
-"Sample","muestra"
-"See price before order confirmation.","Ver precio antes de la confirmación del pedido."
-"Shareable","Se puede compartir"
-"Shipped","Enviado"
-"Sort Order","Ordenar Pedido"
-"Start Download","Comenzar la Descarga"
-"Status","Estado"
-"The file does not exist.","El fichero no existe"
-"The link has expired.","El enlace ha caducado."
-"The link is not available.","En enlace no está disponible."
-"There are files that were selected but not uploaded yet. Please upload or remove them first","Hay archivos que se han seleccionado pero aún no se han subido. Por favor, súbalos o elimÃnelos primero"
-"Title","TÃtulo"
-"To:","A:"
-"U","U"
-"Unlimited","Ilimitado"
-"Use Content-Disposition","Utilizar Contenido-Disposición"
-"Use Default Value","Usar Valor por Defecto"
"View Order","Ver Pedido"
-"What's this?","¿Qué es esto?"
+"Start Download","Comenzar la Descarga"
"You have not purchased any downloadable products yet.","TodavÃa no ha adquirido ningún producto descargable."
-"attachment","documento adjunto"
-"download","descarga"
-"inline","en lÃnea"
-"sample","muestra"
+download,descarga
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/i18n/fr_FR.csv b/app/code/Magento/Downloadable/i18n/fr_FR.csv
index 1aeaeb40fcc..91e16517785 100644
--- a/app/code/Magento/Downloadable/i18n/fr_FR.csv
+++ b/app/code/Magento/Downloadable/i18n/fr_FR.csv
@@ -1,91 +1,88 @@
-"Add","Ajouter"
-"Add New Row","Ajouter nouvelle ligne"
-"Add links and samples to downloadable product","Ajouter des liens et des échantillons au produit téléchargeable"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Il est recommandé de n'utiliser que des lettres, des chiffres, le tiret (-) et le blanc souligné (_) pour les noms de fichiers. Les caractères invalides seront remplacés par '_'."
-"An error occurred while getting requested content. Please contact the store owner.","Une erreur s'est produite en accédant au contenu demandé. Contactez le propriétaire du site."
-"An error occurred while getting the requested content.","Une erreur s'est produite en accédant au contenu demandé."
-"An error occurred while getting the requested content. Please contact the store owner.","Un erreur s'est produite en accédant au contenu demandé. Contactez le propriétaire du site."
-"An error occurred while saving the file(s).","Une erreur s'est produite en sauvegardant les fichiers."
-"Availability:","Disponibilité:"
-"Back","Retour"
-"Canceled","Annulé"
-"Cannot connect to remote host, error: %s.","Impossible de se connecter à l'hôte distant, erreur: %s"
-"Catalog Product View (Downloadable)","Vue de produit du catalogue (téléchargeable)"
-"Category API","API catégorie"
-"Customer My Account Downloadable Items","Objets téléchargeables dans le compte client"
-"Date","Date"
-"Default Link Title","Lien du titre par défaut"
-"Default Maximum Number of Downloads","Nombre de téléchargements maximum par défaut"
-"Default Sample Title","Titre exemple par défaut"
-"Delete","Supprimer"
-"Disable Guest Checkout if Cart Contains Downloadable Items","Désactiver le paiement en statut invité si le panier contient des objets téléchargeables"
-"Downloadable Information","Information téléchargeables"
-"Downloadable Product","Produit téléchargeable"
-"Downloadable Product Options","Options de produit téléchargeable"
-"Downloadable Product Section","Section produit téléchargeable"
-"Edit","Éditer"
-"Edit item parameters","Modifier les paramètres de l'objet"
+Back,Retour
+Price,Prix
+SKU,SKU
+Qty,Qty
"Excl. Tax","Taxe non comprise"
-"File","Fichier"
-"From:","De :"
-"Gift Message","Message cadeau"
-"Go to <a href=""%s"">My Downloadable Products</a>","Aller à <a href=""%s"">Mes produits téléchargeables</a>"
-"Guest checkout will only work with shareable.","Le paiement par invité ne marchera qu'en partagé."
-"In stock","En stock."
+Total,Total
"Incl. Tax","Taxe comprise"
-"Invalid download URL host.","Hôte de l'URL de téléchargement invalide"
-"Invalid download URL scheme.","Schéma de l'URL de téléchargement invalide"
-"Invalid download link type.","Type de lien de téléchargement invalide"
-"Invoiced","Facturé"
-"Links can be purchased separately","Les liens peuvent être achetés séparément."
-"List","Liste"
-"Max. Downloads","Téléchargements maximum"
-"Message:","Message :"
-"Move","Déplacer"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,Fichier
+"Edit item parameters","Modifier les paramètres de l'objet"
+Edit,Éditer
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,Supprimer
+Status,Statut
+"Sort Order","Trier les widgets"
+Title,Titre
+"Browse Files...","Browse Files..."
+"Use Default Value","Utiliser la valeur par défaut"
+Ordered,Commandé
+Invoiced,Facturé
+Shipped,Envoyé
+Refunded,Remboursé
+Canceled,Annulé
+From:,"De :"
+To:,"A :"
+Availability,Availability
+"In stock","En stock."
+"Out of stock",Épuisé
+"Gift Message","Message cadeau"
+Message:,"Message :"
+"Add New Row","Ajouter nouvelle ligne"
+"See price before order confirmation.","Voir le prix avant la confirmation de commande."
+"What's this?","Qu'est-ce ?"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,Date
+"Upload Files","Upload Files"
+"Downloadable Information","Information téléchargeables"
+Samples,Samples
+Links,Links
+Unlimited,Illimité
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
"My Downloadable Products","Mes produits téléchargeables"
-"Open Links in New Window","Ouvrir les liens dans une nouvelle fenêtre"
-"Order","Commande n°"
-"Order Item Status to Enable Downloads","Statut des objets en commande pour activer les téléchargements"
-"Order id cannot be null","L'identifiant de commande ne peut être nul"
-"Order item id cannot be null","L'identifiant de commande ne peut être nul"
-"Ordered","Commandé"
-"Out of stock","Épuisé"
-"Pending","En cours"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","Veuillez vous connecter pour télécharger votre produit ou acheter <a href=""%s"">%s</a>."
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
"Please log in to download your product.","Identifiez-vous pour télécharger votre produit."
+"The link has expired.","Le lien a expiré."
+"The link is not available.","Le lien n'est pas disponible."
"Please set resource file and link type.","Choisissez un fichier ressource et un type de lien."
+"Invalid download link type.","Type de lien de téléchargement invalide"
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null","L'identifiant de commande ne peut être nul"
+"Order item id cannot be null","L'identifiant de commande ne peut être nul"
"Please specify product link(s).","Spécifier un/des lien(s) vers le produit"
-"Price","Prix"
-"Product downloadable links","Liens produit téléchargeable"
-"Quantity","Qté"
-"Refunded","Remboursé"
+attachment,"pièce jointe"
+inline,"en cours"
+Pending,"En cours"
+sample,aperçu
+"Links can be purchased separately","Les liens peuvent être achetés séparément."
+"Max. Downloads","Téléchargements maximum"
+Shareable,Partageable
+Sample,échantillon
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Il est recommandé de n'utiliser que des lettres, des chiffres, le tiret (-) et le blanc souligné (_) pour les noms de fichiers. Les caractères invalides seront remplacés par '_'."
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
"Remaining Downloads","Téléchargements restants"
-"Remove","Supprimer"
-"Remove Item","Supprimer l'objet"
-"Remove links and samples from downloadable product","Supprimer les liens et les échantillons du produit téléchargeable"
-"Requested link does not exist.","Le lien demandé n'existe pas"
-"Retrieve links and samples list from downloadable product","Récupérer la liste de liens et d'échantillons du produit téléchargeable"
-"Sample","échantillon"
-"See price before order confirmation.","Voir le prix avant la confirmation de commande."
-"Shareable","Partageable"
-"Shipped","Envoyé"
-"Sort Order","Trier les widgets"
-"Start Download","Commencer le téléchargement"
-"Status","Statut"
-"The file does not exist.","Le fichier n'existe pas"
-"The link has expired.","Le lien a expiré."
-"The link is not available.","Le lien n'est pas disponible."
-"There are files that were selected but not uploaded yet. Please upload or remove them first","Certains fichiers sélectionnés n'ont toujours pas été envoyés. Veuillez d'abord les envoyer ou les supprimer"
-"Title","Titre"
-"To:","A :"
-"U","U"
-"Unlimited","Illimité"
-"Use Content-Disposition","Utiliser la disposition du contenu"
-"Use Default Value","Utiliser la valeur par défaut"
"View Order","Voir la commande"
-"What's this?","Qu'est-ce ?"
+"Start Download","Commencer le téléchargement"
"You have not purchased any downloadable products yet.","Vous n'avez pas acheté d'objets téléchargeables."
-"attachment","pièce jointe"
-"download","télécharger"
-"inline","en cours"
-"sample","aperçu"
+download,télécharger
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/i18n/nl_NL.csv b/app/code/Magento/Downloadable/i18n/nl_NL.csv
index 3f50dc48ba2..9c29a6b5afc 100644
--- a/app/code/Magento/Downloadable/i18n/nl_NL.csv
+++ b/app/code/Magento/Downloadable/i18n/nl_NL.csv
@@ -1,91 +1,88 @@
-"Add","Toevoegen"
-"Add New Row","Voeg Nieuwe Rij Toe"
-"Add links and samples to downloadable product","Voeg links en voorbeelden toe aan te downloaden product"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Alfanumerieke, schuine streep en onderstreepte lettertekens worden aangeraden voor bestandsnamen. Ongeschikte lettertekens worden vervangen met '_'."
-"An error occurred while getting requested content. Please contact the store owner.","Er is een fout opgetreden bij het ophalen van de gevraagde content. Neem alstublieft contact op met de winkeleigenaar."
-"An error occurred while getting the requested content.","Er is een fout opgetreden bij het ophalen van de gevraagde content."
-"An error occurred while getting the requested content. Please contact the store owner.","Er is een fout opgetreden bij het ophalen van de gevraagde content. Neem alstublieft contact op met de winkeleigenaar."
-"An error occurred while saving the file(s).","Er is een fout opgetreden bij het opslaan van het/de bestand(en)."
-"Availability:","Beschikbaarheid:"
-"Back","Terug"
-"Canceled","Geannuleerd"
-"Cannot connect to remote host, error: %s.","Kan geen verbinding maken met remote host, fout: %s."
-"Catalog Product View (Downloadable)","Catalogus Product Weergave (Downloadbaar)"
-"Category API","Categorie API"
-"Customer My Account Downloadable Items","Klant Mijn Account Downloadbare Items"
-"Date","Datum"
-"Default Link Title","Standaard Link Titel"
-"Default Maximum Number of Downloads","Standaard Maximaal Aantal Downloads"
-"Default Sample Title","Standaard Voorbeeldtitel"
-"Delete","Verwijderen"
-"Disable Guest Checkout if Cart Contains Downloadable Items","Schakel Gast Afrekenen uit als Winkelwagentje Downloadbare Items Bevat"
-"Downloadable Information","Downloadbare informatie"
-"Downloadable Product","Downloadbaar Product"
-"Downloadable Product Options","Downloadbaar Product Opties"
-"Downloadable Product Section","Downloadbaar Productgedeelte"
-"Edit","Bewerken"
-"Edit item parameters","Parameters van artikel bewerken"
+Back,Terug
+Price,Prijs
+SKU,SKU
+Qty,Qty
"Excl. Tax","Excl. BTW"
-"File","Bestand"
-"From:","Van:"
-"Gift Message","Cadeauboodschap"
-"Go to <a href=""%s"">My Downloadable Products</a>","Ga naar <a href=""%s"">Mijn Downloadbare Producten</a>"
-"Guest checkout will only work with shareable.","Gast uitchecken werkt alleen met deelbare."
-"In stock","In voorraad"
+Total,Total
"Incl. Tax","Incl. BTW"
-"Invalid download URL host.","Ongeldige download URL host."
-"Invalid download URL scheme.","Ongeldig download URL schema."
-"Invalid download link type.","Ongeldig download link type."
-"Invoiced","Gefactureerd"
-"Links can be purchased separately","Links kunnen separaat gekocht worden"
-"List","Lijst"
-"Max. Downloads","Max. Downloads"
-"Message:","Bericht:"
-"Move","Verplaats"
-"My Downloadable Products","Mijn Downloadbare Producten"
-"Open Links in New Window","Open Links in Nieuw Venster"
-"Order","Bestelling #"
-"Order Item Status to Enable Downloads","Order Item Status om Downloads Mogelijk te Maken"
-"Order id cannot be null","Bestel id kan geen nul zijn"
-"Order item id cannot be null","Bestel artikel kan geen nul zijn"
-"Ordered","Besteld"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,Bestand
+"Edit item parameters","Parameters van artikel bewerken"
+Edit,Bewerken
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,Verwijderen
+Status,Status
+"Sort Order","Sorteer Bestelling"
+Title,Titel
+"Browse Files...","Browse Files..."
+"Use Default Value","Standaardwaarde gebruiken"
+Ordered,Besteld
+Invoiced,Gefactureerd
+Shipped,Verzonden
+Refunded,Terugbetaald
+Canceled,Geannuleerd
+From:,Van:
+To:,Aan:
+Availability,Availability
+"In stock","In voorraad"
"Out of stock","Uit voorraad"
-"Pending","In afwachting"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","Gelieve in te loggen om uw product te downloaden of te kopen <a href=""%s"">%s</a>."
+"Gift Message",Cadeauboodschap
+Message:,Bericht:
+"Add New Row","Voeg Nieuwe Rij Toe"
+"See price before order confirmation.","Zie prijs voor bevestiging van bestelling."
+"What's this?","Wat is dit?"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,Datum
+"Upload Files","Upload Files"
+"Downloadable Information","Downloadbare informatie"
+Samples,Samples
+Links,Links
+Unlimited,Onbeperkt
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
+"My Downloadable Products","Mijn Downloadbare Producten"
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
"Please log in to download your product.","Log in om uw product te downloaden."
+"The link has expired.","De link is verlopen."
+"The link is not available.","De link is niet beschikbaar."
"Please set resource file and link type.","Bepaal hulpbronnenbestand en link type."
+"Invalid download link type.","Ongeldig download link type."
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null","Bestel id kan geen nul zijn"
+"Order item id cannot be null","Bestel artikel kan geen nul zijn"
"Please specify product link(s).","Specificeer productlink(s)."
-"Price","Prijs"
-"Product downloadable links","Links van te downloaden producten"
-"Quantity","Hoeveelheid"
-"Refunded","Terugbetaald"
+attachment,bijlage
+inline,inline
+Pending,"In afwachting"
+sample,specimen
+"Links can be purchased separately","Links kunnen separaat gekocht worden"
+"Max. Downloads","Max. Downloads"
+Shareable,Deelbaar
+Sample,Monster
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Alfanumerieke, schuine streep en onderstreepte lettertekens worden aangeraden voor bestandsnamen. Ongeschikte lettertekens worden vervangen met '_'."
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
"Remaining Downloads","Resterende downloads"
-"Remove","Verwijderen"
-"Remove Item","Artikel verwijderen"
-"Remove links and samples from downloadable product","Verwijder links en voorbeelden van downloadbaar product"
-"Requested link does not exist.","Gevraagde link bestaat niet."
-"Retrieve links and samples list from downloadable product","Ontvang links- en voorbeeldenlijst van downloadbaar product"
-"Sample","Monster"
-"See price before order confirmation.","Zie prijs voor bevestiging van bestelling."
-"Shareable","Deelbaar"
-"Shipped","Verzonden"
-"Sort Order","Sorteer Bestelling"
-"Start Download","Start download"
-"Status","Status"
-"The file does not exist.","Het bestand bestaat niet."
-"The link has expired.","De link is verlopen."
-"The link is not available.","De link is niet beschikbaar."
-"There are files that were selected but not uploaded yet. Please upload or remove them first","Er zijn bestanden die geselecteerd zijn, maar nog niet geüpload. Gelieve deze te uploaden of te verwijderen."
-"Title","Titel"
-"To:","Aan:"
-"U","U"
-"Unlimited","Onbeperkt"
-"Use Content-Disposition","Gebruik Content-Disposition"
-"Use Default Value","Standaardwaarde gebruiken"
"View Order","Bestelling bekijken"
-"What's this?","Wat is dit?"
+"Start Download","Start download"
"You have not purchased any downloadable products yet.","U heeft nog geen downloadbare artikelen aangeschafd."
-"attachment","bijlage"
-"download","download"
-"inline","inline"
-"sample","specimen"
+download,download
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/i18n/pt_BR.csv b/app/code/Magento/Downloadable/i18n/pt_BR.csv
index d728427b30b..d6c69964430 100644
--- a/app/code/Magento/Downloadable/i18n/pt_BR.csv
+++ b/app/code/Magento/Downloadable/i18n/pt_BR.csv
@@ -1,91 +1,88 @@
-"Add","Adicionar"
-"Add New Row","Adicionar Nova Linha"
-"Add links and samples to downloadable product","Adicionar links e amostras de produto para download"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Caracteres alfanuméricos, traço e sublinhado são recomendados para nomes de arquivos. Caracteres impróprios são substituÃdos por '_'."
-"An error occurred while getting requested content. Please contact the store owner.","Ocorreu um erro ao obter o conteúdo solicitado. Por favor contate o proprietário da loja."
-"An error occurred while getting the requested content.","Ocorreu um erro ao obter o conteúdo solicitado."
-"An error occurred while getting the requested content. Please contact the store owner.","Ocorreu um erro ao obter o conteúdo solicitado. Por favor contate o proprietário da loja."
-"An error occurred while saving the file(s).","Ocorreu um erro ao salvar o(s) arquivo(s)."
-"Availability:","Disponibilidade:"
-"Back","Voltar"
-"Canceled","Cancelado"
-"Cannot connect to remote host, error: %s.","Não é possÃvel conetar ao anfitrião remoto, erro: %s."
-"Catalog Product View (Downloadable)","Ver Catálogo do Produto (descarregável)"
-"Category API","API de Categorias"
-"Customer My Account Downloadable Items","Minha Conta Cliente de Itens para Download"
-"Date","Data"
-"Default Link Title","TÃtulo do Link Predefinido"
-"Default Maximum Number of Downloads","Número Máximo Predefinido de Transferências"
-"Default Sample Title","TÃtulo da Amostra Predefinido"
-"Delete","Excluir"
-"Disable Guest Checkout if Cart Contains Downloadable Items","Desativar Caixa (Checkout) de Visitante se Carrinho Contém Itens para Transferência"
-"Downloadable Information","Informação TransferÃvel"
-"Downloadable Product","Produto Descarregável"
-"Downloadable Product Options","Opções de Produto Descarregável"
-"Downloadable Product Section","Seção de produtos para download"
-"Edit","Editar"
-"Edit item parameters","Editar parâmetros de item"
+Back,Voltar
+Price,Preço
+SKU,SKU
+Qty,Qty
"Excl. Tax","Excluir taxas"
-"File","Arquivo"
-"From:","De:"
-"Gift Message","Mensagem de presente"
-"Go to <a href=""%s"">My Downloadable Products</a>","Vá para <a href=""%s"">Meus Produtos DisponÃveis para Download</a>"
-"Guest checkout will only work with shareable.","A compra como visitante só funcionará com compartilháveis."
-"In stock","Em estoque"
+Total,Total
"Incl. Tax","Incluir taxas"
-"Invalid download URL host.","Host de URL para download inválido."
-"Invalid download URL scheme.","URL scheme para download inválido."
-"Invalid download link type.","Tipo de link inválido para download."
-"Invoiced","Faturado"
-"Links can be purchased separately","Os links podem ser comprados separadamente"
-"List","Lista"
-"Max. Downloads","Máx. de Downloads"
-"Message:","Mensagem:"
-"Move","Mover"
-"My Downloadable Products","Meus Produtos DisponÃveis para Download"
-"Open Links in New Window","Abrir Links em Nova Janela"
-"Order","Ordem #"
-"Order Item Status to Enable Downloads","Solicitar Status de Item para Permitir Downloads"
-"Order id cannot be null","Identificação de solicitação não pode ser nula"
-"Order item id cannot be null","Identificação de solicitação de item não pode ser nula"
-"Ordered","Solicitado"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,Arquivo
+"Edit item parameters","Editar parâmetros de item"
+Edit,Editar
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,Excluir
+Status,Status
+"Sort Order","Classificar pedido"
+Title,TÃtulo
+"Browse Files...","Browse Files..."
+"Use Default Value","Utilizar valor padrão"
+Ordered,Solicitado
+Invoiced,Faturado
+Shipped,Enviado
+Refunded,Reembolsado
+Canceled,Cancelado
+From:,De:
+To:,Para:
+Availability,Availability
+"In stock","Em estoque"
"Out of stock","Fora de estoque"
-"Pending","Pendente"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","Por favor faça login para download do seu produto ou compra <a href=""%s"">%s</a>."
+"Gift Message","Mensagem de presente"
+Message:,Mensagem:
+"Add New Row","Adicionar Nova Linha"
+"See price before order confirmation.","Ver preço antes de confirmar pedido."
+"What's this?","O que é isso?"
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,Data
+"Upload Files","Upload Files"
+"Downloadable Information","Informação TransferÃvel"
+Samples,Samples
+Links,Links
+Unlimited,Ilimitado
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
+"My Downloadable Products","Meus Produtos DisponÃveis para Download"
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
"Please log in to download your product.","Por favor, efetue login para fazer o download de seu produto."
+"The link has expired.","O link expirou."
+"The link is not available.","O link não está disponÃvel."
"Please set resource file and link type.","Por favor, estabeleça arquivo de pesquisa e tipo de link."
+"Invalid download link type.","Tipo de link inválido para download."
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null","Identificação de solicitação não pode ser nula"
+"Order item id cannot be null","Identificação de solicitação de item não pode ser nula"
"Please specify product link(s).","Por favor, especifique link(s) do produto."
-"Price","Preço"
-"Product downloadable links","Links de produto para download."
-"Quantity","Quant."
-"Refunded","Reembolsado"
+attachment,anexo
+inline,"em linha"
+Pending,Pendente
+sample,exemplo
+"Links can be purchased separately","Os links podem ser comprados separadamente"
+"Max. Downloads","Máx. de Downloads"
+Shareable,Compartilhável
+Sample,Amostra
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","Caracteres alfanuméricos, traço e sublinhado são recomendados para nomes de arquivos. Caracteres impróprios são substituÃdos por '_'."
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
"Remaining Downloads","Downloads restantes"
-"Remove","Remover"
-"Remove Item","Remover Item"
-"Remove links and samples from downloadable product","Remover links e amostras de produto para download"
-"Requested link does not exist.","O link solicitado não existe."
-"Retrieve links and samples list from downloadable product","Recuperar lista de links e amostras de produto para download"
-"Sample","Amostra"
-"See price before order confirmation.","Ver preço antes de confirmar pedido."
-"Shareable","Compartilhável"
-"Shipped","Enviado"
-"Sort Order","Classificar pedido"
-"Start Download","Começar Download"
-"Status","Status"
-"The file does not exist.","O arquivo não existe."
-"The link has expired.","O link expirou."
-"The link is not available.","O link não está disponÃvel."
-"There are files that were selected but not uploaded yet. Please upload or remove them first","Esses são arquivos que foram selecionados mas cujo upload ainda não foi feito. Por favor faça upload ou remova-os antes"
-"Title","TÃtulo"
-"To:","Para:"
-"U","U"
-"Unlimited","Ilimitado"
-"Use Content-Disposition","Usar Content-Disposition"
-"Use Default Value","Utilizar valor padrão"
"View Order","Ver Solicitação"
-"What's this?","O que é isso?"
+"Start Download","Começar Download"
"You have not purchased any downloadable products yet.","Você ainda não comprou nenhum produto para baixar."
-"attachment","anexo"
-"download","baixar"
-"inline","em linha"
-"sample","exemplo"
+download,baixar
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/i18n/zh_CN.csv b/app/code/Magento/Downloadable/i18n/zh_CN.csv
index 0b7be786272..e32c84d5d75 100644
--- a/app/code/Magento/Downloadable/i18n/zh_CN.csv
+++ b/app/code/Magento/Downloadable/i18n/zh_CN.csv
@@ -1,91 +1,88 @@
-"Add","æ·»åŠ "
-"Add New Row","æ·»åŠ æ–°è¡Œ"
-"Add links and samples to downloadable product","为å¯ä¸‹è½½äº§å“æ·»åŠ é“¾æŽ¥ä¸ŽèŒƒä¾‹"
-"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","建议对文件å使用å—æ¯ã€æ¨ªçº¿ï¼Œä»¥åŠä¸‹åˆ’线å—符。错误的å—符将被使用 '_'替æ¢ã€‚"
-"An error occurred while getting requested content. Please contact the store owner.","获å–所请求内容时出错。请è”系店铺所有者。"
-"An error occurred while getting the requested content.","获å–所请求的内容时出错。"
-"An error occurred while getting the requested content. Please contact the store owner.","获å–所请求的内容时出错。请è”系店铺所有者。"
-"An error occurred while saving the file(s).","ä¿å˜æ–‡ä»¶æ—¶å‡ºé”™ã€‚"
-"Availability:","å¯ç”¨æ€§ï¼š"
-"Back","返回"
-"Canceled","å·²å–消"
-"Cannot connect to remote host, error: %s.","æ— æ³•è”系远程主机，错误：%s"
-"Catalog Product View (Downloadable)","分类产å“视图（å¯ä¸‹è½½ï¼‰"
-"Category API","分类API"
-"Customer My Account Downloadable Items","客户我的å¸æˆ·ä»ªè¡¨æ¿é¡¹ç›®"
-"Date","日期"
-"Default Link Title","é»˜è®¤é“¾æŽ¥æ ‡é¢˜"
-"Default Maximum Number of Downloads","下载数é‡é»˜è®¤æœ€å¤§å€¼"
-"Default Sample Title","é»˜è®¤èŒƒä¾‹æ ‡é¢˜"
-"Delete","åˆ é™¤"
-"Disable Guest Checkout if Cart Contains Downloadable Items","如果è´ç‰©è½¦åŒ…å«å¯ä¸‹è½½å†…容，则ç¦æ¢æ¥å®¾ç»“è´¦"
-"Downloadable Information","å¯ä¸‹è½½çš„ä¿¡æ¯"
-"Downloadable Product","å¯ä¸‹è½½äº§å“"
-"Downloadable Product Options","å¯ä¸‹è½½äº§å“选项"
-"Downloadable Product Section","å¯ä¸‹è½½äº§å“区å—"
-"Edit","编辑"
-"Edit item parameters","编辑项目å‚æ•°"
-"Excl. Tax","ä¸å«ç¨Ž"
-"File","文件"
-"From:","æ¥è‡ªï¼š"
-"Gift Message","礼å“消æ¯"
-"Go to <a href=""%s"">My Downloadable Products</a>","转到 <a href=""%s"">我的å¯ä¸‹è½½äº§å“</a>"
-"Guest checkout will only work with shareable.","æ¥å®¾ç»“账空能仅é™å¯åˆ†äº«å•†å“。"
-"In stock","现货"
-"Incl. Tax","å«ç¨Ž"
-"Invalid download URL host.","æ— æ•ˆçš„ä¸‹è½½URL主机。"
-"Invalid download URL scheme.","æ— æ•ˆçš„ä¸‹è½½URL架构。"
-"Invalid download link type.","æ— æ•ˆçš„ä¸‹è½½é“¾æŽ¥ç±»åž‹ã€‚"
-"Invoiced","已出å‘票"
-"Links can be purchased separately","链接å¯å•ç‹¬è´ä¹°"
-"List","列表"
-"Max. Downloads","最大下载数"
-"Message:","ä¿¡æ¯ï¼š"
-"Move","移动"
-"My Downloadable Products","我的å¯ä¸‹è½½äº§å“"
-"Open Links in New Window","在新窗å£æ‰“开链接"
-"Order","è®¢å• #"
-"Order Item Status to Enable Downloads","订å•é¡¹ç›®çŠ¶æ€ä¸ºå…许下载"
-"Order id cannot be null","订å•ç¼–å·ä¸èƒ½ä¸ºç©º"
+Back,返回
+Price,ä»·æ ¼
+SKU,SKU
+Qty,Qty
+"Excl. Tax",ä¸å«ç¨Ž
+Total,Total
+"Incl. Tax",å«ç¨Ž
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+File,文件
+"Edit item parameters",编辑项目å‚æ•°
+Edit,编辑
+"Remove item","Remove item"
+"All Files","All Files"
+[GLOBAL],[GLOBAL]
+"[STORE VIEW]","[STORE VIEW]"
+Delete,åˆ é™¤
+Status,状æ€
+"Sort Order",排åºé¡ºåº
+Title,æ ‡é¢˜
+"Browse Files...","Browse Files..."
+"Use Default Value",使用默认值
+Ordered,已下å•
+Invoiced,已出å‘票
+Shipped,å·²å‘è´§
+Refunded,å·²å˜å‚¨
+Canceled,å·²å–消
+From:,æ¥è‡ªï¼š
+To:,至：
+Availability,Availability
+"In stock",现货
+"Out of stock",缺货
+"Gift Message",礼å“消æ¯
+Message:,ä¿¡æ¯ï¼š
+"Add New Row",æ·»åŠ æ–°è¡Œ
+"See price before order confirmation.",确认订å•å‰æ˜¾ç¤ºä»·æ ¼ã€‚
+"What's this?",这是什么？
+"Unit Price Excl. Tax","Unit Price Excl. Tax"
+"Unit Price Incl. Tax","Unit Price Incl. Tax"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Order #","Order #"
+Date,日期
+"Upload Files","Upload Files"
+"Downloadable Information",å¯ä¸‹è½½çš„ä¿¡æ¯
+Samples,Samples
+Links,Links
+Unlimited,æ— é™
+"Something went wrong while getting the requested content.","Something went wrong while getting the requested content."
+"My Downloadable Products",我的å¯ä¸‹è½½äº§å“
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
+"We can't find the link you requested.","We can't find the link you requested."
+"Please log in to download your product or purchase <a href=""%1"">%2</a>.","Please log in to download your product or purchase <a href=""%1"">%2</a>."
+"Please log in to download your product.",请登录以下载您的产å“
+"The link has expired.",该链接已过期。
+"The link is not available.",该链接ä¸å¯ç”¨ã€‚
+"Please set resource file and link type.",请设置资æºç±»åž‹ä¸Žé“¾æŽ¥ç±»åž‹ã€‚
+"Invalid download link type.",æ— æ•ˆçš„ä¸‹è½½é“¾æŽ¥ç±»åž‹ã€‚
+"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)."
+"Order id cannot be null",订å•ç¼–å·ä¸èƒ½ä¸ºç©º
"Order item id cannot be null","订è´ç‰©å“ id ä¸èƒ½ä¸ºç©º"
-"Ordered","已下å•"
-"Out of stock","缺货"
-"Pending","挂起"
-"Please log in to download your product or purchase <a href=""%s"">%s</a>.","请登录以下载您的产å“或è´ä¹° <a href=""%s"">%s</a>。"
-"Please log in to download your product.","请登录以下载您的产å“"
-"Please set resource file and link type.","请设置资æºç±»åž‹ä¸Žé“¾æŽ¥ç±»åž‹ã€‚"
-"Please specify product link(s).","请指定产å“链接。"
-"Price","ä»·æ ¼"
-"Product downloadable links","产å“下载链接"
-"Quantity","æ•°é‡"
-"Refunded","å·²å˜å‚¨"
-"Remaining Downloads","剩余下载"
-"Remove","åˆ é™¤"
-"Remove Item","åˆ é™¤é¡¹ç›®"
-"Remove links and samples from downloadable product","åˆ é™¤å¯ä¸‹è½½äº§å“的链接和范例"
-"Requested link does not exist.","所请求的链接ä¸å˜åœ¨ã€‚"
-"Retrieve links and samples list from downloadable product","从å¯ä¸‹è½½äº§å“或去链接和范例列表"
-"Sample","范例"
-"See price before order confirmation.","确认订å•å‰æ˜¾ç¤ºä»·æ ¼ã€‚"
-"Shareable","å¯åˆ†äº«"
-"Shipped","å·²å‘è´§"
-"Sort Order","排åºé¡ºåº"
-"Start Download","开始下载"
-"Status","状æ€"
-"The file does not exist.","该文件ä¸å˜åœ¨ã€‚"
-"The link has expired.","该链接已过期。"
-"The link is not available.","该链接ä¸å¯ç”¨ã€‚"
-"There are files that were selected but not uploaded yet. Please upload or remove them first","有文件被选ä¸ï¼Œä½†å°šæœªä¸Šä¼ ã€‚è¯·ä¸Šä¼ æˆ–å…ˆå°†å…¶åˆ é™¤"
-"Title","æ ‡é¢˜"
-"To:","至："
-"U","U"
-"Unlimited","æ— é™"
-"Use Content-Disposition","用户内容æè¿°"
-"Use Default Value","使用默认值"
-"View Order","查看订å•"
-"What's this?","这是什么？"
-"You have not purchased any downloadable products yet.","您尚未è´ä¹°ä»»ä½•å¯ä¸‹è½½çš„产å“。"
-"attachment","附件"
-"download","下载"
-"inline","内è”"
-"sample","示例"
+"Please specify product link(s).",请指定产å“链接。
+attachment,附件
+inline,内è”
+Pending,挂起
+sample,示例
+"Links can be purchased separately",链接å¯å•ç‹¬è´ä¹°
+"Max. Downloads",最大下载数
+Shareable,å¯åˆ†äº«
+Sample,范例
+"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with '_'.","建议对文件å使用å—æ¯ã€æ¨ªçº¿ï¼Œä»¥åŠä¸‹åˆ’线å—符。错误的å—符将被使用 '_'替æ¢ã€‚"
+U,U
+"Go to <a href=""%1"">My Downloadable Products</a>","Go to <a href=""%1"">My Downloadable Products</a>"
+"Downloadable Products","Downloadable Products"
+"Remaining Downloads",剩余下载
+"View Order",查看订å•
+"Start Download",开始下载
+"You have not purchased any downloadable products yet.",您尚未è´ä¹°ä»»ä½•å¯ä¸‹è½½çš„产å“。
+download,下载
+"Downloadable Product Options","Downloadable Product Options"
+"Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Default Maximum Number of Downloads","Default Maximum Number of Downloads"
+"Default Sample Title","Default Sample Title"
+"Default Link Title","Default Link Title"
+"Open Links in New Window","Open Links in New Window"
+"Use Content-Disposition","Use Content-Disposition"
+"Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
+"Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
index 1f36b9b5c6d..a4f0ec8141f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
@@ -40,4 +40,3 @@
</p>
<?php endif; ?>
<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getChildHtml('samples') ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
index c87f6f572dc..0c27f2d190b 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
@@ -70,7 +70,7 @@
<div class="message info empty"><span><?php echo __('You have not purchased any downloadable products yet.'); ?></span></div>
<?php endif; ?>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="action back">
<span><?php echo __('Back') ?></span>
diff --git a/app/code/Magento/Eav/i18n/de_DE.csv b/app/code/Magento/Eav/i18n/de_DE.csv
index d4dce2922b8..93a4360977c 100644
--- a/app/code/Magento/Eav/i18n/de_DE.csv
+++ b/app/code/Magento/Eav/i18n/de_DE.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" besteht nicht nur aus Ziffern."
-"""%s"" does not fit the entered date format.","""%s"" stimmt nicht mit dem eingegebenen Datumsformat überein."
-"""%s"" exceeds the allowed file size.","""%s"" überschreitet die vorgeschriebene Dateigröße."
-"""%s"" exceeds the allowed length.","""%s"" überschreitet die vorgeschriebene Länge."
-"""%s"" has not only alphabetic and digit characters.","""%s"" besteht nicht nur aus Buchstaben und Ziffern."
-"""%s"" has not only alphabetic characters.","""%s"" besteht nicht nur aus Buchstaben."
-"""%s"" height exceeds allowed value of %s px.","Die Größe von ""%s"" überschreitet den möglichen Wert von %s px"
-"""%s"" invalid type entered.","Ungültiger ""%s""-Typ eingegeben."
-"""%s"" is a required value.","""%s"" ist ein Zwangsfeld."
-"""%s"" is an empty string.","""%s"" ist ein leerer String."
-"""%s"" is not a valid URL.","""%s"" ist eine ungültige URL."
-"""%s"" is not a valid date.","""%s"" ist ein ungültiges Datum."
-"""%s"" is not a valid email address.","""%s"" ist eine ungültige E-Mail-Adresse."
-"""%s"" is not a valid file","""%s"" ist eine ungültige Datei."
-"""%s"" is not a valid file extension.","""%s"" ist eine ungültige Dateierweiterung."
-"""%s"" is not a valid file.","""%s"" ist eine ungültige Datei."
-"""%s"" is not a valid hostname.","""%s"" ist eine ungültiger Hostname."
-"""%s"" is not a valid image format","""%s"" ist ein ungültiges Bildformat."
-"""%s"" length must be equal or greater than %s characters.","""%s"" muss %s oder mehr Zeichen haben."
-"""%s"" length must be equal or less than %s characters.","""%s"" muss %s oder weniger Zeichen haben."
-"""%s"" width exceeds allowed value of %s px.","Die Breite von ""%s"" überschreitet den vorgeschriebenen Wert von %s Pixeln."
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht extrahieren."
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht unter den bekannten Einträgen finden."
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) entspricht keinem Hostnamen -Schema für TLD '%tld%'."
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","%value%' ist offenbar ein DNS-Hostname mit einem Strich an einer ungültigen Stelle."
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' scheint ein DNS-Hostname zu sein, aber die angegebene Punycode-Notation konnte nicht entschlüsselt werden."
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' scheint der Name eines lokalen Netzwerks zu sein. Namen lokaler Netzwerke sind allerdings nicht erlaubt."
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' scheint eine IP-Adresse zu sein. IP-Adressen sind allerdings nicht erlaubt."
-"'%value%' does not appear to be a valid URI hostname","'%value%' scheint kein gültiger URI-Hostname zu sein"
-"'%value%' does not appear to be a valid local network name","'%value%' scheint kein gültiger Name für ein lokales Netzwerk zu sein."
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' entspricht nicht der erwarteten Struktur eines DNS-Hostnames."
-"A joint field with this alias (%s) is already declared","Ein gemeinsames Feld mit diesem Alias (%s) ist bereits deklariert"
-"Add Option","Option hinzufügen"
-"An error occurred while loading a record, aborting. Error: %s","Fehler beim Laden eines Eintrags, Abbruch. Fehler: %s"
-"An error occurred while loading the collection, aborting. Error: %s","Fehler beim Laden der Zusammenstellung, Abbruch. Fehler: %s"
-"An error occurred while saving a record, aborting. Error: ","Fehler beim Speichern eines Eintrags, Abbruch. Fehler:"
-"Attempt to add an invalid object","Versuch, ein ungültiges Objekt hinzuzufügen"
-"Attribute Code","Attributcode"
-"Attribute Label","Attributlabel"
-"Attribute Properties","Attributeigenschaften"
+None,Keine
+No,Nein
+Email,E-Mail
+Yes,Ja
+System,System
+Required,Benötigt
+label,label
+"Attribute Code",Attributcode
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Vorgegebener Wert"
+"Unique Value","Einmaliger Wert"
+"Unique Value (not shared with other products)","Einmaliger Wert (nicht mit anderen Produkten geteilt)"
+"Not shared with other products","Nicht mit anderen Produkten geteilt"
+"Input Validation for Store Owner","Eingabeprüfung für Shopbesitzer"
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select","Mehrfache Auswahl"
+Dropdown,DropDown
+"Text Field",Textfeld
+"Text Area",Textbereich
+Date,Datum
+Yes/No,Ja/Nein
+URL,URL
"Attribute object is undefined","Attributobjekt ist undefiniert"
-"Attribute set with the ""%s"" name already exists.","Attributset mit dem Namen ""%s"" besteht bereits."
-"Attribute with the same code","Attribut mit dem gleichen Code"
-"Can't create table: %s","Kann keine Tabelle erstellen: %s"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties",Attributeigenschaften
+"Attribute Label",Attributlabel
"Catalog Input Type for Store Owner","Katalog Eingabetyp für Shopbesitzer"
-"Current module EAV entity is undefined","Aktuelles Modul EAV-Einheit ist nicht definiert"
-"Current module pathname is undefined","Der derzeitige Modulpfad ist undefiniert"
+"Values Required",Pflichtangabe
+"Decimal Number",Dezimalzahl
+"Integer Number","Ganze Zahl"
+Letters,Buchstaben
+"Letters (a-z, A-Z) or Numbers (0-9)","Buchstaben (a-z, A-Z) oder Zahlen (0-9)"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined","Entity-Objekt ist undefiniert"
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized","Entity ist nicht initialisiert"
+"Unknown parameter","Unbekannter Parameter"
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
+"Invalid default decimal value","Ungültiger dezimaler Standardwert"
+"Invalid default date","Ungültiges Standarddatum"
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date","Ungültiges Datum"
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object","Versuch, ein ungültiges Objekt hinzuzufügen"
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared","Gemeinsames Feld oder zusätzlicher Ausdruck mit diesem Alias ​​ist bereits deklariert"
+"Invalid alias, already exists in joint attributes","Ungültiger Alias, existiert bereits in gemeinsamen Attributen"
+"Invalid foreign key","Ungültiger ausländischer Schlüssel"
+"Invalid entity type","Ungültiger Entity-Typ"
+"Invalid attribute type","Ungültiger Attributtyp: %s"
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
+"Invalid joint fields","Ungültige gemeinsame Felder"
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
"Data integrity: No header row found for attribute","Datenrichtigkeit: Keine Kopfzeile für dieses Attribut"
-"Date","Datum"
-"Decimal Number","Dezimalzahl"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","Standard Produkt-Listing Sortierung wenn keine verfügbaren Sortierungen für Produkte definiert sind"
-"Default Value","Vorgegebener Wert"
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
+"Wrong entity ID","Falsche Entity-ID"
+"Wrong attribute set ID","Falsche Attribut-ID"
+"Wrong attribute group ID","Falsche Attribut-Gruppen-ID"
"Default option value is not defined","Standard-Optionswert ist nicht definiert"
-"Delete","Löschen"
-"Dropdown","DropDown"
-"Email","E-Mail"
-"Entity collection expected.","Datensatz Zusammenstellung erwartet."
-"Entity collections expected.","Datensatz Zusammenstellungen erwartet."
+"Current module pathname is undefined","Der derzeitige Modulpfad ist undefiniert"
+"Current module EAV entity is undefined","Aktuelles Modul EAV-Einheit ist nicht definiert"
+"Form code is not defined","Formularcode ist nicht definiert"
"Entity instance is not defined","Entity-Instanz ist nicht definiert"
-"Entity is not initialized","Entity ist nicht initialisiert"
-"Entity object is undefined","Entity-Objekt ist undefiniert"
-"Failed to load node %s from config","Fehler beim Laden des Knotens %s von der Konfiguration"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Zum internen Gebrauch. Muss einzigartig sein und darf keine Leerzeichen enthalten. Die maximale Länge des Attribut-Codes muss weniger als %s Zeichen betragen"
+"Invalid form type.","Ungültiger Formulartyp."
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code","Attribut mit dem gleichen Code"
+"Frontend label is not defined","Frotend-Label ist nicht definiert"
"Form Element with the same attribute","Formular-Element mit gleichem Attribut"
"Form Fieldset with the same code","Formular-Fieldset mit gleichem Code"
"Form Type with the same code","Formulartyp mit gleichem Code"
-"Form code is not defined","Formularcode ist nicht definiert"
-"Frontend label is not defined","Frotend-Label ist nicht definiert"
-"Input Validation for Store Owner","Eingabeprüfung für Shopbesitzer"
-"Integer Number","Ganze Zahl"
-"Invalid EAV attribute.","Ungültiges EAV-Attribut."
-"Invalid alias, already exists in joint attributes","Ungültiger Alias, existiert bereits in gemeinsamen Attributen"
-"Invalid attribute name: %s","Ungültiger Attributname: %s"
-"Invalid attribute requested: %s","Ungültiges Attribut angefragt: %s"
-"Invalid attribute type","Ungültiger Attributtyp: %s"
-"Invalid character encountered in increment ID: %s","Ungültiges Zeichen in hochgezählter ID gefunden: %s"
-"Invalid date","Ungültiges Datum"
-"Invalid default date","Ungültiges Standarddatum"
-"Invalid default decimal value","Ungültiger dezimaler Standardwert"
-"Invalid entity specified","Ungültiger Datensatz angegeben"
-"Invalid entity supplied.","Ungültiger Datensatz angegeben."
-"Invalid entity supplied: %s","Ungültige Entity eingegeben: %s"
-"Invalid entity type","Ungültiger Entity-Typ"
-"Invalid entity_id, skipping the record.","Ungültige Datensatz ID, Eintrag wird übersprungen."
-"Invalid entity_type specified: %s","Ungültiger Datensatztyp angegeben: %s"
-"Invalid foreign key","Ungültiger ausländischer Schlüssel"
-"Invalid form type.","Ungültiger Formulartyp."
-"Invalid joint fields","Ungültige gemeinsame Felder"
-"Invalid store specified","Ungültiger Store definiert"
-"Invalid type given. String expected","Ungültigen Typ angegeben. Zeichenfolge erwartet."
-"Joined field with this alias is already declared","Mit diesem Alias verbundenes Feld ​​ist bereits deklariert"
-"Joint field or attribute expression with this alias is already declared","Gemeinsames Feld oder zusätzlicher Ausdruck mit diesem Alias ​​ist bereits deklariert"
-"Letters","Buchstaben"
-"Letters (a-z, A-Z) or Numbers (0-9)","Buchstaben (a-z, A-Z) oder Zahlen (0-9)"
-"Loaded %d records","%d Einträge geladen"
-"Maximum length of attribute code must be less then %s symbols","Die maximale Länge dieses Attributcodes sollte nicht länger als %s Zeichen sein."
-"Multiple Select","Mehrfache Auswahl"
-"No","Nein"
-"No options found in config node %s","Keine Optionen in Konfigurationsknoten %s gefunden"
-"None","Keine"
-"Not shared with other products","Nicht mit anderen Produkten geteilt"
-"Problem loading the collection, aborting. Error: %s","Problem beim Laden der Zusammenstellung, Abbruch. Fehler: %s"
-"Problem saving the collection, aborting. Error: %s","Problem beim Speichern der Zusammenstellung, Abbruch. Fehler: %s"
-"Required","Benötigt"
-"Saved %d record(s).","%d Eingaben gespeichert."
-"Source model ""%s"" not found for attribute ""%s""","Quellen-Modell ""%s"" wurde nicht gefunden für das Attribut ""%s"""
-"System","System"
-"Text Area","Textbereich"
-"Text Field","Textfeld"
-"The attribute code '%s' is reserved by system. Please try another attribute code","Der Attributcode '%s' wurde vom System reserviert. Bitte probieren Sie einen anderen Attributcode aus."
-"The value of attribute ""%s"" must be unique","Der Wert des Attributs ""%s"" muss einzigartig sein."
-"The value of attribute ""%s"" must be unique.","Der Wert des Attributs ""%s"" muss einzigartig sein."
-"URL","URL"
-"Unique Value","Einmaliger Wert"
-"Unique Value (not shared with other products)","Einmaliger Wert (nicht mit anderen Produkten geteilt)"
-"Unknown parameter","Unbekannter Parameter"
-"Values Required","Pflichtangabe"
-"Wrong attribute group ID","Falsche Attribut-Gruppen-ID"
-"Wrong attribute set ID","Falsche Attribut-ID"
-"Wrong entity ID","Falsche Entity-ID"
-"Wrong type definition for %s","Falsche Typdefinition für %s"
-"Yes","Ja"
-"Yes/No","Ja/Nein"
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Eav/i18n/en_US.csv b/app/code/Magento/Eav/i18n/en_US.csv
index 87734b83156..c1819f87eee 100644
--- a/app/code/Magento/Eav/i18n/en_US.csv
+++ b/app/code/Magento/Eav/i18n/en_US.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" contains not only digit characters."
-"""%s"" does not fit the entered date format.","""%s"" does not fit the entered date format."
-"""%s"" exceeds the allowed file size.","""%s"" exceeds the allowed file size."
-"""%s"" exceeds the allowed length.","""%s"" exceeds the allowed length."
-"""%s"" has not only alphabetic and digit characters.","""%s"" has not only alphabetic and digit characters."
-"""%s"" has not only alphabetic characters.","""%s"" has not only alphabetic characters."
-"""%s"" height exceeds allowed value of %s px.","""%s"" height exceeds allowed value of %s px."
-"""%s"" invalid type entered.","""%s"" invalid type entered."
-"""%s"" is a required value.","""%s"" is a required value."
-"""%s"" is an empty string.","""%s"" is an empty string."
-"""%s"" is not a valid URL.","""%s"" is not a valid URL."
-"""%s"" is not a valid date.","""%s"" is not a valid date."
-"""%s"" is not a valid email address.","""%s"" is not a valid email address."
-"""%s"" is not a valid file","""%s"" is not a valid file"
-"""%s"" is not a valid file extension.","""%s"" is not a valid file extension."
-"""%s"" is not a valid file.","""%s"" is not a valid file."
-"""%s"" is not a valid hostname.","""%s"" is not a valid hostname."
-"""%s"" is not a valid image format","""%s"" is not a valid image format"
-"""%s"" length must be equal or greater than %s characters.","""%s"" length must be equal or greater than %s characters."
-"""%s"" length must be equal or less than %s characters.","""%s"" length must be equal or less than %s characters."
-"""%s"" width exceeds allowed value of %s px.","""%s"" width exceeds allowed value of %s px."
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' appears to be a DNS hostname but contains a dash in an invalid position"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' appears to be a local network name but local network names are not allowed"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' appears to be an IP address, but IP addresses are not allowed"
-"'%value%' does not appear to be a valid URI hostname","'%value%' does not appear to be a valid URI hostname"
-"'%value%' does not appear to be a valid local network name","'%value%' does not appear to be a valid local network name"
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' does not match the expected structure for a DNS hostname"
-"A joint field with this alias (%s) is already declared","A joint field with this alias (%s) is already declared"
-"Add Option","Add Option"
-"An error occurred while loading a record, aborting. Error: %s","An error occurred while loading a record, aborting. Error: %s"
-"An error occurred while loading the collection, aborting. Error: %s","An error occurred while loading the collection, aborting. Error: %s"
-"An error occurred while saving a record, aborting. Error: ","An error occurred while saving a record, aborting. Error: "
-"Attempt to add an invalid object","Attempt to add an invalid object"
+None,None
+No,No
+Email,Email
+Yes,Yes
+System,System
+Required,Required
+label,label
"Attribute Code","Attribute Code"
-"Attribute Label","Attribute Label"
-"Attribute Properties","Attribute Properties"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Default Value"
+"Unique Value","Unique Value"
+"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
+"Not shared with other products","Not shared with other products"
+"Input Validation for Store Owner","Input Validation for Store Owner"
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select","Multiple Select"
+Dropdown,Dropdown
+"Text Field","Text Field"
+"Text Area","Text Area"
+Date,Date
+Yes/No,Yes/No
+URL,URL
"Attribute object is undefined","Attribute object is undefined"
-"Attribute set with the ""%s"" name already exists.","Attribute set with the ""%s"" name already exists."
-"Attribute with the same code","Attribute with the same code"
-"Can't create table: %s","Can't create table: %s"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties","Attribute Properties"
+"Attribute Label","Attribute Label"
"Catalog Input Type for Store Owner","Catalog Input Type for Store Owner"
-"Current module EAV entity is undefined","Current module EAV entity is undefined"
-"Current module pathname is undefined","Current module pathname is undefined"
-"Data integrity: No header row found for attribute","Data integrity: No header row found for attribute"
-"Date","Date"
+"Values Required","Values Required"
"Decimal Number","Decimal Number"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","Default Product Listing Sort by not exists on Available Product Listing Sort By"
-"Default Value","Default Value"
-"Default option value is not defined","Default option value is not defined"
-"Delete","Delete"
-"Dropdown","Dropdown"
-"Email","Email"
-"Entity collection expected.","Entity collection expected."
-"Entity collections expected.","Entity collections expected."
-"Entity instance is not defined","Entity instance is not defined"
-"Entity is not initialized","Entity is not initialized"
-"Entity object is undefined","Entity object is undefined"
-"Failed to load node %s from config","Failed to load node %s from config"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols"
-"Form Element with the same attribute","Form Element with the same attribute"
-"Form Fieldset with the same code","Form Fieldset with the same code"
-"Form Type with the same code","Form Type with the same code"
-"Form code is not defined","Form code is not defined"
-"Frontend label is not defined","Frontend label is not defined"
-"Input Validation for Store Owner","Input Validation for Store Owner"
"Integer Number","Integer Number"
-"Invalid EAV attribute.","Invalid EAV attribute."
-"Invalid alias, already exists in joint attributes","Invalid alias, already exists in joint attributes"
-"Invalid attribute name: %s","Invalid attribute name: %s"
-"Invalid attribute requested: %s","Invalid attribute requested: %s"
-"Invalid attribute type","Invalid attribute type"
-"Invalid character encountered in increment ID: %s","Invalid character encountered in increment ID: %s"
-"Invalid date","Invalid date"
-"Invalid default date","Invalid default date"
+Letters,Letters
+"Letters (a-z, A-Z) or Numbers (0-9)","Letters (a-z, A-Z) or Numbers (0-9)"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined","Entity object is undefined"
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized","Entity is not initialized"
+"Unknown parameter","Unknown parameter"
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
"Invalid default decimal value","Invalid default decimal value"
-"Invalid entity specified","Invalid entity specified"
-"Invalid entity supplied.","Invalid entity supplied."
-"Invalid entity supplied: %s","Invalid entity supplied: %s"
-"Invalid entity type","Invalid entity type"
-"Invalid entity_id, skipping the record.","Invalid entity_id, skipping the record."
-"Invalid entity_type specified: %s","Invalid entity_type specified: %s"
+"Invalid default date","Invalid default date"
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date","Invalid date"
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object","Attempt to add an invalid object"
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared","Joint field or attribute expression with this alias is already declared"
+"Invalid alias, already exists in joint attributes","Invalid alias, already exists in joint attributes"
"Invalid foreign key","Invalid foreign key"
-"Invalid form type.","Invalid form type."
+"Invalid entity type","Invalid entity type"
+"Invalid attribute type","Invalid attribute type"
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
"Invalid joint fields","Invalid joint fields"
-"Invalid store specified","Invalid store specified"
-"Invalid type given. String expected","Invalid type given. String expected"
-"Joined field with this alias is already declared","Joined field with this alias is already declared"
-"Joint field or attribute expression with this alias is already declared","Joint field or attribute expression with this alias is already declared"
-"Letters","Letters"
-"Letters (a-z, A-Z) or Numbers (0-9)","Letters (a-z, A-Z) or Numbers (0-9)"
-"Loaded %d records","Loaded %d records"
-"Maximum length of attribute code must be less then %s symbols","Maximum length of attribute code must be less then %s symbols"
-"Multiple Select","Multiple Select"
-"No","No"
-"No options found in config node %s","No options found in config node %s"
-"None","None"
-"Not shared with other products","Not shared with other products"
-"Problem loading the collection, aborting. Error: %s","Problem loading the collection, aborting. Error: %s"
-"Problem saving the collection, aborting. Error: %s","Problem saving the collection, aborting. Error: %s"
-"Required","Required"
-"Saved %d record(s).","Saved %d record(s)."
-"Source model ""%s"" not found for attribute ""%s""","Source model ""%s"" not found for attribute ""%s"""
-"System","System"
-"Text Area","Text Area"
-"Text Field","Text Field"
-"The attribute code '%s' is reserved by system. Please try another attribute code","The attribute code '%s' is reserved by system. Please try another attribute code"
-"The value of attribute ""%s"" must be unique","The value of attribute ""%s"" must be unique"
-"The value of attribute ""%s"" must be unique.","The value of attribute ""%s"" must be unique."
-"URL","URL"
-"Unique Value","Unique Value"
-"Unique Value (not shared with other products)","Unique Value (not shared with other products)"
-"Unknown parameter","Unknown parameter"
-"Values Required","Values Required"
-"Wrong attribute group ID","Wrong attribute group ID"
-"Wrong attribute set ID","Wrong attribute set ID"
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
+"Data integrity: No header row found for attribute","Data integrity: No header row found for attribute"
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
"Wrong entity ID","Wrong entity ID"
-"Wrong type definition for %s","Wrong type definition for %s"
-"Yes","Yes"
-"Yes/No","Yes/No"
+"Wrong attribute set ID","Wrong attribute set ID"
+"Wrong attribute group ID","Wrong attribute group ID"
+"Default option value is not defined","Default option value is not defined"
+"Current module pathname is undefined","Current module pathname is undefined"
+"Current module EAV entity is undefined","Current module EAV entity is undefined"
+"Form code is not defined","Form code is not defined"
+"Entity instance is not defined","Entity instance is not defined"
+"Invalid form type.","Invalid form type."
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code","Attribute with the same code"
+"Frontend label is not defined","Frontend label is not defined"
+"Form Element with the same attribute","Form Element with the same attribute"
+"Form Fieldset with the same code","Form Fieldset with the same code"
+"Form Type with the same code","Form Type with the same code"
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Eav/i18n/es_ES.csv b/app/code/Magento/Eav/i18n/es_ES.csv
index 250578defc4..3d2f45326d0 100644
--- a/app/code/Magento/Eav/i18n/es_ES.csv
+++ b/app/code/Magento/Eav/i18n/es_ES.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" no solo contiene dÃgitos."
-"""%s"" does not fit the entered date format.","""%s"" no se ajusta al formato de fecha introducido."
-"""%s"" exceeds the allowed file size.","""%s"" supera el tamaño de archivo permitido."
-"""%s"" exceeds the allowed length.","""%s"" excede la extensión permitida."
-"""%s"" has not only alphabetic and digit characters.","""%s"" no solo contiene letras y dÃgitos."
-"""%s"" has not only alphabetic characters.","""%s"" no solo contiene letras."
-"""%s"" height exceeds allowed value of %s px.","""%s"" excede la altura permitida para el valor de %s px."
-"""%s"" invalid type entered.","""%s"" introducido inválido."
-"""%s"" is a required value.","""%s"" es un valor necesario."
-"""%s"" is an empty string.","""%s"" es una cadena vacÃa."
-"""%s"" is not a valid URL.","""%s"" no es un URL válido."
-"""%s"" is not a valid date.","""%s"" no es una fecha válida."
-"""%s"" is not a valid email address.","""%s"" no es una dirección de e-mail válida."
-"""%s"" is not a valid file","""%s"" no es un archivo válido"
-"""%s"" is not a valid file extension.","""%s"" no es una extensión de archivo válida."
-"""%s"" is not a valid file.","""%s"" no es un archivo válido."
-"""%s"" is not a valid hostname.","""%s"" no es un servidor válido."
-"""%s"" is not a valid image format","""%s"" no es un formato de imagen válido"
-"""%s"" length must be equal or greater than %s characters.","La longitud de ""%"" debe ser igual o mayor a los caracteres de %."
-"""%s"" length must be equal or less than %s characters.","La longitud de ""%"" debe ser igual o menor a los caracteres de %."
-"""%s"" width exceeds allowed value of %s px.","""%s"" el ancho excede el valor permitido de %s px."
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser un servidor DNS pero no puede extraer la parte TLD"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser un servidor DNS pero no puede hacer coincidir en TLD con la lista"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser un servidor DNS pero no puede hacer coincidir el esquema del servidor con el TLD '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser un servidor DNS pero contiene un guión en una posición inválida"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","%value%' parece ser un nombre de servidor DNS pero no se puede descifrar la notación del Punycode introducido"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser un nombre de red local pero no se permiten los nombres de redes locales"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser una dirección IP, pero no se permiten direcciones IP"
-"'%value%' does not appear to be a valid URI hostname","'%value%' no parece ser un nombre de servidor URI válido"
-"'%value%' does not appear to be a valid local network name","'%value%' no parece ser un nombre válido de red local"
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' no concuerda con la estructura prevista de un nombre de servidor DNS"
-"A joint field with this alias (%s) is already declared","Ya se ha declarado un campo conjunto con este alias (%s)"
-"Add Option","Agregar opción"
-"An error occurred while loading a record, aborting. Error: %s","Se produjo un error al cargar un registro. Se anulará la operación. Error: %s"
-"An error occurred while loading the collection, aborting. Error: %s","Se produjo un error al cargar la recopilación. Se anulará la operación. Error: %s"
-"An error occurred while saving a record, aborting. Error: ","Se produjo un error al guardar un registro. Se anulará la operación. Error: %s"
-"Attempt to add an invalid object","Intento de añadir un objeto inválido"
+None,Nada
+No,No
+Email,"Correo electrónico"
+Yes,SÃ
+System,Sistema
+Required,Obligatorio
+label,label
"Attribute Code","Código de atributo"
-"Attribute Label","Etiqueta de atributo"
-"Attribute Properties","Propiedades de atributo"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Valor predeterminado"
+"Unique Value","Valor único"
+"Unique Value (not shared with other products)","Valor único (no se comparte con otros productos)"
+"Not shared with other products","No se comparte con otros productos"
+"Input Validation for Store Owner","Validación de entrada para el dueño de la tienda"
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select","Elección múltiple"
+Dropdown,Desplegar
+"Text Field","Campo de Texto"
+"Text Area","Ãrea de Texto"
+Date,Fecha
+Yes/No,Si/No
+URL,URL
"Attribute object is undefined","Objeto de campo indefinido"
-"Attribute set with the ""%s"" name already exists.","El atributo fijado con el nombre ""%s"" ya existe."
-"Attribute with the same code","Atributo con el mismo código"
-"Can't create table: %s","No se puede crear la tabla: %s"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties","Propiedades de atributo"
+"Attribute Label","Etiqueta de atributo"
"Catalog Input Type for Store Owner","Tipo de entrada de catálogo para el dueño de la tienda"
-"Current module EAV entity is undefined","Entidad de módulo EAV actual indefinida"
-"Current module pathname is undefined","Módulo URL actual indefinido"
-"Data integrity: No header row found for attribute","Integridad de datos: No se ha encontrado una lÃnea de encabezamiento para el campo"
-"Date","Fecha"
+"Values Required","Valores obligatorios"
"Decimal Number","Número decimal"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","La opción de orden predeterminado de lista de productos no existe entre los órdenes de lista de productos disponibles"
-"Default Value","Valor predeterminado"
-"Default option value is not defined","Valor automático indefinido"
-"Delete","Eliminar"
-"Dropdown","Desplegar"
-"Email","Correo electrónico"
-"Entity collection expected.","Se espera una recopilación de entidades."
-"Entity collections expected.","Se esperan recopilaciones de entidades."
-"Entity instance is not defined","Contenido de la entidad indefinido"
-"Entity is not initialized","Entidad no iniciada"
-"Entity object is undefined","Objeto de entidad indefinido"
-"Failed to load node %s from config","Fallo al cargar el nodo %s de la configuración"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Para uso interno. Debe ser único, sin espacios. La longitud máxima del código de atributo debe ser menor que los sÃmbolos %s"
-"Form Element with the same attribute","Formar elemento con el mismo atributo"
-"Form Fieldset with the same code","Formar conjunto de campos con el mismo código"
-"Form Type with the same code","Formar tipo con el mismo código"
-"Form code is not defined","Código indefinido"
-"Frontend label is not defined","Etiqueta inicial indefinida"
-"Input Validation for Store Owner","Validación de entrada para el dueño de la tienda"
"Integer Number","Número entero"
-"Invalid EAV attribute.","Atributo de EAV no válido."
-"Invalid alias, already exists in joint attributes","Alias no válido, ya existe en campos conjuntos"
-"Invalid attribute name: %s","Nombre de campo no válido: %s"
-"Invalid attribute requested: %s","Se solicitó un atributo no válido: %s"
-"Invalid attribute type","Tipo de campo no válido"
-"Invalid character encountered in increment ID: %s","Se encontró un caracter no válido en el ID de incremento: %s"
-"Invalid date","Fecha no válida"
-"Invalid default date","Fecha por defecto no válida"
+Letters,Letras
+"Letters (a-z, A-Z) or Numbers (0-9)","Letras (a-z, A-Z) o números (0-9)"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined","Objeto de entidad indefinido"
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized","Entidad no iniciada"
+"Unknown parameter","Parámetro desconocido"
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
"Invalid default decimal value","Valor decimal por defecto no válido"
-"Invalid entity specified","Se especificó una entidad no válida"
-"Invalid entity supplied.","Se suministró una entidad no válida."
-"Invalid entity supplied: %s","Entidad indicada no válida: %s"
-"Invalid entity type","Tipo de entidad no válido"
-"Invalid entity_id, skipping the record.","entity_id no válido. Se omitirá el registro."
-"Invalid entity_type specified: %s","Se especificó un entity_type no válido: %s"
+"Invalid default date","Fecha por defecto no válida"
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date","Fecha no válida"
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object","Intento de añadir un objeto inválido"
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared","Ya se ha declarado un campo de join o una expresión de atributos con este alias"
+"Invalid alias, already exists in joint attributes","Alias no válido, ya existe en campos conjuntos"
"Invalid foreign key","Clave externa no válida"
-"Invalid form type.","Tipo de forma no válido."
+"Invalid entity type","Tipo de entidad no válido"
+"Invalid attribute type","Tipo de campo no válido"
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
"Invalid joint fields","Campos de la joint no válidos"
-"Invalid store specified","Se especificó una tienda no válida"
-"Invalid type given. String expected","Tipo incorrecto introducido. Se esperaba una cadena"
-"Joined field with this alias is already declared","Ya se ha declarado un campo de join con este alias"
-"Joint field or attribute expression with this alias is already declared","Ya se ha declarado un campo de join o una expresión de atributos con este alias"
-"Letters","Letras"
-"Letters (a-z, A-Z) or Numbers (0-9)","Letras (a-z, A-Z) o números (0-9)"
-"Loaded %d records","Se cargaron %d registros"
-"Maximum length of attribute code must be less then %s symbols","La longitud máxima del código de atributo tiene que ser menor de %s sÃmbolos"
-"Multiple Select","Elección múltiple"
-"No","No"
-"No options found in config node %s","No se encontraron opciones en el nodo de configuración %s"
-"None","Nada"
-"Not shared with other products","No se comparte con otros productos"
-"Problem loading the collection, aborting. Error: %s","Se produjo un problema al cargar la recopilación. Se anulará la operación. Error: %s"
-"Problem saving the collection, aborting. Error: %s","Se produjo un problema al guardar la recopilación. Se anulará la operación. Error: %s"
-"Required","Obligatorio"
-"Saved %d record(s).","Se guardaron %d registros."
-"Source model ""%s"" not found for attribute ""%s""","No se ha encontrado el modelo fuente ""%s"" para el atributo ""%s"""
-"System","Sistema"
-"Text Area","Ãrea de Texto"
-"Text Field","Campo de Texto"
-"The attribute code '%s' is reserved by system. Please try another attribute code","El código de atributo '%s' está reservado por el sistema. Por favor, prueba con otro código de atributo"
-"The value of attribute ""%s"" must be unique","El valor del atributo ""%s"" tiene que ser único"
-"The value of attribute ""%s"" must be unique.","El valor del atributo ""%s"" tiene que ser único."
-"URL","URL"
-"Unique Value","Valor único"
-"Unique Value (not shared with other products)","Valor único (no se comparte con otros productos)"
-"Unknown parameter","Parámetro desconocido"
-"Values Required","Valores obligatorios"
-"Wrong attribute group ID","ID de grupo de atributos no válido"
-"Wrong attribute set ID","ID de conjunto de atributos no válido"
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
+"Data integrity: No header row found for attribute","Integridad de datos: No se ha encontrado una lÃnea de encabezamiento para el campo"
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
"Wrong entity ID","ID de entidad no válido"
-"Wrong type definition for %s","Definición de tipo no válida para %s"
-"Yes","SÃ"
-"Yes/No","Si/No"
+"Wrong attribute set ID","ID de conjunto de atributos no válido"
+"Wrong attribute group ID","ID de grupo de atributos no válido"
+"Default option value is not defined","Valor automático indefinido"
+"Current module pathname is undefined","Módulo URL actual indefinido"
+"Current module EAV entity is undefined","Entidad de módulo EAV actual indefinida"
+"Form code is not defined","Código indefinido"
+"Entity instance is not defined","Contenido de la entidad indefinido"
+"Invalid form type.","Tipo de forma no válido."
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code","Atributo con el mismo código"
+"Frontend label is not defined","Etiqueta inicial indefinida"
+"Form Element with the same attribute","Formar elemento con el mismo atributo"
+"Form Fieldset with the same code","Formar conjunto de campos con el mismo código"
+"Form Type with the same code","Formar tipo con el mismo código"
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Eav/i18n/fr_FR.csv b/app/code/Magento/Eav/i18n/fr_FR.csv
index dee07cd04a8..98e09d8b349 100644
--- a/app/code/Magento/Eav/i18n/fr_FR.csv
+++ b/app/code/Magento/Eav/i18n/fr_FR.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" ne contient pas que des chiffres."
-"""%s"" does not fit the entered date format.","""%s"" ne correspond pas au format de date entré."
-"""%s"" exceeds the allowed file size.","""%s"" dépasse la taille maximale autorisée."
-"""%s"" exceeds the allowed length.","""%s"" dépasse la longueur autorisée."
-"""%s"" has not only alphabetic and digit characters.","""%s"" ne contient pas que des lettres et des chiffres"
-"""%s"" has not only alphabetic characters.","""%s"" n'a pas que des lettres"
-"""%s"" height exceeds allowed value of %s px.","La hauteur de ""%s"" dépasse la valeur autorisée de %s pixels."
-"""%s"" invalid type entered.","Type ""%s"" invalide entré"
-"""%s"" is a required value.","""%s"" est une valeur requise."
-"""%s"" is an empty string.","""%s"" est vide."
-"""%s"" is not a valid URL.","""%s"" n'est pas une URL valide"
-"""%s"" is not a valid date.","""%s"" n'est pas une date valide"
-"""%s"" is not a valid email address.","""%s"" n'est pas une adresse email valide"
-"""%s"" is not a valid file","""%s"" n'est pas un fichier valide"
-"""%s"" is not a valid file extension.","""%s"" n'est pas une extension de fichier valide"
-"""%s"" is not a valid file.","""%s"" n'est pas un fichier valide"
-"""%s"" is not a valid hostname.","""%s"" n'est pas un nom valide"
-"""%s"" is not a valid image format","""%s"" n'est pas un format d'image valide"
-"""%s"" length must be equal or greater than %s characters.","""%s"" doit comporter %s caractères au minimum."
-"""%s"" length must be equal or less than %s characters.","""%s"" doit comporter %s caractères au maximum."
-"""%s"" width exceeds allowed value of %s px.","La largeur de ""%s"" dépasse la valeur autorisée de %s pixels."
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","""%s"" semble être un nom de DNS, mais il est impossible d'en extraire TLD"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' semble être un nom de DNS, mais il est impossible de trouver une correspondance dans la liste TLD"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' semble être un nom de DNS, mais impossible de trouver une correspondance avec le schéma TLD"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' semble être un nom de DNS, mais contient un / à un emplacement invalide."
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' semble être un nom de DNS mais la notation ne peut être décodée"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' semble être le nom d'un réseau local, mais les noms de réseaux locaux ne sont pas autorisés."
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' semble être une adresse IP, mais les adresses IP ne sont pas autorisées."
-"'%value%' does not appear to be a valid URI hostname","'%value%' ne semble pas être une URL valide"
-"'%value%' does not appear to be a valid local network name","'%value%' ne semble pas être un nom de réseau local valide"
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' ne correspond pas à la structure attendue pour un nom de DNS"
-"A joint field with this alias (%s) is already declared","Un champ joint avec l'alias (%s) est déjà déclaré."
-"Add Option","Ajouter option"
-"An error occurred while loading a record, aborting. Error: %s","Une erreur est survenue lors du chargement d'un enregistrement. Erreur : %s"
-"An error occurred while loading the collection, aborting. Error: %s","Une erreur est survenue lors du chargement de la collection. Erreur : %s"
-"An error occurred while saving a record, aborting. Error: ","Une erreur est survenue lors de la sauvegarde d'un enregistrement. Erreur :"
-"Attempt to add an invalid object","Tentative d'ajout d'un objet invalide"
+None,aucun
+No,Non
+Email,Email
+Yes,oui
+System,Système
+Required,Requis
+label,label
"Attribute Code","Code d'attribut"
-"Attribute Label","Label d'attribut"
-"Attribute Properties","Propriétés d'attribut"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Valeur par Défaut"
+"Unique Value","Valeur unique"
+"Unique Value (not shared with other products)","Valeur unique (non partagée avec d'autres produits)"
+"Not shared with other products","Non partagé avec d'autres produits"
+"Input Validation for Store Owner","Validation de l'entrée pour le propriétaire de la boutique"
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select","Choix multiple"
+Dropdown,"Liste déroulante"
+"Text Field","Champ de texte"
+"Text Area","Zone de texte"
+Date,Date
+Yes/No,Oui/Non
+URL,URL
"Attribute object is undefined","L'attribut de l'objet n'est pas défini"
-"Attribute set with the ""%s"" name already exists.","Un attribut avec le nom ""%s"" existe déjà ."
-"Attribute with the same code","Attribut avec le même code"
-"Can't create table: %s","Ne peut pas créer la table : %s"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties","Propriétés d'attribut"
+"Attribute Label","Label d'attribut"
"Catalog Input Type for Store Owner","Type d'entrée de catalogue pour le propriétaire de la boutique"
-"Current module EAV entity is undefined","L'entité de module actuelle EAV n'est pas définie"
-"Current module pathname is undefined","Le nom du répertoire du module actuel n'est pas défini"
-"Data integrity: No header row found for attribute","Intégrité des données : pas de ligne d'en-tête trouvée pour l'attribut"
-"Date","Date"
+"Values Required","Valeur requises"
"Decimal Number","Nombre décimal"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","Le tri par défaut des produits n'existe pas sur la liste des produits disponibles"
-"Default Value","Valeur par Défaut"
-"Default option value is not defined","Valeur d'option par défaut non définie"
-"Delete","Supprimer"
-"Dropdown","Liste déroulante"
-"Email","Email"
-"Entity collection expected.","Une collecte d'entité est attendue."
-"Entity collections expected.","Collectes d'entités attendues."
-"Entity instance is not defined","Instance de l'entité non définie"
-"Entity is not initialized","Entité non initialisée"
-"Entity object is undefined","Objet de l'entité non défini"
-"Failed to load node %s from config","Echec du chargement de %s depuis la configuration"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Pour usage interne. Doit être unique, sans espaces. La longueur maximale du code des attributs doit être inférieure à %s symboles"
-"Form Element with the same attribute","Élément de formulaire avec le même attribut"
-"Form Fieldset with the same code","Formulaire de champ avec le même code"
-"Form Type with the same code","Type de formulaire avec le même code"
-"Form code is not defined","Code formulaire non défini"
-"Frontend label is not defined","Étiquette front-end non définie"
-"Input Validation for Store Owner","Validation de l'entrée pour le propriétaire de la boutique"
"Integer Number","Nombre entier"
-"Invalid EAV attribute.","Attribut EAV invalide."
-"Invalid alias, already exists in joint attributes","Pseudonyme invalide, existe déjà dans des attributs conjoints"
-"Invalid attribute name: %s","Nom d'attribut invalide : %s"
-"Invalid attribute requested: %s","Attribut requis invalide : %s"
-"Invalid attribute type","Type d'attribut invalide"
-"Invalid character encountered in increment ID: %s","Caractère invalide trouvé dans l'ID d'incrément : %s"
-"Invalid date","Date invalide"
-"Invalid default date","Date par défaut invalide"
+Letters,Lettres
+"Letters (a-z, A-Z) or Numbers (0-9)","Lettres (a-z, A-Z) ou chiffres (0-9)"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined","Objet de l'entité non défini"
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized","Entité non initialisée"
+"Unknown parameter","Paramètre inconnu"
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
"Invalid default decimal value","Valeur décimale par défaut invalide"
-"Invalid entity specified","Entité spécifiée invalide"
-"Invalid entity supplied.","Entité fournie invalide."
-"Invalid entity supplied: %s","Entité fournie invalide : %s"
-"Invalid entity type","Type d'entité invalide"
-"Invalid entity_id, skipping the record.","ID de l'entité invalide, enregistrement sauté."
-"Invalid entity_type specified: %s","Type d'entité spécifiée invalide : %s"
+"Invalid default date","Date par défaut invalide"
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date","Date invalide"
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object","Tentative d'ajout d'un objet invalide"
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared","Champ joint ou expression d'attribut avec cet alias déjà déclaré"
+"Invalid alias, already exists in joint attributes","Pseudonyme invalide, existe déjà dans des attributs conjoints"
"Invalid foreign key","Clé étrangère invalide"
-"Invalid form type.","Type de formulaire invalide."
+"Invalid entity type","Type d'entité invalide"
+"Invalid attribute type","Type d'attribut invalide"
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
"Invalid joint fields","Champs joints invalides"
-"Invalid store specified","Boutique spécifiée invalide"
-"Invalid type given. String expected","Type donné invalide."
-"Joined field with this alias is already declared","Un champ joint avec cet alias est déjà déclaré"
-"Joint field or attribute expression with this alias is already declared","Champ joint ou expression d'attribut avec cet alias déjà déclaré"
-"Letters","Lettres"
-"Letters (a-z, A-Z) or Numbers (0-9)","Lettres (a-z, A-Z) ou chiffres (0-9)"
-"Loaded %d records","%d enregistrements chargés"
-"Maximum length of attribute code must be less then %s symbols","La longueur maximale du code d'attribut doit être moins de %s symboles"
-"Multiple Select","Choix multiple"
-"No","Non"
-"No options found in config node %s","Aucune option trouvée dans le nœud de config %s"
-"None","aucun"
-"Not shared with other products","Non partagé avec d'autres produits"
-"Problem loading the collection, aborting. Error: %s","Problème lors du chargement de la collection, annulation. Erreur : %s"
-"Problem saving the collection, aborting. Error: %s","Problème lors de l'enregistrement de la collection, annulation. Erreur : %s"
-"Required","Requis"
-"Saved %d record(s).","%d enregistrements enregistré(s)."
-"Source model ""%s"" not found for attribute ""%s""","Source modèle ""%s"" non trouvé pour l'attribut ""%s"""
-"System","Système"
-"Text Area","Zone de texte"
-"Text Field","Champ de texte"
-"The attribute code '%s' is reserved by system. Please try another attribute code","Le code d'attribut '%s' est réservé par le système. Veuillez essayer un autre code"
-"The value of attribute ""%s"" must be unique","La valeur de l'attribut ""%s"" doit être unique"
-"The value of attribute ""%s"" must be unique.","La valeur de l'attribut ""%s"" doit être unique."
-"URL","URL"
-"Unique Value","Valeur unique"
-"Unique Value (not shared with other products)","Valeur unique (non partagée avec d'autres produits)"
-"Unknown parameter","Paramètre inconnu"
-"Values Required","Valeur requises"
-"Wrong attribute group ID","Identifiant du groupe attribut incorrect"
-"Wrong attribute set ID","Jeu d'attribut identifiant incorrect"
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
+"Data integrity: No header row found for attribute","Intégrité des données : pas de ligne d'en-tête trouvée pour l'attribut"
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
"Wrong entity ID","Identifiant de l'entité incorrect"
-"Wrong type definition for %s","Type de définition incorrect pour %s"
-"Yes","oui"
-"Yes/No","Oui/Non"
+"Wrong attribute set ID","Jeu d'attribut identifiant incorrect"
+"Wrong attribute group ID","Identifiant du groupe attribut incorrect"
+"Default option value is not defined","Valeur d'option par défaut non définie"
+"Current module pathname is undefined","Le nom du répertoire du module actuel n'est pas défini"
+"Current module EAV entity is undefined","L'entité de module actuelle EAV n'est pas définie"
+"Form code is not defined","Code formulaire non défini"
+"Entity instance is not defined","Instance de l'entité non définie"
+"Invalid form type.","Type de formulaire invalide."
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code","Attribut avec le même code"
+"Frontend label is not defined","Étiquette front-end non définie"
+"Form Element with the same attribute","Élément de formulaire avec le même attribut"
+"Form Fieldset with the same code","Formulaire de champ avec le même code"
+"Form Type with the same code","Type de formulaire avec le même code"
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Eav/i18n/nl_NL.csv b/app/code/Magento/Eav/i18n/nl_NL.csv
index fc59d4a4f3f..f4957e8caf4 100644
--- a/app/code/Magento/Eav/i18n/nl_NL.csv
+++ b/app/code/Magento/Eav/i18n/nl_NL.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" bevat niet alleen numerieke tekens."
-"""%s"" does not fit the entered date format.","""%s"" past niet in het ingevoegde datum format."
-"""%s"" exceeds the allowed file size.","""%s"" overschrijdt de toegestane bestandsgrootte."
-"""%s"" exceeds the allowed length.","""%s"" overschrijdt de toegestane lengte"
-"""%s"" has not only alphabetic and digit characters.","""%s"" bevat niet alleen alfabetische en numerieke tekens."
-"""%s"" has not only alphabetic characters.","""%s"" bevat niet alleen alfabetische tekens."
-"""%s"" height exceeds allowed value of %s px.","""%s"" hoogte overschrijd de toegestane waarde van %s px."
-"""%s"" invalid type entered.","""%s"" ongeldige type ingevoerd."
-"""%s"" is a required value.","""%s"" is een vereiste waarde."
-"""%s"" is an empty string.","""%s"" is een lege string."
-"""%s"" is not a valid URL.","""%s"" is een ongeldige URL."
-"""%s"" is not a valid date.","""%s"" is een ongeldige datum."
-"""%s"" is not a valid email address.","""%s"" is een ongeldig e-mail adres."
-"""%s"" is not a valid file","""%s"" is een ongeldig bestand."
-"""%s"" is not a valid file extension.","""%s"" is een ongeldige bestandsextensie."
-"""%s"" is not a valid file.","""%s"" is een ongeldig bestand."
-"""%s"" is not a valid hostname.","""%s"" is een ongeldige bestandsnaam."
-"""%s"" is not a valid image format","""%s"" is een ongeldige afbeeldings indeling"
-"""%s"" length must be equal or greater than %s characters.","""%s"" lengte moet groter zijn dan of gelijk zijn aan %s karakters."
-"""%s"" length must be equal or less than %s characters.","""%s"" lengte moet kleiner zijn dan of gelijk zijn aan %s karakter."
-"""%s"" width exceeds allowed value of %s px.","""%s"" breedte overschrijd de toegestane waarde van %s px."
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' lijkt een DNS hostnaam te zijn maar kan geen TLD deel eruit halen."
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' lijkt een DNS hostnaam te zijn maar komt niet overeen met de TLD in de eigen bekende lijst."
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' lijkt een DNS hostnaam te zijn maar kan niet overeenkomen met de hostnaam voor het TLD schema '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' lijkt een DNS hostnaam te zijn maar bevat een liggende streep op een ongeldige positie"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' lijkt een DNS hostnaam te zijn maar de gegeven punycode kan niet worden gedecodeerd"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' lijkt een lokale netwerk naam te zijn maar, lokale netwerk namen zijn niet toegestaan"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' lijkt een IP adres te zijn, maar IP adressen zijn niet toegestaan"
-"'%value%' does not appear to be a valid URI hostname","'%value%' blijkt geen geldige URI hostnaam te zijn"
-"'%value%' does not appear to be a valid local network name","'%value%' blijkt geen geldige lokale netwerk naam te zijn"
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' komt niet overeen met de verwachte structuur van een DNS hostnaam"
-"A joint field with this alias (%s) is already declared","Een samengesteld veld met deze alias (%s) is al opgegeven"
-"Add Option","Voeg Optie toe"
-"An error occurred while loading a record, aborting. Error: %s","Er is een fout opgetreden tijdens het laden van een record, afbreken. Fout: %s"
-"An error occurred while loading the collection, aborting. Error: %s","Er is een fout opgetreden tijdens het laden van de collectie, afbreken. Fout: %s"
-"An error occurred while saving a record, aborting. Error: ","Er is een fout opgetreden tijdens het opslaan van een record, afbreken. Fout:"
-"Attempt to add an invalid object","Poging een ongeldig object toe te voegen"
-"Attribute Code","Attribuutcode"
-"Attribute Label","Attribuutlabel"
-"Attribute Properties","Attribuut Eigenschappen"
+None,Geen
+No,Nee
+Email,Email
+Yes,Ja
+System,Systeem
+Required,Benodigd
+label,label
+"Attribute Code",Attribuutcode
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Vaststaande Waarde"
+"Unique Value","Unieke waarde"
+"Unique Value (not shared with other products)","Unieke waarde (niet gedeeld met andere producten)"
+"Not shared with other products","Niet gedeeld met andere producten"
+"Input Validation for Store Owner","Input Validatie voor Winkeleigenaar"
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select","Multiple Selecteer"
+Dropdown,Dropdown
+"Text Field",Tekstveld
+"Text Area",Tekstgebied
+Date,Datum
+Yes/No,Ja/Nee
+URL,URL
"Attribute object is undefined","Attribuut object is ongedefinieerd"
-"Attribute set with the ""%s"" name already exists.","Attributenset met naam ""%s"" bestaat al."
-"Attribute with the same code","Attribuut met zelfde code"
-"Can't create table: %s","Kan geen tabel creëren: %s"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties","Attribuut Eigenschappen"
+"Attribute Label",Attribuutlabel
"Catalog Input Type for Store Owner","Catalogus Input Type voor Winkeleigenaar"
-"Current module EAV entity is undefined","Huidige module EAV eenheid in ongedefinieerd"
-"Current module pathname is undefined","Huidige module padnaam is ongedefinieerd"
-"Data integrity: No header row found for attribute","Data integriteit: Geen koptekst rij gevonden voor attribuut"
-"Date","Datum"
+"Values Required","Waardes verplicht"
"Decimal Number","Decimaal Getal"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","Default Product Listing Sort by bestaat niet op Available Product Listing Sort By"
-"Default Value","Vaststaande Waarde"
-"Default option value is not defined","Vaststaande optie waarde is niet gedefinieerd."
-"Delete","Verwijderen"
-"Dropdown","Dropdown"
-"Email","Email"
-"Entity collection expected.","Eenheidscollectie verwacht."
-"Entity collections expected.","Eenheidscollecties verwacht."
-"Entity instance is not defined","Voorbeeld eenheid is niet gedefinieerd"
-"Entity is not initialized","Eenheid is niet geïnitialiseerd"
-"Entity object is undefined","Doel eenheid is niet gedefinieerd"
-"Failed to load node %s from config","Knooppunt %s van config laden mislukt"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Voor intern gebruik. Moet uniek zijn zonder spaties. Maximale lengte van attribuut code moet minder dan %s tekens zijn"
-"Form Element with the same attribute","Vorm element met zelfde attribuut"
-"Form Fieldset with the same code","Vorm Fieldset met zelfde code"
-"Form Type with the same code","Vorm Type met zelfde code"
-"Form code is not defined","Vorm code is niet gedefinieerd"
-"Frontend label is not defined","Front end label is niet gedefinieerd"
-"Input Validation for Store Owner","Input Validatie voor Winkeleigenaar"
"Integer Number","Integer Getal"
-"Invalid EAV attribute.","Ongeldig EAV attribuut."
-"Invalid alias, already exists in joint attributes","Ongeldige alias, bestaat al in samengestelde attributen"
-"Invalid attribute name: %s","Ongeldige attribuutnaam: %s"
-"Invalid attribute requested: %s","Ongeldig attribuut gevraagd: %s"
-"Invalid attribute type","Ongeldig attribuut type"
-"Invalid character encountered in increment ID: %s","Ongeldig teken gevonden in increment ID: %s"
-"Invalid date","Ongeldige datum"
-"Invalid default date","Ongeldige standaarddatum"
+Letters,Letters
+"Letters (a-z, A-Z) or Numbers (0-9)","Letters (a-z, A-Z) or cijfers (0-9)"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined","Doel eenheid is niet gedefinieerd"
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized","Eenheid is niet geïnitialiseerd"
+"Unknown parameter","Onbekende parameter"
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
"Invalid default decimal value","Ongeldige standaard decimale waarde"
-"Invalid entity specified","Ongeldige entiteit gespecificeerd"
-"Invalid entity supplied.","Ongeldige entiteit geleverd."
-"Invalid entity supplied: %s","Ongeldige entiteit geleverd: %s"
-"Invalid entity type","Ongeldig type entiteit"
-"Invalid entity_id, skipping the record.","Ongeldige entiteit_id, record wordt overgeslagen."
-"Invalid entity_type specified: %s","Ongeldige entiteit_type gespecificeerd: %s"
+"Invalid default date","Ongeldige standaarddatum"
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date","Ongeldige datum"
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object","Poging een ongeldig object toe te voegen"
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared","Verbonden veld of attribuut expressie met deze alias is reeds gedeclareerd"
+"Invalid alias, already exists in joint attributes","Ongeldige alias, bestaat al in samengestelde attributen"
"Invalid foreign key","Ongeldige vreemde sleutel"
-"Invalid form type.","Ongeldig type formulier."
+"Invalid entity type","Ongeldig type entiteit"
+"Invalid attribute type","Ongeldig attribuut type"
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
"Invalid joint fields","Ongeldige verbonden velden"
-"Invalid store specified","Ongeldige winkel gespecificeerd"
-"Invalid type given. String expected","Ongeldog type opgegeven. String verwacht"
-"Joined field with this alias is already declared","Verbonden veld met deze alias is reeds gedeclareerd"
-"Joint field or attribute expression with this alias is already declared","Verbonden veld of attribuut expressie met deze alias is reeds gedeclareerd"
-"Letters","Letters"
-"Letters (a-z, A-Z) or Numbers (0-9)","Letters (a-z, A-Z) or cijfers (0-9)"
-"Loaded %d records","%d Records geladen"
-"Maximum length of attribute code must be less then %s symbols","Maximale lengte van attribuutcode moet minder zijn dan %s symbolen"
-"Multiple Select","Multiple Selecteer"
-"No","Nee"
-"No options found in config node %s","Geen opties gevonden in config node %s"
-"None","Geen"
-"Not shared with other products","Niet gedeeld met andere producten"
-"Problem loading the collection, aborting. Error: %s","Probleem bij laden van collectie, laden wordt geaborteerd. Fout: %s"
-"Problem saving the collection, aborting. Error: %s","Probleem bij opslaan van verzameling, opslaan wordt geborteerd. Fout: %s"
-"Required","Benodigd"
-"Saved %d record(s).","%d Record(s) opgeslagen."
-"Source model ""%s"" not found for attribute ""%s""","Bronmodel ""%s"" niet gevonden voor attribuut ""%s"""
-"System","Systeem"
-"Text Area","Tekstgebied"
-"Text Field","Tekstveld"
-"The attribute code '%s' is reserved by system. Please try another attribute code","De attribuutcode '%s' is door het systeem gereserveerd. Probeer alsjeblieft een andere attribuutcode."
-"The value of attribute ""%s"" must be unique","De waarde van attribuut ""%s"" moet uniek zijn"
-"The value of attribute ""%s"" must be unique.","De waarde van attribute ""%s"" moet uniek zijn."
-"URL","URL"
-"Unique Value","Unieke waarde"
-"Unique Value (not shared with other products)","Unieke waarde (niet gedeeld met andere producten)"
-"Unknown parameter","Onbekende parameter"
-"Values Required","Waardes verplicht"
-"Wrong attribute group ID","Verkeerde attribuut groep ID"
-"Wrong attribute set ID","Verkeerde attribuut set ID"
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
+"Data integrity: No header row found for attribute","Data integriteit: Geen koptekst rij gevonden voor attribuut"
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
"Wrong entity ID","Verkeerde entiteit ID"
-"Wrong type definition for %s","Verkeerde soort definitie voor %s"
-"Yes","Ja"
-"Yes/No","Ja/Nee"
+"Wrong attribute set ID","Verkeerde attribuut set ID"
+"Wrong attribute group ID","Verkeerde attribuut groep ID"
+"Default option value is not defined","Vaststaande optie waarde is niet gedefinieerd."
+"Current module pathname is undefined","Huidige module padnaam is ongedefinieerd"
+"Current module EAV entity is undefined","Huidige module EAV eenheid in ongedefinieerd"
+"Form code is not defined","Vorm code is niet gedefinieerd"
+"Entity instance is not defined","Voorbeeld eenheid is niet gedefinieerd"
+"Invalid form type.","Ongeldig type formulier."
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code","Attribuut met zelfde code"
+"Frontend label is not defined","Front end label is niet gedefinieerd"
+"Form Element with the same attribute","Vorm element met zelfde attribuut"
+"Form Fieldset with the same code","Vorm Fieldset met zelfde code"
+"Form Type with the same code","Vorm Type met zelfde code"
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Eav/i18n/pt_BR.csv b/app/code/Magento/Eav/i18n/pt_BR.csv
index 41e063a9973..5e0a6753066 100644
--- a/app/code/Magento/Eav/i18n/pt_BR.csv
+++ b/app/code/Magento/Eav/i18n/pt_BR.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" não contém apenas caracteres de dÃgitos."
-"""%s"" does not fit the entered date format.","""%s"" não se encaixa no formato de data inserida."
-"""%s"" exceeds the allowed file size.","""%s"" excede o tamanho de arquivo permitido."
-"""%s"" exceeds the allowed length.","""%s"" excede o tamanho permitido."
-"""%s"" has not only alphabetic and digit characters.","""%s"" não tem apenas caracteres alfabéticos e dÃgitos."
-"""%s"" has not only alphabetic characters.","""%s"" não tem apenas caracteres alfabéticos."
-"""%s"" height exceeds allowed value of %s px.","A altura de ""%s"" excede o valor permitido de %s px."
-"""%s"" invalid type entered.","tipo ""%s"" inválido entrou."
-"""%s"" is a required value.","""%s"" é um valor necessário."
-"""%s"" is an empty string.","""%s"" é um valor vazio."
-"""%s"" is not a valid URL.","""%s"" não é um URL válido."
-"""%s"" is not a valid date.","""%s"" não é uma data válida."
-"""%s"" is not a valid email address.","""%s"" não é um endereço de e-mail válido."
-"""%s"" is not a valid file","""%s"" não é um arquivo válido"
-"""%s"" is not a valid file extension.","""%s"" não é uma extensão de arquivo válida."
-"""%s"" is not a valid file.","""%s"" não é um arquivo válido."
-"""%s"" is not a valid hostname.","""%s"" não é um nome de alojamento válido."
-"""%s"" is not a valid image format","""%s"" não é um formato de imagem válido"
-"""%s"" length must be equal or greater than %s characters.","Comprimento de ""%s"" deve ser igual ou maior que %s caracteres."
-"""%s"" length must be equal or less than %s characters.","Comprimento de ""%s"" deve ser igual ou menor que %s caracteres."
-"""%s"" width exceeds allowed value of %s px.","Largura de ""%s"" excede o valor permitido de %s px."
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser um nome de alojamento DNS mas não pode extrair parte TLD"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser um nome de alojamento DNS mas não consegue encontrar TLD contra a lista conhecida"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser um nome de alojamento DNS mas não pode ser comparado contra o esquema nome de alojamento para TLD '%tld%'"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser um nome de alojamento DNS mas contém um traço em uma posição inválida"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' parece ser um DNS de alojamento mas a notação punycode dada não pode ser descodificada"
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser um nome de rede local mas nomes de rede local não são permitidos"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser um endereço IP, mas endereços IP não são permitidos"
-"'%value%' does not appear to be a valid URI hostname","'%value%' não parece ser um URI de alojamento válido"
-"'%value%' does not appear to be a valid local network name","'%value%' não parece ser um nome de rede local válido"
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' não corresponde à estrutura esperada de um nome de alojamento DNS"
-"A joint field with this alias (%s) is already declared","Um campo em conjunto com este pseudônimo (%s) já está declarado"
-"Add Option","Adicionar Opção"
-"An error occurred while loading a record, aborting. Error: %s","Ocorreu um erro ao carregar um registro, abortando. Erro: %s"
-"An error occurred while loading the collection, aborting. Error: %s","Ocorreu um erro ao carregar a coleção, abortando. Erro: %s"
-"An error occurred while saving a record, aborting. Error: ","Ocorreu um erro ao salvar um registro, abortando. Erro:"
-"Attempt to add an invalid object","Tentativa de adicionar um objeto inválido"
+None,Nenhum
+No,Não
+Email,E-mail
+Yes,Sim
+System,Sistema
+Required,Obrigatório
+label,label
"Attribute Code","Código do Atributo"
-"Attribute Label","Etiqueta do Atributo"
-"Attribute Properties","Propriedades do Atributo"
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value","Valor Predifinido"
+"Unique Value","Valor Único"
+"Unique Value (not shared with other products)","Valor Único (não compartilhado com outros produtos)"
+"Not shared with other products","Não compartilhado com outros produtos"
+"Input Validation for Store Owner","Validação de Entrada para Dono da Loja"
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select","Múltipla escolha"
+Dropdown,"Menu suspenso"
+"Text Field","Campo de texto"
+"Text Area","Ãrea de texto"
+Date,Data
+Yes/No,Sim/Não
+URL,URL
"Attribute object is undefined","Objeto do atributo é indefinido"
-"Attribute set with the ""%s"" name already exists.","Atributo definido com o nome ""%s"" já existe."
-"Attribute with the same code","Atributo com o mesmo código"
-"Can't create table: %s","Não é possÃvel criar tabela: %s"
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties","Propriedades do Atributo"
+"Attribute Label","Etiqueta do Atributo"
"Catalog Input Type for Store Owner","Catálogo de Tipo de Entrada para Dono da Loja"
-"Current module EAV entity is undefined","Módulo de entidade EAV atual indefinido"
-"Current module pathname is undefined","Nome do caminho do módulo atual indefinido"
-"Data integrity: No header row found for attribute","Integridade dos dados: Linha de cabeçalho para o atributo não encontrada"
-"Date","Data"
+"Values Required","Valores Obrigatórios"
"Decimal Number","Número Decimal"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","Ordenar Lista de Produtos Predifinida por não existâncias no Ordenar Por Listagem de Produtos DisponÃveis"
-"Default Value","Valor Predifinido"
-"Default option value is not defined","Valor de opção predifinida não foi definido"
-"Delete","Excluir"
-"Dropdown","Menu suspenso"
-"Email","E-mail"
-"Entity collection expected.","Coleção entidade esperada."
-"Entity collections expected.","Coleções entidade esperadas."
-"Entity instance is not defined","Instância da entidade não está definida"
-"Entity is not initialized","Entidade não está inicializada"
-"Entity object is undefined","Objeto de entidade indefinido"
-"Failed to load node %s from config","Falha ao carregar nó %s de configuração"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Para uso interno. Deve ser único, sem espaços. Comprimento máximo do código do atributo deve ter menos de %s sÃmbolos"
-"Form Element with the same attribute","Elemento de Formulário com o mesmo atributo"
-"Form Fieldset with the same code","Fieldset de Formulário com o mesmo código"
-"Form Type with the same code","Tipo de Formulário com o mesmo código"
-"Form code is not defined","Código de Formulário não está definido"
-"Frontend label is not defined","Rótulo frontend não está definido"
-"Input Validation for Store Owner","Validação de Entrada para Dono da Loja"
"Integer Number","Número Inteiro"
-"Invalid EAV attribute.","Atributo EAV inválido."
-"Invalid alias, already exists in joint attributes","Apelido inválido, já existe em atributos comuns"
-"Invalid attribute name: %s","Nome de atributo inválido: %s"
-"Invalid attribute requested: %s","Pedido de atributo inválido: %s"
-"Invalid attribute type","Tipo de atributo inválido"
-"Invalid character encountered in increment ID: %s","Caractere inválido encontrado na identificação de incremento: %s"
-"Invalid date","Data inválida"
-"Invalid default date","Data-padrão inválida"
+Letters,Letras
+"Letters (a-z, A-Z) or Numbers (0-9)","Letras (a-z, A-Z) ou Números (0-9)"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined","Objeto de entidade indefinido"
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized","Entidade não está inicializada"
+"Unknown parameter","Parâmetro desconhecido"
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
"Invalid default decimal value","Valor decimal-padrão inválido"
-"Invalid entity specified","Entidade especificada inválida"
-"Invalid entity supplied.","Entidade fornecida inválida."
-"Invalid entity supplied: %s","Entidade fornecida inválida: %s"
-"Invalid entity type","Tipo de entidade inválido"
-"Invalid entity_id, skipping the record.","Identificação de entidade inválida. Saltando o registro."
-"Invalid entity_type specified: %s","Tipo inválido de entidade especificado: %s"
+"Invalid default date","Data-padrão inválida"
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date","Data inválida"
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object","Tentativa de adicionar um objeto inválido"
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared","O campo conjunto ou expressão de atributos com este apelido já está declarado"
+"Invalid alias, already exists in joint attributes","Apelido inválido, já existe em atributos comuns"
"Invalid foreign key","Chave estrangeira inválida"
-"Invalid form type.","Tipo inválido de formulário."
+"Invalid entity type","Tipo de entidade inválido"
+"Invalid attribute type","Tipo de atributo inválido"
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
"Invalid joint fields","Campos conjuntos inválidos"
-"Invalid store specified","Loja especificada inválida"
-"Invalid type given. String expected","Tipo fornecido inválido. Esperado: cadeia de caracteres."
-"Joined field with this alias is already declared","O campo acrescentado com este apelido já está declarado"
-"Joint field or attribute expression with this alias is already declared","O campo conjunto ou expressão de atributos com este apelido já está declarado"
-"Letters","Letras"
-"Letters (a-z, A-Z) or Numbers (0-9)","Letras (a-z, A-Z) ou Números (0-9)"
-"Loaded %d records","%d registros carregados"
-"Maximum length of attribute code must be less then %s symbols","O código de atributo precisa ter menos de %s sÃmbolos"
-"Multiple Select","Múltipla escolha"
-"No","Não"
-"No options found in config node %s","Nenhuma opção encontrada no nó de configuração %s"
-"None","Nenhum"
-"Not shared with other products","Não compartilhado com outros produtos"
-"Problem loading the collection, aborting. Error: %s","Problema ao carregar a coleção. Abortando. Erro: %s"
-"Problem saving the collection, aborting. Error: %s","Problema ao salvar a coleção. Abortando. Erro: %s"
-"Required","Obrigatório"
-"Saved %d record(s).","%d registro(s) salvo(s)."
-"Source model ""%s"" not found for attribute ""%s""","Modelo-fonte ""%s"" não encontrado para atributo ""%s"""
-"System","Sistema"
-"Text Area","Ãrea de texto"
-"Text Field","Campo de texto"
-"The attribute code '%s' is reserved by system. Please try another attribute code","O código de atributo '%s' é reservado pelo sistema. Tente outro código de atributo"
-"The value of attribute ""%s"" must be unique","O valor do atributo ""%s"" tem de ser único."
-"The value of attribute ""%s"" must be unique.","O valor do atributo ""%s"" tem de ser único."
-"URL","URL"
-"Unique Value","Valor Único"
-"Unique Value (not shared with other products)","Valor Único (não compartilhado com outros produtos)"
-"Unknown parameter","Parâmetro desconhecido"
-"Values Required","Valores Obrigatórios"
-"Wrong attribute group ID","Identificação errada para grupo de atributos"
-"Wrong attribute set ID","Identificação errada para conjunto de atributos"
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
+"Data integrity: No header row found for attribute","Integridade dos dados: Linha de cabeçalho para o atributo não encontrada"
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
"Wrong entity ID","Identificação de entidade errada"
-"Wrong type definition for %s","Definição de tipo errada para %s"
-"Yes","Sim"
-"Yes/No","Sim/Não"
+"Wrong attribute set ID","Identificação errada para conjunto de atributos"
+"Wrong attribute group ID","Identificação errada para grupo de atributos"
+"Default option value is not defined","Valor de opção predifinida não foi definido"
+"Current module pathname is undefined","Nome do caminho do módulo atual indefinido"
+"Current module EAV entity is undefined","Módulo de entidade EAV atual indefinido"
+"Form code is not defined","Código de Formulário não está definido"
+"Entity instance is not defined","Instância da entidade não está definida"
+"Invalid form type.","Tipo inválido de formulário."
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code","Atributo com o mesmo código"
+"Frontend label is not defined","Rótulo frontend não está definido"
+"Form Element with the same attribute","Elemento de Formulário com o mesmo atributo"
+"Form Fieldset with the same code","Fieldset de Formulário com o mesmo código"
+"Form Type with the same code","Tipo de Formulário com o mesmo código"
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Eav/i18n/zh_CN.csv b/app/code/Magento/Eav/i18n/zh_CN.csv
index d74c3a83478..5bb43b6aa0b 100644
--- a/app/code/Magento/Eav/i18n/zh_CN.csv
+++ b/app/code/Magento/Eav/i18n/zh_CN.csv
@@ -1,123 +1,113 @@
-"""%s"" contains not only digit characters.","""%s"" 包å«ä¸æ¢æ•°å—代ç 。"
-"""%s"" does not fit the entered date format.","""%s""ä¸Žè¾“å…¥çš„æ—¥æœŸæ ¼å¼ä¸ç¬¦åˆã€‚"
-"""%s"" exceeds the allowed file size.","""%s""超过了å…许的文件尺寸。"
-"""%s"" exceeds the allowed length.","""%s""超过了å…许的尺寸。"
-"""%s"" has not only alphabetic and digit characters.","""%s""包å«ä¸æ¢å—æ¯å’Œæ•°å—代ç 。"
-"""%s"" has not only alphabetic characters.","""%s""有ä¸æ¢å—æ¯ã€‚"
-"""%s"" height exceeds allowed value of %s px.","""%s""高度超过%s pxçš„å…许值"
-"""%s"" invalid type entered.","""%s""æ— æ•ˆè¾“å…¥ã€‚"
-"""%s"" is a required value.","""%s""是必填值。"
-"""%s"" is an empty string.","""%s""是一个空的指令。"
-"""%s"" is not a valid URL.","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„URL。"
-"""%s"" is not a valid date.","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„日期。"
-"""%s"" is not a valid email address.","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„电å邮件地å€ã€‚"
-"""%s"" is not a valid file","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„文件"
-"""%s"" is not a valid file extension.","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„文件扩展å。"
-"""%s"" is not a valid file.","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„文件。"
-"""%s"" is not a valid hostname.","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„主机å。"
-"""%s"" is not a valid image format","""%s""ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å›¾å½¢æ ¼å¼ã€‚"
-"""%s"" length must be equal or greater than %s characters.","""%s""长度必须大于ç‰äºŽ%s。"
-"""%s"" length must be equal or less than %s characters.","""%s""长度必须å°äºŽç‰äºŽ%s。"
-"""%s"" width exceeds allowed value of %s px.","""%s""长度超过%s pxå…许值。"
-"'%value%' appears to be a DNS hostname but cannot extract TLD part","“%value%†似乎是一个 DNS 主机åï¼Œä½†æ— æ³•æå– TLD 部分"
-"'%value%' appears to be a DNS hostname but cannot match TLD against known list","“%value%†似乎是一个 DNS 主机åï¼Œä½†æ— æ³•ä¸Žå·²çŸ¥åˆ—è¡¨åŒ¹é… TLD"
-"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","“%value%†似乎是一个 DNS 主机åï¼Œä½†æ— æ³•ä¸Ž TLD “%tld%†的主机å模å¼ç›¸åŒ¹é…。"
-"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","“%value%†似乎是一个 DNS 主机åï¼Œä½†åœ¨æ— æ•ˆä½ç½®åŒ…å«ç ´æŠ˜å·"
-"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' 似乎是 DNS 主机åï¼Œä½†æ— æ³•å¯¹æŒ‡å®šçš„ Punycode符å·è§£ç "
-"'%value%' appears to be a local network name but local network names are not allowed","'%value%' 似乎是本地网络å称，æ¤å¤„ä¸èƒ½ä½¿ç”¨æœ¬åœ°ç½‘络å称"
-"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' 似乎是 IP 地å€ï¼Œæ¤å¤„ä¸èƒ½ä½¿ç”¨ IP 地å€"
-"'%value%' does not appear to be a valid URI hostname","'%value%' 似乎ä¸æ˜¯æœ‰æ•ˆçš„ URI 主机å"
-"'%value%' does not appear to be a valid local network name","'%value%' 似乎ä¸æ˜¯æœ‰æ•ˆçš„本地网络å"
-"'%value%' does not match the expected structure for a DNS hostname","'%value%' æ— æ³•ä¸Žé¢„æœŸçš„ DNS 主机å相匹é…"
-"A joint field with this alias (%s) is already declared","使用该别å (%s) çš„è”åˆå—段已声å"
-"Add Option","æ·»åŠ é€‰é¡¹"
-"An error occurred while loading a record, aborting. Error: %s","åŠ è½½è®°å½•æ—¶å‡ºé”™ï¼Œæ£åœ¨å¿½ç•¥ã€‚错误：%s"
-"An error occurred while loading the collection, aborting. Error: %s","åŠ è½½é›†åˆæ—¶å‡ºé”™ï¼Œæ£åœ¨å¿½ç•¥ã€‚错误：%s"
-"An error occurred while saving a record, aborting. Error: ","ä¿å˜è®°å½•æ—¶å‡ºé”™ï¼Œæ£åœ¨å¿½ç•¥ã€‚错误："
-"Attempt to add an invalid object","å°è¯•æ·»åŠ çš„å¯¹è±¡æ— æ•ˆ"
-"Attribute Code","属性代ç "
-"Attribute Label","å±žæ€§æ ‡ç¾"
-"Attribute Properties","属性的属性"
-"Attribute object is undefined","属性对象未定义"
-"Attribute set with the ""%s"" name already exists.","使用“%sâ€ä¸ºå的属性已å˜åœ¨ã€‚"
-"Attribute with the same code","使用相åŒä»£ç 的属性"
-"Can't create table: %s","æ— æ³•åˆ›å»ºè¡¨æ ¼ï¼š%s"
-"Catalog Input Type for Store Owner","店铺所有者的分类输出类型"
-"Current module EAV entity is undefined","当å‰æ¨¡å—EAV实体未定义"
-"Current module pathname is undefined","当å‰æ¨¡å—路径å未定义"
-"Data integrity: No header row found for attribute","æ•°æ®å®Œæ•´æ€§ï¼šå±žæ€§çš„表头行没找到"
-"Date","日期"
-"Decimal Number","å进制数"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","å¯ç”¨äº§å“列表使用的默认产å“列表顺åºä¸å˜åœ¨"
-"Default Value","默认值"
-"Default option value is not defined","默认选项值未定义"
-"Delete","åˆ é™¤"
-"Dropdown","下拉èœå•"
-"Email","电å邮件"
-"Entity collection expected.","预计为实体集åˆã€‚"
-"Entity collections expected.","预计为实体集åˆã€‚"
-"Entity instance is not defined","实体实例未定义"
-"Entity is not initialized","实体未åˆå§‹åŒ–"
-"Entity object is undefined","实体对象未定义"
-"Failed to load node %s from config","从é…ç½®ä¸åŠ 载节点 %s 出错"
-"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","ä»…é™å†…部使用。必须具备唯一性且ä¸åŒ…å«ç©ºæ ¼ã€‚属性代ç 的长度最大值ä¸èƒ½è¶…过 %s 个符å·ã€‚"
-"Form Element with the same attribute","使用相åŒå±žæ€§çš„表å•å…ƒç´ "
-"Form Fieldset with the same code","使用相åŒä»£ç 的表å•å—段集"
-"Form Type with the same code","使用相åŒä»£ç 的表å•ç±»åž‹"
-"Form code is not defined","表å•ä»£ç 未定义"
-"Frontend label is not defined","å‰ç«¯æ ‡ç¾æœªå®šä¹‰"
-"Input Validation for Store Owner","店铺所有者的输入验è¯"
-"Integer Number","æ•´æ•°"
-"Invalid EAV attribute.","æ— æ•ˆçš„EAV属性。"
-"Invalid alias, already exists in joint attributes","æ— æ•ˆçš„åˆ«åã€å·²ç»å˜åœ¨äºŽè”åˆå±žæ€§ä¸ã€‚"
-"Invalid attribute name: %s","æ— æ•ˆçš„å±žæ€§å：%s"
-"Invalid attribute requested: %s","æ— æ•ˆçš„å±žæ€§è¯·æ±‚ï¼š%s"
-"Invalid attribute type","æ— æ•ˆçš„å±žæ€§ç±»åž‹"
-"Invalid character encountered in increment ID: %s","å¢žé‡ ID ä¸é‡åˆ°æ— 效å—符：%s"
-"Invalid date","æ— æ•ˆçš„æ—¥æœŸ"
-"Invalid default date","æ— æ•ˆçš„é»˜è®¤æ—¥æœŸ"
-"Invalid default decimal value","æ— æ•ˆçš„é»˜è®¤å进制数值"
-"Invalid entity specified","æ— æ•ˆçš„å·²æŒ‡å®šå®žä½“"
-"Invalid entity supplied.","æ— æ•ˆçš„å·²æ供实体。"
-"Invalid entity supplied: %s","æ— æ•ˆçš„å·²æ供实体：%s"
-"Invalid entity type","æ— æ•ˆçš„å®žä½“ç±»åž‹"
-"Invalid entity_id, skipping the record.","æ— æ•ˆçš„ entity_id，跳过该记录。"
-"Invalid entity_type specified: %s","æ— æ•ˆçš„å·²æŒ‡å®š entity_type：%s"
-"Invalid foreign key","æ— æ•ˆçš„å¤–é”®"
-"Invalid form type.","æ— æ•ˆçš„è¡¨å•ç±»åž‹ã€‚"
-"Invalid joint fields","æ— æ•ˆçš„åˆå¹¶å—段"
-"Invalid store specified","æŒ‡å®šçš„åº—é“ºæ— æ•ˆ"
-"Invalid type given. String expected","æŒ‡å®šçš„ç±»æ— æ•ˆã€‚éœ€ä½¿ç”¨å—符串"
-"Joined field with this alias is already declared","使用æ¤åˆ«åçš„åˆå¹¶å—段已被声明"
-"Joint field or attribute expression with this alias is already declared","使用æ¤åˆ«åçš„åˆå¹¶å—段或属性表达å¼å·²è¢«å£°æ˜Ž"
-"Letters","å—æ¯"
+None,æ—
+No,å¦
+Email,电å邮件
+Yes,是
+System,系统
+Required,å¿…é¡»
+label,label
+"Attribute Code",属性代ç
+"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols","For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols"
+"Default Value",默认值
+"Unique Value",唯一数值
+"Unique Value (not shared with other products)",唯一数值（ä¸ä¸Žå…¶å®ƒäº§å“共享）
+"Not shared with other products",未与其它产å“共享
+"Input Validation for Store Owner",店铺所有者的输入验è¯
+"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"Multiple Select",多选
+Dropdown,下拉èœå•
+"Text Field",文本å—段
+"Text Area",文本区
+Date,日期
+Yes/No,是/å¦
+URL,URL
+"Attribute object is undefined",属性对象未定义
+"""%1"" invalid type entered.","""%1"" invalid type entered."
+"""%1"" contains non-alphabetic or non-numeric characters.","""%1"" contains non-alphabetic or non-numeric characters."
+"""%1"" is an empty string.","""%1"" is an empty string."
+"""%1"" contains non-numeric characters.","""%1"" contains non-numeric characters."
+"""%1"" contains non-alphabetic characters.","""%1"" contains non-alphabetic characters."
+"""%1"" is not a valid email address.","""%1"" is not a valid email address."
+"""%1"" is not a valid hostname.","""%1"" is not a valid hostname."
+"""%1"" exceeds the allowed length.","""%1"" exceeds the allowed length."
+"'%value%' appears to be an IP address, but IP addresses are not allowed.","'%value%' appears to be an IP address, but IP addresses are not allowed."
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list.","'%value%' appears to be a DNS hostname but cannot match TLD against known list."
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position.","'%value%' appears to be a DNS hostname but contains a dash in an invalid position."
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'.","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part.","'%value%' appears to be a DNS hostname but cannot extract TLD part."
+"'%value%' does not appear to be a valid local network name.","'%value%' does not appear to be a valid local network name."
+"'%value%' appears to be a local network name but local network names are not allowed.","'%value%' appears to be a local network name but local network names are not allowed."
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded.","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded."
+"""%1"" is not a valid URL.","""%1"" is not a valid URL."
+"""%1"" is not a valid date.","""%1"" is not a valid date."
+"""%1"" does not fit the entered date format.","""%1"" does not fit the entered date format."
+"""%1"" is a required value.","""%1"" is a required value."
+"Please enter a valid date between %1 and %2 at %3.","Please enter a valid date between %1 and %2 at %3."
+"Please enter a valid date equal to or greater than %1 at %2.","Please enter a valid date equal to or greater than %1 at %2."
+"Please enter a valid date less than or equal to %1 at %2.","Please enter a valid date less than or equal to %1 at %2."
+"""%1"" is not a valid file extension.","""%1"" is not a valid file extension."
+"""%1"" is not a valid file.","""%1"" is not a valid file."
+"""%1"" exceeds the allowed file size.","""%1"" exceeds the allowed file size."
+"""%1"" width exceeds allowed value of %2 px.","""%1"" width exceeds allowed value of %2 px."
+"""%1"" height exceeds allowed value of %2 px.","""%1"" height exceeds allowed value of %2 px."
+"""%1"" length must be equal or greater than %2 characters.","""%1"" length must be equal or greater than %2 characters."
+"""%1"" length must be equal or less than %2 characters.","""%1"" length must be equal or less than %2 characters."
+"Maximum length of attribute code must be less than %1 symbols","Maximum length of attribute code must be less than %1 symbols"
+"Attribute Properties",属性的属性
+"Attribute Label",å±žæ€§æ ‡ç¾
+"Catalog Input Type for Store Owner",店铺所有者的分类输出类型
+"Values Required",需è¦æ•°å€¼
+"Decimal Number",å进制数
+"Integer Number",æ•´æ•°
+Letters,å—æ¯
"Letters (a-z, A-Z) or Numbers (0-9)","å—æ¯ (a-z, A-Z) æˆ–æ•°å— (0-9)"
-"Loaded %d records","已载入 %d æ¡è®°å½•"
-"Maximum length of attribute code must be less then %s symbols","属性代ç 的最大长度必须å°äºŽ %s 个符å·"
-"Multiple Select","多选"
-"No","å¦"
-"No options found in config node %s","é…置节点 %s ä¸æ²¡æœ‰æ‰¾åˆ°é€‰é¡¹"
-"None","æ— "
-"Not shared with other products","未与其它产å“共享"
-"Problem loading the collection, aborting. Error: %s","载入收è—æ—¶é‡åˆ°é—®é¢˜ï¼Œæ£åœ¨ä¸æ¢ã€‚错误：%s"
-"Problem saving the collection, aborting. Error: %s","ä¿å˜æ”¶è—æ—¶é‡åˆ°é—®é¢˜ï¼Œæ£åœ¨ä¸æ¢ã€‚错误：%s"
-"Required","å¿…é¡»"
-"Saved %d record(s).","å·²ä¿å˜ %d æ¡è®°å½•ã€‚"
-"Source model ""%s"" not found for attribute ""%s""","æºæ¨¡åž‹â€œ%sâ€åœ¨å±žæ€§â€œ%sâ€ä¸æœªæ‰¾åˆ°"
-"System","系统"
-"Text Area","文本区"
-"Text Field","文本å—段"
-"The attribute code '%s' is reserved by system. Please try another attribute code","属性代ç ‘%s’已被系统预留。请å°è¯•å¦ä¸€ä¸ªå±žæ€§ä»£ç "
-"The value of attribute ""%s"" must be unique","属性“%sâ€çš„值必须为唯一"
-"The value of attribute ""%s"" must be unique.","属性“%sâ€çš„值必须为唯一。"
-"URL","URL"
-"Unique Value","唯一数值"
-"Unique Value (not shared with other products)","唯一数值（ä¸ä¸Žå…¶å®ƒäº§å“共享）"
-"Unknown parameter","未知å‚æ•°"
-"Values Required","需è¦æ•°å€¼"
-"Wrong attribute group ID","错误的属性群组 ID"
-"Wrong attribute set ID","错误的属性设置 ID"
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Entity object is undefined",实体对象未定义
+"""%1"" is not a valid file","""%1"" is not a valid file"
+"""%1"" is not a valid image format","""%1"" is not a valid image format"
+"Invalid entity_type specified: %1","Invalid entity_type specified: %1"
+"Entity is not initialized",实体未åˆå§‹åŒ–
+"Unknown parameter",未知å‚æ•°
+"The attribute code '%1' is reserved by system. Please try another attribute code","The attribute code '%1' is reserved by system. Please try another attribute code"
+"Invalid default decimal value",æ— æ•ˆçš„é»˜è®¤å进制数值
+"Invalid default date",æ— æ•ˆçš„é»˜è®¤æ—¥æœŸ
+"Invalid entity supplied","Invalid entity supplied"
+"Invalid backend model specified: ","Invalid backend model specified: "
+"Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
+"The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
+"Invalid date",æ— æ•ˆçš„æ—¥æœŸ
+"Attribute set name is empty.","Attribute set name is empty."
+"An attribute set with the ""%1"" name already exists.","An attribute set with the ""%1"" name already exists."
+"No options found.","No options found."
+"Invalid entity supplied: %1","Invalid entity supplied: %1"
+"Attempt to add an invalid object",å°è¯•æ·»åŠ çš„å¯¹è±¡æ— æ•ˆ
+"Invalid attribute identifier for filter (%1)","Invalid attribute identifier for filter (%1)"
+"Invalid attribute requested: %1","Invalid attribute requested: %1"
+"Joint field or attribute expression with this alias is already declared",使用æ¤åˆ«åçš„åˆå¹¶å—段或属性表达å¼å·²è¢«å£°æ˜Ž
+"Invalid alias, already exists in joint attributes",æ— æ•ˆçš„åˆ«åã€å·²ç»å˜åœ¨äºŽè”åˆå±žæ€§ä¸ã€‚
+"Invalid foreign key",æ— æ•ˆçš„å¤–é”®
+"Invalid entity type",æ— æ•ˆçš„å®žä½“ç±»åž‹
+"Invalid attribute type",æ— æ•ˆçš„å±žæ€§ç±»åž‹
+"A joined field with this alias is already declared.","A joined field with this alias is already declared."
+"Invalid joint fields",æ— æ•ˆçš„åˆå¹¶å—段
+"A joint field with this alias (%1) is already declared.","A joint field with this alias (%1) is already declared."
+"Data integrity: No header row found for attribute",æ•°æ®å®Œæ•´æ€§ï¼šå±žæ€§çš„表头行没找到
+"Invalid attribute name: %1","Invalid attribute name: %1"
+"Invalid character encountered in increment ID: %1","Invalid character encountered in increment ID: %1"
"Wrong entity ID","错误的实体 ID"
-"Wrong type definition for %s","错误的类定义：%s"
-"Yes","是"
-"Yes/No","是/å¦"
+"Wrong attribute set ID","错误的属性设置 ID"
+"Wrong attribute group ID","错误的属性群组 ID"
+"Default option value is not defined",默认选项值未定义
+"Current module pathname is undefined",当å‰æ¨¡å—路径å未定义
+"Current module EAV entity is undefined",当å‰æ¨¡å—EAV实体未定义
+"Form code is not defined",表å•ä»£ç 未定义
+"Entity instance is not defined",实体实例未定义
+"Invalid form type.",æ— æ•ˆçš„è¡¨å•ç±»åž‹ã€‚
+"Invalid EAV attribute","Invalid EAV attribute"
+"Attribute with the same code",使用相åŒä»£ç 的属性
+"Frontend label is not defined",å‰ç«¯æ ‡ç¾æœªå®šä¹‰
+"Form Element with the same attribute",使用相åŒå±žæ€§çš„表å•å…ƒç´
+"Form Fieldset with the same code",使用相åŒä»£ç 的表å•å—段集
+"Form Type with the same code",使用相åŒä»£ç 的表å•ç±»åž‹
+"The value of attribute ""%1"" is invalid","The value of attribute ""%1"" is invalid"
+"EAV types and attributes","EAV types and attributes"
+"Entity types declaration cache.","Entity types declaration cache."
diff --git a/app/code/Magento/Email/i18n/de_DE.csv b/app/code/Magento/Email/i18n/de_DE.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/de_DE.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Email/i18n/en_US.csv b/app/code/Magento/Email/i18n/en_US.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/en_US.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Email/i18n/es_ES.csv b/app/code/Magento/Email/i18n/es_ES.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/es_ES.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Email/i18n/fr_FR.csv b/app/code/Magento/Email/i18n/fr_FR.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/fr_FR.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Email/i18n/nl_NL.csv b/app/code/Magento/Email/i18n/nl_NL.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/nl_NL.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Email/i18n/pt_BR.csv b/app/code/Magento/Email/i18n/pt_BR.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/pt_BR.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Email/i18n/zh_CN.csv b/app/code/Magento/Email/i18n/zh_CN.csv
new file mode 100644
index 00000000000..21c4989d602
--- /dev/null
+++ b/app/code/Magento/Email/i18n/zh_CN.csv
@@ -0,0 +1,74 @@
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Country,Country
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+Preview,Preview
+%1,%1
+"Insert Variable...","Insert Variable..."
+Subject,Subject
+Unknown,Unknown
+Updated,Updated
+"Add New Template","Add New Template"
+"Transactional Emails","Transactional Emails"
+"Delete Template","Delete Template"
+"Convert to Plain Text","Convert to Plain Text"
+"Return Html Version","Return Html Version"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Load Template","Load Template"
+"Edit Email Template","Edit Email Template"
+"New Email Template","New Email Template"
+GLOBAL,GLOBAL
+"Template Information","Template Information"
+"Used Currently For","Used Currently For"
+"Used as Default For","Used as Default For"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Email Templates","Email Templates"
+"Edit Template","Edit Template"
+"Edit System Template","Edit System Template"
+"New Template","New Template"
+"New System Template","New System Template"
+"This email template no longer exists.","This email template no longer exists."
+"The email template has been saved.","The email template has been saved."
+"The email template has been deleted.","The email template has been deleted."
+"The email template is currently being used.","The email template is currently being used."
+"An error occurred while deleting email template data. Please review log and try again.","An error occurred while deleting email template data. Please review log and try again."
+"We can't find an email template to delete.","We can't find an email template to delete."
+"An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview."
+"Base Unsecure URL","Base Unsecure URL"
+"Base Secure URL","Base Secure URL"
+"General Contact Name","General Contact Name"
+"General Contact Email","General Contact Email"
+"Sales Representative Contact Name","Sales Representative Contact Name"
+"Sales Representative Contact Email","Sales Representative Contact Email"
+"Custom1 Contact Name","Custom1 Contact Name"
+"Custom1 Contact Email","Custom1 Contact Email"
+"Custom2 Contact Name","Custom2 Contact Name"
+"Custom2 Contact Email","Custom2 Contact Email"
+"Store Name","Store Name"
+"Store Phone Number","Store Phone Number"
+Region/State,Region/State
+"Street Address 1","Street Address 1"
+"Street Address 2","Street Address 2"
+"Store Contact Information","Store Contact Information"
+"Template Variables","Template Variables"
+"The template Name must not be empty.","The template Name must not be empty."
+"Duplicate Of Template Name","Duplicate Of Template Name"
+"Invalid transactional email code: %1","Invalid transactional email code: %1"
+"Requested invalid store ""%1""","Requested invalid store ""%1"""
+"Invalid sender data","Invalid sender data"
+"Load default template","Load default template"
+Template,Template
+"Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Failed to load template. See error log for details.","Failed to load template. See error log for details."
+"Email Preview","Email Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+"Template Type","Template Type"
diff --git a/app/code/Magento/Fedex/i18n/de_DE.csv b/app/code/Magento/Fedex/i18n/de_DE.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/de_DE.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/Fedex/i18n/en_US.csv b/app/code/Magento/Fedex/i18n/en_US.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/en_US.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/Fedex/i18n/es_ES.csv b/app/code/Magento/Fedex/i18n/es_ES.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/es_ES.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/Fedex/i18n/fr_FR.csv b/app/code/Magento/Fedex/i18n/fr_FR.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/fr_FR.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/Fedex/i18n/nl_NL.csv b/app/code/Magento/Fedex/i18n/nl_NL.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/nl_NL.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/Fedex/i18n/pt_BR.csv b/app/code/Magento/Fedex/i18n/pt_BR.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/pt_BR.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/Fedex/i18n/zh_CN.csv b/app/code/Magento/Fedex/i18n/zh_CN.csv
new file mode 100644
index 00000000000..681ecc56108
--- /dev/null
+++ b/app/code/Magento/Fedex/i18n/zh_CN.csv
@@ -0,0 +1,72 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+Password,Password
+"Unable to retrieve tracking","Unable to retrieve tracking"
+"Failed to parse xml document: %1","Failed to parse xml document: %1"
+"Europe First Priority","Europe First Priority"
+"1 Day Freight","1 Day Freight"
+"2 Day Freight","2 Day Freight"
+"2 Day","2 Day"
+"2 Day AM","2 Day AM"
+"3 Day Freight","3 Day Freight"
+"Express Saver","Express Saver"
+Ground,Ground
+"First Overnight","First Overnight"
+"Home Delivery","Home Delivery"
+"International Economy","International Economy"
+"Intl Economy Freight","Intl Economy Freight"
+"International First","International First"
+"International Ground","International Ground"
+"International Priority","International Priority"
+"Intl Priority Freight","Intl Priority Freight"
+"Priority Overnight","Priority Overnight"
+"Smart Post","Smart Post"
+"Standard Overnight","Standard Overnight"
+Freight,Freight
+"National Freight","National Freight"
+"Regular Pickup","Regular Pickup"
+"Request Courier","Request Courier"
+"Drop Box","Drop Box"
+"Business Service Center","Business Service Center"
+Station,Station
+"FedEx Envelope","FedEx Envelope"
+"FedEx Pak","FedEx Pak"
+"FedEx Box","FedEx Box"
+"FedEx Tube","FedEx Tube"
+"FedEx 10kg Box","FedEx 10kg Box"
+"FedEx 25kg Box","FedEx 25kg Box"
+"Your Packaging","Your Packaging"
+"Not Required","Not Required"
+Adult,Adult
+Direct,Direct
+Indirect,Indirect
+status,status
+"Empty response","Empty response"
+Key,Key
+Debug,Debug
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+FedEx,FedEx
+"Account ID","Account ID"
+"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Meter Number","Meter Number"
+"Sandbox Mode","Sandbox Mode"
+"Web-Services URL (Production)","Web-Services URL (Production)"
+"Web-Services URL (Sandbox)","Web-Services URL (Sandbox)"
+"Packages Request Type","Packages Request Type"
+Packaging,Packaging
+Dropoff,Dropoff
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+"Residential Delivery","Residential Delivery"
+"Hub ID","Hub ID"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
diff --git a/app/code/Magento/GiftMessage/i18n/de_DE.csv b/app/code/Magento/GiftMessage/i18n/de_DE.csv
index ab3adc26c98..f1a1e78b405 100644
--- a/app/code/Magento/GiftMessage/i18n/de_DE.csv
+++ b/app/code/Magento/GiftMessage/i18n/de_DE.csv
@@ -1,38 +1,22 @@
-"Add","Hinzufügen"
-"Add gift message for shopping cart","Grußbotschaft für Warenkorb hinzufügen"
-"Add gift messages for quote item of shopping cart","Grußbotschaften für bestimmte Artikel im Warenkorb hinzufügen"
-"Add gift messages to products of shopping cart","Grußbotschaften für Produkte im Warenkorb hinzufügen"
+Cancel,Abbrechen
+From,Von
+To,An
+OK,OK
+"Gift Message",Grußnachricht
+Message,Nachricht
+"Unknown entity type","Unbekannter Entitätentyp"
+"Gift Options",Geschenkoptionen
+"Do you have any gift items in your order?","Haben Sie Geschenkartikel in Ihrer Bestellung?"
"Add gift options","Geschenkoptionen hinzufügen"
-"Add gift options for Individual Items","Geschenkoptionen für einzelne Artikel hinzufügen"
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
"Add gift options for the Entire Order","Geschenkoptionen für die gesamte Bestellung hinzufügen"
-"Add gift options.","Geschenkoptionen hinzufügen."
-"Allow Gift Messages for Order Items","Geschenknachrichten für Bestellartikel erlauben"
-"Allow Gift Messages on Order Level","Geschenknachrichten auf Bestellebene erlauben"
-"An error occurred while saving the gift message.","Beim Speichern der Geschenknachricht ist ein Fehler aufgetreten."
-"Are you sure?","Sind Sie sicher?"
-"Cancel","Abbrechen"
-"Do you have any gift items in your order?","Haben Sie Geschenkartikel in Ihrer Bestellung?"
-"Edit","Bearbeiten"
-"From","Von"
-"Gift Message","Grußnachricht"
-"Gift Message API","Grußbotschaft API"
-"Gift Options","Geschenkoptionen"
-"Gift Options for","Geschenkoptionen für"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
"Gift Options for Individual Items","Geschenkoptionen für einzelne Artikel"
-"Gift Options for the Entire Order.","Geschenkoptionen für den gesamten Auftrag."
+"Add gift options for Individual Items","Geschenkoptionen für einzelne Artikel hinzufügen"
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
"Gift Options for this address.","Geschenkoptionen für diese Anschrift."
-"Item %d of %d","Artikel %d von %d"
-"Message","Nachricht"
-"No","Nein"
-"OK","OK"
-"Save Gift Message","Geschenknachricht speichern"
-"The gift message has been removed","Die Geschenknachricht wurde entfernt"
-"The gift message has been saved","Die Geschenknachricht wurde gespeichert"
-"The gift message has been saved.","Die Geschennachricht wurde gespeichert."
-"To","An"
-"Unknown entity type","Unbekannter Entitätentyp"
-"Use config","Konfiguration benützen"
-"Yes","Ja"
-"You can leave this box blank if you do not wish to add a gift message for the item.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zum Artikel hinzufügen wollen."
"You can leave this box blank if you do not wish to add a gift message for this address.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zu dieser Adresse hinzufügen wollen."
-"You can leave this box blank if you do not wish to add a gift message for whole order.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zur gesamten Bestellung hinzufügen wollen."
+"You can leave this box blank if you do not wish to add a gift message for the item.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zum Artikel hinzufügen wollen."
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/i18n/en_US.csv b/app/code/Magento/GiftMessage/i18n/en_US.csv
index 7bb450a2f60..fccfca3dc17 100644
--- a/app/code/Magento/GiftMessage/i18n/en_US.csv
+++ b/app/code/Magento/GiftMessage/i18n/en_US.csv
@@ -1,38 +1,22 @@
-"Add","Add"
-"Add gift message for shopping cart","Add gift message for shopping cart"
-"Add gift messages for quote item of shopping cart","Add gift messages for quote item of shopping cart"
-"Add gift messages to products of shopping cart","Add gift messages to products of shopping cart"
-"Add gift options","Add gift options"
-"Add gift options for Individual Items","Add gift options for Individual Items"
-"Add gift options for the Entire Order","Add gift options for the Entire Order"
-"Add gift options.","Add gift options."
-"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
-"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
-"An error occurred while saving the gift message.","An error occurred while saving the gift message."
-"Are you sure?","Are you sure?"
-"Cancel","Cancel"
-"Do you have any gift items in your order?","Do you have any gift items in your order?"
-"Edit","Edit"
-"From","From"
+Cancel,Cancel
+From,From
+To,To
+OK,OK
"Gift Message","Gift Message"
-"Gift Message API","Gift Message API"
+Message,Message
+"Unknown entity type","Unknown entity type"
"Gift Options","Gift Options"
-"Gift Options for","Gift Options for"
+"Do you have any gift items in your order?","Do you have any gift items in your order?"
+"Add gift options","Add gift options"
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
+"Add gift options for the Entire Order","Add gift options for the Entire Order"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
"Gift Options for Individual Items","Gift Options for Individual Items"
-"Gift Options for the Entire Order.","Gift Options for the Entire Order."
+"Add gift options for Individual Items","Add gift options for Individual Items"
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
"Gift Options for this address.","Gift Options for this address."
-"Item %d of %d","Item %d of %d"
-"Message","Message"
-"No","No"
-"OK","OK"
-"Save Gift Message","Save Gift Message"
-"The gift message has been removed","The gift message has been removed"
-"The gift message has been saved","The gift message has been saved"
-"The gift message has been saved.","The gift message has been saved."
-"To","To"
-"Unknown entity type","Unknown entity type"
-"Use config","Use config"
-"Yes","Yes"
-"You can leave this box blank if you do not wish to add a gift message for the item.","You can leave this box blank if you do not wish to add a gift message for the item."
"You can leave this box blank if you do not wish to add a gift message for this address.","You can leave this box blank if you do not wish to add a gift message for this address."
-"You can leave this box blank if you do not wish to add a gift message for whole order.","You can leave this box blank if you do not wish to add a gift message for whole order."
+"You can leave this box blank if you do not wish to add a gift message for the item.","You can leave this box blank if you do not wish to add a gift message for the item."
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/i18n/es_ES.csv b/app/code/Magento/GiftMessage/i18n/es_ES.csv
index 8a05da44a7c..c6b65bb9fab 100644
--- a/app/code/Magento/GiftMessage/i18n/es_ES.csv
+++ b/app/code/Magento/GiftMessage/i18n/es_ES.csv
@@ -1,38 +1,22 @@
-"Add","Agregar"
-"Add gift message for shopping cart","Añadir mensaje de regalo para el carro de la compra"
-"Add gift messages for quote item of shopping cart","Añadir mensajes de regalo para artÃculo presupuestado del carro de la compra"
-"Add gift messages to products of shopping cart","Añadir mensajes de regalo a productos del carro de la compra"
-"Add gift options","Añadir opciones de regalo"
-"Add gift options for Individual Items","Añadir opciones de regalo para artÃculos individuales"
-"Add gift options for the Entire Order","Añadir opciones de regalo para todo el pedido"
-"Add gift options.","Añadir opciones de regalo."
-"Allow Gift Messages for Order Items","Permitir mensajes de regalo en artÃculos del pedido"
-"Allow Gift Messages on Order Level","Permitir mensajes de regalo en el nivel del pedido"
-"An error occurred while saving the gift message.","Se ha producido un error al grabar el mensaje del regalo."
-"Are you sure?","¿Está seguro?"
-"Cancel","Cancelar"
-"Do you have any gift items in your order?","¿Tiene artÃculos de regalo en su pedido?"
-"Edit","Editar"
-"From","De"
+Cancel,Cancelar
+From,De
+To,Para
+OK,Aceptar
"Gift Message","Mensaje regalo"
-"Gift Message API","API de mensaje de regalo"
+Message,Mensaje
+"Unknown entity type","Tipo de entidad desconocido"
"Gift Options","Opciones de regalo"
-"Gift Options for","Opciones de regalo para"
+"Do you have any gift items in your order?","¿Tiene artÃculos de regalo en su pedido?"
+"Add gift options","Añadir opciones de regalo"
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
+"Add gift options for the Entire Order","Añadir opciones de regalo para todo el pedido"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
"Gift Options for Individual Items","Opciones de regalo para artÃculos individuales"
-"Gift Options for the Entire Order.","Opciones de regalo para todo el pedido."
+"Add gift options for Individual Items","Añadir opciones de regalo para artÃculos individuales"
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
"Gift Options for this address.","Opciones de regalo para esta dirección."
-"Item %d of %d","ArtÃculo %d de %d"
-"Message","Mensaje"
-"No","No"
-"OK","Aceptar"
-"Save Gift Message","Grabar el mensaje de regalo"
-"The gift message has been removed","Se ha borrado el mensaje de regalo"
-"The gift message has been saved","Se ha grabado el mensaje de regalo"
-"The gift message has been saved.","Se ha grabado el mensaje de regalo."
-"To","Para"
-"Unknown entity type","Tipo de entidad desconocido"
-"Use config","Usar config"
-"Yes","SÃ"
-"You can leave this box blank if you do not wish to add a gift message for the item.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para el artÃculo."
"You can leave this box blank if you do not wish to add a gift message for this address.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para esta dirección."
-"You can leave this box blank if you do not wish to add a gift message for whole order.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para el pedido completo."
+"You can leave this box blank if you do not wish to add a gift message for the item.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para el artÃculo."
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/i18n/fr_FR.csv b/app/code/Magento/GiftMessage/i18n/fr_FR.csv
index 7b56d83db47..c8b5a949b7b 100644
--- a/app/code/Magento/GiftMessage/i18n/fr_FR.csv
+++ b/app/code/Magento/GiftMessage/i18n/fr_FR.csv
@@ -1,38 +1,22 @@
-"Add","Ajouter"
-"Add gift message for shopping cart","Ajouter un message de cadeau au panier d'achat"
-"Add gift messages for quote item of shopping cart","Ajouter des messages de cadeau pour l/les élément(s) cité(s) du panier d'achat"
-"Add gift messages to products of shopping cart","Ajouter des messages de cadeau aux produits du panier d'achat"
-"Add gift options","Ajouter des options de cadeau"
-"Add gift options for Individual Items","Ajouter des options de cadeau pour des objets individuels"
-"Add gift options for the Entire Order","Ajouter des options de cadeau pour l'ensemble de la commande"
-"Add gift options.","Ajouter des options de cadeau."
-"Allow Gift Messages for Order Items","Autoriser les messages cadeaux pour les commandes d'objets"
-"Allow Gift Messages on Order Level","Autoriser les messages cadeaux au niveau de la commande"
-"An error occurred while saving the gift message.","Une erreur est survenue lors de l'enregistrement du message cadeau."
-"Are you sure?","Etes-vous sûr ?"
-"Cancel","Annuler"
-"Do you have any gift items in your order?","Avez-vous des messages cadeaux dans votre commande ?"
-"Edit","Modifier"
-"From","De"
+Cancel,Annuler
+From,De
+To,A
+OK,OK
"Gift Message","Message du cadeau"
-"Gift Message API","Message de cadeau interface de programmation"
+Message,Message
+"Unknown entity type","Type d'entité inconnu"
"Gift Options","Options de cadeau"
-"Gift Options for","Options de cadeau pour"
+"Do you have any gift items in your order?","Avez-vous des messages cadeaux dans votre commande ?"
+"Add gift options","Ajouter des options de cadeau"
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
+"Add gift options for the Entire Order","Ajouter des options de cadeau pour l'ensemble de la commande"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
"Gift Options for Individual Items","Options de cadeau pour des objets individuels"
-"Gift Options for the Entire Order.","Options de cadeau pour l'ensemble de la commande"
+"Add gift options for Individual Items","Ajouter des options de cadeau pour des objets individuels"
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
"Gift Options for this address.","Options de cadeau pour cette adresse."
-"Item %d of %d","Objet %d de %d"
-"Message","Message"
-"No","Non"
-"OK","OK"
-"Save Gift Message","Sauvegarder le message cadeau"
-"The gift message has been removed","Le message cadeau a été supprimé"
-"The gift message has been saved","Le message cadeau a été enregistré."
-"The gift message has been saved.","Le message cadeau a été enregistré."
-"To","A"
-"Unknown entity type","Type d'entité inconnu"
-"Use config","Utiliser la configuration"
-"Yes","oui"
-"You can leave this box blank if you do not wish to add a gift message for the item.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cet objet."
"You can leave this box blank if you do not wish to add a gift message for this address.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cette adresse."
-"You can leave this box blank if you do not wish to add a gift message for whole order.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cette commande."
+"You can leave this box blank if you do not wish to add a gift message for the item.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cet objet."
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/i18n/nl_NL.csv b/app/code/Magento/GiftMessage/i18n/nl_NL.csv
index 82a99005064..4103bf00254 100644
--- a/app/code/Magento/GiftMessage/i18n/nl_NL.csv
+++ b/app/code/Magento/GiftMessage/i18n/nl_NL.csv
@@ -1,38 +1,22 @@
-"Add","Toevoegen"
-"Add gift message for shopping cart","Voeg persoonlijke boodschap toe voor winkelmand"
-"Add gift messages for quote item of shopping cart","Voeg persoonlijke boodschap toe voor bepaald artikel in winkelmand"
-"Add gift messages to products of shopping cart","Voeg persoonlijke boodschappen toe aan producten in winkelmand"
+Cancel,Annuleren
+From,Van
+To,Naar
+OK,OK
+"Gift Message",Cadeauboodschap
+Message,Boodschap
+"Unknown entity type","Onbekend entiteit type"
+"Gift Options",Cadeauopties
+"Do you have any gift items in your order?","Zijn er cadeaus bij uw bestelling?"
"Add gift options","Voeg cadeauopties toe"
-"Add gift options for Individual Items","Voeg cadeauopties toe voor afzonderlijke artikelen"
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
"Add gift options for the Entire Order","Voeg cadeauopties toe voor gehele bestelling"
-"Add gift options.","Cadeauopties toevoegen."
-"Allow Gift Messages for Order Items","Cadeauberichten toestaan voor artikelen in bestelling"
-"Allow Gift Messages on Order Level","Cadeauberichten toestaan op niveau van bestelling"
-"An error occurred while saving the gift message.","Fout bij opslaan van cadeaubericht."
-"Are you sure?","Weet u het zeker?"
-"Cancel","Annuleren"
-"Do you have any gift items in your order?","Zijn er cadeaus bij uw bestelling?"
-"Edit","Bewerken"
-"From","Van"
-"Gift Message","Cadeauboodschap"
-"Gift Message API","Persoonlijke boodschap API"
-"Gift Options","Cadeauopties"
-"Gift Options for","Cadeauopties voor"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
"Gift Options for Individual Items","Cadeauopties voor afzonderlijke artikelen"
-"Gift Options for the Entire Order.","Cadeauopties voor de hele bestelling."
+"Add gift options for Individual Items","Voeg cadeauopties toe voor afzonderlijke artikelen"
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
"Gift Options for this address.","Cadeauopties voor dit adres."
-"Item %d of %d","Artikel %d van %d"
-"Message","Boodschap"
-"No","Nee"
-"OK","OK"
-"Save Gift Message","Cadeaubericht opslaan"
-"The gift message has been removed","Het cadeaubericht is verwijderd"
-"The gift message has been saved","Het cadeaubericht is opgeslagen"
-"The gift message has been saved.","Het cadeaubericht is opgeslagen."
-"To","Naar"
-"Unknown entity type","Onbekend entiteit type"
-"Use config","Gebruik config"
-"Yes","Ja"
-"You can leave this box blank if you do not wish to add a gift message for the item.","Je kunt deze ruimte leeglaten als je geen cadeaubericht wilt toevoegen voor dit artikel."
"You can leave this box blank if you do not wish to add a gift message for this address.","Je kunt deze ruimte leeglaten als je geen cadeaubericht wilt toevoegen voor dit adres."
-"You can leave this box blank if you do not wish to add a gift message for whole order.","Je kunt deze ruimte leeglaten als je voor de hele bestelling geen cadeaubericht wilt toevoegen."
+"You can leave this box blank if you do not wish to add a gift message for the item.","Je kunt deze ruimte leeglaten als je geen cadeaubericht wilt toevoegen voor dit artikel."
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/i18n/pt_BR.csv b/app/code/Magento/GiftMessage/i18n/pt_BR.csv
index f697686d0e9..0d5c4d35e1d 100644
--- a/app/code/Magento/GiftMessage/i18n/pt_BR.csv
+++ b/app/code/Magento/GiftMessage/i18n/pt_BR.csv
@@ -1,38 +1,22 @@
-"Add","Adicionar"
-"Add gift message for shopping cart","Adicionar mensagem de presente no carrinho de compras"
-"Add gift messages for quote item of shopping cart","Adicionar mensagens de presente em item cotado carrinho de compras"
-"Add gift messages to products of shopping cart","Adicionar mensagens de presente a produtos do carrinho de compras"
-"Add gift options","Adicionar opções de presente"
-"Add gift options for Individual Items","Adicionar opções de presente em Itens Individuais"
-"Add gift options for the Entire Order","Adicionar opções de presente no Pedido Completo"
-"Add gift options.","Adicionar opções de presente."
-"Allow Gift Messages for Order Items","Permitir Mensagens de Presente em Itens do Pedido"
-"Allow Gift Messages on Order Level","Permitir Mensagens de Presente em NÃvel de Pedido"
-"An error occurred while saving the gift message.","Ocorreu um erro ao salvar a mensagem de presente."
-"Are you sure?","Tem certeza?"
-"Cancel","Cancelar"
-"Do you have any gift items in your order?","Você tem algum item de presente em seu pedido?"
-"Edit","Editar"
-"From","De"
+Cancel,Cancelar
+From,De
+To,Para
+OK,OK
"Gift Message","Mensagem de presente"
-"Gift Message API","API para Mensagens de Presente"
+Message,Mensagem
+"Unknown entity type","Tipo de entidade desconhecido"
"Gift Options","Opções de presente"
-"Gift Options for","Opções de Presente para"
+"Do you have any gift items in your order?","Você tem algum item de presente em seu pedido?"
+"Add gift options","Adicionar opções de presente"
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
+"Add gift options for the Entire Order","Adicionar opções de presente no Pedido Completo"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
"Gift Options for Individual Items","Opções de Presente para Itens Individuais"
-"Gift Options for the Entire Order.","Opções de Presente para o Pedido Completo."
+"Add gift options for Individual Items","Adicionar opções de presente em Itens Individuais"
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
"Gift Options for this address.","Opções de presente para este endereço."
-"Item %d of %d","Item %d de %d"
-"Message","Mensagem"
-"No","Não"
-"OK","OK"
-"Save Gift Message","Salvar mensagem de presente"
-"The gift message has been removed","A mensagem de presente foi removida"
-"The gift message has been saved","A mensagem de presente foi salva"
-"The gift message has been saved.","A mensagem de presente foi salva."
-"To","Para"
-"Unknown entity type","Tipo de entidade desconhecido"
-"Use config","Use config"
-"Yes","Sim"
-"You can leave this box blank if you do not wish to add a gift message for the item.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para o item."
"You can leave this box blank if you do not wish to add a gift message for this address.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para este endereço."
-"You can leave this box blank if you do not wish to add a gift message for whole order.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para toda a ordem."
+"You can leave this box blank if you do not wish to add a gift message for the item.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para o item."
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/i18n/zh_CN.csv b/app/code/Magento/GiftMessage/i18n/zh_CN.csv
index 4d542693b09..e1aaa8599a4 100644
--- a/app/code/Magento/GiftMessage/i18n/zh_CN.csv
+++ b/app/code/Magento/GiftMessage/i18n/zh_CN.csv
@@ -1,38 +1,22 @@
-"Add","æ·»åŠ "
-"Add gift message for shopping cart","为è´ç‰©è½¦æ·»åŠ 礼å“消æ¯"
-"Add gift messages for quote item of shopping cart","为è´ç‰©è½¦ä¸çš„æŠ¥ä»·é¡¹ç›®æ·»åŠ ç¤¼å“消æ¯"
-"Add gift messages to products of shopping cart","æ·»åŠ ç¤¼å“消æ¯åˆ°è´ç‰©è½¦ä¸çš„产å“"
-"Add gift options","æ·»åŠ ç¤¼å“选项"
-"Add gift options for Individual Items","为å•ä¸ªé¡¹ç›®æ·»åŠ 礼å“选项"
-"Add gift options for the Entire Order","为整个订å•æ·»åŠ 礼å“选项"
-"Add gift options.","æ·»åŠ ç¤¼å“选项。"
-"Allow Gift Messages for Order Items","å…许为订å•é¡¹ç›®æ·»åŠ 礼å“消æ¯"
-"Allow Gift Messages on Order Level","å…许按订å•çº§åˆ«æ·»åŠ 礼å“消æ¯"
-"An error occurred while saving the gift message.","ä¿å˜ç¤¼å“消æ¯æ—¶å‘生错误。"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Cancel","å–消"
-"Do you have any gift items in your order?","您的订å•ä¸åŒ…å«ä»»ä½•ç¤¼å“项目å—？"
-"Edit","编辑"
-"From","æ¥è‡ª"
-"Gift Message","礼å“消æ¯"
-"Gift Message API","礼å“æ¶ˆæ¯ API"
-"Gift Options","礼å“选项"
-"Gift Options for","礼å“选项，适用于"
-"Gift Options for Individual Items","适用于å•ä¸ªé¡¹ç›®çš„礼å“选项"
-"Gift Options for the Entire Order.","适用于整个订å•çš„礼å“选项。"
-"Gift Options for this address.","适用于该地å€çš„礼å“选项。"
-"Item %d of %d","第 %d 个项目，共 %d 个"
-"Message","ä¿¡æ¯"
-"No","å¦"
-"OK","确定"
-"Save Gift Message","ä¿å˜ç¤¼å“ä¿¡æ¯"
-"The gift message has been removed","礼å“ä¿¡æ¯å·²åˆ 除"
-"The gift message has been saved","礼å“ä¿¡æ¯å·²ä¿å˜"
-"The gift message has been saved.","礼å“ä¿¡æ¯å·²ä¿å˜ã€‚"
-"To","å‘é€è‡³"
-"Unknown entity type","未知实体类型"
-"Use config","用户é…ç½®"
-"Yes","是"
-"You can leave this box blank if you do not wish to add a gift message for the item.","如果您ä¸æƒ³ä¸ºè¯¥å•†å“æ·»åŠ ç¤¼å“ä¿¡æ¯ï¼Œåˆ™å¯ä»¥åœ¨è¿™é‡Œç•™ç©ºã€‚"
-"You can leave this box blank if you do not wish to add a gift message for this address.","如果您ä¸æƒ³ä¸ºè¯¥åœ°å€æ·»åŠ 礼å“ä¿¡æ¯ï¼Œåˆ™å¯ä»¥åœ¨è¿™é‡Œç•™ç©ºã€‚"
-"You can leave this box blank if you do not wish to add a gift message for whole order.","如果您ä¸æƒ³ä¸ºæ•´ä¸ªè®¢å•æ·»åŠ 礼å“ä¿¡æ¯ï¼Œåˆ™å¯ä»¥åœ¨è¿™é‡Œç•™ç©ºã€‚"
+Cancel,å–消
+From,æ¥è‡ª
+To,å‘é€è‡³
+OK,确定
+"Gift Message",礼å“消æ¯
+Message,ä¿¡æ¯
+"Unknown entity type",未知实体类型
+"Gift Options",礼å“选项
+"Do you have any gift items in your order?",您的订å•ä¸åŒ…å«ä»»ä½•ç¤¼å“项目å—？
+"Add gift options",æ·»åŠ ç¤¼å“选项
+"Gift Options for the Entire Order","Gift Options for the Entire Order"
+"Add gift options for the Entire Order",为整个订å•æ·»åŠ 礼å“选项
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"Gift Options for Individual Items",适用于å•ä¸ªé¡¹ç›®çš„礼å“选项
+"Add gift options for Individual Items",为å•ä¸ªé¡¹ç›®æ·»åŠ 礼å“选项
+"Item %1 of %2","Item %1 of %2"
+"You can leave a box blank if you don't wish to add a gift message for the item.","You can leave a box blank if you don't wish to add a gift message for the item."
+"Gift Options for this address.",适用于该地å€çš„礼å“选项。
+"You can leave this box blank if you do not wish to add a gift message for this address.",如果您ä¸æƒ³ä¸ºè¯¥åœ°å€æ·»åŠ 礼å“ä¿¡æ¯ï¼Œåˆ™å¯ä»¥åœ¨è¿™é‡Œç•™ç©ºã€‚
+"You can leave this box blank if you do not wish to add a gift message for the item.",如果您ä¸æƒ³ä¸ºè¯¥å•†å“æ·»åŠ ç¤¼å“ä¿¡æ¯ï¼Œåˆ™å¯ä»¥åœ¨è¿™é‡Œç•™ç©ºã€‚
+"Allow Gift Messages on Order Level","Allow Gift Messages on Order Level"
+"Allow Gift Messages for Order Items","Allow Gift Messages for Order Items"
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index 1905e64a2a7..42e7020c466 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -31,7 +31,7 @@
<?php switch ($this->getType()): ?>
<?php case 'onepage_checkout': ?>
- <fieldset class="fieldset gift message">
+ <fieldset class="fieldset gift-message">
<legend class="legend"><span><?php echo __('Do you have any gift items in your order?'); ?></span></legend><br>
<div class="field choice" id="add-gift-options-<?php echo $this->getEntity()->getId() ?>">
@@ -39,21 +39,20 @@
<label for="allow_gift_options" class="label"><span><?php echo __('Add gift options') ?></span></label>
</div>
- <dl class="block items" id="allow-gift-options-container">
+ <dl class="options-items" id="allow-gift-options-container">
<?php if ($this->isMessagesAvailable()): ?>
- <dt id="add-gift-options-for-order-<?php echo $this->getEntity()->getId() ?>" class="title order">
- <div class="title"><span><?php echo __('Gift Options for the Entire Order'); ?></span></div>
+ <dt id="add-gift-options-for-order-<?php echo $this->getEntity()->getId() ?>" class="order-title">
<div class="field choice">
<input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_options_for_order" class="label"><span><?php echo __('Add gift options for the Entire Order') ?></span></label>
+ <label for="allow_gift_options_for_order" class="label"><span><?php echo __('Gift Options for the Entire Order'); ?></span></label>
</div>
</dt>
- <dd id="allow-gift-options-for-order-container" class="options order">
+ <dd id="allow-gift-options-for-order-container" class="order-options">
<div class="options-order-container" id="options-order-container-<?php echo $this->getEntity()->getId() ?>"></div>
<input type="hidden" name="giftoptions[<?php echo $this->getEntity()->getId() ?>][type]" value="quote" />
<a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'><?php echo __('Gift Message') ?></a>
- <div id="allow-gift-messages-for-order-container" class="hidden">
+ <div id="allow-gift-messages-for-order-container" class="gift-messages-order hidden">
<fieldset class="fieldset">
<input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]" value="quote" />
<p><?php echo __('If you don\'t want to leave a gift message for the entire order, leave this box blank.') ?></p>
@@ -84,32 +83,30 @@
</dd>
<?php endif ?>
<?php if ($this->isItemsAvailable()): ?>
- <dt id="add-gift-options-for-items-<?php echo $this->getEntity()->getId() ?>" class="title individual">
- <div class="title"><span><?php echo __('Gift Options for Individual Items'); ?></span></div>
+ <dt id="add-gift-options-for-items-<?php echo $this->getEntity()->getId() ?>" class="order-title individual">
<div class="field choice">
<input type="checkbox" name="allow_gift_options_for_items" id="allow_gift_options_for_items" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container"}'<?php if($this->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_options_for_items" class="label"><span><?php echo __('Add gift options for Individual Items') ?></span></label>
+ <label for="allow_gift_options_for_items" class="label"><span><?php echo __('Gift Options for Individual Items'); ?></span></label>
</div>
</dt>
- <dd id="allow-gift-options-for-items-container" class="options individual">
- <ol>
+ <dd id="allow-gift-options-for-items-container" class="order-options individual">
+ <ol class="items">
<?php foreach($this->getItems() as $_index=>$_item): ?>
<?php $_product=$_item->getProduct() ?>
<li class="item">
<input type="hidden" name="giftoptions[<?php echo $_item->getId() ?>][type]" value="quote_item" />
- <p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p>
<div class="product">
+ <div class="number">
+ <?php echo __('<span>Item %1</span> of %2', $_index+1, $this->countItems()) ?>
+ </div>
<div class="img photo container">
- <img src="<?php echo $this->getThumbnailUrl($_product); ?>"
- width="<?php echo $this->getThumbnailSize()?>"
- height="<?php echo $this->getThumbnailSize()?>"
- alt="<?php echo $this->escapeHtml($_product->getName()) ?>"
- title="<?php echo $this->escapeHtml($_product->getName()) ?>" />
+ <?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+ <?php echo $imageBlock->init($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
</div>
<strong class="product name"><?php echo $this->escapeHtml($_product->getName()) ?></strong>
</div>
- <div class="item options">
+ <div class="options">
<div class="options-items-container" id="options-items-container-<?php echo $this->getEntity()->getId() ?>-<?php echo $_item->getId() ?>"></div>
<?php if ($this->isItemMessagesAvailable($_item)): ?>
<a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php echo $_item->getId() ?>"}}'><?php echo __('Gift Message') ?></a>
@@ -157,7 +154,7 @@
<?php break; ?>
<?php case 'multishipping_address': ?>
- <fieldset id="add-gift-options-<?php echo $this->getEntity()->getId() ?>" class="fieldset gift message">
+ <fieldset id="add-gift-options-<?php echo $this->getEntity()->getId() ?>" class="fieldset gift-message">
<legend class="legend"><span><?php echo __('Do you have any gift items in your order?'); ?></span></legend><br>
<div class="field choice" id="add-gift-options-<?php echo $this->getEntity()->getId() ?>">
@@ -174,7 +171,7 @@
</div>
</dt>
- <dd id="allow-gift-options-for-order-container-<?php echo $this->getEntity()->getId() ?>" class="options order">
+ <dd id="allow-gift-options-for-order-container-<?php echo $this->getEntity()->getId() ?>" class="order-options">
<div class="options-order-container" id="options-order-container-<?php echo $this->getEntity()->getId() ?>"></div>
<input type="hidden" name="giftoptions[<?php echo $this->getEntity()->getId() ?>][type]" value="quote_address" />
<?php if ($this->isMessagesAvailable()): ?>
@@ -224,11 +221,8 @@
<p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p>
<div class="product">
<div class="img photo container">
- <img src="<?php echo $this->getThumbnailUrl($_product); ?>"
- width="<?php echo $this->getThumbnailSize()?>"
- height="<?php echo $this->getThumbnailSize()?>"
- alt="<?php echo $this->escapeHtml($_product->getName()) ?>"
- title="<?php echo $this->escapeHtml($_product->getName()) ?>" />
+ <?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+ <?php echo $imageBlock->init($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
</div>
<strong class="product name"><?php echo $this->escapeHtml($_product->getName()) ?></strong>
</div>
diff --git a/app/code/Magento/GoogleAdwords/i18n/de_DE.csv b/app/code/Magento/GoogleAdwords/i18n/de_DE.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/de_DE.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAdwords/i18n/en_US.csv b/app/code/Magento/GoogleAdwords/i18n/en_US.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/en_US.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAdwords/i18n/es_ES.csv b/app/code/Magento/GoogleAdwords/i18n/es_ES.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/es_ES.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAdwords/i18n/fr_FR.csv b/app/code/Magento/GoogleAdwords/i18n/fr_FR.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/fr_FR.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAdwords/i18n/nl_NL.csv b/app/code/Magento/GoogleAdwords/i18n/nl_NL.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/nl_NL.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAdwords/i18n/pt_BR.csv b/app/code/Magento/GoogleAdwords/i18n/pt_BR.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/pt_BR.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAdwords/i18n/zh_CN.csv b/app/code/Magento/GoogleAdwords/i18n/zh_CN.csv
new file mode 100644
index 00000000000..90126968a46
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/i18n/zh_CN.csv
@@ -0,0 +1,13 @@
+Enable,Enable
+Dynamic,Dynamic
+Constant,Constant
+"Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value.","Conversion Color value is not valid ""%1"". Please set hexadecimal 6-digit value."
+"Conversion Id value is not valid ""%1"". Conversion Id should be an integer.","Conversion Id value is not valid ""%1"". Conversion Id should be an integer."
+"Google AdWords","Google AdWords"
+"Conversion ID","Conversion ID"
+"Conversion Language","Conversion Language"
+"Conversion Format","Conversion Format"
+"Conversion Color","Conversion Color"
+"Conversion Label","Conversion Label"
+"Conversion Value Type","Conversion Value Type"
+"Conversion Value","Conversion Value"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/de_DE.csv b/app/code/Magento/GoogleAnalytics/i18n/de_DE.csv
index da520a49116..c20ee05c7c3 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/de_DE.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/de_DE.csv
@@ -1,4 +1,4 @@
-"Account Number","Kundenkontonummer"
-"Enable","Aktivieren"
-"Google API","Google-API"
+Enable,Aktivieren
+"Account Number",Kundenkontonummer
+"Google API",Google-API
"Google Analytics","Google Analytics"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/en_US.csv b/app/code/Magento/GoogleAnalytics/i18n/en_US.csv
index 75c64e03bb7..2ddf9c21343 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/en_US.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/en_US.csv
@@ -1,4 +1,4 @@
+Enable,Enable
"Account Number","Account Number"
-"Enable","Enable"
"Google API","Google API"
"Google Analytics","Google Analytics"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/es_ES.csv b/app/code/Magento/GoogleAnalytics/i18n/es_ES.csv
index 3917d55abe9..205958c5f86 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/es_ES.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/es_ES.csv
@@ -1,4 +1,4 @@
+Enable,Habilitar
"Account Number","Número de cuenta"
-"Enable","Habilitar"
"Google API","Google API"
"Google Analytics","Google Analytics"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/fr_FR.csv b/app/code/Magento/GoogleAnalytics/i18n/fr_FR.csv
index afc302879f0..6e60d29b945 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/fr_FR.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/fr_FR.csv
@@ -1,4 +1,4 @@
+Enable,Activer
"Account Number","Numéro de compte"
-"Enable","Activer"
"Google API","Google API"
"Google Analytics","Google Analytics"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/nl_NL.csv b/app/code/Magento/GoogleAnalytics/i18n/nl_NL.csv
index 8d742528191..a034490f5f5 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/nl_NL.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/nl_NL.csv
@@ -1,4 +1,4 @@
+Enable,"Maak bruikbaar"
"Account Number","Account nummer"
-"Enable","Maak bruikbaar"
"Google API","Google API"
"Google Analytics","Google Analytics"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/pt_BR.csv b/app/code/Magento/GoogleAnalytics/i18n/pt_BR.csv
index 469e84a0310..95d6c2b7672 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/pt_BR.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/pt_BR.csv
@@ -1,4 +1,4 @@
+Enable,Ativar
"Account Number","Número de Conta"
-"Enable","Ativar"
"Google API","Google API"
"Google Analytics","Google Analytics"
diff --git a/app/code/Magento/GoogleAnalytics/i18n/zh_CN.csv b/app/code/Magento/GoogleAnalytics/i18n/zh_CN.csv
index b72c7e50ec8..a3424425a9d 100644
--- a/app/code/Magento/GoogleAnalytics/i18n/zh_CN.csv
+++ b/app/code/Magento/GoogleAnalytics/i18n/zh_CN.csv
@@ -1,4 +1,4 @@
-"Account Number","å¸æˆ·å·ç "
-"Enable","å¯ç”¨"
+Enable,å¯ç”¨
+"Account Number",å¸æˆ·å·ç
"Google API","Google API"
"Google Analytics","Google 分æž"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/de_DE.csv b/app/code/Magento/GoogleOptimizer/i18n/de_DE.csv
index cc0ab5448c9..ad13c3d9d1f 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/de_DE.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/de_DE.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","-- Bitte auswählen --"
-"Account Registration","Konto Registrierung"
-"All fields of script types have to be filled.","Alle Felder zu den Skripttypen müssen ausgefüllt werden."
-"Attributes","Attribute"
-"Category View Optimization","Kategorie-Ansicht Optimierung"
-"Control Script","Kontrollskript"
-"Conversion Page","Conversion-Seite"
-"Conversion Page URL","Conversion-Seite URL"
-"Conversion Script","Conversion Skript"
-"Enable","Aktivieren"
-"Google Optimizer Scripts","Google Optimizer Skripte"
-"Google Website Optimizer","Google Website Optimizer"
-"Install Scripts","Skripte installieren"
-"Multi Address Checkout","Mehradress-Checkout"
-"One Page Checkout","Eine Seite Checkout"
-"Order Success (Multi Address Checkout)","Bestellung erfolgreich aufgegeben (Mehradress-Checkout)"
-"Order Success (One Page Checkout)","Bestellung erfolgreich aufgegeben (Eine Seite Checkout)"
-"Original Page","Originalseite"
-"Other","Sonstige"
-"Page Type","Seitentyp"
-"Page View Optimization","Seitenansicht Optimierung"
-"Please copy and paste this value to experiment edit form","Bitte diesen Wert per Kopieren und Einfügen ins Experiment-Bearbeitungsformular einfügen"
-"Please copy and paste this value to experiment edit form.","Bitte diesen Wert per Kopieren und Einfügen ins Experiment-Bearbeitungsformular einfügen"
-"Please select store view to see the URL","Bitte Store-Ansicht auswählen, um URL zu sehen"
-"Please select store view to see the URL.","Bitte Store-Ansicht auswählen, um URL zu sehen"
"Product View Optimization","Produktansicht Optimierung"
-"Scripts Install URL","Skripte URL installieren"
-"Shopping Cart","Warenkorb"
-"The limit is 8 attributes only.","Die Grenze liegt bei maximal 8 Attributen."
-"Tracking Script","Tracking-Skript"
-"Use Default","Default verwenden"
-"Use Default Values","Default-Werte verwenden"
-"Variant Page","Varianten-Seite"
+"Page View Optimization","Seitenansicht Optimierung"
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization","Kategorie-Ansicht Optimierung"
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/en_US.csv b/app/code/Magento/GoogleOptimizer/i18n/en_US.csv
index 74bb376ef4c..08fad3e5baa 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/en_US.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/en_US.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","-- Please Select --"
-"Account Registration","Account Registration"
-"All fields of script types have to be filled.","All fields of script types have to be filled."
-"Attributes","Attributes"
-"Category View Optimization","Category View Optimization"
-"Control Script","Control Script"
-"Conversion Page","Conversion Page"
-"Conversion Page URL","Conversion Page URL"
-"Conversion Script","Conversion Script"
-"Enable","Enable"
-"Google Optimizer Scripts","Google Optimizer Scripts"
-"Google Website Optimizer","Google Website Optimizer"
-"Install Scripts","Install Scripts"
-"Multi Address Checkout","Multi Address Checkout"
-"One Page Checkout","One Page Checkout"
-"Order Success (Multi Address Checkout)","Order Success (Multi Address Checkout)"
-"Order Success (One Page Checkout)","Order Success (One Page Checkout)"
-"Original Page","Original Page"
-"Other","Other"
-"Page Type","Page Type"
-"Page View Optimization","Page View Optimization"
-"Please copy and paste this value to experiment edit form","Please copy and paste this value to experiment edit form"
-"Please copy and paste this value to experiment edit form.","Please copy and paste this value to experiment edit form."
-"Please select store view to see the URL","Please select store view to see the URL"
-"Please select store view to see the URL.","Please select store view to see the URL."
"Product View Optimization","Product View Optimization"
-"Scripts Install URL","Scripts Install URL"
-"Shopping Cart","Shopping Cart"
-"The limit is 8 attributes only.","The limit is 8 attributes only."
-"Tracking Script","Tracking Script"
-"Use Default","Use Default"
-"Use Default Values","Use Default Values"
-"Variant Page","Variant Page"
+"Page View Optimization","Page View Optimization"
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization","Category View Optimization"
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/es_ES.csv b/app/code/Magento/GoogleOptimizer/i18n/es_ES.csv
index c245799a7f9..35a2ab2991d 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/es_ES.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/es_ES.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","-- Seleccionar, por favor --"
-"Account Registration","Registro de cuenta."
-"All fields of script types have to be filled.","Todos los campos de escritura deben ser rellenados."
-"Attributes","Atributos"
-"Category View Optimization","Optimización de la vista de categorÃas."
-"Control Script","Control de escritura."
-"Conversion Page","Pagina de conversión."
-"Conversion Page URL","Página de conversión de la URL."
-"Conversion Script","Conversión de la escritura."
-"Enable","Habilitar"
-"Google Optimizer Scripts","Optimizador de escrituras de Google."
-"Google Website Optimizer","Optimizador de página web de Google."
-"Install Scripts","Instalar escritos."
-"Multi Address Checkout","Comprobar multi direcciones."
-"One Page Checkout","Compra en una página"
-"Order Success (Multi Address Checkout)","Orden de éxito (comprobar multi direcciones)."
-"Order Success (One Page Checkout)","Orden de éxito (Comprobar una página)."
-"Original Page","Página original."
-"Other","Otro(a)."
-"Page Type","Tipo de página."
-"Page View Optimization","Optimización de la vista de página."
-"Please copy and paste this value to experiment edit form","Por favor copie y pegue este valor para experimentar tipo de edición."
-"Please copy and paste this value to experiment edit form.","Por favor copie y pegue este valor para experimentar tipo de edición."
-"Please select store view to see the URL","Por favor seleccione vista de tienda para ver la URL"
-"Please select store view to see the URL.","Por favor seleccione vista de tienda para ver la URL"
"Product View Optimization","Optimización de vista de producto."
-"Scripts Install URL","Escritura de instalación de URL"
-"Shopping Cart","Cesta de la Compra"
-"The limit is 8 attributes only.","El lÃmite son solo 8 atributos"
-"Tracking Script","Escrito de seguimiento"
-"Use Default","El uso por defecto"
-"Use Default Values","Use valores predeterminados"
-"Variant Page","Página variante"
+"Page View Optimization","Optimización de la vista de página."
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization","Optimización de la vista de categorÃas."
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/fr_FR.csv b/app/code/Magento/GoogleOptimizer/i18n/fr_FR.csv
index 017e893b7d2..ea0f0f256d5 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/fr_FR.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/fr_FR.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","-- Veuillez sélectionner --"
-"Account Registration","Créer un compte"
-"All fields of script types have to be filled.","Tous les champs du script doivent être remplis."
-"Attributes","Attributs"
-"Category View Optimization","Optimisation de la vue par catégories"
-"Control Script","Script de contrôle"
-"Conversion Page","Page de conversion"
-"Conversion Page URL","URL de la page de conversion"
-"Conversion Script","Script de conversion"
-"Enable","Activer"
-"Google Optimizer Scripts","Scripts d'optimisation de Google"
-"Google Website Optimizer","Optimisation de sites web Google"
-"Install Scripts","Installer les scripts"
-"Multi Address Checkout","Vérification des adresses"
-"One Page Checkout","Vérification une page"
-"Order Success (Multi Address Checkout)","Commande réalisée avec succès"
-"Order Success (One Page Checkout)","Commande réalisée avec succès"
-"Original Page","Page originale"
-"Other","Autre"
-"Page Type","Type de page"
-"Page View Optimization","Optimisation de la vue par page"
-"Please copy and paste this value to experiment edit form","Veuillez copier puis coller cette valeur pour tester le formulaire d'édition"
-"Please copy and paste this value to experiment edit form.","Veuillez copier puis coller cette valeur pour tester le formulaire d'édition"
-"Please select store view to see the URL","Veuillez sélectionner la vue boutique pour voir l'URL"
-"Please select store view to see the URL.","Veuillez sélectionner la vue boutique pour voir l'URL."
"Product View Optimization","Optimisation de la vue par produit"
-"Scripts Install URL","URL de l'installation des scripts"
-"Shopping Cart","Panier"
-"The limit is 8 attributes only.","La limite est de 8 attributs."
-"Tracking Script","Script de suivi"
-"Use Default","Utiliser par défaut."
-"Use Default Values","Utiliser les valeurs par défaut"
-"Variant Page","Page des variantes."
+"Page View Optimization","Optimisation de la vue par page"
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization","Optimisation de la vue par catégories"
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/nl_NL.csv b/app/code/Magento/GoogleOptimizer/i18n/nl_NL.csv
index 00de89d76fc..96a34398ff2 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/nl_NL.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/nl_NL.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","-- Selecteer alstublieft --"
-"Account Registration","Account registratie"
-"All fields of script types have to be filled.","Alle velden van scripttypes moeten gevuld worden."
-"Attributes","Attributen"
-"Category View Optimization","Categorie aanblik optimalisatie"
-"Control Script","Controlescript"
-"Conversion Page","Conversiepagina"
-"Conversion Page URL","URL conversiepagina"
-"Conversion Script","Conversiescript"
-"Enable","Maak bruikbaar"
-"Google Optimizer Scripts","Google optimaliseerder scripts"
-"Google Website Optimizer","Google website optimaliseerder"
-"Install Scripts","Installatiescripts"
-"Multi Address Checkout","Afrekening met meerdere adressen"
-"One Page Checkout","Een-pagina afrekenen"
-"Order Success (Multi Address Checkout)","Succesvolle bestelling (afrekening met meerdere adressen)"
-"Order Success (One Page Checkout)","Succesvolle bestelling (een pagina afrekening)"
-"Original Page","Originele pagina"
-"Other","Andere"
-"Page Type","Paginatype"
-"Page View Optimization","Optimalisatie pagina-aanblik"
-"Please copy and paste this value to experiment edit form","Kopieer en plak alstublieft deze waarde naar het formulier om het experiment te bewerken"
-"Please copy and paste this value to experiment edit form.","Kopieer en plak alstublieft deze waarde naar het formulier om het experiment te bewerken."
-"Please select store view to see the URL","Selecteer alstublieft de winkelaanblik om de URL te zien"
-"Please select store view to see the URL.","Selecteer alstublieft de winkelaanblik om de URL te zien."
"Product View Optimization","Optimalisatie productaanblik"
-"Scripts Install URL","Scripts installatie URL"
-"Shopping Cart","Winkelmandje"
-"The limit is 8 attributes only.","De limiet is 8 attributen."
-"Tracking Script","Tracking script"
-"Use Default","Gebruik Standaard"
-"Use Default Values","Gebruik standaardwaarden"
-"Variant Page","Variant pagina"
+"Page View Optimization","Optimalisatie pagina-aanblik"
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization","Categorie aanblik optimalisatie"
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/pt_BR.csv b/app/code/Magento/GoogleOptimizer/i18n/pt_BR.csv
index 7a21e8f3b7b..fc6be0304b3 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/pt_BR.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/pt_BR.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","- Por Favor Selecione -"
-"Account Registration","Registro de Conta"
-"All fields of script types have to be filled.","Todos os campos de tipos de script devem ser preenchidos."
-"Attributes","Atributos"
-"Category View Optimization","Otimização de Visualização de Categoria"
-"Control Script","Controlar Script"
-"Conversion Page","Página de Conversão"
-"Conversion Page URL","URL de Página de Conversão"
-"Conversion Script","Script de Conversão"
-"Enable","Ativar"
-"Google Optimizer Scripts","Scripts Otimizadores do Google"
-"Google Website Optimizer","Otimizador de Website do Google"
-"Install Scripts","Instalar Scripts"
-"Multi Address Checkout","Verificação de Multi Endereço"
-"One Page Checkout","SaÃda de Uma Página"
-"Order Success (Multi Address Checkout)","Solicitação Bem-sucedida (Verificação de Multi Endereço)"
-"Order Success (One Page Checkout)","Solicitação Bem-sucedida (Verificação de Uma Página)"
-"Original Page","Página Original"
-"Other","Outra"
-"Page Type","Tipo de Página"
-"Page View Optimization","Otimização de Visualização de Página"
-"Please copy and paste this value to experiment edit form","Por favor, copie e cole esse valor para testar edição de formulário"
-"Please copy and paste this value to experiment edit form.","Por favor, copie e cole esse valor para testar edição de formulário"
-"Please select store view to see the URL","Por favor, selecione visualização da loja para ver a URL"
-"Please select store view to see the URL.","Por favor, selecione visualização da loja para ver a URL."
"Product View Optimization","Otimização de Visualização do Produto"
-"Scripts Install URL","URL para Instalação de Scripts"
-"Shopping Cart","Carrinho de compras"
-"The limit is 8 attributes only.","O limite é de somente 8 atributos."
-"Tracking Script","Script de Rastreamento"
-"Use Default","Utilizar padrão"
-"Use Default Values","Usar Valores Padrões"
-"Variant Page","Página Variante"
+"Page View Optimization","Otimização de Visualização de Página"
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization","Otimização de Visualização de Categoria"
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv b/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv
index 6a868fa27ac..32109201a30 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv
@@ -1,33 +1,7 @@
-"-- Please Select --","-- 请选择 --"
-"Account Registration","账户注册"
-"All fields of script types have to be filled.","脚本类型的所有å—段都必须填写。"
-"Attributes","属性"
-"Category View Optimization","分类视图优化"
-"Control Script","控制脚本"
-"Conversion Page","转æ¢é¡µé¢"
-"Conversion Page URL","转æ¢é¡µé¢ URL"
-"Conversion Script","转æ¢è„šæœ¬"
-"Enable","å¯ç”¨"
-"Google Optimizer Scripts","Google 优化工具脚本"
-"Google Website Optimizer","Google 网站优化工具"
-"Install Scripts","安装脚本"
-"Multi Address Checkout","多地å€ç»“è´¦"
-"One Page Checkout","å•é¡µé¢ç»“è´¦"
-"Order Success (Multi Address Checkout)","订è´æˆåŠŸï¼ˆå¤šåœ°å€ç»“账）"
-"Order Success (One Page Checkout)","订è´æˆåŠŸï¼ˆå•é¡µé¢ç»“账）"
-"Original Page","原始页é¢"
-"Other","其它"
-"Page Type","页é¢ç±»åž‹"
-"Page View Optimization","页é¢è§†å›¾ä¼˜åŒ–"
-"Please copy and paste this value to experiment edit form","请å¤åˆ¶å’Œç²˜è´´è¯¥æ•°å€¼æ¥è¯•éªŒç¼–辑表å•"
-"Please copy and paste this value to experiment edit form.","请å¤åˆ¶å’Œç²˜è´´è¯¥æ•°å€¼æ¥è¯•éªŒç¼–辑表å•ã€‚"
-"Please select store view to see the URL","请选择商店视图æ¥æŸ¥çœ‹ URL"
-"Please select store view to see the URL.","请选择商店视图æ¥æŸ¥çœ‹ URL。"
-"Product View Optimization","产å“视图优化"
-"Scripts Install URL","脚本安装 URL"
-"Shopping Cart","è´ç‰©è½¦"
-"The limit is 8 attributes only.","é™åˆ¶ä¸º 8 个属性。"
-"Tracking Script","追踪脚本"
-"Use Default","使用默认值"
-"Use Default Values","使用默认值"
-"Variant Page","å˜é‡é¡µé¢"
+"Product View Optimization",产å“视图优化
+"Page View Optimization",页é¢è§†å›¾ä¼˜åŒ–
+"Google Analytics Content Experiments Code","Google Analytics Content Experiments Code"
+"Experiment Code","Experiment Code"
+"Note: Experiment code should be added to the original page only.","Note: Experiment code should be added to the original page only."
+"Category View Optimization",分类视图优化
+"Enable Content Experiments","Enable Content Experiments"
diff --git a/app/code/Magento/GoogleShopping/Helper/Data.php b/app/code/Magento/GoogleShopping/Helper/Data.php
index 5adeff27fe8..08709495800 100644
--- a/app/code/Magento/GoogleShopping/Helper/Data.php
+++ b/app/code/Magento/GoogleShopping/Helper/Data.php
@@ -114,7 +114,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
}
if (strip_tags($row) == $row) {
- $row = preg_replace('/@ (.*)/', __("See '\\1'"), $row);
+ $row = preg_replace('/@ (.*)/', __('See \'\1\''), $row);
if (!is_null($product)) {
$row .= ' ' . __(
"for product '%1' (in '%2' store)",
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
index a17c35bbd3d..f2c290a7884 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
@@ -25,8 +25,6 @@ namespace Magento\GoogleShopping\Model\Attribute;
/**
* Link attribute model
- *
- * @author Magento Core Team <core@magentocommerce.com>
*/
class Link extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
{
@@ -86,7 +84,11 @@ class Link extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
{
$url = $product->getProductUrl(false);
if ($url) {
- if (!$this->_scopeConfig->isSetFlag('web/url/use_store', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ $isStoreInUrl = $this->_scopeConfig->isSetFlag(
+ \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ );
+ if (!$isStoreInUrl) {
$urlInfo = parse_url($url);
$store = $product->getStore()->getCode();
if (isset($urlInfo['query']) && $urlInfo['query'] != '') {
diff --git a/app/code/Magento/GoogleShopping/i18n/de_DE.csv b/app/code/Magento/GoogleShopping/i18n/de_DE.csv
new file mode 100644
index 00000000000..fbfd44f7be4
--- /dev/null
+++ b/app/code/Magento/GoogleShopping/i18n/de_DE.csv
@@ -0,0 +1,157 @@
+"Are you sure?","Are you sure?"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
+"Attribute Set","Attribute Set"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
+"Delete Mapping","Delete Mapping"
+"Edit attribute set mapping","Edit attribute set mapping"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
+"Google Content","Google Content"
+"Google Content Items","Google Content Items"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
+"Hosted or Google","Hosted or Google"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
+"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
+"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
+"Product Ads","Product Ads"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
+"Sale Price","Sale Price"
+"Sale Price Effective From Date","Sale Price Effective From Date"
+"Sale Price Effective To Date","Sale Price Effective To Date"
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
+"Shipping Weight","Shipping Weight"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GoogleShopping/i18n/en_US.csv b/app/code/Magento/GoogleShopping/i18n/en_US.csv
index 1a543673558..fbfd44f7be4 100644
--- a/app/code/Magento/GoogleShopping/i18n/en_US.csv
+++ b/app/code/Magento/GoogleShopping/i18n/en_US.csv
@@ -1,140 +1,157 @@
-"Account ID","Account ID"
-"Account Login","Account Login"
-"Account Password","Account Password"
-"Account Type","Account Type"
-"Add Attribute Mapping","Add Attribute Mapping"
-"Add New Attribute","Add New Attribute"
-"Add to Google Content","Add to Google Content"
-"Adult","Adult"
-"Age Group","Age Group"
"Are you sure?","Are you sure?"
-"Attribute","Attribute"
-"Attribute Maps","Attribute Maps"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
"Attribute Set","Attribute Set"
-"Attribute set mapping","Attribute set mapping"
-"Attribute set mapping was deleted","Attribute set mapping was deleted"
-"Attributes","Attributes"
-"Attributes Mapping","Attributes Mapping"
-"Attributes Set","Attributes Set"
-"Australia","Australia"
-"Australian Dollar","Australian Dollar"
-"AuthSub","AuthSub"
-"Available Products","Available Products"
-"Brand","Brand"
-"Brazil","Brazil"
-"Brazilian Real","Brazilian Real"
-"British Pound Sterling","British Pound Sterling"
-"Can't create Attribute Set Mapping.","Can't create Attribute Set Mapping."
-"Can't delete Attribute Set Mapping.","Can't delete Attribute Set Mapping."
-"Can't edit Attribute Set Mapping.","Can't edit Attribute Set Mapping."
-"Can't load attribute sets.","Can't load attribute sets."
-"Can't load attributes.","Can't load attributes."
-"Can't save Attribute Set Mapping.","Can't save Attribute Set Mapping."
-"Cannot update %s items.","Cannot update %s items."
-"Captcha confirmation error.","Captcha confirmation error."
-"Captcha confirmation error: %s","Captcha confirmation error: %s"
-"Captcha has been confirmed.","Captcha has been confirmed."
-"Catalog","Catalog"
-"China","China"
-"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
-"ClientLogin","ClientLogin"
-"Color","Color"
-"Commerce Search","Commerce Search"
-"Condition","Condition"
-"Confirm","Confirm"
-"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
-"Custom attribute, no mapping","Custom attribute, no mapping"
-"Debug","Debug"
-"Default","Default"
-"Delete","Delete"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
"Delete Mapping","Delete Mapping"
-"Description","Description"
-"Destinations","Destinations"
-"Edit Attribute Mapping","Edit Attribute Mapping"
"Edit attribute set mapping","Edit attribute set mapping"
-"Error: %s","Error: %s"
-"Euro","Euro"
-"Excluded","Excluded"
-"Expiration date","Expiration date"
-"Expires","Expires"
-"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
-"France","France"
-"GTIN","GTIN"
-"Gender","Gender"
-"Germany","Germany"
-"Google","Google"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
"Google Content","Google Content"
-"Google Content Attribute","Google Content Attribute"
"Google Content Items","Google Content Items"
-"Google Product Category","Google Product Category"
-"Google Product Search","Google Product Search"
-"Google Shopping","Google Shopping"
-"Google shopping only supports %d tax rates per product","Google shopping only supports %d tax rates per product"
-"Grouping","Grouping"
-"Hosted","Hosted"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
"Hosted or Google","Hosted or Google"
-"Italy","Italy"
-"Items","Items"
-"Japan","Japan"
-"Japanese Yen","Japanese Yen"
-"Labels","Labels"
-"Manage Attribute Mapping","Manage Attribute Mapping"
-"Manage Attributes","Manage Attributes"
-"Manage Items","Manage Items"
-"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
-"Material","Material"
-"Netherlands","Netherlands"
-"New Attribute Mapping","New Attribute Mapping"
-"New attribute set mapping","New attribute set mapping"
-"No","No"
-"No items were deleted from Google Content","No items were deleted from Google Content"
-"No products were added to Google Content","No products were added to Google Content"
-"Online Only","Online Only"
-"Pattern/Graphic","Pattern/Graphic"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
-"Price","Price"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
"Product Ads","Product Ads"
-"Product","Product"
-"Product Review Average","Product Review Average"
-"Product Review Count","Product Review Count"
-"Product Type (Category)","Product Type (Category)"
-"Query Param","Query Param"
-"Redirect","Redirect"
-"Remove","Remove"
-"Required","Required"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
"Sale Price","Sale Price"
"Sale Price Effective From Date","Sale Price Effective From Date"
"Sale Price Effective To Date","Sale Price Effective To Date"
-"Save Mapping","Save Mapping"
-"See '\1'","See '\1'"
-"Session expired during export. Please revise exported products and repeat the process if necessary.","Session expired during export. Please revise exported products and repeat the process if necessary."
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
"Shipping Weight","Shipping Weight"
-"Size","Size"
-"Spain","Spain"
-"Swiss Franc","Swiss Franc"
-"Switzerland","Switzerland"
-"Synchronize","Synchronize"
-"Target Country","Target Country"
-"The Google Content item for product '%s' (in '%s' store) has already exist.","The Google Content item for product '%s' (in '%s' store) has already exist."
-"The attribute ""%s"" has incorrect type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","The attribute ""%s"" has incorrect type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
-"The attribute mapping has been saved.","The attribute mapping has been saved."
-"The item ""%s"" hasn't been deleted.","The item ""%s"" hasn't been deleted."
-"The item ""%s"" hasn't been updated.","The item ""%s"" hasn't been updated."
-"The product ""%s"" hasn't been added to Google Content.","The product ""%s"" hasn't been added to Google Content."
-"The store's currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Content."
-"This action will update items attributes and remove the items which are not available in Google Content. If an attributes was deleted from mapping, it will be deleted from Google too. Continue?","This action will update items attributes and remove the items which are not available in Google Content. If an attributes was deleted from mapping, it will be deleted from Google too. Continue?"
-"Title","Title"
-"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","Total of %d items(s) have been deleted; total of %d items(s) have been updated."
-"Total of %d items(s) have been removed from Google Content.","Total of %d items(s) have been removed from Google Content."
-"Total of %d product(s) have been added to Google Content.","Total of %d product(s) have been added to Google Content."
-"US Dollar","US Dollar"
-"Unable to connect to Google Content. Please, check Account settings in configuration.","Unable to connect to Google Content. Please, check Account settings in configuration."
-"Unable to select a Store View.","Unable to select a Store View."
-"United Kingdom","United Kingdom"
-"United States","United States"
-"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
-"View Available Products","View Available Products"
-"View Item in Google Content","View Item in Google Content"
-"Yes","Yes"
-"for product '%s' (in '%s' store)","for product '%s' (in '%s' store)"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GoogleShopping/i18n/es_ES.csv b/app/code/Magento/GoogleShopping/i18n/es_ES.csv
new file mode 100644
index 00000000000..fbfd44f7be4
--- /dev/null
+++ b/app/code/Magento/GoogleShopping/i18n/es_ES.csv
@@ -0,0 +1,157 @@
+"Are you sure?","Are you sure?"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
+"Attribute Set","Attribute Set"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
+"Delete Mapping","Delete Mapping"
+"Edit attribute set mapping","Edit attribute set mapping"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
+"Google Content","Google Content"
+"Google Content Items","Google Content Items"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
+"Hosted or Google","Hosted or Google"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
+"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
+"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
+"Product Ads","Product Ads"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
+"Sale Price","Sale Price"
+"Sale Price Effective From Date","Sale Price Effective From Date"
+"Sale Price Effective To Date","Sale Price Effective To Date"
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
+"Shipping Weight","Shipping Weight"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GoogleShopping/i18n/fr_FR.csv b/app/code/Magento/GoogleShopping/i18n/fr_FR.csv
new file mode 100644
index 00000000000..fbfd44f7be4
--- /dev/null
+++ b/app/code/Magento/GoogleShopping/i18n/fr_FR.csv
@@ -0,0 +1,157 @@
+"Are you sure?","Are you sure?"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
+"Attribute Set","Attribute Set"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
+"Delete Mapping","Delete Mapping"
+"Edit attribute set mapping","Edit attribute set mapping"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
+"Google Content","Google Content"
+"Google Content Items","Google Content Items"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
+"Hosted or Google","Hosted or Google"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
+"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
+"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
+"Product Ads","Product Ads"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
+"Sale Price","Sale Price"
+"Sale Price Effective From Date","Sale Price Effective From Date"
+"Sale Price Effective To Date","Sale Price Effective To Date"
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
+"Shipping Weight","Shipping Weight"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GoogleShopping/i18n/nl_NL.csv b/app/code/Magento/GoogleShopping/i18n/nl_NL.csv
new file mode 100644
index 00000000000..fbfd44f7be4
--- /dev/null
+++ b/app/code/Magento/GoogleShopping/i18n/nl_NL.csv
@@ -0,0 +1,157 @@
+"Are you sure?","Are you sure?"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
+"Attribute Set","Attribute Set"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
+"Delete Mapping","Delete Mapping"
+"Edit attribute set mapping","Edit attribute set mapping"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
+"Google Content","Google Content"
+"Google Content Items","Google Content Items"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
+"Hosted or Google","Hosted or Google"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
+"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
+"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
+"Product Ads","Product Ads"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
+"Sale Price","Sale Price"
+"Sale Price Effective From Date","Sale Price Effective From Date"
+"Sale Price Effective To Date","Sale Price Effective To Date"
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
+"Shipping Weight","Shipping Weight"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GoogleShopping/i18n/pt_BR.csv b/app/code/Magento/GoogleShopping/i18n/pt_BR.csv
new file mode 100644
index 00000000000..fbfd44f7be4
--- /dev/null
+++ b/app/code/Magento/GoogleShopping/i18n/pt_BR.csv
@@ -0,0 +1,157 @@
+"Are you sure?","Are you sure?"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
+"Attribute Set","Attribute Set"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
+"Delete Mapping","Delete Mapping"
+"Edit attribute set mapping","Edit attribute set mapping"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
+"Google Content","Google Content"
+"Google Content Items","Google Content Items"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
+"Hosted or Google","Hosted or Google"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
+"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
+"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
+"Product Ads","Product Ads"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
+"Sale Price","Sale Price"
+"Sale Price Effective From Date","Sale Price Effective From Date"
+"Sale Price Effective To Date","Sale Price Effective To Date"
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
+"Shipping Weight","Shipping Weight"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GoogleShopping/i18n/zh_CN.csv b/app/code/Magento/GoogleShopping/i18n/zh_CN.csv
new file mode 100644
index 00000000000..fbfd44f7be4
--- /dev/null
+++ b/app/code/Magento/GoogleShopping/i18n/zh_CN.csv
@@ -0,0 +1,157 @@
+"Are you sure?","Are you sure?"
+Remove,Remove
+Product,Product
+Price,Price
+ID,ID
+SKU,SKU
+No,No
+Action,Action
+Items,Items
+Synchronize,Synchronize
+Delete,Delete
+Yes,Yes
+Title,Title
+Type,Type
+Redirect,Redirect
+Description,Description
+Required,Required
+Catalog,Catalog
+Default,Default
+"Add New Attribute","Add New Attribute"
+"Attribute Set","Attribute Set"
+Condition,Condition
+Confirm,Confirm
+Gender,Gender
+Adult,Adult
+Expires,Expires
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?"
+"Add to Google Content","Add to Google Content"
+"View Item in Google Content","View Item in Google Content"
+"Add Attribute Mapping","Add Attribute Mapping"
+"Manage Attribute Mapping","Manage Attribute Mapping"
+"Save Mapping","Save Mapping"
+"Delete Mapping","Delete Mapping"
+"Edit attribute set mapping","Edit attribute set mapping"
+"New attribute set mapping","New attribute set mapping"
+"Custom attribute, no mapping","Custom attribute, no mapping"
+"Attribute set mapping","Attribute set mapping"
+"Target Country","Target Country"
+"Google Product Category","Google Product Category"
+"Attributes Mapping","Attributes Mapping"
+"Google Content","Google Content"
+"Google Content Items","Google Content Items"
+"The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content.","The store's currency should be set to %1 for %2 in system configuration. Otherwise item prices won't be correct in Google Content."
+"An error has occurred while adding products to google shopping account.","An error has occurred while adding products to google shopping account."
+"An error has occurred while deleting products from google shopping account.","An error has occurred while deleting products from google shopping account."
+"One or more products were not deleted from google shopping account. Refer to the log file for details.","One or more products were not deleted from google shopping account. Refer to the log file for details."
+"Captcha has been confirmed.","Captcha has been confirmed."
+"There was a Captcha confirmation error: %1","There was a Captcha confirmation error: %1"
+"Something went wrong during Captcha confirmation.","Something went wrong during Captcha confirmation."
+"Unable to select a Store View","Unable to select a Store View"
+"Google Content Attributes","Google Content Attributes"
+"Attribute Maps","Attribute Maps"
+"New Google Content Attribute Mapping","New Google Content Attribute Mapping"
+"We can't create Attribute Set Mapping.","We can't create Attribute Set Mapping."
+"Google Content Attribute Mapping","Google Content Attribute Mapping"
+"We can't edit Attribute Set Mapping.","We can't edit Attribute Set Mapping."
+"The attribute mapping has been saved.","The attribute mapping has been saved."
+"We can't save Attribute Set Mapping.","We can't save Attribute Set Mapping."
+"Attribute set mapping was deleted","Attribute set mapping was deleted"
+"We can't delete Attribute Set Mapping.","We can't delete Attribute Set Mapping."
+"We can't load attributes.","We can't load attributes."
+"We can't load attribute sets.","We can't load attribute sets."
+"For information on Google's required attributes for different product categories, please see this link: %s","For information on Google's required attributes for different product categories, please see this link: %s"
+"See '\1'","See '\1'"
+"for product '%1' (in '%2' store)","for product '%1' (in '%2' store)"
+"Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content.","Please correct the attribute ""%1"" type for Google Shopping. The product with this attribute hasn't been updated in Google Content."
+"Google shopping only supports %1 tax rates per product","Google shopping only supports %1 tax rates per product"
+"The Google Content item for product '%1' (in '%2' store) already exists.","The Google Content item for product '%1' (in '%2' store) already exists."
+"The product ""%1"" cannot be added to Google Content. %2","The product ""%1"" cannot be added to Google Content. %2"
+"The product ""%1"" hasn't been added to Google Content.","The product ""%1"" hasn't been added to Google Content."
+"Products were added to Google Shopping account.","Products were added to Google Shopping account."
+"A total of %1 product(s) have been added to Google Content.","A total of %1 product(s) have been added to Google Content."
+"Errors happened while adding products to Google Shopping.","Errors happened while adding products to Google Shopping."
+"Operation of adding products to Google Shopping expired.","Operation of adding products to Google Shopping expired."
+"Some products may have not been added to Google Shopping bacause of expiration","Some products may have not been added to Google Shopping bacause of expiration"
+"The item ""%1"" cannot be updated at Google Content. %2","The item ""%1"" cannot be updated at Google Content. %2"
+"The item ""%1"" hasn't been updated.","The item ""%1"" hasn't been updated."
+"Product synchronization with Google Shopping completed","Product synchronization with Google Shopping completed"
+"A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated.","A total of %1 items(s) have been deleted; a total of %2 items(s) have been updated."
+"We cannot update %1 items.","We cannot update %1 items."
+"Errors happened during synchronization with Google Shopping","Errors happened during synchronization with Google Shopping"
+"The item ""%1"" hasn't been deleted.","The item ""%1"" hasn't been deleted."
+"Google Shopping item removal process succeded","Google Shopping item removal process succeded"
+"Total of %1 items(s) have been removed from Google Shopping.","Total of %1 items(s) have been removed from Google Shopping."
+"Errors happened while deleting items from Google Shopping","Errors happened while deleting items from Google Shopping"
+"Google Shopping Error","Google Shopping Error"
+"Google Shopping operation has expired.","Google Shopping operation has expired."
+"One or more google shopping synchronization operations failed because of timeout.","One or more google shopping synchronization operations failed because of timeout."
+"Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration.","Sorry, but we can't connect to Google Content. Please check the account settings in your store configuration."
+"Error: %1","Error: %1"
+"Hosted or Google","Hosted or Google"
+Google,Google
+Hosted,Hosted
+AuthSub,AuthSub
+ClientLogin,ClientLogin
+Excluded,Excluded
+"Available Products","Available Products"
+"Google Shopping synchronization process is running","Google Shopping synchronization process is running"
+"Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
+"Current Mapping will be reloaded. Continue?","Current Mapping will be reloaded. Continue?"
+Attribute,Attribute
+"Google Content Attribute","Google Content Attribute"
+"Please, select Attribute Set to load attributes","Please, select Attribute Set to load attributes"
+Germany,Germany
+Netherlands,Netherlands
+Size,Size
+Labels,Labels
+Debug,Debug
+"Account ID","Account ID"
+"Google Shopping","Google Shopping"
+"Account Login","Account Login"
+"Account Password","Account Password"
+"Account Type","Account Type"
+"Update Google Shopping Item when Product is Updated","Update Google Shopping Item when Product is Updated"
+"Verifying Meta Tag","Verifying Meta Tag"
+Destinations,Destinations
+"Google Product Search","Google Product Search"
+"Product Ads","Product Ads"
+"Commerce Search","Commerce Search"
+Australia,Australia
+"Australian Dollar","Australian Dollar"
+Brazil,Brazil
+"Brazilian Real","Brazilian Real"
+China,China
+"Chinese Yuan Renminbi","Chinese Yuan Renminbi"
+France,France
+Euro,Euro
+Italy,Italy
+Japan,Japan
+"Japanese Yen","Japanese Yen"
+Spain,Spain
+Switzerland,Switzerland
+"Swiss Franc","Swiss Franc"
+"United Kingdom","United Kingdom"
+"British Pound Sterling","British Pound Sterling"
+"United States","United States"
+"US Dollar","US Dollar"
+"Expiration date","Expiration date"
+"Sale Price","Sale Price"
+"Sale Price Effective From Date","Sale Price Effective From Date"
+"Sale Price Effective To Date","Sale Price Effective To Date"
+"Age Group","Age Group"
+Brand,Brand
+Color,Color
+"Manufacturer's Part Number (MPN)","Manufacturer's Part Number (MPN)"
+"Online Only","Online Only"
+GTIN,GTIN
+"Product Type (Category)","Product Type (Category)"
+"Product Review Average","Product Review Average"
+"Product Review Count","Product Review Count"
+"Shipping Weight","Shipping Weight"
+Material,Material
+Pattern/Graphic,Pattern/Graphic
+Grouping,Grouping
+"Query Param","Query Param"
+"Attributes Set","Attributes Set"
+"Total Qty Content Items","Total Qty Content Items"
diff --git a/app/code/Magento/GroupedProduct/i18n/de_DE.csv b/app/code/Magento/GroupedProduct/i18n/de_DE.csv
index 42bd011f7b3..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/de_DE.csv
+++ b/app/code/Magento/GroupedProduct/i18n/de_DE.csv
@@ -1,4 +1,25 @@
-"Catalog Product View (Grouped)","Produktansicht des Katalogs (in Gruppen)"
-"Grouped Product","Gruppiertes Produkt"
-"Grouped Product Image","Gruppiertes Produktbild"
-
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
+"Grouped Product Image","Grouped Product Image"
diff --git a/app/code/Magento/GroupedProduct/i18n/en_US.csv b/app/code/Magento/GroupedProduct/i18n/en_US.csv
index f2f1873e0ab..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/en_US.csv
+++ b/app/code/Magento/GroupedProduct/i18n/en_US.csv
@@ -1,4 +1,25 @@
-"Catalog Product View (Grouped)","Catalog Product View (Grouped)"
-"Grouped Product","Grouped Product"
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
"Grouped Product Image","Grouped Product Image"
-
diff --git a/app/code/Magento/GroupedProduct/i18n/es_ES.csv b/app/code/Magento/GroupedProduct/i18n/es_ES.csv
index 7ca2042a10d..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/es_ES.csv
+++ b/app/code/Magento/GroupedProduct/i18n/es_ES.csv
@@ -1,3 +1,25 @@
-"Catalog Product View (Grouped)","Vista del Catálogo de Producto (Agrupada)"
-"Grouped Product","Producto agrupado"
-"Grouped Product Image","Imagen de productos agrupados"
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
+"Grouped Product Image","Grouped Product Image"
diff --git a/app/code/Magento/GroupedProduct/i18n/fr_FR.csv b/app/code/Magento/GroupedProduct/i18n/fr_FR.csv
index 32a3ed55815..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/fr_FR.csv
+++ b/app/code/Magento/GroupedProduct/i18n/fr_FR.csv
@@ -1,4 +1,25 @@
-"Catalog Product View (Grouped)","Affichage du Produit Catalogue (Groupé)"
-"Grouped Product","Produits groupés"
-"Grouped Product Image","Image groupée du produit"
-
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
+"Grouped Product Image","Grouped Product Image"
diff --git a/app/code/Magento/GroupedProduct/i18n/nl_NL.csv b/app/code/Magento/GroupedProduct/i18n/nl_NL.csv
index ddd7672f35d..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/nl_NL.csv
+++ b/app/code/Magento/GroupedProduct/i18n/nl_NL.csv
@@ -1,3 +1,25 @@
-"Catalog Product View (Grouped)","Catalogus Product Bezichtiging (Gegroepeerd)"
-"Grouped Product","Gegroepeerd Product"
-"Grouped Product Image","Gegroepeerde productafbeelding"
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
+"Grouped Product Image","Grouped Product Image"
diff --git a/app/code/Magento/GroupedProduct/i18n/pt_BR.csv b/app/code/Magento/GroupedProduct/i18n/pt_BR.csv
index ff5786c4444..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/pt_BR.csv
+++ b/app/code/Magento/GroupedProduct/i18n/pt_BR.csv
@@ -1,3 +1,25 @@
-"Catalog Product View (Grouped)","Visualizar Produto de Catálogo (Agrupado)"
-"Grouped Product","Produto Agrupado"
-"Grouped Product Image","Imagem de Produto Agrupado"
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
+"Grouped Product Image","Grouped Product Image"
diff --git a/app/code/Magento/GroupedProduct/i18n/zh_CN.csv b/app/code/Magento/GroupedProduct/i18n/zh_CN.csv
index 2c3135bb038..5f49443a3bc 100644
--- a/app/code/Magento/GroupedProduct/i18n/zh_CN.csv
+++ b/app/code/Magento/GroupedProduct/i18n/zh_CN.csv
@@ -1,4 +1,25 @@
-"Catalog Product View (Grouped)","分类产å“视图（分组）"
-"Grouped Product","分组产å“"
-"Grouped Product Image","已分组的产å“图片"
-
+Cancel,Cancel
+Price,Price
+ID,ID
+SKU,SKU
+Qty,Qty
+Name,Name
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+Availability:,Availability:
+"No options of this product are available.","No options of this product are available."
+"Excl. Tax:","Excl. Tax:"
+"Incl. Tax:","Incl. Tax:"
+"Product Name","Product Name"
+"Associated Products","Associated Products"
+"Grouped Products","Grouped Products"
+"We cannot process the item.","We cannot process the item."
+"Please specify the quantity of product(s).","Please specify the quantity of product(s)."
+"There are no grouped products.","There are no grouped products."
+"Default Qty","Default Qty"
+"Starting at:","Starting at:"
+"Grouped product items","Grouped product items"
+"Add Selected Products","Add Selected Products"
+"Add Products to Group","Add Products to Group"
+"Grouped Product Image","Grouped Product Image"
diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
index aad1419c882..46724dca1d3 100644
--- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
@@ -45,7 +45,7 @@ if ($minProduct) {
<div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
<?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $this->getZone()): ?>
<p class="minimal-price">
- <span class="price-label"><?php echo __('Starting at:') . $amountRender->toHtml();?></span>
+ <span class="price-label"><?php echo __('Starting at')?></span><?php echo $amountRender->toHtml();?>
</p>
<?php endif ?>
</div>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
index c880c91ed56..22716a4e573 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
@@ -31,4 +31,7 @@
<referenceContainer name="product.info.grouped.extra">
<block class="Magento\GroupedProduct\Block\Stockqty\Type\Grouped" template="Magento_CatalogInventory::stockqty/composite.phtml"/>
</referenceContainer>
+ <referenceContainer name="product.info.type">
+ <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" as="product.info.grouped" template="product/view/type/default.phtml"/>
+ </referenceContainer>
</layout>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
new file mode 100644
index 00000000000..2f77cc2020b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Catalog\Block\Product\View\AbstractView */?>
+<?php $_product = $this->getProduct() ?>
+
+<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
+<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
+<?php if ($this->displayProductStockStatus()): ?>
+ <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
+ <p class="stock available" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
+ <?php else: ?>
+ <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
+ <?php endif; ?>
+<?php endif; ?>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index c68215b765f..b942832e44e 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -33,17 +33,6 @@
<?php $_product = $this->getProduct(); ?>
<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
-<?php if ($this->displayProductStockStatus()): ?>
- <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
- <p class="stock available" title="<?php echo __('Availability') ?>">
- <span><?php echo __('In stock') ?></span>
- </p>
- <?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability') ?>">
- <span><?php echo __('Out of stock') ?></span>
- </p>
- <?php endif; ?>
-<?php endif; ?>
<div class="wrapper table grouped">
<table class="table data grouped" id="super-product-table">
@@ -51,26 +40,24 @@
<thead>
<tr>
<th class="col item"><?php echo __('Product Name') ?></th>
- <?php if ($this->getCanShowProductPrice($_product)): ?>
- <th class="col price"><?php echo __('Price') ?></th>
- <?php endif; ?>
<?php if ($_product->isSaleable()): ?>
<th class="col qty"><?php echo __('Qty') ?></th>
<?php endif; ?>
</tr>
</thead>
- <tbody>
+
<?php if ($_hasAssociatedProducts): ?>
<?php foreach ($_associatedProducts as $_item): ?>
+ <tbody>
<tr>
- <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
- <?php if ($this->getCanShowProductPrice($_product)): ?>
- <td class="col price">
- <?php if ($this->getCanShowProductPrice($_item)): ?>
- <?php echo $this->getProductPrice($_item) ?>
- <?php endif; ?>
+ <td class="col item">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ <?php if ($this->getCanShowProductPrice($_product)): ?>
+ <?php if ($this->getCanShowProductPrice($_item)): ?>
+ <?php echo $this->getProductPrice($_item) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</td>
- <?php endif; ?>
<?php if ($_product->isSaleable()): ?>
<td class="col qty">
<?php if ($_item->isSaleable()) : ?>
@@ -91,16 +78,33 @@
</td>
<?php endif; ?>
</tr>
+ <?php if ($this->getCanShowProductPrice($_product)
+ && $this->getCanShowProductPrice($_item)
+ && trim($this->getProductPriceHtml(
+ $_item,
+ \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE
+ ))): ?>
+ <tr class="row-tier-price">
+ <td colspan="2">
+ <?php echo $this->getProductPriceHtml(
+ $_item,
+ \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE
+ ) ?>
+ </td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
<?php endforeach; ?>
<?php else: ?>
+ <tbody>
<tr>
<td class="unavailable"
colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
<?php echo __('No options of this product are available.') ?>
</td>
</tr>
- <?php endif; ?>
</tbody>
+ <?php endif; ?>
</table>
</div>
<div id="validation-message-box"></div>
diff --git a/app/code/Magento/ImportExport/i18n/de_DE.csv b/app/code/Magento/ImportExport/i18n/de_DE.csv
index 9cb478aa704..9ba56e2886c 100644
--- a/app/code/Magento/ImportExport/i18n/de_DE.csv
+++ b/app/code/Magento/ImportExport/i18n/de_DE.csv
@@ -1,61 +1,88 @@
-" in rows: ","in Reihen:"
"-- Please Select --","-- Bitte wählen --"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","Adapter muss eine Anwendung von \Magento\ImportExport\Model\Import\Adapter\Abstract sein"
-"Adapter type must be a non empty string","Adapter Typ muss eine nicht leere Zeichenfolge sein"
-"Can not determine attribute filter type","Kann die Eigenschaften des Filter-Typs nicht erkennen"
-"Can not find required columns: ","Kann die erforderlichen Spalten nicht finden:"
-"Can not get autoincrement value","Kann den Wert für Auto Increment nicht beziehen"
+Status,Status
+From,From
+To,To
+Export,Export
+label,label
+"Attribute Code","Attribute Code"
+Import,Import
+Continue,Weiter
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
"Check Data","Daten prüfen"
-"Column names have duplicates","Die Spaltennamen haben Duplikate"
-"Column names is empty or is not an array","Spaltennamen ist leer oder keine Reihe"
-"Column names: ""%s"" are invalid","Spaltennamen: ""%s"" sind ungültig"
-"Continue","Weiter"
-"Data is invalid or file is not uploaded","Daten sind ungültig oder Datei ist nicht hochgeladen"
-"Destination directory is not writable","Zielverzeichnis ist nicht beschreibbar"
-"Destination file is not writable","Zieldatei ist nicht beschreibbar"
-"Destination file path must be a string","Zieldatei-Pfad muss eine Reihe sein"
-"Entity Attributes","Entitätenattribute"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","Entity-Adapter-Objekt muss eine Anwendung von \Magento\ImportExport\Model\Import\Entity\Abstract sein"
-"Entity is unknown","Entity ist unbekannt"
-"Error in data structure: behaviors are mixed","Fehler in der Datenstruktur: Vorgehensweisen sind unterschiedlich"
-"Error in data structure: entity codes are mixed","Fehler in der Datenstruktur: Entity-Codes sind unterschiedlich"
-"Export","Export"
-"Export FAQ","Export FAQ"
-"FAQ","FAQ"
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,Import/Export
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
"File does not contain data. Please upload another one","Datei enthält keine Daten. Bitte laden Sie eine andere hoch"
-"File format is unknown","Dateityp unbekannt"
-"File is partially valid, but import is not possible","Datei ist teilweise gültig, Import ist aber nicht möglich"
-"File is totally invalid. Please fix errors and re-upload file","Datei ist komplett ungültig. Bitte beheben Sie die Fehler und laden Sie sie erneut hoch"
"File is valid! To start import process press ""Import"" button","Datei ist gültig! Klicken Sie auf den Import-Button, um den Importvorgang zu starten."
"File is valid, but import is not possible","Datei ist gültig, Import ist aber nicht möglich"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded","Daten sind ungültig oder Datei ist nicht hochgeladen"
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible","Datei ist teilweise gültig, Import ist aber nicht möglich"
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown","Entity ist unbekannt"
+"File format is unknown","Dateityp unbekannt"
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string","Zieldatei-Pfad muss eine Reihe sein"
+"Destination directory is not writable","Zielverzeichnis ist nicht beschreibbar"
+"Destination file is not writable","Zieldatei ist nicht beschreibbar"
"Header column names already set","Spaltennamen in der Kopfzeile sind schon festgelegt."
-"Import","Import"
-"Import / Export FAQ (Frequently Asked Questions)","Import / Export FAQ (häufig gestellte Fragen)"
-"Import FAQ","Import FAQ"
-"Import successfully done.","Import erfolgreich abgeschlossen."
-"Import/Export","Import/Export"
-"In/Out","Ein/Aus"
-"Input entity code is not equal to entity adapter code","Code der Eingabeeinheit entspricht nicht dem Adapter-Code der Einheit"
-"Invalid entity","Ungültige Einheit"
-"Invalid file format","Ungültiger Dateityp"
-"Invalid parameters","Ungültige Parameter"
-"Invalid seek position","Ungültige Suchposition"
-"Invalid value for '%s'","Ungültiger Wert für '%s'"
-"No filter data provided","Keine Filterdaten angegeben"
-"No source specified","Keine Quelle angegeben"
-"No valid data sent","Keine gültige Daten gesendet"
-"No writer specified","Nicht Schreiber-spezifiziert"
-"Node does not has model token tag","Knoten hat nicht das Schild des Modells"
-"Not implemented yet","Noch nicht implementiert"
-"Please fix errors and re-upload file","Bitte beheben Sie die Fehler und laden Sie erneut hoch"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Bitte beheben Sie die Fehler und laden Sie die Datei erneut hoch, oder betätigen Sie die ""Import""-Schaltfläche um Reihen mit Fehlern zu überspringen"
-"Some other FAQ","Andere Fragen"
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension","Hochgeladene Datei hat keine Dateiendung"
"Source file moving failed","Verschieben der Quelldatei fehlgeschlagen"
-"Source file path must be a string","Quelldateipfad muss ein String sein"
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
"Source is not set","Quelle ist nicht festgelegt"
-"Status","Status"
-"System busy","System belegt"
-"There are no product types available for export","Es sind keine Produkttypen für den Export verfügbar"
-"Total size of uploadable files must not exceed %s","Gesamtgröße der hochzuladenden Dateien darf %s nicht übersteigen"
-"Uploaded file has no extension","Hochgeladene Datei hat keine Dateiendung"
-"Validation Results","Prüfergebnisse"
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes",Entitätenattribute
+"Validation Results",Prüfergebnisse
diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
index 962df32c6e5..05144e02a98 100644
--- a/app/code/Magento/ImportExport/i18n/en_US.csv
+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
@@ -1,61 +1,88 @@
-" in rows: "," in rows: "
"-- Please Select --","-- Please Select --"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract"
-"Adapter type must be a non empty string","Adapter type must be a non empty string"
-"Can not determine attribute filter type","Can not determine attribute filter type"
-"Can not find required columns: ","Can not find required columns: "
-"Can not get autoincrement value","Can not get autoincrement value"
+Status,Status
+From,From
+To,To
+Export,Export
+label,label
+"Attribute Code","Attribute Code"
+Import,Import
+Continue,Continue
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
"Check Data","Check Data"
-"Column names have duplicates","Column names have duplicates"
-"Column names is empty or is not an array","Column names is empty or is not an array"
-"Column names: ""%s"" are invalid","Column names: ""%s"" are invalid"
-"Continue","Continue"
-"Data is invalid or file is not uploaded","Data is invalid or file is not uploaded"
-"Destination directory is not writable","Destination directory is not writable"
-"Destination file is not writable","Destination file is not writable"
-"Destination file path must be a string","Destination file path must be a string"
-"Entity Attributes","Entity Attributes"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract"
-"Entity is unknown","Entity is unknown"
-"Error in data structure: behaviors are mixed","Error in data structure: behaviors are mixed"
-"Error in data structure: entity codes are mixed","Error in data structure: entity codes are mixed"
-"Export","Export"
-"Export FAQ","Export FAQ"
-"FAQ","FAQ"
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,Import/Export
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
"File does not contain data. Please upload another one","File does not contain data. Please upload another one"
-"File format is unknown","File format is unknown"
-"File is partially valid, but import is not possible","File is partially valid, but import is not possible"
-"File is totally invalid. Please fix errors and re-upload file","File is totally invalid. Please fix errors and re-upload file"
"File is valid! To start import process press ""Import"" button","File is valid! To start import process press ""Import"" button"
"File is valid, but import is not possible","File is valid, but import is not possible"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded","Data is invalid or file is not uploaded"
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible","File is partially valid, but import is not possible"
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown","Entity is unknown"
+"File format is unknown","File format is unknown"
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string","Destination file path must be a string"
+"Destination directory is not writable","Destination directory is not writable"
+"Destination file is not writable","Destination file is not writable"
"Header column names already set","Header column names already set"
-"Import","Import"
-"Import / Export FAQ (Frequently Asked Questions)","Import / Export FAQ (Frequently Asked Questions)"
-"Import FAQ","Import FAQ"
-"Import successfully done.","Import successfully done."
-"Import/Export","Import/Export"
-"In/Out","In/Out"
-"Input entity code is not equal to entity adapter code","Input entity code is not equal to entity adapter code"
-"Invalid entity","Invalid entity"
-"Invalid file format","Invalid file format"
-"Invalid parameters","Invalid parameters"
-"Invalid seek position","Invalid seek position"
-"Invalid value for '%s'","Invalid value for '%s'"
-"No filter data provided","No filter data provided"
-"No source specified","No source specified"
-"No valid data sent","No valid data sent"
-"No writer specified","No writer specified"
-"Node does not has model token tag","Node does not has model token tag"
-"Not implemented yet","Not implemented yet"
-"Please fix errors and re-upload file","Please fix errors and re-upload file"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors"
-"Some other FAQ","Some other FAQ"
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension","Uploaded file has no extension"
"Source file moving failed","Source file moving failed"
-"Source file path must be a string","Source file path must be a string"
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
"Source is not set","Source is not set"
-"Status","Status"
-"System busy","System busy"
-"There are no product types available for export","There are no product types available for export"
-"Total size of uploadable files must not exceed %s","Total size of uploadable files must not exceed %s"
-"Uploaded file has no extension","Uploaded file has no extension"
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes","Entity Attributes"
"Validation Results","Validation Results"
diff --git a/app/code/Magento/ImportExport/i18n/es_ES.csv b/app/code/Magento/ImportExport/i18n/es_ES.csv
index eec75a789d9..44213bbe924 100644
--- a/app/code/Magento/ImportExport/i18n/es_ES.csv
+++ b/app/code/Magento/ImportExport/i18n/es_ES.csv
@@ -1,61 +1,88 @@
-" in rows: ","en filas:"
"-- Please Select --","-- Por favor seleccione --"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","El adaptador debe ser una instancia de \Magento\ImportExport\Model\Import\Adapter\Abstract"
-"Adapter type must be a non empty string","El tipo de adaptador debe ser una cadena no vacÃa"
-"Can not determine attribute filter type","No se puede determinar el tipo de filtro de atributos"
-"Can not find required columns: ","No se pueden encontrar las columnas necesarias:"
-"Can not get autoincrement value","No se puede obtener el valor de autoincremento"
+Status,Progreso
+From,From
+To,To
+Export,Exportar
+label,label
+"Attribute Code","Attribute Code"
+Import,Importar
+Continue,Continuar
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
"Check Data","Verificar los datos"
-"Column names have duplicates","Los nombres de columna tienen duplicados"
-"Column names is empty or is not an array","Nombres de columna está vacÃo o no es una matriz"
-"Column names: ""%s"" are invalid","Nombres de comlumna: ""%s"" no son válidos"
-"Continue","Continuar"
-"Data is invalid or file is not uploaded","Los datos son incorrectos o el archivo no está cargado"
-"Destination directory is not writable","No se puede escribir en el directorio de destino"
-"Destination file is not writable","No se puede escribir en el archivo de destino"
-"Destination file path must be a string","La ruta del archivo de destino debe ser una cadena"
-"Entity Attributes","Atributos de la Entidad"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","El objeto de adaptador de entidad debe ser una instancia de \Magento\ImportExport\Model\Import\Entity\Abstract"
-"Entity is unknown","Entidad desconocida"
-"Error in data structure: behaviors are mixed","Error en la estructura de datos: hay conductas mezcladas"
-"Error in data structure: entity codes are mixed","Error en la estructura de datos: hay códigos de entidad mezclados"
-"Export","Exportar"
-"Export FAQ","Exportar FAQ"
-"FAQ","FAQ"
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,Importar/Exportar
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
"File does not contain data. Please upload another one","El archivo no contiene datos. Por favor cargue otro distinto"
-"File format is unknown","Formato de archivo desconocido"
-"File is partially valid, but import is not possible","El archivo es parcialmente válido, pero no es posible importar"
-"File is totally invalid. Please fix errors and re-upload file","El archivo es totalmente inválido. Por favor corrija los errores y vuelva a cargar el archivo"
"File is valid! To start import process press ""Import"" button","El archivo no es correcto. Para empezar el proceso de importación pulse el botón ""Importar"""
"File is valid, but import is not possible","El archivo es válido, pero importar no es posible"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded","Los datos son incorrectos o el archivo no está cargado"
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible","El archivo es parcialmente válido, pero no es posible importar"
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown","Entidad desconocida"
+"File format is unknown","Formato de archivo desconocido"
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string","La ruta del archivo de destino debe ser una cadena"
+"Destination directory is not writable","No se puede escribir en el directorio de destino"
+"Destination file is not writable","No se puede escribir en el archivo de destino"
"Header column names already set","Nombres de los encabezados de las columnas ya fijados"
-"Import","Importar"
-"Import / Export FAQ (Frequently Asked Questions)","Importar / Exportar FAQ (preguntas frecuentes)"
-"Import FAQ","Importar FAQ"
-"Import successfully done.","Importación realizada con éxito."
-"Import/Export","Importar/Exportar"
-"In/Out","Dentro/Fuera"
-"Input entity code is not equal to entity adapter code","El código de la entidad de entrada no es igual al código adaptador de la entidad"
-"Invalid entity","Entidad no válida"
-"Invalid file format","Formato de archivo no válido"
-"Invalid parameters","Parámetros no válidos"
-"Invalid seek position","Posición de búsqueda no válida"
-"Invalid value for '%s'","Valor inválido para '%s'"
-"No filter data provided","No se han proporcionado filtros de datos"
-"No source specified","Ninguna fuente especificada"
-"No valid data sent","Los datos enviados no son válidos"
-"No writer specified","Ningún escritor especificado"
-"Node does not has model token tag","El nodo no tiene una etiqueta de señal modelo"
-"Not implemented yet","Aún no implementado"
-"Please fix errors and re-upload file","Por favor, corrija los errores y vuelva a cargar el archivo"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Solucione los errores y vuelva a cargar el archivo, o pulse el botón ""Importar"" para omitir las filas con errores"
-"Some other FAQ","Algunas FAQs más"
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension","El archivo cargado no tiene extensión"
"Source file moving failed","Fallo al mover el archivo de origen"
-"Source file path must be a string","La ruta del archivo de origen debe ser una cadena"
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
"Source is not set","No se ha definido el origen"
-"Status","Progreso"
-"System busy","El sistema está ocupado"
-"There are no product types available for export","No hay tipos de productos disponibles para la exportación"
-"Total size of uploadable files must not exceed %s","El tamaño total de los archivos a cargar no puede exceder %s"
-"Uploaded file has no extension","El archivo cargado no tiene extensión"
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes","Atributos de la Entidad"
"Validation Results","Resultados de Validación"
diff --git a/app/code/Magento/ImportExport/i18n/fr_FR.csv b/app/code/Magento/ImportExport/i18n/fr_FR.csv
index 0d1bdd15ff4..334869e29ff 100644
--- a/app/code/Magento/ImportExport/i18n/fr_FR.csv
+++ b/app/code/Magento/ImportExport/i18n/fr_FR.csv
@@ -1,61 +1,88 @@
-" in rows: ","en ligne :"
"-- Please Select --","-- Veuillez sélectionner --"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","L'adaptateur doit être une instance de \Magento\ImportExport\Model\Import\Adapter\Abstract"
-"Adapter type must be a non empty string","Le type d'adaptateur doit être une variable non vide"
-"Can not determine attribute filter type","N'a pas pu déterminer le type de filtre d'attribut"
-"Can not find required columns: ","N'a pas pu trouver les colonnes requises :"
-"Can not get autoincrement value","N'a pas pu obtenir la valeur"
+Status,Statut
+From,From
+To,To
+Export,Exporter
+label,label
+"Attribute Code","Attribute Code"
+Import,Importation
+Continue,Continuer
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
"Check Data","Vérifier données"
-"Column names have duplicates","Il y a des noms de colonne en double"
-"Column names is empty or is not an array","Le nom de la colonne est vide, ou invalide"
-"Column names: ""%s"" are invalid","Noms des colonnes : ""%s"" est invalide"
-"Continue","Continuer"
-"Data is invalid or file is not uploaded","Donnée invalide ou fichier non soumis;"
-"Destination directory is not writable","Le répertoire de destination n'est pas accessible en écriture"
-"Destination file is not writable","Le fichier de destination n'est pas accessible en écriture"
-"Destination file path must be a string","Le répertoire de destination du fichier doit être une variable"
-"Entity Attributes","Attributs de l'entité"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","L'objet adaptateur doit être une isntance de \Magento\ImportExport\Model\Import\Entity\Abstract"
-"Entity is unknown","Entitée inconnue"
-"Error in data structure: behaviors are mixed","Erreur dans la structure des données : les comportements sont mélangés"
-"Error in data structure: entity codes are mixed","Erreur dans la structure des données : les codes d'entité sont mélangés"
-"Export","Exporter"
-"Export FAQ","Exporter FAS"
-"FAQ","FAQ"
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,"Importer / Exporter"
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
"File does not contain data. Please upload another one","Le fichier ne contient pas de donné. Veuillez en soumettre un nouveau"
-"File format is unknown","Format de fichier inconnu"
-"File is partially valid, but import is not possible","Le fichier est partiellement valide, mais l'importation est impossible"
-"File is totally invalid. Please fix errors and re-upload file","Le fichier est totalement invalide. Veuillez corriger les erreurs et soumettre à nouveau le fichier"
"File is valid! To start import process press ""Import"" button","Fichier valide ! Pour lancer le processus d'importation, appuyez sur le bouton ""Importer"""
"File is valid, but import is not possible","Le fichier est valide, mais l'importation n'est pas possible"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded","Donnée invalide ou fichier non soumis;"
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible","Le fichier est partiellement valide, mais l'importation est impossible"
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown","Entitée inconnue"
+"File format is unknown","Format de fichier inconnu"
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string","Le répertoire de destination du fichier doit être une variable"
+"Destination directory is not writable","Le répertoire de destination n'est pas accessible en écriture"
+"Destination file is not writable","Le fichier de destination n'est pas accessible en écriture"
"Header column names already set","Noms de colonnes déjà fixés"
-"Import","Importation"
-"Import / Export FAQ (Frequently Asked Questions)","Importer / Exporter FAQ (Foire Aux Questions)"
-"Import FAQ","Importer FAQ"
-"Import successfully done.","Importation effectuée avec succès"
-"Import/Export","Importer / Exporter"
-"In/Out","Entré/sortie"
-"Input entity code is not equal to entity adapter code","Le code d'entité ne correspond pas au code d'entité adaptateur"
-"Invalid entity","Entité invalide"
-"Invalid file format","Format de fichier invalide"
-"Invalid parameters","Paramètres invalides"
-"Invalid seek position","Position de recherche invalide"
-"Invalid value for '%s'","Valeur invalide pour '%s'"
-"No filter data provided","Pas de filtre de données fourni"
-"No source specified","Pas de source spécifiée"
-"No valid data sent","Pas de donnée valide envoyée"
-"No writer specified","Pas d'auteur spécifié"
-"Node does not has model token tag","Le voyant n'a pas de tag modèle"
-"Not implemented yet","Pas encore implémenté"
-"Please fix errors and re-upload file","Veuillez corriger les erreurs et soumettre à nouveau le fichier"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Veuillez corriger les erreurs et retélécharger le fichier ou appuyez simplement sur le bouton ""Importer"" pour sauter les lignes avec des erreurs"
-"Some other FAQ","Autres FAQ"
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension","Le fichier téléchargé n'a pas d'extension"
"Source file moving failed","Le déplacement du fichier source a échoué"
-"Source file path must be a string","Le chemin d'accès du fichier source doit être une chaîne"
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
"Source is not set","La source n'est pas définie"
-"Status","Statut"
-"System busy","Le système est occupé"
-"There are no product types available for export","Il n'y a aucun type de produit disponible pour l'exportation"
-"Total size of uploadable files must not exceed %s","La taille totale des fichirs ne doit pas dépasser %s"
-"Uploaded file has no extension","Le fichier téléchargé n'a pas d'extension"
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes","Attributs de l'entité"
"Validation Results","Résultats validation"
diff --git a/app/code/Magento/ImportExport/i18n/nl_NL.csv b/app/code/Magento/ImportExport/i18n/nl_NL.csv
index 1e1dc6c99f6..fc27f6d6371 100644
--- a/app/code/Magento/ImportExport/i18n/nl_NL.csv
+++ b/app/code/Magento/ImportExport/i18n/nl_NL.csv
@@ -1,61 +1,88 @@
-" in rows: ","in rijen:"
"-- Please Select --","-- Selecteer alstublieft --"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","Adapter moet een instantie zijn van \Magento\ImportExport\Model\Import\Adapter\Abstract"
-"Adapter type must be a non empty string","Adaptertype mag geen lege zin zijn"
-"Can not determine attribute filter type","Kan filtertype attribuut niet bepalen"
-"Can not find required columns: ","Kan vereist kolommen niet vinden:"
-"Can not get autoincrement value","Kan automatische verhogingswaarde niet verkrijgen"
+Status,Status
+From,From
+To,To
+Export,Export
+label,label
+"Attribute Code","Attribute Code"
+Import,Import
+Continue,Doorgaan
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
"Check Data","Kijk Data Na"
-"Column names have duplicates","Kolomnamen bevat dubbele invoer"
-"Column names is empty or is not an array","Kolomnamen is leeg of niet een reeks"
-"Column names: ""%s"" are invalid","Kolomnamen: ""%s"" is ongeldig"
-"Continue","Doorgaan"
-"Data is invalid or file is not uploaded","Gegevens zijn ongeldig of bestand is niet geüpload"
-"Destination directory is not writable","Bestemmingsmap is niet beschrijfbaar"
-"Destination file is not writable","Bestemmingsbestand is niet schrijfbaar"
-"Destination file path must be a string","Bestemmingspad bestand moet tekst zijn"
-"Entity Attributes","Eenheidattributen"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","Entiteit adapterobject moet een instantie zijn van Magento_ImportExport_model_Import_Entity_Abstract"
-"Entity is unknown","Entiteit is onbekend"
-"Error in data structure: behaviors are mixed","Fout in datastructuur: gedragingen zijn gemengd"
-"Error in data structure: entity codes are mixed","Fout in datastructuur: entiteitcodes zijn gemengd"
-"Export","Export"
-"Export FAQ","Export FAQ"
-"FAQ","FAQ"
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,Import/Export
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
"File does not contain data. Please upload another one","Bestand bevat geen gegevens. Upload a.u.b. een andere"
-"File format is unknown","Bestand format is onbekend"
-"File is partially valid, but import is not possible","Bestand is gedeeltelijk geldig, maar het is niet mogelijk te importeren"
-"File is totally invalid. Please fix errors and re-upload file","Bestand is totaal ongeldig. Herstel a.u.b. de fouten en upload bestand opnieuw"
"File is valid! To start import process press ""Import"" button","Bestand is geldig! Om het importeren te starten klik op de ""Import"" knop"
"File is valid, but import is not possible","Bestand is geldig, maar het is niet mogelijk te importeren"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded","Gegevens zijn ongeldig of bestand is niet geüpload"
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible","Bestand is gedeeltelijk geldig, maar het is niet mogelijk te importeren"
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown","Entiteit is onbekend"
+"File format is unknown","Bestand format is onbekend"
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string","Bestemmingspad bestand moet tekst zijn"
+"Destination directory is not writable","Bestemmingsmap is niet beschrijfbaar"
+"Destination file is not writable","Bestemmingsbestand is niet schrijfbaar"
"Header column names already set","Koptekst kolom namen zijn reeds ingesteld"
-"Import","Import"
-"Import / Export FAQ (Frequently Asked Questions)","Import / Export FAQ (Veel Gestelde Vragen)"
-"Import FAQ","Import FAQ"
-"Import successfully done.","Import is succesvol gelukt"
-"Import/Export","Import/Export"
-"In/Out","In/Uit"
-"Input entity code is not equal to entity adapter code","Ingevoerde entity code staat niet gelijk aan de entity adapter code"
-"Invalid entity","Ongeldige entity"
-"Invalid file format","Ongeldig bestandsformat"
-"Invalid parameters","Ongeldige parameters"
-"Invalid seek position","Ongeldige zoek positie"
-"Invalid value for '%s'","Ongeldige waarde voor '%s'"
-"No filter data provided","Geen gefilterde data gegeven"
-"No source specified","Geen bron gespecificeerd"
-"No valid data sent","Geen geldige gegevens verzonden"
-"No writer specified","Geen schrijver gespecificeerd"
-"Node does not has model token tag","Node heeft geen model token tag"
-"Not implemented yet","Nog niet ingevoerd"
-"Please fix errors and re-upload file","Herstel a.u.b. fouten en upload bestand opnieuw"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Gelieve de fouten te corrigeren en de bestanden opnieuw te uploaden of klik simpelweg ""Importeer"" om een regel met fouten over te slaan"
-"Some other FAQ","Andere FAQ"
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension","Het geüploade bestand heeft geen uitgang"
"Source file moving failed","Verplaatsen van het bronbestand mislukt"
-"Source file path must be a string","Bronbestand moet een string zijn"
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
"Source is not set","Bron is niet aangegeven"
-"Status","Status"
-"System busy","Systeem bezig"
-"There are no product types available for export","Er zijn geen product types beschikbaar voor export"
-"Total size of uploadable files must not exceed %s","Totale grootte van bestanden die geüpload dienen te worden moet niet groter zijn dan %s"
-"Uploaded file has no extension","Het geüploade bestand heeft geen uitgang"
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes",Eenheidattributen
"Validation Results","Validatie Resultaten"
diff --git a/app/code/Magento/ImportExport/i18n/pt_BR.csv b/app/code/Magento/ImportExport/i18n/pt_BR.csv
index adfeda3cb84..1d03b6c8a1d 100644
--- a/app/code/Magento/ImportExport/i18n/pt_BR.csv
+++ b/app/code/Magento/ImportExport/i18n/pt_BR.csv
@@ -1,61 +1,88 @@
-" in rows: ","em linhas:"
"-- Please Select --","- Por Favor Selecione -"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","Adaptador deve ser uma instância de \Magento\ImportExport\Model\Import\Adapter\Abstract"
-"Adapter type must be a non empty string","Tipo de adaptador deve ser uma sequência não vazia"
-"Can not determine attribute filter type","Não pode determinar o tipo de atributo de filtro"
-"Can not find required columns: ","Não é possÃvel encontrar colunas necessárias:"
-"Can not get autoincrement value","Não pode obter o valor de autoincremento"
+Status,Status
+From,From
+To,To
+Export,Exportar
+label,label
+"Attribute Code","Attribute Code"
+Import,Importar
+Continue,Continue
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
"Check Data","Verificar Dados"
-"Column names have duplicates","Nomes de coluna têm duplicados"
-"Column names is empty or is not an array","Nomes de coluna estão vazios ou não em série"
-"Column names: ""%s"" are invalid","Nomes de colunas: ""%s"" são inválidos"
-"Continue","Continue"
-"Data is invalid or file is not uploaded","Dados são inválidos ou arquivo não está carregado"
-"Destination directory is not writable","Diretório de destino não é gravável"
-"Destination file is not writable","Arquivo de destino não é gravável"
-"Destination file path must be a string","Caminho do arquivo de destino deve ser uma sequência"
-"Entity Attributes","Atributos da entidade"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","Objeto adaptador da entidade deve ser uma instância de \Magento\ImportExport\Model\Import\Entity\Abstract"
-"Entity is unknown","Entidade desconhecida"
-"Error in data structure: behaviors are mixed","Erro na estrutura de dados: os comportamentos estão misturados"
-"Error in data structure: entity codes are mixed","Erro na estrutura de dados: os códigos de entidade estão misturados"
-"Export","Exportar"
-"Export FAQ","FAQ de Exportação"
-"FAQ","FAQ"
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,Importação/Exportação
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
"File does not contain data. Please upload another one","Arquivo não contém dados. Por favor envie outro"
-"File format is unknown","Formato de arquivo é desconhecido"
-"File is partially valid, but import is not possible","Arquivo é parcialmente válido, mas a importação não é possÃvel"
-"File is totally invalid. Please fix errors and re-upload file","Arquivo é totalmente inválido. Por favor corrija os erros e recarregue arquivos"
"File is valid! To start import process press ""Import"" button","Arquivo é válido! Para iniciar o processo de importação carregue no botão ""Importar"""
"File is valid, but import is not possible","Arquivo é válido, mas a importação não é possÃvel"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded","Dados são inválidos ou arquivo não está carregado"
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible","Arquivo é parcialmente válido, mas a importação não é possÃvel"
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown","Entidade desconhecida"
+"File format is unknown","Formato de arquivo é desconhecido"
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string","Caminho do arquivo de destino deve ser uma sequência"
+"Destination directory is not writable","Diretório de destino não é gravável"
+"Destination file is not writable","Arquivo de destino não é gravável"
"Header column names already set","Nomes das colunas de cabeçalho já estão definidos"
-"Import","Importar"
-"Import / Export FAQ (Frequently Asked Questions)","FAQ (Questões Frequentemente Perguntadas) Importação/Exportação"
-"Import FAQ","FAQ Importação"
-"Import successfully done.","Importação feita com sucesso."
-"Import/Export","Importação/Exportação"
-"In/Out","Entrada/SaÃda"
-"Input entity code is not equal to entity adapter code","Código de entrada da entidade não é igual ao código de adaptador da entidade"
-"Invalid entity","Entidade inválida"
-"Invalid file format","Formato de arquivo inválido"
-"Invalid parameters","Parâmetros inválidos"
-"Invalid seek position","Posição inválida de busca"
-"Invalid value for '%s'","Valor inválido para ""%s"""
-"No filter data provided","Dados fornecidos não filtrados"
-"No source specified","Nenhuma fonte especificada"
-"No valid data sent","Não há dados válidos de envio"
-"No writer specified","Nenhum escritor especificado"
-"Node does not has model token tag","Nó não tem modelo de marca simbólico"
-"Not implemented yet","Ainda não implementado"
-"Please fix errors and re-upload file","Corrija os erros e carregue novamente o arquivo"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Corrija os erros e carregue novamente o arquivo, ou simplesmente pressione o botão ""Importar"" para pular as linhas com erros"
-"Some other FAQ","Alguns outros FAQs"
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension","O arquivo carregado não possui extensão"
"Source file moving failed","Falha na movimentação do arquivo fonte"
-"Source file path must be a string","O caminho do arquivo fonte deve ser uma sequência de caracteres"
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
"Source is not set","A fonte não está definida"
-"Status","Status"
-"System busy","Sistema ocupado"
-"There are no product types available for export","Não há tipos de produto disponÃveis para exportação"
-"Total size of uploadable files must not exceed %s","O tamanho total dos arquivos a serem carregados não deve exceder %s"
-"Uploaded file has no extension","O arquivo carregado não possui extensão"
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes","Atributos da entidade"
"Validation Results","Resultados de Validação"
diff --git a/app/code/Magento/ImportExport/i18n/zh_CN.csv b/app/code/Magento/ImportExport/i18n/zh_CN.csv
index bed37847c22..75fc92958c8 100644
--- a/app/code/Magento/ImportExport/i18n/zh_CN.csv
+++ b/app/code/Magento/ImportExport/i18n/zh_CN.csv
@@ -1,61 +1,88 @@
-" in rows: ","行："
"-- Please Select --","-- 请选择 --"
-"Adapter must be an instance of \Magento\ImportExport\Model\Import\Adapter\Abstract","适é…器必须为\Magento\ImportExport\Model\Import\Adapter\Abstract的实例"
-"Adapter type must be a non empty string","适é…器类型必须为éžç©ºå—符串"
-"Can not determine attribute filter type","æ— æ³•ç¡®å®šå±žæ€§ç›é€‰ç±»åž‹"
-"Can not find required columns: ","æ— æ³•æ‰¾åˆ°æ‰€è¯·æ±‚çš„æ ："
-"Can not get autoincrement value","æ— æ³•èŽ·å¾—è‡ªåŠ¨å¢žé‡å€¼"
-"Check Data","检查数æ®"
-"Column names have duplicates","æ å称有é‡å¤"
-"Column names is empty or is not an array","æ å称为空或éžé˜µåˆ—"
-"Column names: ""%s"" are invalid","æ å称：%s æ— æ•ˆ"
-"Continue","继ç»"
-"Data is invalid or file is not uploaded","æ•°æ®æ— æ•ˆï¼Œæˆ–æ–‡ä»¶æœªè¢«ä¸Šä¼ "
-"Destination directory is not writable","ç›®æ ‡ç›®å½•ä¸å¯å†™"
-"Destination file is not writable","ç›®æ ‡æ–‡ä»¶ä¸å¯å†™"
-"Destination file path must be a string","ç›®æ ‡æ–‡ä»¶è·¯å¾„å¿…é¡»ä¸ºå—符串"
-"Entity Attributes","编辑属性"
-"Entity adapter object must be an instance of \Magento\ImportExport\Model\Import\Entity\Abstract","实体适é…器对象必须为\Magento\ImportExport\Model\Import\Entity\Abstract的实例"
-"Entity is unknown","未知实体"
-"Error in data structure: behaviors are mixed","æ•°æ®ç»“构有误：行为是混åˆçš„"
-"Error in data structure: entity codes are mixed","æ•°æ®ç»“构有误：实体代ç 是混åˆçš„"
-"Export","导出"
-"Export FAQ","导出 FAQ"
-"FAQ","常è§é—®é¢˜ä¸Žè§£ç”"
-"File does not contain data. Please upload another one","文件ä¸åŒ…å«æ•°æ®ã€‚è¯·ä¸Šä¼ å¦ä¸€ä¸ªæ–‡ä»¶"
-"File format is unknown","æœªçŸ¥çš„æ–‡ä»¶æ ¼å¼"
-"File is partially valid, but import is not possible","æ–‡ä»¶éƒ¨åˆ†æœ‰æ•ˆï¼Œä½†æ— æ³•å¯¼å…¥"
-"File is totally invalid. Please fix errors and re-upload file","æ–‡ä»¶æ— æ•ˆã€‚è¯·ä¿®å¤é”™è¯¯å¹¶é‡æ–°ä¸Šä¼ 文件"
-"File is valid! To start import process press ""Import"" button","文件有效ï¼è¦å¼€å§‹å¯¼å…¥ï¼Œè¯·å•å‡»â€œå¯¼å…¥â€æŒ‰é’®"
-"File is valid, but import is not possible","æ–‡ä»¶æœ‰æ•ˆï¼Œä½†æ— æ³•å¯¼å…¥"
-"Header column names already set","æ ‡é¢˜åˆ—å称已设置"
-"Import","导入"
-"Import / Export FAQ (Frequently Asked Questions)","导入 / 导出 FAQ（常è§é—®é¢˜ï¼‰"
-"Import FAQ","导入 FAQ"
-"Import successfully done.","导入æˆåŠŸå®Œæˆã€‚"
-"Import/Export","导入/导出"
-"In/Out","入/出"
-"Input entity code is not equal to entity adapter code","输入的实体代ç 与实体适é…器代ç ä¸ç›¸åŒ"
-"Invalid entity","æ— æ•ˆçš„å®žä½“"
-"Invalid file format","æ— æ•ˆçš„æ–‡ä»¶æ ¼å¼"
-"Invalid parameters","æ— æ•ˆçš„å‚æ•°"
-"Invalid seek position","æ— æ•ˆçš„ä½ç½®å¯»æ‰¾"
-"Invalid value for '%s'","“%sâ€çš„æ•°å€¼æ— æ•ˆ"
-"No filter data provided","没有æ供过滤器数æ®"
-"No source specified","没有指定æº"
-"No valid data sent","没有å‘é€æœ‰æ•ˆçš„æ•°æ®"
-"No writer specified","没有指定作者"
-"Node does not has model token tag","节点ä¸å…·æœ‰æ¨¡åž‹ä»¤ç‰Œæ ‡ç¾"
-"Not implemented yet","尚未实现"
-"Please fix errors and re-upload file","请修å¤é”™è¯¯å¹¶é‡æ–°ä¸Šä¼ 文件"
-"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","请修å¤é”™è¯¯å¹¶é‡æ–°ä¸Šä¼ 文件，或å•å‡»â€œå¯¼å…¥â€æŒ‰é’®æ¥è·³è¿‡é”™è¯¯è¡Œ"
-"Some other FAQ","一些其他 FAQ"
-"Source file moving failed","æºæ–‡ä»¶ç§»åŠ¨å¤±è´¥"
-"Source file path must be a string","æºæ–‡ä»¶è·¯å¾„必须为å—符串"
-"Source is not set","æºæœªè®¾ç½®"
-"Status","状æ€"
-"System busy","系统忙碌"
-"There are no product types available for export","没有å¯ç”¨çš„产å“类型å¯ä¾›å¯¼å‡º"
-"Total size of uploadable files must not exceed %s","å¯ä¸Šä¼ 文件的总大å°ä¸å¯è¶…过 %s"
-"Uploaded file has no extension","å·²ä¸Šä¼ çš„æ–‡ä»¶æ²¡æœ‰æ‰©å±•å"
-"Validation Results","验è¯ç»“æžœ"
+Status,状æ€
+From,From
+To,To
+Export,导出
+label,label
+"Attribute Code","Attribute Code"
+Import,导入
+Continue,继ç»
+"Attribute Label","Attribute Label"
+"Export Settings","Export Settings"
+"Entity Type","Entity Type"
+"Export File Format","Export File Format"
+"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
+Exclude,Exclude
+Filter,Filter
+"Unknown attribute filter type","Unknown attribute filter type"
+"Check Data",检查数æ®
+"Import Settings","Import Settings"
+"Import Behavior","Import Behavior"
+"File to Import","File to Import"
+"Select File to Import","Select File to Import"
+Import/Export,导入/导出
+"Please correct the data sent.","Please correct the data sent."
+"Import successfully done","Import successfully done"
+"File does not contain data. Please upload another one",文件ä¸åŒ…å«æ•°æ®ã€‚è¯·ä¸Šä¼ å¦ä¸€ä¸ªæ–‡ä»¶
+"File is valid! To start import process press ""Import"" button",文件有效ï¼è¦å¼€å§‹å¯¼å…¥ï¼Œè¯·å•å‡»â€œå¯¼å…¥â€æŒ‰é’®
+"File is valid, but import is not possible",æ–‡ä»¶æœ‰æ•ˆï¼Œä½†æ— æ³•å¯¼å…¥
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
+"Please fix errors and re-upload file.","Please fix errors and re-upload file."
+"File was not uploaded","File was not uploaded"
+"Data is invalid or file is not uploaded",æ•°æ®æ— 效，或文件未被上ä¼
+"File is totally invalid. Please fix errors and re-upload file.","File is totally invalid. Please fix errors and re-upload file."
+"Errors limit (%1) reached. Please fix errors and re-upload file.","Errors limit (%1) reached. Please fix errors and re-upload file."
+"Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button' ' to skip rows with errors"
+"File is partially valid, but import is not possible",æ–‡ä»¶éƒ¨åˆ†æœ‰æ•ˆï¼Œä½†æ— æ³•å¯¼å…¥
+"in rows:","in rows:"
+"The total size of the uploadable files can't be more that %1M","The total size of the uploadable files can't be more that %1M"
+"System doesn't allow to get file upload settings","System doesn't allow to get file upload settings"
+"Please enter a correct entity model","Please enter a correct entity model"
+"Entity adapter object must be an instance of %1 or %2","Entity adapter object must be an instance of %1 or %2"
+"The input entity code is not equal to entity adapter code.","The input entity code is not equal to entity adapter code."
+"Please enter a correct entity.","Please enter a correct entity."
+"Adapter object must be an instance of %1","Adapter object must be an instance of %1"
+"Please correct the file format.","Please correct the file format."
+"Begin export of %1","Begin export of %1"
+"There is no data for export","There is no data for export"
+"Exported %1 rows.","Exported %1 rows."
+"Export has been done.","Export has been done."
+"Please provide filter data.","Please provide filter data."
+"Cannot determine attribute filter type","Cannot determine attribute filter type"
+"Entity is unknown",未知实体
+"File format is unknown",æœªçŸ¥çš„æ–‡ä»¶æ ¼å¼
+"Please correct the value for '%1' column","Please correct the value for '%1' column"
+"Please specify writer.","Please specify writer."
+"Destination file path must be a string",ç›®æ ‡æ–‡ä»¶è·¯å¾„å¿…é¡»ä¸ºå—符串
+"Destination directory is not writable",ç›®æ ‡ç›®å½•ä¸å¯å†™
+"Destination file is not writable",ç›®æ ‡æ–‡ä»¶ä¸å¯å†™
+"Header column names already set",æ ‡é¢˜åˆ—å称已设置
+"in rows","in rows"
+"Validation finished successfully","Validation finished successfully"
+"File does not contain data.","File does not contain data."
+"Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
+"Import has been done successfuly.","Import has been done successfuly."
+"File was not uploaded.","File was not uploaded."
+"Uploaded file has no extension",å·²ä¸Šä¼ çš„æ–‡ä»¶æ²¡æœ‰æ‰©å±•å
+"Source file moving failed",æºæ–‡ä»¶ç§»åŠ¨å¤±è´¥
+"Begin data validation","Begin data validation"
+"Done import data validation","Done import data validation"
+"Invalid behavior token for %1","Invalid behavior token for %1"
+"Source is not set",æºæœªè®¾ç½®
+"Please correct the value for '%s'.","Please correct the value for '%s'."
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Cannot find required columns: %1","Cannot find required columns: %1"
+"Columns number: ""%1"" have empty headers","Columns number: ""%1"" have empty headers"
+"Column names: ""%1"" are invalid","Column names: ""%1"" are invalid"
+"The adapter type must be a non empty string.","The adapter type must be a non empty string."
+"Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource","Adapter must be an instance of \Magento\ImportExport\Model\Import\AbstractSource"
+"Please specify a source.","Please specify a source."
+"Cannot get autoincrement value","Cannot get autoincrement value"
+"Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed"
+"Append Complex Data","Append Complex Data"
+"Replace Existing Complex Data","Replace Existing Complex Data"
+"Delete Entities","Delete Entities"
+"Add/Update Complex Data","Add/Update Complex Data"
+"Custom Action","Custom Action"
+"Entity Attributes",编辑属性
+"Validation Results",验è¯ç»“æžœ
diff --git a/app/code/Magento/Index/i18n/de_DE.csv b/app/code/Magento/Index/i18n/de_DE.csv
index 3b35ce21dce..9ca3f4b392a 100644
--- a/app/code/Magento/Index/i18n/de_DE.csv
+++ b/app/code/Magento/Index/i18n/de_DE.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","%s Index-Verarbeitung läuft gerade. Bitte versuchen Sie, diesen Prozess später zu starten."
-"%s index was rebuilt.","%s Index wurde wieder hergestellt."
-"'%s' Index Process Information","""%s"" Index-Verarbeitung Information"
-"Action","Aktion"
-"Cannot initialize the indexer process.","Indexer-Verarbeitung konnte nicht initialisiert werden."
-"Change Index Mode","Index-Modus ändern"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","Klicken Sie hier, um zur <a href=""%s"">Cacheverwaltung</a> zu gelangen und die Cachetypen zu aktualisieren."
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","Klicken Sie hier, um zur <a href=""%s"">Indexverwaltung</a> zu gelangen und nötige Indizes wiederherzustellen."
-"Description","Beschreibung"
-"Disable","Deaktivieren"
-"Enable","Aktivieren"
-"General","Allgemein"
-"Index","Index"
-"Index Description","Index Beschreibung"
+No,Nein
+Action,Aktion
+General,Allgemein
+Yes,Ja
+Status,Status
+Description,Beschreibung
+System,System
+Never,Nie
+Updated,Updated
"Index Management","Index Management"
-"Index Mode","Index Modus"
+"Save Process","Save Process"
+"Reindex Data","Daten neu indexieren"
+"'%1' Index Process Information","'%1' Index Process Information"
"Index Name","Index Name"
-"Index mode","Indexmodus"
-"Indexer code is not defined.","Indexer-Code nicht definiert."
-"Indexer model is not defined.","Indexer-Vorlage nicht definiert."
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","Indexer-Vorlage sollte Erweiterung für \Magento\Index\Model\Indexer\AbstractIndexer sein."
-"Manual Update","Manuelle Aktualisierung"
-"Mode","Modus"
-"Never","Nie"
-"No","Nein"
-"One or more of the Indexes are not up to date:","Ein oder mehrere Indexe sind nicht aktuell:"
-"Please select Index(es)","Bitte Index(e) auswählen"
-"Please select Indexes","Bitte Indexe auswählen"
+"Index Description","Index Beschreibung"
+"Index Mode","Index Modus"
"Process Information","Informationen verarbeiten"
-"Processing","Verarbeitung läuft"
-"Ready","Fertig"
-"Refresh","Aktualisieren"
-"Reindex Data","Daten neu indexieren"
-"Reindex Required","Neuindexierung erforderlich"
-"Status","Status"
-"System","System"
+Index,Index
+Mode,Modus
+"Update Required","Update erforderlich"
+"Change Index Mode","Index-Modus ändern"
+"Index mode",Indexmodus
+"Cannot initialize the indexer process.","Indexer-Verarbeitung konnte nicht initialisiert werden."
"The index has been saved.","Der Index wurde gespeichert."
-"There was a problem with reindexing process.","Bei der Verarbeitung der Reindexierung ist ein Problem aufgetreten."
"There was a problem with saving process.","Beim Speichern ist ein Problem aufgetreten."
-"Total of %d index(es) have changed index mode.","Der Index-Modus von insgesamt %d Index(en) wurde geändert."
-"Total of %d index(es) have reindexed data.","Insgesamt %d Index(e) haben neu indexierte Daten."
-"Update Required","Update erforderlich"
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.","Bei der Verarbeitung der Reindexierung ist ein Problem aufgetreten."
+"Please select Indexes","Bitte Indexe auswählen"
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)","Bitte Index(e) auswählen"
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.","Indexer-Vorlage nicht definiert."
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
"Update on Save","Aktualisierung gespeichert."
-"Updated At","Aktualisiert am"
-"Yes","Ja"
+"Manual Update","Manuelle Aktualisierung"
+Ready,Fertig
+Processing,"Verarbeitung läuft"
+"Reindex Required","Neuindexierung erforderlich"
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Index/i18n/en_US.csv b/app/code/Magento/Index/i18n/en_US.csv
index 16c3ce41050..438556cd67b 100644
--- a/app/code/Magento/Index/i18n/en_US.csv
+++ b/app/code/Magento/Index/i18n/en_US.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","%s Index process is working now. Please try run this process later."
-"%s index was rebuilt.","%s index was rebuilt."
-"'%s' Index Process Information","'%s' Index Process Information"
-"Action","Action"
-"Cannot initialize the indexer process.","Cannot initialize the indexer process."
-"Change Index Mode","Change Index Mode"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types."
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes."
-"Description","Description"
-"Disable","Disable"
-"Enable","Enable"
-"General","General"
-"Index","Index"
-"Index Description","Index Description"
+No,No
+Action,Action
+General,General
+Yes,Yes
+Status,Status
+Description,Description
+System,System
+Never,Never
+Updated,Updated
"Index Management","Index Management"
-"Index Mode","Index Mode"
+"Save Process","Save Process"
+"Reindex Data","Reindex Data"
+"'%1' Index Process Information","'%1' Index Process Information"
"Index Name","Index Name"
-"Index mode","Index mode"
-"Indexer code is not defined.","Indexer code is not defined."
-"Indexer model is not defined.","Indexer model is not defined."
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer."
-"Manual Update","Manual Update"
-"Mode","Mode"
-"Never","Never"
-"No","No"
-"One or more of the Indexes are not up to date:","One or more of the Indexes are not up to date:"
-"Please select Index(es)","Please select Index(es)"
-"Please select Indexes","Please select Indexes"
+"Index Description","Index Description"
+"Index Mode","Index Mode"
"Process Information","Process Information"
-"Processing","Processing"
-"Ready","Ready"
-"Refresh","Refresh"
-"Reindex Data","Reindex Data"
-"Reindex Required","Reindex Required"
-"Status","Status"
-"System","System"
+Index,Index
+Mode,Mode
+"Update Required","Update Required"
+"Change Index Mode","Change Index Mode"
+"Index mode","Index mode"
+"Cannot initialize the indexer process.","Cannot initialize the indexer process."
"The index has been saved.","The index has been saved."
-"There was a problem with reindexing process.","There was a problem with reindexing process."
"There was a problem with saving process.","There was a problem with saving process."
-"Total of %d index(es) have changed index mode.","Total of %d index(es) have changed index mode."
-"Total of %d index(es) have reindexed data.","Total of %d index(es) have reindexed data."
-"Update Required","Update Required"
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.","There was a problem with reindexing process."
+"Please select Indexes","Please select Indexes"
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)","Please select Index(es)"
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.","Indexer model is not defined."
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
"Update on Save","Update on Save"
-"Updated At","Updated At"
-"Yes","Yes"
+"Manual Update","Manual Update"
+Ready,Ready
+Processing,Processing
+"Reindex Required","Reindex Required"
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Index/i18n/es_ES.csv b/app/code/Magento/Index/i18n/es_ES.csv
index 368432a7b32..abe1e543764 100644
--- a/app/code/Magento/Index/i18n/es_ES.csv
+++ b/app/code/Magento/Index/i18n/es_ES.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","Se esta haciendo el proceso de indexeado en estos momentos. Por favor intente ealizar este proceso más tarde."
-"%s index was rebuilt.","Porcentaje indexeado fue reconstruido"
-"'%s' Index Process Information","Información del proceso de indexación"
-"Action","Acción"
-"Cannot initialize the indexer process.","No se puede iniciar el proceso de indexación"
-"Change Index Mode","Cambiar la modalidad de indexación"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","Haga clic aquà para ir a <a href=""%s"">Administración de caché</a> y actualizar los tipos de caché."
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","Haga clic aquà para ir a <a href=""%s"">Administración de Ãndices</a> y reconstruir los Ãndices necesarios."
-"Description","Descripción"
-"Disable","Desactivar"
-"Enable","Habilitar"
-"General","General"
-"Index","Indice"
-"Index Description","Descripción del indice"
+No,No
+Action,Acción
+General,General
+Yes,SÃ
+Status,Estado
+Description,Descripción
+System,Sistema
+Never,Nunca
+Updated,Updated
"Index Management","Gestión de Ãndices"
-"Index Mode","Modalidad de indice"
+"Save Process","Save Process"
+"Reindex Data","Volver a indexear los datos"
+"'%1' Index Process Information","'%1' Index Process Information"
"Index Name","Nombre de indice"
-"Index mode","Modo de Ãndice"
-"Indexer code is not defined.","Codigo de indexeado no especificado"
-"Indexer model is not defined.","Modelo de indexeado no definido"
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","Modelo de indexeado deberÃa extender \Magento\Index\Model\Indexer\AbstractIndexer."
-"Manual Update","Actualización manual"
-"Mode","Modalidad"
-"Never","Nunca"
-"No","No"
-"One or more of the Indexes are not up to date:","Uno o mas Ãndices no estan actualizados"
-"Please select Index(es)","Por favor seleccione indice(s)"
-"Please select Indexes","Por favor seleccione indices"
+"Index Description","Descripción del indice"
+"Index Mode","Modalidad de indice"
"Process Information","Información de proceso"
-"Processing","Procesando"
-"Ready","Listo"
-"Refresh","Actualizar"
-"Reindex Data","Volver a indexear los datos"
-"Reindex Required","Volver a indexear requerido"
-"Status","Estado"
-"System","Sistema"
+Index,Indice
+Mode,Modalidad
+"Update Required","Es necesaria la actualización."
+"Change Index Mode","Cambiar la modalidad de indexación"
+"Index mode","Modo de Ãndice"
+"Cannot initialize the indexer process.","No se puede iniciar el proceso de indexación"
"The index has been saved.","El indice se ha guardado"
-"There was a problem with reindexing process.","Hubo un problema con el proceso de indexear de nuevo"
"There was a problem with saving process.","Hubo un problema mientras se guardaba"
-"Total of %d index(es) have changed index mode.","El porcentage del total de los indices ha cambiado el modelo de indexeado."
-"Total of %d index(es) have reindexed data.","El porcentage del total de los indices ha vuelto a indexear los datos"
-"Update Required","Es necesaria la actualización."
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.","Hubo un problema con el proceso de indexear de nuevo"
+"Please select Indexes","Por favor seleccione indices"
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)","Por favor seleccione indice(s)"
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.","Modelo de indexeado no definido"
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
"Update on Save","actualización guardada"
-"Updated At","Actualizado En"
-"Yes","SÃ"
+"Manual Update","Actualización manual"
+Ready,Listo
+Processing,Procesando
+"Reindex Required","Volver a indexear requerido"
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Index/i18n/fr_FR.csv b/app/code/Magento/Index/i18n/fr_FR.csv
index ebd95eff7c9..efc407dcf9c 100644
--- a/app/code/Magento/Index/i18n/fr_FR.csv
+++ b/app/code/Magento/Index/i18n/fr_FR.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","%s traitement index est actuellement actif. Veuillez essayer de lancer ce traitement plus tard."
-"%s index was rebuilt.","%s de l'index a été reconstruit."
-"'%s' Index Process Information","'%s information traitement index"
-"Action","Action"
-"Cannot initialize the indexer process.","Ne peut initialiser le traitement de l'indexage"
-"Change Index Mode","Change mode index"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","Cliquez ici pour accéder à la <a href=""%s"">Gestion de cache</a> et rafraîchir le type de cache."
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","Cliquez ici pour aller à la <a href=""%s"">Gestion des index</a> et reconstruire les index requis."
-"Description","Description"
-"Disable","Désactive"
-"Enable","Active"
-"General","Général"
-"Index","Index"
-"Index Description","Description index"
+No,Non
+Action,Action
+General,Général
+Yes,Oui
+Status,État
+Description,Description
+System,Système
+Never,Jamais
+Updated,Updated
"Index Management","Gestion index"
-"Index Mode","Mode index"
+"Save Process","Save Process"
+"Reindex Data","Ré-indexer données"
+"'%1' Index Process Information","'%1' Index Process Information"
"Index Name","Nom index"
-"Index mode","Mode index"
-"Indexer code is not defined.","Code indexage non défini."
-"Indexer model is not defined.","Modèle indexage non défini."
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","Modèle indexage devrait s'étendre Magento_index_modèle_indexage_extrait."
-"Manual Update","Mise à jour manuelle"
-"Mode","Mode"
-"Never","Jamais"
-"No","Non"
-"One or more of the Indexes are not up to date:","Un des index ou plus n'est pas à jour:"
-"Please select Index(es)","Veuillez sélectionner un ou plusieurs index"
-"Please select Indexes","Veuillez sélectionner des index"
+"Index Description","Description index"
+"Index Mode","Mode index"
"Process Information","Traiter infos"
-"Processing","Traitement"
-"Ready","Prêt"
-"Refresh","Rafraîchir"
-"Reindex Data","Ré-indexer données"
-"Reindex Required","Ré-indexage requis"
-"Status","État"
-"System","Système"
+Index,Index
+Mode,Mode
+"Update Required","Mise à jour nécessaire"
+"Change Index Mode","Change mode index"
+"Index mode","Mode index"
+"Cannot initialize the indexer process.","Ne peut initialiser le traitement de l'indexage"
"The index has been saved.","L'index a été sauvegardé."
-"There was a problem with reindexing process.","Il y a eu un problème avec le traitement de ré-indexage."
"There was a problem with saving process.","Il y a eu un problème avec le traitement de sauvegarde."
-"Total of %d index(es) have changed index mode.","Total de %d index a(ont) changé le mode d'index."
-"Total of %d index(es) have reindexed data.","Total de %d index a(ont) ré-indexé les données."
-"Update Required","Mise à jour nécessaire"
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.","Il y a eu un problème avec le traitement de ré-indexage."
+"Please select Indexes","Veuillez sélectionner des index"
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)","Veuillez sélectionner un ou plusieurs index"
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.","Modèle indexage non défini."
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
"Update on Save","Mise à jour lors de la sauvegarde"
-"Updated At","mis à jour à "
-"Yes","Oui"
+"Manual Update","Mise à jour manuelle"
+Ready,Prêt
+Processing,Traitement
+"Reindex Required","Ré-indexage requis"
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Index/i18n/nl_NL.csv b/app/code/Magento/Index/i18n/nl_NL.csv
index b8f3ae02f96..fa4cbe6a31f 100644
--- a/app/code/Magento/Index/i18n/nl_NL.csv
+++ b/app/code/Magento/Index/i18n/nl_NL.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","%s Index proces is nu in werking. Probeer dit proces later te laten lopen."
-"%s index was rebuilt.","%s index is verbouwd."
-"'%s' Index Process Information","'%s' Index Proces Informatie"
-"Action","Actie"
-"Cannot initialize the indexer process.","Kan het indexeerproces niet initialiseren."
-"Change Index Mode","Change Index Modus"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","Klik hier om naar <a href=""%s"">Cache beheer</a> te gaan en ververs cachetypes."
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","Klik hier om naar <a href=""%s"">Indexbeheer</a> te gaan en de vereiste indices te herbouwen."
-"Description","Beschrijving"
-"Disable","Maak onbruikbaar"
-"Enable","Maak bruikbaar"
-"General","Algemeen"
-"Index","Index"
-"Index Description","Index Omschrijving"
+No,Nee
+Action,Actie
+General,Algemeen
+Yes,Ja
+Status,Status
+Description,Beschrijving
+System,Systeem
+Never,Nooit
+Updated,Updated
"Index Management","Index Management"
-"Index Mode","Index Modus"
+"Save Process","Save Process"
+"Reindex Data","Data herindexeren"
+"'%1' Index Process Information","'%1' Index Process Information"
"Index Name","Index Naam"
+"Index Description","Index Omschrijving"
+"Index Mode","Index Modus"
+"Process Information",Procesinformatie
+Index,Index
+Mode,Modus
+"Update Required","Update is Nodig"
+"Change Index Mode","Change Index Modus"
"Index mode","Index modus"
-"Indexer code is not defined.","Indexeercode is niet gedefinieerd."
-"Indexer model is not defined.","Indexeermodel is niet gedefinieerd."
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","Indexeermodel moet \Magento\Index\Model\Indexer\AbstractIndexer uitbreiden."
-"Manual Update","Handmatige Update"
-"Mode","Modus"
-"Never","Nooit"
-"No","Nee"
-"One or more of the Indexes are not up to date:","Een of meer van de indexen zijn niet up-to-date:"
-"Please select Index(es)","Selecteer index(en)"
-"Please select Indexes","Selecteer indexen"
-"Process Information","Procesinformatie"
-"Processing","Aan het verwerken"
-"Ready","Gereed"
-"Refresh","Ververs"
-"Reindex Data","Data herindexeren"
-"Reindex Required","Herindexering noodzakelijk"
-"Status","Status"
-"System","Systeem"
+"Cannot initialize the indexer process.","Kan het indexeerproces niet initialiseren."
"The index has been saved.","De index is opgeslagen."
-"There was a problem with reindexing process.","Er was een probleem met het herindexeren."
"There was a problem with saving process.","Er is een probleem bij het opslaan."
-"Total of %d index(es) have changed index mode.","Totaal van %d index(en) hebben een gewijzigde index modus."
-"Total of %d index(es) have reindexed data.","Totaal van %d index(en) hebben geherindexeerde data."
-"Update Required","Update is Nodig"
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.","Er was een probleem met het herindexeren."
+"Please select Indexes","Selecteer indexen"
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)","Selecteer index(en)"
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.","Indexeermodel is niet gedefinieerd."
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
"Update on Save","Update bij opslaan."
-"Updated At","Geüpdate At"
-"Yes","Ja"
+"Manual Update","Handmatige Update"
+Ready,Gereed
+Processing,"Aan het verwerken"
+"Reindex Required","Herindexering noodzakelijk"
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Index/i18n/pt_BR.csv b/app/code/Magento/Index/i18n/pt_BR.csv
index a8704b8c77d..a332b075a9b 100644
--- a/app/code/Magento/Index/i18n/pt_BR.csv
+++ b/app/code/Magento/Index/i18n/pt_BR.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","%s do processo de indexação está funcionando agora. Por favor, tente rodar esse processo mais tarde."
-"%s index was rebuilt.","%s do Ãndice foi reconstruÃdo."
-"'%s' Index Process Information","'%s' de Informações do Processo de Indexação"
-"Action","Ação"
-"Cannot initialize the indexer process.","Não é possÃvel inicializar processo indexador."
-"Change Index Mode","Alterar Modo de Indexação"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","Clique aqui para ir ao <a href=""%s"">Gerenciador de Cache</a> e atualizar tipos de cache."
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","Clique aqui para ir ao <a href=""%s"">Gerenciador de Ãndice</a> e reconstruir os Ãndices necessários."
-"Description","Descrição"
-"Disable","Desativar"
-"Enable","Ativar"
-"General","Geral"
-"Index","Ãndice"
-"Index Description","Descrição de Ãndice"
+No,Não
+Action,Ação
+General,Geral
+Yes,Sim
+Status,Status
+Description,Descrição
+System,Sistema
+Never,Nunca
+Updated,Updated
"Index Management","Gerenciamento de Ãndice"
-"Index Mode","Modo de Ãndice"
+"Save Process","Save Process"
+"Reindex Data","Reindexar Dados"
+"'%1' Index Process Information","'%1' Index Process Information"
"Index Name","Nome do Ãndice"
-"Index mode","Modo de Ãndice"
-"Indexer code is not defined.","Código Indexador não está definido."
-"Indexer model is not defined.","Modelo indexador não está definido."
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","Modelo indexador deve incluir \Magento\Index\Model\Indexer\AbstractIndexer."
-"Manual Update","Atualização Manual"
-"Mode","Modo"
-"Never","Nunca"
-"No","Não"
-"One or more of the Indexes are not up to date:","Um ou mais dos Ãndices não estão atualizados:"
-"Please select Index(es)","Por favor, selecione Ãndice(es)"
-"Please select Indexes","Por favor, selecione Ãndices"
+"Index Description","Descrição de Ãndice"
+"Index Mode","Modo de Ãndice"
"Process Information","Processar informação"
-"Processing","Processando"
-"Ready","Pronto"
-"Refresh","Atualizar"
-"Reindex Data","Reindexar Dados"
-"Reindex Required","Obrigatório Reindexar"
-"Status","Status"
-"System","Sistema"
+Index,Ãndice
+Mode,Modo
+"Update Required","Atualização necessária"
+"Change Index Mode","Alterar Modo de Indexação"
+"Index mode","Modo de Ãndice"
+"Cannot initialize the indexer process.","Não é possÃvel inicializar processo indexador."
"The index has been saved.","O Ãndice foi salvo"
-"There was a problem with reindexing process.","Houve um problema com o processo de reindexação."
"There was a problem with saving process.","Houve um problema no processo de salvar."
-"Total of %d index(es) have changed index mode.","Total de %d Ãndice(es) mudaram o modo de Ãndice."
-"Total of %d index(es) have reindexed data.","Total de %d Ãndice(es) reindexou dados."
-"Update Required","Atualização necessária"
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.","Houve um problema com o processo de reindexação."
+"Please select Indexes","Por favor, selecione Ãndices"
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)","Por favor, selecione Ãndice(es)"
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.","Modelo indexador não está definido."
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
"Update on Save","Atualização em Salvar"
-"Updated At","Atualizado Em"
-"Yes","Sim"
+"Manual Update","Atualização Manual"
+Ready,Pronto
+Processing,Processando
+"Reindex Required","Obrigatório Reindexar"
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Index/i18n/zh_CN.csv b/app/code/Magento/Index/i18n/zh_CN.csv
index 7e3cbaae68e..c35413f791a 100644
--- a/app/code/Magento/Index/i18n/zh_CN.csv
+++ b/app/code/Magento/Index/i18n/zh_CN.csv
@@ -1,45 +1,42 @@
-"%s Index process is working now. Please try run this process later.","%s 索引进程æ£åœ¨å·¥ä½œã€‚请ç¨åŽå°è¯•è¿è¡Œè¯¥è¿›ç¨‹ã€‚"
-"%s index was rebuilt.","%s 索引已é‡å»ºã€‚"
-"'%s' Index Process Information","“%sâ€ç´¢å¼•è¿›ç¨‹ä¿¡æ¯"
-"Action","æ“作"
-"Cannot initialize the indexer process.","æ— æ³•åˆå§‹åŒ–索引器进程。"
-"Change Index Mode","更改索引模å¼"
-"Click here to go to <a href=""%s"">Cache Management</a> and refresh cache types.","å•å‡»è¿™é‡Œå‰å¾€<a href=""%s"">缓å˜ç®¡ç†</a>并刷新缓å˜ç±»åž‹ã€‚"
-"Click here to go to <a href=""%s"">Index Management</a> and rebuild required indexes.","å•å‡»è¿™é‡Œå‰å¾€<a href=""%s"">索引管ç†</a>并é‡å»ºéœ€è¦çš„索引。"
-"Description","æè¿°"
-"Disable","ç¦ç”¨"
-"Enable","å¯ç”¨"
-"General","常规"
-"Index","索引"
-"Index Description","索引æè¿°"
-"Index Management","索引管ç†"
-"Index Mode","索引模å¼"
-"Index Name","索引å称"
-"Index mode","索引模å¼"
-"Indexer code is not defined.","索引器代ç 未定义。"
-"Indexer model is not defined.","索引器模型未定义。"
-"Indexer model should extend \Magento\Index\Model\Indexer\AbstractIndexer.","索引器模型必须延伸 \Magento\Index\Model\Indexer\AbstractIndexer。"
-"Manual Update","手动更新"
-"Mode","模å¼"
-"Never","æ°¸ä¸"
-"No","å¦"
-"One or more of the Indexes are not up to date:","一个或多个索引ä¸æ˜¯æœ€æ–°ï¼š"
-"Please select Index(es)","请选择索引"
-"Please select Indexes","请选择索引"
-"Process Information","处ç†ä¿¡æ¯"
-"Processing","æ£åœ¨å¤„ç†"
-"Ready","就绪"
-"Refresh","刷新"
-"Reindex Data","é‡æ–°ç´¢å¼•æ•°æ®"
-"Reindex Required","需è¦é‡æ–°ç´¢å¼•"
-"Status","状æ€"
-"System","系统"
-"The index has been saved.","索引已ä¿å˜ã€‚"
-"There was a problem with reindexing process.","é‡æ–°ç´¢å¼•è¿›ç¨‹é‡åˆ°é—®é¢˜ã€‚"
-"There was a problem with saving process.","ä¿å˜è¿›ç¨‹é‡åˆ°é—®é¢˜ã€‚"
-"Total of %d index(es) have changed index mode.","总计 %d 个索引已å˜æ›´ç´¢å¼•æ¨¡å¼ã€‚"
-"Total of %d index(es) have reindexed data.","总计 %d 个索引包å«é‡æ–°ç´¢å¼•æ•°æ®ã€‚"
-"Update Required","需è¦æ›´æ–°"
-"Update on Save","ä¿å˜æ—¶æ›´æ–°"
-"Updated At","更新于"
-"Yes","是"
+No,å¦
+Action,æ“作
+General,常规
+Yes,是
+Status,状æ€
+Description,æè¿°
+System,系统
+Never,æ°¸ä¸
+Updated,Updated
+"Index Management",索引管ç†
+"Save Process","Save Process"
+"Reindex Data",é‡æ–°ç´¢å¼•æ•°æ®
+"'%1' Index Process Information","'%1' Index Process Information"
+"Index Name",索引å称
+"Index Description",索引æè¿°
+"Index Mode",索引模å¼
+"Process Information",处ç†ä¿¡æ¯
+Index,索引
+Mode,模å¼
+"Update Required",需è¦æ›´æ–°
+"Change Index Mode",更改索引模å¼
+"Index mode",索引模å¼
+"Cannot initialize the indexer process.",æ— æ³•åˆå§‹åŒ–索引器进程。
+"The index has been saved.",索引已ä¿å˜ã€‚
+"There was a problem with saving process.",ä¿å˜è¿›ç¨‹é‡åˆ°é—®é¢˜ã€‚
+"%1 index was rebuilt.","%1 index was rebuilt."
+"There was a problem with reindexing process.",é‡æ–°ç´¢å¼•è¿›ç¨‹é‡åˆ°é—®é¢˜ã€‚
+"Please select Indexes",请选择索引
+"Total of %1 index(es) have reindexed data.","Total of %1 index(es) have reindexed data."
+"Please select Index(es)",请选择索引
+"Total of %1 index(es) have changed index mode.","Total of %1 index(es) have changed index mode."
+"%1 Index process is not working now. Please try running this process later.","%1 Index process is not working now. Please try running this process later."
+"Indexer name is not defined.","Indexer name is not defined."
+"Indexer model is not defined.",索引器模型未定义。
+"Indexer model should extend \Magento\Index\Model\Indexer\Abstract.","Indexer model should extend \Magento\Index\Model\Indexer\Abstract."
+"Update on Save",ä¿å˜æ—¶æ›´æ–°
+"Manual Update",手动更新
+Ready,就绪
+Processing,æ£åœ¨å¤„ç†
+"Reindex Required",需è¦é‡æ–°ç´¢å¼•
+"One or more of the Indexes are not up to date: %1","One or more of the Indexes are not up to date: %1"
+"Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","Please go to <a href=""%1"">Index Management</a> and rebuild required indexes."
diff --git a/app/code/Magento/Indexer/i18n/de_DE.csv b/app/code/Magento/Indexer/i18n/de_DE.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/de_DE.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Indexer/i18n/en_US.csv b/app/code/Magento/Indexer/i18n/en_US.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/en_US.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Indexer/i18n/es_ES.csv b/app/code/Magento/Indexer/i18n/es_ES.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/es_ES.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Indexer/i18n/fr_FR.csv b/app/code/Magento/Indexer/i18n/fr_FR.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/fr_FR.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Indexer/i18n/nl_NL.csv b/app/code/Magento/Indexer/i18n/nl_NL.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/nl_NL.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Indexer/i18n/pt_BR.csv b/app/code/Magento/Indexer/i18n/pt_BR.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/pt_BR.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Indexer/i18n/zh_CN.csv b/app/code/Magento/Indexer/i18n/zh_CN.csv
new file mode 100644
index 00000000000..ebe2a2f240e
--- /dev/null
+++ b/app/code/Magento/Indexer/i18n/zh_CN.csv
@@ -0,0 +1,19 @@
+Status,Status
+Description,Description
+Never,Never
+Updated,Updated
+Mode,Mode
+"Update on Save","Update on Save"
+Ready,Ready
+Processing,Processing
+"New Indexer Management","New Indexer Management"
+"Update by Schedule","Update by Schedule"
+"Reindex required","Reindex required"
+"New Index Management","New Index Management"
+"Please select indexers.","Please select indexers."
+"A total of %1 indexer(s) have been turned Update on Save mode on.","A total of %1 indexer(s) have been turned Update on Save mode on."
+"We couldn't change indexer(s)' mode because of an error.","We couldn't change indexer(s)' mode because of an error."
+"A total of %1 indexer(s) have been turned Update by Schedule mode on.","A total of %1 indexer(s) have been turned Update by Schedule mode on."
+"State for the same indexer","State for the same indexer"
+"State for the same view","State for the same view"
+Indexer,Indexer
diff --git a/app/code/Magento/Install/i18n/de_DE.csv b/app/code/Magento/Install/i18n/de_DE.csv
index 9324bf68199..1d842842af3 100644
--- a/app/code/Magento/Install/i18n/de_DE.csv
+++ b/app/code/Magento/Install/i18n/de_DE.csv
@@ -1,125 +1,118 @@
-"(Make sure you keep it in a safe place.)","(Bitte bewahren Sie es sicher auf.)"
-"(Optional. Leave blank for no prefix)","(Optional. Lassen Sie es aus, wenn sie kein Präfix brauchen)"
-"(ver. %s)","(ver. &s)"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Zusätzlicher Pfad nach Base URL hinzugefügt um auf Administrationskonsole zuzugreifen (z.B. admin, backend, control etc.)."
-"Admin Path","Admin Pfad"
-"After successfull installation please click the button below.","Bitte klicken Sie den untenstehenden Link nach erfolgreicher Installation."
-"All packages were installed, click 'OK' to continue with installation.","Alle Packages wurden installiert, klicken Sie OK um mit der Installation fortzufahren."
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Alternativ können Sie die 'Manuelle Downloads und Upgrades' Methode verwenden."
+"User Name",Benutzername
+"First Name",Vorname
+"Last Name",Nachname
+Email,E-Mail
+"Password Confirmation",Passwortbestätigung
+Configuration,Konfiguration
+"File System",Dateisystem
+Database,Datenbank
+Welcome,Wilkommen
+"Personal Information","Persönliche Informationen"
+"User Password",Benutzerpasswort
+"Email Address",E-Mail-Adresse
+Password,Passwort
+"Confirm Password","Passwort bestätigen"
+Continue,Fortsetzen
+Download,Download
+"Login Information","Login Informationen"
+"Required Fields",Pflichtfelder
+"Save Session Files In","Sessiondateien speichern in"
+Locale,Sprachumgebung
+"Time Zone",Zeitzone
+"Default Currency",Standardwährung
+Validation,Validierung
+"Magento Connect Manager Deployment","Magento Verbindungsmanagerentwicklung"
+"Downloading and installing Magento, please wait...","Magento wird heruntergeladen und installiert, bitte warten..."
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
+"Database server does not support the InnoDB storage engine.","Der Datenbankserver unterstützt die InnoDB Storage-Engine nicht."
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard","Wilkommen zum Magento Installationsassistenten"
+"I agree to the above terms and conditions.","Ich stimme den allgemeinen Geschäftsbedingungen zu."
+"Web access options","Optionen für Webzugang"
"Base URL","Base URL"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Bevor Sie zu Ihrem Shop gehen, bitte beachten Sie Ihren Kodierungsschlüssel. (Magento verwendet ihn um Passwörter, Kreditkarten und mehr zu verschlüsseln)."
-"Check out our","Probieren Sie unser"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Wählen Sie diese Box nur an, wenn es nicht möglich ist, die Secure URL automatisch zu validieren, wie zum Beispiel wenn eine HTTP Authentifizierung erforderlich ist."
+"Admin Path","Admin Pfad"
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts","Tabellen aktivieren"
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step","Base URL Validierung vor dem nächsten Schritt überspringen"
"Check this box only if it is not possible to automatically validate the Base URL.","Wählen Sie diese Box nur an, wenn es nicht möglich ist, die Base URL automatisch zu validieren."
-"Choose this if you would like to test frontend and backend functionality.","Wählen Sie dies, wenn Sie Frontend- und Backendfunktionalität testen wollen."
-"Configuration","Konfiguration"
-"Confirm Password","Passwort bestätigen"
-"Connection","Verbindung"
-"Continue","Fortsetzen"
-"Continue After Manual Download","Nach manuellem Download fortfahren"
-"Continue Full Download / SVN Installation","Vollen Download / SVN Installation fortfahren"
+"Use Web Server (Apache) Rewrites","Webserver (Apache) Rewrites verwenden"
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Bitte gehen Sie sicher, dass <code>mod_rewrite</code> in der Apache Konfiguration aktiviert ist."
+"Use Secure URLs (SSL)","Secure URLs (SSL) verwenden"
+"Enable this option only if you have SSL available.","Aktivieren Sie diese Option nur, wenn Sie über SSL verfügen."
+"Secure Base URL","Secure Base URL"
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL","Admininterface mit SSL ausführen"
+"Skip Secure URL validation before next step","Base URL Validierung vor nächsten Schritt überspringen"
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Wählen Sie diese Box nur an, wenn es nicht möglich ist, die Secure URL automatisch zu validieren, wie zum Beispiel wenn eine HTTP Authentifizierung erforderlich ist."
+"Session Storage Options","Session Storage Optionen"
+"Save Session Data In","Sessiondaten speichern in"
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
"Create Admin Account","Adminkonto erstellen"
-"Currently this is the most stable state available for Magento packages.","Dies ist der derzeitig stabileste Zustand für Magento Packages."
-"Database","Datenbank"
-"Database Connection","Datenbankverbindung"
-"Database Name","Datenbankname"
-"Database Name cannot be empty.","Datenbankname kann nicht leergelassen werden."
-"Database Type","Datenbanktyp"
-"Database connection error.","Datenbankverbindungsfehler."
-"Database host","Datenbankhost"
-"Database server does not support the InnoDB storage engine.","Der Datenbankserver unterstützt die InnoDB Storage-Engine nicht."
+Username,Benutzername
+"Encryption Key",Kodierungsschlüssel
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,Verbindung
+"Database Connection",Datenbankverbindung
+"Database Type",Datenbanktyp
+Host,Host
+"Database host",Datenbankhost
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Sie können den Server-Port spezifizieren, Ex.: Lokalhost:3307<br />Wenn Sie nicht den Standard-UNIX-Anschluss verwenden, können Sie dies hier anstelle des Host spezifizieren, Ex.: /var/run/mysqld/mysqld.sock"
+"Database Name",Datenbankname
"Database user name","Datenbank Benutzername"
"Database user password","Datebank Benutzerpasswort"
-"Default Currency","Standardwährung"
-"Download","Download"
+"Tables Prefix",Tabellenpräfix
+"(Optional. Leave blank for no prefix)","(Optional. Lassen Sie es aus, wenn sie kein Präfix brauchen)"
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
"Download Magento Core Modules and Updates","Magento Core Modules und Updates herunterladen"
-"Downloading and installing Magento, please wait...","Magento wird heruntergeladen und installiert, bitte warten..."
-"Email","E-Mail"
-"Email Address","E-Mail-Adresse"
-"Enable Charts","Tabellen aktivieren"
-"Enable this option if you want the charts to be displayed on Dashboard.","Aktivieren Sie diese Option, wenn sie die Tabellen auf dem Armaturenbrett angezeigt haben wollen."
-"Enable this option only if you have SSL available.","Aktivieren Sie diese Option nur, wenn Sie über SSL verfügen."
-"Encryption Key","Kodierungsschlüssel"
-"File System","Dateisystem"
-"First Name","Vorname"
"Full Download / SVN Installation","Volles Download / SVN Installation"
-"Get ready to experience Open-Source eCommerce Evolved.","Machen Sie sich bereit, Open-Source eCommerce Evolved zu erleben."
-"Go to Backend","Zum Backend gehen"
-"Go to Frontend","Zum Frontend gehen"
-"Having trouble installing Magento?","Probleme bei der Installation von Magento?"
-"Help Us to Keep Magento Healthy","Helfen Sie uns, Magento gesund zu halten"
-"Host","Host"
-"I agree to the above terms and conditions.","Ich stimme den allgemeinen Geschäftsbedingungen zu."
-"If you are a developer and would like to have the latest public updates, choose this option.","Wenn Sie Entwickler sind und gerne die neusten öffentlichen Updates erhalten wollen, wählen Sie diese Option."
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Falls Sie PHP als GCI benützen, könnten Ihre PHP Prozesse under dem selben User ausgeführt werden, der genutzt wurde um Magentodateien hochzuladen."
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Falls Sie den Installationsassistenten über eine vorher heruntergeladene und installierte Magentoinstallation laufen lassen wollen, fahren Sie mit dieser Method fort."
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Falls Sie es nicht wünschen oder nicht in der Lage sind, Magento Ordner schreibbar für Webprozessierung zu machen, können Sie PEAR verwenden, welches im Rootverzeichnis der Magentoinstallation zu finden ist."
"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Falls Sie das volle Package heruntergeladen oder Magento über SVN installiert haben, überspringen Sie Packageinstallation und Validierung indem Sie den untenstehenden Button klicken."
+"Continue Full Download / SVN Installation","Vollen Download / SVN Installation fortfahren"
+"Package Management through the Web","Packageverwaltung durch das Web"
"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Falls Sie es wünschen Mangeto Packages durch das Web Admin Interface zu verwalten, müssen Sie webschreibbare Erlaubnis auf alle Magento Ordner und Dateien anwenden."
"If your server is running on MS Windows, most probably you will not need to change anything.","Falls Ihr Server auf MS Windows läuft, müssen Sie höchstwahrscheinlich nichts ändern."
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Falls Sie PHP als GCI benützen, könnten Ihre PHP Prozesse under dem selben User ausgeführt werden, der genutzt wurde um Magentodateien hochzuladen."
"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","In anderen Fällen, müssen Sie Magento Dateien schreibbar für User, unter dem der Webserverprozess läuft, machen."
-"Installation","Installation"
-"Installation Guide","Installationsanleitung"
-"Installer does not exist for %s database type","Es existiert kein Installer für den Datenbanktyp %s"
-"Last Name","Nachname"
-"License Agreement","Linzenvereinbarung"
-"Locale","Sprachumgebung"
-"Locale settings","Spracheinstellungen"
-"Localization","Lokalisierung"
-"Login Information","Login Informationen"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Magento Verbindungsmanagerentwicklung"
-"Magento Installation Wizard","Magento Installationsassistent"
-"Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc.","Magento ist eine Schutzmarke von X.commerce, Inc. Copyright © %s X.commerce, Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento verwendet diesen Schlüssel um Passwörter, Kreditkarten und mehr zu verschlüsseln. Wenn dieses Feld leer gelassen wird, erstellt das System einen Kodierungsschlüssel für Sie und zeigt ihn auf der nächsten Seite an."
-"Manual Downloads and Upgrades","Manuelle Downloads und Upgrades"
-"No resource for %s DB model.","Keine Ressource für %s DB Modell."
-"One of PHP Extensions ""%s"" must be loaded.","Eine der PHP-Erweiterungen ""%s"" muss geladen werden."
-"PHP Extension '%s' loaded","PHP Erweiterung '%s' geladen"
-"PHP Extensions ""%s"" must be loaded.","PHP-Erweiterung ""%s"" muss geladen werden."
-"PHP extension ""%s"" must be loaded.","PHP-Erweiterung ""%s"" muss geladen werden."
-"Package Management through the Web","Packageverwaltung durch das Web"
-"Password","Passwort"
-"Password Confirmation","Passwortbestätigung"
-"Path ""%s"" must be writable.","Pfad ""%s"" muss beschreibbar sein."
-"Personal Information","Persönliche Informationen"
-"Please correct the user data and try again.","Bitte geben Sie korrekte Benutzerdaten ein und versuchen Sie es nochmal."
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Bitte gehen Sie sicher, dass <code>mod_rewrite</code> in der Apache Konfiguration aktiviert ist."
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.","Wenn Sie Entwickler sind und gerne die neusten öffentlichen Updates erhalten wollen, wählen Sie diese Option."
"Please note that it is much less stable than beta.","Bitte beachten Sie, dass es viel weniger stabil als beta ist."
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Bitte beachten Sie, dass nur UNIX, Linux und Mac OS X Shells derzeit unterstützt werden. Für Windows, verwenden Sie die Option '%s'."
-"Please set all required settings before clicking Continue","Bitte setzen Sie alle erforderlichen Einstellungen bevor Sie auf Weiter klicken"
-"Preferred stability: %s","Bevorzugte Stabilität: %s"
-"Proceed With Automatic Download (%s)","Mit Automatischem Download (%s) fortfahren"
-"Provide a complete base URL for SSL connection. For example: %s","Stellen Sie eine vollständige Base URL für die SSL Verbindung zur Verfügung. Zum Beispiel: %s"
-"Report All Bugs","Alle Bugs Melden"
-"Required Fields","Pflichtfelder"
-"Response from server isn't valid.","Serverantwort ist nicht gültig."
-"Run admin interface with SSL","Admininterface mit SSL ausführen"
+"Manual Downloads and Upgrades","Manuelle Downloads und Upgrades"
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Falls Sie den Installationsassistenten über eine vorher heruntergeladene und installierte Magentoinstallation laufen lassen wollen, fahren Sie mit dieser Method fort."
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Falls Sie es nicht wünschen oder nicht in der Lage sind, Magento Ordner schreibbar für Webprozessierung zu machen, können Sie PEAR verwenden, welches im Rootverzeichnis der Magentoinstallation zu finden ist."
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
"Run this in your shell from Magento root folder:","Führen Sie dies in Ihrer Shell aus dem Magento Rootordner aus:"
-"Save Session Data In","Sessiondaten speichern in"
-"Save Session Files In","Sessiondateien speichern in"
-"Secure Base URL","Secure Base URL"
-"Session Storage Options","Session Storage Optionen"
-"Setting preferred state to: %s","Bevorzugter Zustand auf %s gesetzt"
-"Skip Base URL Validation Before the Next Step","Base URL Validierung vor dem nächsten Schritt überspringen"
-"Skip Secure URL validation before next step","Base URL Validierung vor nächsten Schritt überspringen"
-"Tables Prefix","Tabellenpräfix"
-"The URL ""%s"" is invalid.","Die URL ""%s"" ist ungültig."
-"The URL ""%s"" is not accessible.","Die URL ""%s"" ist nicht verfügbar."
-"The database server version doesn't match system requirements (required: %s, actual: %s).","Die Version des Datenbankservers stimmt nicht mit den Systemanforderungen (benötigt: %s, vorhanden: %s) überein."
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","Das Tabellen-Präfix darf nur Buchstaben (a-z), Ziffern (0-9) oder Unterstriche (_) enthalten; das erste Zeichen sollte ein Buchstabe sein."
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Beim Installieren der Magento Packages ist ein Fehler aufgetreten. Bitte lesen Sie das Log, korrigieren Sie Fehler und versuchen sie es erneut."
-"Time Zone","Zeitzone"
-"Use Secure URLs (SSL)","Secure URLs (SSL) verwenden"
-"Use Web Server (Apache) Rewrites","Webserver (Apache) Rewrites verwenden"
-"User Name","Benutzername"
-"User Password","Benutzerpasswort"
-"Username","Benutzername"
-"Validation","Validierung"
-"Web access options","Optionen für Webzugang"
-"Welcome","Wilkommen"
-"Welcome to Magento's Installation Wizard","Wilkommen zum Magento Installationsassistenten"
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Sie können den Server-Port spezifizieren, Ex.: Lokalhost:3307<br />Wenn Sie nicht den Standard-UNIX-Anschluss verwenden, können Sie dies hier anstelle des Host spezifizieren, Ex.: /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Sie können diese Option aktivieren, um die Webserver Rewrites Funktionalität für verbesserte Suchmachinenoptimierung zu verwenden."
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download","Nach manuellem Download fortfahren"
"You're All Set","Sie sind bereit"
+"Get ready to experience Open-Source eCommerce Evolved.","Machen Sie sich bereit, Open-Source eCommerce Evolved zu erleben."
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Bevor Sie zu Ihrem Shop gehen, bitte beachten Sie Ihren Kodierungsschlüssel. (Magento verwendet ihn um Passwörter, Kreditkarten und mehr zu verschlüsseln)."
+"(Make sure you keep it in a safe place.)","(Bitte bewahren Sie es sicher auf.)"
+"Go to Frontend","Zum Frontend gehen"
+"Go to Backend","Zum Backend gehen"
+Localization,Lokalisierung
+"Locale settings",Spracheinstellungen
+"Magento Installation Wizard","Magento Installationsassistent"
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs","Alle Bugs Melden"
+"(ver. %1)","(ver. %1)"
+Installation,Installation
+"Having trouble installing Magento?","Probleme bei der Installation von Magento?"
+"Check out our","Probieren Sie unser"
+"Installation Guide",Installationsanleitung
+"License Agreement",Linzenvereinbarung
"You're All Set!","Sie sind bereit!"
diff --git a/app/code/Magento/Install/i18n/en_US.csv b/app/code/Magento/Install/i18n/en_US.csv
index 95e1e4e67f9..1a79f03cf17 100644
--- a/app/code/Magento/Install/i18n/en_US.csv
+++ b/app/code/Magento/Install/i18n/en_US.csv
@@ -1,126 +1,118 @@
-"(Make sure you keep it in a safe place.)","(Make sure you keep it in a safe place.)"
-"(Optional. Leave blank for no prefix)","(Optional. Leave blank for no prefix)"
-"(ver. %s)","(ver. %s)"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.)."
-"Admin Path","Admin Path"
-"After successfull installation please click the button below.","After successfull installation please click the button below."
-"All packages were installed, click 'OK' to continue with installation.","All packages were installed, click 'OK' to continue with installation."
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Alternatively you could try the 'Manual Downloads and Upgrades' method."
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"Password Confirmation","Password Confirmation"
+Configuration,Configuration
+"File System","File System"
+Database,Database
+Welcome,Welcome
+"Personal Information","Personal Information"
+"User Password","User Password"
+"Email Address","Email Address"
+Password,Password
+"Confirm Password","Confirm Password"
+Continue,Continue
+Download,Download
+"Login Information","Login Information"
+"Required Fields","Required Fields"
+"Save Session Files In","Save Session Files In"
+Locale,Locale
+"Time Zone","Time Zone"
+"Default Currency","Default Currency"
+Validation,Validation
+"Magento Connect Manager Deployment","Magento Connect Manager Deployment"
+"Downloading and installing Magento, please wait...","Downloading and installing Magento, please wait..."
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
+"Database server does not support the InnoDB storage engine.","Database server does not support the InnoDB storage engine."
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard","Welcome to Magento's Installation Wizard"
+"I agree to the above terms and conditions.","I agree to the above terms and conditions."
+"Web access options","Web access options"
"Base URL","Base URL"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more)."
-"Check out our","Check out our"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required."
+"Admin Path","Admin Path"
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts","Enable Charts"
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step","Skip Base URL Validation Before the Next Step"
"Check this box only if it is not possible to automatically validate the Base URL.","Check this box only if it is not possible to automatically validate the Base URL."
-"Choose this if you would like to test frontend and backend functionality.","Choose this if you would like to test frontend and backend functionality."
-"Configuration","Configuration"
-"Confirm Password","Confirm Password"
-"Connection","Connection"
-"Continue","Continue"
-"Continue After Manual Download","Continue After Manual Download"
-"Continue Full Download / SVN Installation","Continue Full Download / SVN Installation"
+"Use Web Server (Apache) Rewrites","Use Web Server (Apache) Rewrites"
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration."
+"Use Secure URLs (SSL)","Use Secure URLs (SSL)"
+"Enable this option only if you have SSL available.","Enable this option only if you have SSL available."
+"Secure Base URL","Secure Base URL"
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL","Run admin interface with SSL"
+"Skip Secure URL validation before next step","Skip Secure URL validation before next step"
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required."
+"Session Storage Options","Session Storage Options"
+"Save Session Data In","Save Session Data In"
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
"Create Admin Account","Create Admin Account"
-"Currently this is the most stable state available for Magento packages.","Currently this is the most stable state available for Magento packages."
-"Database","Database"
+Username,Username
+"Encryption Key","Encryption Key"
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,Connection
"Database Connection","Database Connection"
-"Database Name","Database Name"
-"Database Name cannot be empty.","Database Name cannot be empty."
"Database Type","Database Type"
-"Database connection error.","Database connection error."
+Host,Host
"Database host","Database host"
-"Database server does not support the InnoDB storage engine.","Database server does not support the InnoDB storage engine."
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock"
+"Database Name","Database Name"
"Database user name","Database user name"
"Database user password","Database user password"
-"Default Currency","Default Currency"
-"Download","Download"
+"Tables Prefix","Tables Prefix"
+"(Optional. Leave blank for no prefix)","(Optional. Leave blank for no prefix)"
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
"Download Magento Core Modules and Updates","Download Magento Core Modules and Updates"
-"Downloading and installing Magento, please wait...","Downloading and installing Magento, please wait..."
-"Email","Email"
-"Email Address","Email Address"
-"Enable Charts","Enable Charts"
-"Enable this option if you want the charts to be displayed on Dashboard.","Enable this option if you want the charts to be displayed on Dashboard."
-"Enable this option only if you have SSL available.","Enable this option only if you have SSL available."
-"Encryption Key","Encryption Key"
-"File System","File System"
-"First Name","First Name"
"Full Download / SVN Installation","Full Download / SVN Installation"
-"Get ready to experience Open-Source eCommerce Evolved.","Get ready to experience Open-Source eCommerce Evolved."
-"Go to Backend","Go to Backend"
-"Go to Frontend","Go to Frontend"
-"Having trouble installing Magento?","Having trouble installing Magento?"
-"Help Us to Keep Magento Healthy","Help Us to Keep Magento Healthy"
-"Host","Host"
-"I agree to the above terms and conditions.","I agree to the above terms and conditions."
-"If you are a developer and would like to have the latest public updates, choose this option.","If you are a developer and would like to have the latest public updates, choose this option."
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files."
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method."
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation."
"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below."
+"Continue Full Download / SVN Installation","Continue Full Download / SVN Installation"
+"Package Management through the Web","Package Management through the Web"
"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files."
"If your server is running on MS Windows, most probably you will not need to change anything.","If your server is running on MS Windows, most probably you will not need to change anything."
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files."
"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","In other cases you will need to make Magento files writeable for the user that the web server process is running under."
-"Installation","Installation"
-"Installation Guide","Installation Guide"
-"Installer does not exist for %s database type","Installer does not exist for %s database type"
-"Last Name","Last Name"
-"License Agreement","License Agreement"
-"Locale","Locale"
-"Locale settings","Locale settings"
-"Localization","Localization"
-"Login Information","Login Information"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Magento Connect Manager Deployment"
-"Magento Installation Wizard","Magento Installation Wizard"
-"Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc.","Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page."
-"Manual Downloads and Upgrades","Manual Downloads and Upgrades"
-"No resource for %s DB model.","No resource for %s DB model."
-"One of PHP Extensions ""%s"" must be loaded.","One of PHP Extensions ""%s"" must be loaded."
-"PHP Extension '%s' loaded","PHP Extension '%s' loaded"
-"PHP Extensions ""%s"" must be loaded.","PHP Extensions ""%s"" must be loaded."
-"PHP extension ""%s"" must be loaded.","PHP extension ""%s"" must be loaded."
-"Package Management through the Web","Package Management through the Web"
-"Password","Password"
-"Password Confirmation","Password Confirmation"
-"Path ""%s"" must be writable.","Path ""%s"" must be writable."
-"Personal Information","Personal Information"
-"Please correct the user data and try again.","Please correct the user data and try again."
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration."
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.","If you are a developer and would like to have the latest public updates, choose this option."
"Please note that it is much less stable than beta.","Please note that it is much less stable than beta."
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option."
-"Please set all required settings before clicking Continue","Please set all required settings before clicking Continue"
-"Preferred stability: %s","Preferred stability: %s"
-"Proceed With Automatic Download (%s)","Proceed With Automatic Download (%s)"
-"Provide a complete base URL for SSL connection. For example: %s","Provide a complete base URL for SSL connection. For example: %s"
-"Report All Bugs","Report All Bugs"
-"Required Fields","Required Fields"
-"Response from server isn't valid.","Response from server isn't valid."
-"Run admin interface with SSL","Run admin interface with SSL"
+"Manual Downloads and Upgrades","Manual Downloads and Upgrades"
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method."
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation."
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
"Run this in your shell from Magento root folder:","Run this in your shell from Magento root folder:"
-"Save Session Data In","Save Session Data In"
-"Save Session Files In","Save Session Files In"
-"Secure Base URL","Secure Base URL"
-"Session Storage Options","Session Storage Options"
-"Setting preferred state to: %s","Setting preferred state to: %s"
-"Skip Base URL Validation Before the Next Step","Skip Base URL Validation Before the Next Step"
-"Skip Secure URL validation before next step","Skip Secure URL validation before next step"
-"Tables Prefix","Tables Prefix"
-"The URL ""%s"" is invalid.","The URL ""%s"" is invalid."
-"The URL ""%s"" is not accessible.","The URL ""%s"" is not accessible."
-"The database server version doesn't match system requirements (required: %s, actual: %s).","The database server version doesn't match system requirements (required: %s, actual: %s)."
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter."
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","There was a problem installing Magento packages. Please read the log, correct errors and try again."
-"Time Zone","Time Zone"
-"Use Secure URLs (SSL)","Use Secure URLs (SSL)"
-"Use Web Server (Apache) Rewrites","Use Web Server (Apache) Rewrites"
-"User Name","User Name"
-"User Password","User Password"
-"Username","Username"
-"Validation","Validation"
-"Web access options","Web access options"
-"Welcome","Welcome"
-"Welcome to Magento's Installation Wizard","Welcome to Magento's Installation Wizard"
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","You could enable this option to use web server rewrites functionality for improved search engines optimization."
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download","Continue After Manual Download"
"You're All Set","You're All Set"
+"Get ready to experience Open-Source eCommerce Evolved.","Get ready to experience Open-Source eCommerce Evolved."
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more)."
+"(Make sure you keep it in a safe place.)","(Make sure you keep it in a safe place.)"
+"Go to Frontend","Go to Frontend"
+"Go to Backend","Go to Backend"
+Localization,Localization
+"Locale settings","Locale settings"
+"Magento Installation Wizard","Magento Installation Wizard"
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs","Report All Bugs"
+"(ver. %1)","(ver. %1)"
+Installation,Installation
+"Having trouble installing Magento?","Having trouble installing Magento?"
+"Check out our","Check out our"
+"Installation Guide","Installation Guide"
+"License Agreement","License Agreement"
"You're All Set!","You're All Set!"
-"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
diff --git a/app/code/Magento/Install/i18n/es_ES.csv b/app/code/Magento/Install/i18n/es_ES.csv
index 9264b240d65..4b5764ed983 100644
--- a/app/code/Magento/Install/i18n/es_ES.csv
+++ b/app/code/Magento/Install/i18n/es_ES.csv
@@ -1,125 +1,118 @@
-"(Make sure you keep it in a safe place.)","(Asegúrese de guardarlo en un lugar seguro.)"
-"(Optional. Leave blank for no prefix)","(Opcional. Déjelo en blanco si no desea agregar un prefijo.)"
-"(ver. %s)","(ver. %s)"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Ruta adicional que se agrega después de la dirección URL básica para tener acceso al Panel de Administración (por ejemplo, administración, área técnica, control, etc.)."
-"Admin Path","Ruta de administración"
-"After successfull installation please click the button below.","Después de realizar correctamente la instalación, haga clic en el siguiente botón."
-"All packages were installed, click 'OK' to continue with installation.","Se instalaron todos los paquetes. Haga clic en 'Aceptar' para continuar con la instalación."
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","De forma alternativa, puede intentar utilizar el método 'Descargas y actualizaciones manuales'."
+"User Name","Nombre de Usuario"
+"First Name",Nombre
+"Last Name",Apellido
+Email,"Correo electrónico"
+"Password Confirmation","Confirmación de contraseña"
+Configuration,Configuración
+"File System","Sistema de archivos"
+Database,"Base de datos"
+Welcome,Bienvenido
+"Personal Information","Información Personal"
+"User Password","Contraseña de Usuario"
+"Email Address","Dirección de email"
+Password,Contraseña
+"Confirm Password","Confirma Contraseña"
+Continue,Continuar
+Download,Descargar
+"Login Information","Información de registro"
+"Required Fields","Campos obligatorios"
+"Save Session Files In","Guardar archivos de sesión en"
+Locale,"Configuración regional"
+"Time Zone","Zona Horaria"
+"Default Currency","Moneda predeterminada"
+Validation,Validación
+"Magento Connect Manager Deployment","Implementación del administrador de conexión de Magento"
+"Downloading and installing Magento, please wait...","Descargando e instalando Magento. Espere, por favor."
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
+"Database server does not support the InnoDB storage engine.","El servidor de la base de datos no es compatible el motor de almacenamiento InnoDB."
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard","Bienvenido al asistente de instalación de Magento"
+"I agree to the above terms and conditions.","Estoy de acuerdo con los términos y las condiciones que se establecen más arriba."
+"Web access options","Opciones de acceso web"
"Base URL","Dirección URL básica"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Antes de continuar con su tienda, tome nota de su clave de cifrado (Magento la utiliza para cifrar las contraseñas, las tarjetas de crédito y más)."
-"Check out our","Descubra nuestro"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Marque esta casilla sólo si no es posible validar automáticamente las direcciones URL seguras, por ejemplo, si se necesita autenticación HTTP."
+"Admin Path","Ruta de administración"
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts","Activar gráficos"
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step","Saltar validación de URL base antes del próximo paso"
"Check this box only if it is not possible to automatically validate the Base URL.","Marque esta casilla sólo si no es posible validar automáticamente la dirección URL básica."
-"Choose this if you would like to test frontend and backend functionality.","Elija esta opción si desea probar el funcionamiento de la interfaz del cliente y el área de administración."
-"Configuration","Configuración"
-"Confirm Password","Confirma Contraseña"
-"Connection","Conexión"
-"Continue","Continuar"
-"Continue After Manual Download","Continuar después de la descarga manual"
-"Continue Full Download / SVN Installation","Continuar la descarga completa/instalación de SVN"
+"Use Web Server (Apache) Rewrites","Use reescritura de servidor (Apache)"
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Por favor asegúrese de que <code>mod_rewrite</code> está activado en la configuración de Apache."
+"Use Secure URLs (SSL)","URLs segura (SSL) de usuario"
+"Enable this option only if you have SSL available.","Active esta opción sólo si tiene SSL disponible."
+"Secure Base URL","URL base segura"
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL","Ejecutar la interfaz de administración con SSL"
+"Skip Secure URL validation before next step","Saltar validación de URL segura antes del próximo paso"
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Marque esta casilla sólo si no es posible validar automáticamente las direcciones URL seguras, por ejemplo, si se necesita autenticación HTTP."
+"Session Storage Options","Opciones de almacenaje de sesión"
+"Save Session Data In","Guardar datos de sesión en"
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
"Create Admin Account","Crear cuenta de administración"
-"Currently this is the most stable state available for Magento packages.","Actualmente éste es el estado más estable disponible para los paquetes de Magento."
-"Database","Base de datos"
+Username,"Nombre de usuario"
+"Encryption Key","Clave de cifrado"
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,Conexión
"Database Connection","Conexión a la base de datos"
-"Database Name","Nombre de la base de datos"
-"Database Name cannot be empty.","El nombre de la base de datos no puede estar vacÃo."
"Database Type","Tipo de base de datos"
-"Database connection error.","Error de conexión de la base de datos."
+Host,Host
"Database host","Host de base de datos"
-"Database server does not support the InnoDB storage engine.","El servidor de la base de datos no es compatible el motor de almacenamiento InnoDB."
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Puedes especificar el puerto de servidor, ej: localhost:3307<br />Si no estás utilizando el socket UNIX predeterminado, puedes especificarlo aquà en vez del host, ej.: /var/run/mysqld/mysqld.sock"
+"Database Name","Nombre de la base de datos"
"Database user name","Nombre de usuario de la base de datos"
"Database user password","Contraseña de usuario de la base de datos"
-"Default Currency","Moneda predeterminada"
-"Download","Descargar"
+"Tables Prefix","Prefijo de tablas"
+"(Optional. Leave blank for no prefix)","(Opcional. Déjelo en blanco si no desea agregar un prefijo.)"
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
"Download Magento Core Modules and Updates","Descargar los módulos básicos y las actualizaciones de Magento"
-"Downloading and installing Magento, please wait...","Descargando e instalando Magento. Espere, por favor."
-"Email","Correo electrónico"
-"Email Address","Dirección de email"
-"Enable Charts","Activar gráficos"
-"Enable this option if you want the charts to be displayed on Dashboard.","Active esta opción si desea mostrar los cuadros en el Panel de Control."
-"Enable this option only if you have SSL available.","Active esta opción sólo si tiene SSL disponible."
-"Encryption Key","Clave de cifrado"
-"File System","Sistema de archivos"
-"First Name","Nombre"
"Full Download / SVN Installation","Descarga completa/instalación de SVN"
-"Get ready to experience Open-Source eCommerce Evolved.","Prepárese para descubrir la evolución del comercio electrónico de código abierto."
-"Go to Backend","Ir al área de administración"
-"Go to Frontend","Ir a la interfaz del cliente"
-"Having trouble installing Magento?","¿Tiene problemas con la instalación de Magento?"
-"Help Us to Keep Magento Healthy","Ayúdenos a que Magento siga funcionando correctamente"
-"Host","Host"
-"I agree to the above terms and conditions.","Estoy de acuerdo con los términos y las condiciones que se establecen más arriba."
-"If you are a developer and would like to have the latest public updates, choose this option.","Si es desarrollador y desea recibir las actualizaciones públicas más reciente, elija esta opción."
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Si ejecuta PHP como CGI, sus procesos de PHP pueden ejecutarse con el mismo usuario que utilizó al cargar los archivos de Magento."
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Si está ejecutando el asistente de instalación sobre una instalación de Magento descargada e instalada previamente, siga con este método."
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Si no puede escribir en las carpetas de Magento para el proceso web, o no desea hacerlo, puede utilizar el ejecutable PEAR ubicado en la raÃz de instalación de Magento."
"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","SI ha descargado el paquete completo o ha instalado Magento mediante SVN, debe omitir los pasos de instalación y validación de paquetes haciendo clic en el siguiente botón."
+"Continue Full Download / SVN Installation","Continuar la descarga completa/instalación de SVN"
+"Package Management through the Web","Administración de paquetes a través de la web"
"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","SI desea administrar los paquetes de Magento mediante la interfaz de administración web, deberá aplicar permisos de escritura web a todas las carpetas y todos los archivos de Magento."
"If your server is running on MS Windows, most probably you will not need to change anything.","Si el servidor se ejecuta en MS Windows, es probable que no necesite hacer cambios."
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Si ejecuta PHP como CGI, sus procesos de PHP pueden ejecutarse con el mismo usuario que utilizó al cargar los archivos de Magento."
"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","En otros casos, deberá establecer permiso de escritura en los archivos de Magento para el usuario bajo el cual se ejecute el proceso del servidor web."
-"Installation","Instalación"
-"Installation Guide","GuÃa de instalación"
-"Installer does not exist for %s database type","No existe instalador para el tipo de base de datos %s"
-"Last Name","Apellido"
-"License Agreement","Acuerdo de licencia"
-"Locale","Configuración regional"
-"Locale settings","Configuración local"
-"Localization","Localización"
-"Login Information","Información de registro"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Implementación del administrador de conexión de Magento"
-"Magento Installation Wizard","Asistente de instalación de Magento"
-"Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc.","Magento es una marca registrada de X.commerce, Inc. Copyright © %s X.commerce, Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento usa esta clave para encriptar contraseñas, tarjetas de crédito y más. Si este campo se deja vacÃo, el sistema creará una clave cifrada para usted y se mostrará en la siguiente página."
-"Manual Downloads and Upgrades","Descargas manuales y actualizaciones"
-"No resource for %s DB model.","Ningún recurso para el modelo %s DB."
-"One of PHP Extensions ""%s"" must be loaded.","Una de las extensiones PHP ""%s"" tiene que cargarse."
-"PHP Extension '%s' loaded","Extensión PHP '%s' cargada"
-"PHP Extensions ""%s"" must be loaded.","Se deben cargar las extensiones PHP ""%s""."
-"PHP extension ""%s"" must be loaded.","La extensión PHP ""%s"" tiene que cargarse."
-"Package Management through the Web","Administración de paquetes a través de la web"
-"Password","Contraseña"
-"Password Confirmation","Confirmación de contraseña"
-"Path ""%s"" must be writable.","La ruta""%s"" tiene que poder escribirse."
-"Personal Information","Información Personal"
-"Please correct the user data and try again.","Por favor corrija los datos del usuario e inténtelo de nuevo."
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Por favor asegúrese de que <code>mod_rewrite</code> está activado en la configuración de Apache."
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.","Si es desarrollador y desea recibir las actualizaciones públicas más reciente, elija esta opción."
"Please note that it is much less stable than beta.","Por favor tenga en cuenta que es mucho menos estable que beta."
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Por favor tenga en cuenta que sólo extensiones UNIX, Linux y Mac OX X son soportadas actualmente. Para Windows use la opción '%s'"
-"Please set all required settings before clicking Continue","Por favor establezca todas las configuraciones requeridas antes de hacer click en continuar"
-"Preferred stability: %s","estabilidad preferida: %s"
-"Proceed With Automatic Download (%s)","Proceda con descarga automática (%s)"
-"Provide a complete base URL for SSL connection. For example: %s","Proporcione una completa URL base para conexión SSL. Por ejemplo: %s"
-"Report All Bugs","Informar de todos los errores"
-"Required Fields","Campos obligatorios"
-"Response from server isn't valid.","La respuesta del servidor no es válida."
-"Run admin interface with SSL","Ejecutar la interfaz de administración con SSL"
+"Manual Downloads and Upgrades","Descargas manuales y actualizaciones"
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Si está ejecutando el asistente de instalación sobre una instalación de Magento descargada e instalada previamente, siga con este método."
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Si no puede escribir en las carpetas de Magento para el proceso web, o no desea hacerlo, puede utilizar el ejecutable PEAR ubicado en la raÃz de instalación de Magento."
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
"Run this in your shell from Magento root folder:","Ejecute esto en su sistema desde la carpeta raÃz de Magento:"
-"Save Session Data In","Guardar datos de sesión en"
-"Save Session Files In","Guardar archivos de sesión en"
-"Secure Base URL","URL base segura"
-"Session Storage Options","Opciones de almacenaje de sesión"
-"Setting preferred state to: %s","Configurar estado preferido a: %s"
-"Skip Base URL Validation Before the Next Step","Saltar validación de URL base antes del próximo paso"
-"Skip Secure URL validation before next step","Saltar validación de URL segura antes del próximo paso"
-"Tables Prefix","Prefijo de tablas"
-"The URL ""%s"" is invalid.","El URL ""%s"" no es válido."
-"The URL ""%s"" is not accessible.","No se puede acceder al URL ""%s""."
-"The database server version doesn't match system requirements (required: %s, actual: %s).","La versión del servidor de la base de datos no se adecua a los requisitos del sistema (requeridos: %s, existentes: %s)."
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","El prefijo de tabla solo debe contener letras (a-z), números (0-9) o el carácter de subrayado (_), el primer carácter deberÃa ser una letra."
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Hubo un problema al instalar los paquetes de Magento. Por favor lea el registro, corrija los errores e inténtelo de nuevo."
-"Time Zone","Zona Horaria"
-"Use Secure URLs (SSL)","URLs segura (SSL) de usuario"
-"Use Web Server (Apache) Rewrites","Use reescritura de servidor (Apache)"
-"User Name","Nombre de Usuario"
-"User Password","Contraseña de Usuario"
-"Username","Nombre de usuario"
-"Validation","Validación"
-"Web access options","Opciones de acceso web"
-"Welcome","Bienvenido"
-"Welcome to Magento's Installation Wizard","Bienvenido al asistente de instalación de Magento"
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Puedes especificar el puerto de servidor, ej: localhost:3307<br />Si no estás utilizando el socket UNIX predeterminado, puedes especificarlo aquà en vez del host, ej.: /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Usted puede activar esta opción para usar la función de reescritura del servidor para mejorar la optimización para motores de búsqueda."
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download","Continuar después de la descarga manual"
"You're All Set","Usted está preparado"
+"Get ready to experience Open-Source eCommerce Evolved.","Prepárese para descubrir la evolución del comercio electrónico de código abierto."
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Antes de continuar con su tienda, tome nota de su clave de cifrado (Magento la utiliza para cifrar las contraseñas, las tarjetas de crédito y más)."
+"(Make sure you keep it in a safe place.)","(Asegúrese de guardarlo en un lugar seguro.)"
+"Go to Frontend","Ir a la interfaz del cliente"
+"Go to Backend","Ir al área de administración"
+Localization,Localización
+"Locale settings","Configuración local"
+"Magento Installation Wizard","Asistente de instalación de Magento"
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs","Informar de todos los errores"
+"(ver. %1)","(ver. %1)"
+Installation,Instalación
+"Having trouble installing Magento?","¿Tiene problemas con la instalación de Magento?"
+"Check out our","Descubra nuestro"
+"Installation Guide","GuÃa de instalación"
+"License Agreement","Acuerdo de licencia"
"You're All Set!","Usted está preparado!"
diff --git a/app/code/Magento/Install/i18n/fr_FR.csv b/app/code/Magento/Install/i18n/fr_FR.csv
index b0dcd01de95..fe1e60d65e9 100644
--- a/app/code/Magento/Install/i18n/fr_FR.csv
+++ b/app/code/Magento/Install/i18n/fr_FR.csv
@@ -1,125 +1,118 @@
-"(Make sure you keep it in a safe place.)","(Assurez-vous que vous le conservez dans un lieu sûr.)"
-"(Optional. Leave blank for no prefix)","(Optionnel. Laissez vide s'il n'y a pas de préfixe)"
-"(ver. %s)","(ver. %s)"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Chemin supplémentaire ajouté après l'URL de base pour accéder à votre panel d'administration (admin, gestion, contrôle, etc.)"
-"Admin Path","Répertoire administrateur"
-"After successfull installation please click the button below.","Après installation, veuillez cliquer sur le bouton ci-dessous."
-"All packages were installed, click 'OK' to continue with installation.","Tous les logiciels ont été installés, cliquer sur ""OK"" pour continuer l'installation."
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Vous pourriez aussi essayer la méthode de ""Téléchargement et mise à jour manuels""."
+"User Name","Nom d'utilisateur"
+"First Name",Prénom
+"Last Name",Nom
+Email,Email
+"Password Confirmation","Confirmation du mot de passe"
+Configuration,Configuration
+"File System","Système de fichiers"
+Database,"Base de données"
+Welcome,Bienvenue
+"Personal Information","Information personnelle"
+"User Password","Mot de passe utilisateur"
+"Email Address","Adresse email"
+Password,"Mot de passe"
+"Confirm Password","Confirmez le mot de passe"
+Continue,Continuer
+Download,Téléchargement
+"Login Information","Information de connexion"
+"Required Fields","Champs requis"
+"Save Session Files In","Enregistrer les fichiers de la session dans"
+Locale,"Paramètres régionaux"
+"Time Zone","Fuseau horaire"
+"Default Currency","Monnaie par défaut"
+Validation,Validation
+"Magento Connect Manager Deployment","Déploiement du Magento Connect Manager"
+"Downloading and installing Magento, please wait...","Téléchargement et installation de Magento, veuillez patienter ..."
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
+"Database server does not support the InnoDB storage engine.","Le serveur de base de données ne prend pas en charge le moteur de stockage InnoDB."
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard","Bienvenue dans l'assistant d'installation Magento"
+"I agree to the above terms and conditions.","Je suis d'accord avec les conditions d'utilisations."
+"Web access options","Options d'accès Internet"
"Base URL","URL de base"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Avant de continuer vers notre boutique, veuillez noter votre clé encryptage (Magento l'utilise pour encrypter les mots de passe, cartes crédit, etc.)"
-"Check out our","Paiement ou"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Cochez cette case uniquement s'il n'est pas possible de valider automatiquement l'URL sécurisée, par exemple si une authentification HTTP est nécessaire."
+"Admin Path","Répertoire administrateur"
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts","Activer les graphiques"
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step","Sauter la validation de l'URL de base avant l'étape suivante."
"Check this box only if it is not possible to automatically validate the Base URL.","Cochez cette case uniquement s'il n'est pas possible de valider automatiquement l'URL de base."
-"Choose this if you would like to test frontend and backend functionality.","Choisissez ceci si vous désirez tester les fonctionnalités d'interface et de technique."
-"Configuration","Configuration"
-"Confirm Password","Confirmez le mot de passe"
-"Connection","Connexion"
-"Continue","Continuer"
-"Continue After Manual Download","Continuer après le téléchargement manuel"
-"Continue Full Download / SVN Installation","Continuer le téléchargement complet / l'installation d'SVN"
+"Use Web Server (Apache) Rewrites","Utiliser les réécritures du serveur web (Apache)"
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Veuillez vous assurer que <code>mod_rewrite</code> est activé dans la configuration Apache."
+"Use Secure URLs (SSL)","Utiliser des URLs sécurisées (SSL)"
+"Enable this option only if you have SSL available.","Choisissez cette option si seul le SSL est disponible."
+"Secure Base URL","Base d'url sécurisée"
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL","Exécuter l'interface admin avec SSL"
+"Skip Secure URL validation before next step","Passer la validation d'URL sécurisée avant la prochaine étape"
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Cochez cette case uniquement s'il n'est pas possible de valider automatiquement l'URL sécurisée, par exemple si une authentification HTTP est nécessaire."
+"Session Storage Options","Option de stockage de la session"
+"Save Session Data In","Enregistrer les données de la session dans"
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
"Create Admin Account","Créer un compte administrateur"
-"Currently this is the most stable state available for Magento packages.","Il s'agit actuellement de l'état le plus stable disponible pour les logiciels Magento."
-"Database","Base de données"
+Username,"Nom d'utilisateur"
+"Encryption Key","Clé d'encryptage"
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,Connexion
"Database Connection","Connexion à la base de données"
-"Database Name","Nom de la base de données"
-"Database Name cannot be empty.","Le nom de la base de données ne peut pas être vide."
"Database Type","Type de base de données"
-"Database connection error.","Erreur de connexion à la base de données."
+Host,Hôte
"Database host","Hébergeur de la base de données"
-"Database server does not support the InnoDB storage engine.","Le serveur de base de données ne prend pas en charge le moteur de stockage InnoDB."
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Vous pouvez spécifier un port de serveur, par exemple : localhost:3307<br />Si vous n'utilisez pas de socket UNIX par défaut, vous pouvez le préciser ici à la place de l'hôte, par exemple : /var/run/mysqld/mysqld.sock"
+"Database Name","Nom de la base de données"
"Database user name","Nom d'utilisateur de la base de données"
"Database user password","Mot de passe utilisateur de la base de données"
-"Default Currency","Monnaie par défaut"
-"Download","Téléchargement"
+"Tables Prefix","Préfixe de tables"
+"(Optional. Leave blank for no prefix)","(Optionnel. Laissez vide s'il n'y a pas de préfixe)"
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
"Download Magento Core Modules and Updates","Télécharger les modules de base de Magento ainsi que les mises à jour"
-"Downloading and installing Magento, please wait...","Téléchargement et installation de Magento, veuillez patienter ..."
-"Email","Email"
-"Email Address","Adresse email"
-"Enable Charts","Activer les graphiques"
-"Enable this option if you want the charts to be displayed on Dashboard.","Activez cette option si vous voulez que les graphiques soit affichés sur l'espace de travail."
-"Enable this option only if you have SSL available.","Choisissez cette option si seul le SSL est disponible."
-"Encryption Key","Clé d'encryptage"
-"File System","Système de fichiers"
-"First Name","Prénom"
"Full Download / SVN Installation","Téléchargement complet / Installation d'SVN"
-"Get ready to experience Open-Source eCommerce Evolved.","Préparez-vous à découvrir le commerce électronique open-source évolué."
-"Go to Backend","Allez à la partie technique"
-"Go to Frontend","Allez à l'interface visuel"
-"Having trouble installing Magento?","Problèmes d'installation de Magento ?"
-"Help Us to Keep Magento Healthy","Aidez-nous à garder Magento bon pour la santé"
-"Host","Hôte"
-"I agree to the above terms and conditions.","Je suis d'accord avec les conditions d'utilisations."
-"If you are a developer and would like to have the latest public updates, choose this option.","Si vous êtes un développeur et que vous aimeriez bénéficier des dernières mises à jour disponibles, choisissez cette option."
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Si vous utilisez PHP comme CGI, votre processus PHP doit utiliser le même nom d'utilisateur que pour l'envoi des fichiers Magento."
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Si vous lancez une installation alors qu'une autre version de Magento est déjà installée, continuez avec cette méthode."
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Si vous ne souhaitez pas ou ne pouvez pas rendre les dossiers de Magento accessibles en écriture pour le processus web, vous pouvez utiliser l'exécutable PEAR situé à la racine de l'installation Magento."
"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Si vous avez installé l'ensemble des logiciels ou installé Magento via SVN, vous devriez sauter l'installation et la validation des librairies en cliquant le bouton ci-dessous."
+"Continue Full Download / SVN Installation","Continuer le téléchargement complet / l'installation d'SVN"
+"Package Management through the Web","Gestion de paquet via le web"
"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Si vous souhaitez gérer les fichiers de Magento via l'interface web, vous aurez besoin d'avoir les permissions d'écritures web appliquées à tous les dossiers et fichiers Magento."
"If your server is running on MS Windows, most probably you will not need to change anything.","Si votre serveur utilise MS Windows, vous n'aurez probablement pas besoin de changer quoique ce soit."
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Si vous utilisez PHP comme CGI, votre processus PHP doit utiliser le même nom d'utilisateur que pour l'envoi des fichiers Magento."
"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","Sinon vous aurez à rendre les fichiers Magento accessibles en écriture pour l'utilisateur sous lequel le processus web tourne."
-"Installation","Installation"
-"Installation Guide","Guide d'installation"
-"Installer does not exist for %s database type","Il n'y a pas d'installateur pour le type de base de données suivant : %s"
-"Last Name","Nom"
-"License Agreement","Accord de license"
-"Locale","Paramètres régionaux"
-"Locale settings","Réglages des paramètres régionaux"
-"Localization","Paramètres régionaux"
-"Login Information","Information de connexion"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Déploiement du Magento Connect Manager"
-"Magento Installation Wizard","Assistant d'installation Magento"
-"Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc.","Magento est une marque de X.commerce, Inc. Copyright © %s X.commerce, Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento utilise cette clé pour crypter les mots de passe, numéros de cartes de crédit et plus encore. Si ce champ est laissé vide le système créera une clé de cryptage pour vous et l'affichera sur la page suivante."
-"Manual Downloads and Upgrades","Téléchargement de mode d'emploi et mises à niveau"
-"No resource for %s DB model.","Aucune ressource pour le modèle DB %s"
-"One of PHP Extensions ""%s"" must be loaded.","Une des extensions PHP ""%s"" doit être ajoutée."
-"PHP Extension '%s' loaded","L'extension PHP '%s' est chargée"
-"PHP Extensions ""%s"" must be loaded.","L'extension PHP « %s » doit être chargée."
-"PHP extension ""%s"" must be loaded.","L'extension PHP ""%s"" doit être ajoutée."
-"Package Management through the Web","Gestion de paquet via le web"
-"Password","Mot de passe"
-"Password Confirmation","Confirmation du mot de passe"
-"Path ""%s"" must be writable.","Le chemin d'accès ""%s"" doit être accessible en écriture."
-"Personal Information","Information personnelle"
-"Please correct the user data and try again.","Veuillez corriger les données utilisateur et réessayer."
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Veuillez vous assurer que <code>mod_rewrite</code> est activé dans la configuration Apache."
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.","Si vous êtes un développeur et que vous aimeriez bénéficier des dernières mises à jour disponibles, choisissez cette option."
"Please note that it is much less stable than beta.","Veuillez noter que ceci est bien moins stable qu'une beta."
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Veuillez noter que seuls les shells de UNIX, Linux et Mac OS X sont actuellement supportés. Pour Windows, utilisez l'option '%s'."
-"Please set all required settings before clicking Continue","Veuillez définir tous les réglages nécessaires avant de cliquer sur Continuer"
-"Preferred stability: %s","Stabilité préférée: %s"
-"Proceed With Automatic Download (%s)","Procéder avec le téléchargement automatique (%s)"
-"Provide a complete base URL for SSL connection. For example: %s","Fournir une base complète d'URL pour une connexion SSL. Par exemple : %s"
-"Report All Bugs","Rapporter tous les bugs"
-"Required Fields","Champs requis"
-"Response from server isn't valid.","La réponse du serveur n'est pas valide."
-"Run admin interface with SSL","Exécuter l'interface admin avec SSL"
+"Manual Downloads and Upgrades","Téléchargement de mode d'emploi et mises à niveau"
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Si vous lancez une installation alors qu'une autre version de Magento est déjà installée, continuez avec cette méthode."
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Si vous ne souhaitez pas ou ne pouvez pas rendre les dossiers de Magento accessibles en écriture pour le processus web, vous pouvez utiliser l'exécutable PEAR situé à la racine de l'installation Magento."
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
"Run this in your shell from Magento root folder:","Exécuter ceci dans votre shell depuis le dossier racine de Magento :"
-"Save Session Data In","Enregistrer les données de la session dans"
-"Save Session Files In","Enregistrer les fichiers de la session dans"
-"Secure Base URL","Base d'url sécurisée"
-"Session Storage Options","Option de stockage de la session"
-"Setting preferred state to: %s","Régler l'état préféré sur: %s"
-"Skip Base URL Validation Before the Next Step","Sauter la validation de l'URL de base avant l'étape suivante."
-"Skip Secure URL validation before next step","Passer la validation d'URL sécurisée avant la prochaine étape"
-"Tables Prefix","Préfixe de tables"
-"The URL ""%s"" is invalid.","L'URL ""%s"" n'est pas valide."
-"The URL ""%s"" is not accessible.","L'URL ""%s"" n'est pas accessible."
-"The database server version doesn't match system requirements (required: %s, actual: %s).","La version du serveur de base de données ne correspond pas aux conditions du système (requis : %s, présent : %s)."
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","Le préfixe du tableau ne doit contenir que des lettres (a-z), des chiffres (0-9) ou des tirets bas (_), et le premier caractère doit être une lettre."
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Un problème est survenu lors de l'installation des paquets Magento. Veuillez lire le journal, corriger les erreurs et réessayer."
-"Time Zone","Fuseau horaire"
-"Use Secure URLs (SSL)","Utiliser des URLs sécurisées (SSL)"
-"Use Web Server (Apache) Rewrites","Utiliser les réécritures du serveur web (Apache)"
-"User Name","Nom d'utilisateur"
-"User Password","Mot de passe utilisateur"
-"Username","Nom d'utilisateur"
-"Validation","Validation"
-"Web access options","Options d'accès Internet"
-"Welcome","Bienvenue"
-"Welcome to Magento's Installation Wizard","Bienvenue dans l'assistant d'installation Magento"
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Vous pouvez spécifier un port de serveur, par exemple : localhost:3307<br />Si vous n'utilisez pas de socket UNIX par défaut, vous pouvez le préciser ici à la place de l'hôte, par exemple : /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Vous pouvez activer cette option pour utiliser la fonctionnalité de réécriture du serveur web pour optimiser les moteurs de recherche."
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download","Continuer après le téléchargement manuel"
"You're All Set","Vous êtes prêt"
+"Get ready to experience Open-Source eCommerce Evolved.","Préparez-vous à découvrir le commerce électronique open-source évolué."
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Avant de continuer vers notre boutique, veuillez noter votre clé encryptage (Magento l'utilise pour encrypter les mots de passe, cartes crédit, etc.)"
+"(Make sure you keep it in a safe place.)","(Assurez-vous que vous le conservez dans un lieu sûr.)"
+"Go to Frontend","Allez à l'interface visuel"
+"Go to Backend","Allez à la partie technique"
+Localization,"Paramètres régionaux"
+"Locale settings","Réglages des paramètres régionaux"
+"Magento Installation Wizard","Assistant d'installation Magento"
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs","Rapporter tous les bugs"
+"(ver. %1)","(ver. %1)"
+Installation,Installation
+"Having trouble installing Magento?","Problèmes d'installation de Magento ?"
+"Check out our","Paiement ou"
+"Installation Guide","Guide d'installation"
+"License Agreement","Accord de license"
"You're All Set!","Vous êtes prêt !"
diff --git a/app/code/Magento/Install/i18n/nl_NL.csv b/app/code/Magento/Install/i18n/nl_NL.csv
index 4dc5d5cffeb..8a888274742 100644
--- a/app/code/Magento/Install/i18n/nl_NL.csv
+++ b/app/code/Magento/Install/i18n/nl_NL.csv
@@ -1,125 +1,118 @@
-"(Make sure you keep it in a safe place.)","(Zorg ervoor dat u het op een veilige plaats bewaard)"
-"(Optional. Leave blank for no prefix)","(Optioneel. Laat leeg als er geen prefix is)"
-"(ver. %s)","(ver. %s)"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Extra pad toegevoegd na Base URL om uw Administratieve Paneel te bereiken (b.v. admin, database, bediening enz.)."
-"Admin Path","Admin Pad"
-"After successfull installation please click the button below.","Zodra installatie gelukt is, klik op onderstaande knop."
-"All packages were installed, click 'OK' to continue with installation.","Alle pakketten zijn geïnstalleerd, klik op 'OK' om met de installatie verder te gaan."
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","U kunt daarnaast ook de 'Handmatige Downloads en Upgrades' methode proberen."
+"User Name",Gebruikersnaam
+"First Name",Voornaam
+"Last Name",Achternaam
+Email,Email
+"Password Confirmation","Wachtwoord Confirmatie"
+Configuration,Configuratie
+"File System","Bestanden Systeem"
+Database,Database
+Welcome,Welkom
+"Personal Information","Persoonlijke Informatie"
+"User Password",Gebruikerswachtwoord
+"Email Address",e-mailadres
+Password,Wachtwoord
+"Confirm Password","Bevestig wachtwoord"
+Continue,Doorgaan
+Download,Download
+"Login Information","Log in Gegevens"
+"Required Fields","Benodigde Velden"
+"Save Session Files In","Sla Sessie Bestanden Op In"
+Locale,Lokaal
+"Time Zone",Tijdszone
+"Default Currency","Standaard Currency"
+Validation,Validatie
+"Magento Connect Manager Deployment","Magento Connect Manager Deployment"
+"Downloading and installing Magento, please wait...","Magento aan het downloaden en installeren, wachten aub..."
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
+"Database server does not support the InnoDB storage engine.","Database-server ondersteunt de InnoDB opslag engine niet."
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard","Welkom bij Magento's Installatiewizard"
+"I agree to the above terms and conditions.","Ik accepteer de bovenstaande voorwaarden en condities."
+"Web access options",Webtoegangsopties
"Base URL","Basis URL"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Voor u doorgaat met opslaan, maak a.u.b. een notitie van uw versleutelingscode (Magento gebruikt het om wachtwoorden, creditcards en meer te versleutelen)."
-"Check out our","Bekijk onze"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Bekijk dit vakje alleen als het niet lukt om automatisch Secure URL te valideren, bijvoorbeeld als HTTP verificatie vereist is."
+"Admin Path","Admin Pad"
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts","Charts instellen"
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step","Sla Basis-URL Validatie Over Voor de Volgende Stap"
"Check this box only if it is not possible to automatically validate the Base URL.","Bekijk dit vakje alleen als het niet lukt om automatisch Base URL te valideren."
-"Choose this if you would like to test frontend and backend functionality.","Kies dit als u de front en back end functionaliteit wilt testen."
-"Configuration","Configuratie"
-"Confirm Password","Bevestig wachtwoord"
-"Connection","Verbinding"
-"Continue","Doorgaan"
-"Continue After Manual Download","Ga door Na Handmatige Download"
-"Continue Full Download / SVN Installation","Ga door Met Volledige Download / SVN Installatie"
+"Use Web Server (Apache) Rewrites","Gebruik Web Server (Apache) Herschrijvingen"
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Controleer of <code>mod_rewrite</code> is ingeschakeld in uw Apache configuratie."
+"Use Secure URLs (SSL)","Gebruik Beveiligde URL's (SSL)"
+"Enable this option only if you have SSL available.","Schakel deze optie alleen in als je SSL geschikbaar hebt."
+"Secure Base URL","Veilige Basis URL"
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL","Start administratie bedieningspaneel met SSL"
+"Skip Secure URL validation before next step","Sla Beveiligde URL validatie over voor volgende stap"
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Bekijk dit vakje alleen als het niet lukt om automatisch Secure URL te valideren, bijvoorbeeld als HTTP verificatie vereist is."
+"Session Storage Options","Sessie Opslag Opties"
+"Save Session Data In","Sla Sessie Data Op In"
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
"Create Admin Account","Creëer Admin Account"
-"Currently this is the most stable state available for Magento packages.","Op dit moment is dit de stabielste staat voor Magento pakketten."
-"Database","Database"
+Username,Gebruikersnaam
+"Encryption Key","Versleutel Key"
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,Verbinding
"Database Connection","Database Verbinding"
-"Database Name","Naam Database"
-"Database Name cannot be empty.","Naam database kan niet leeg zijn."
"Database Type","Database Type"
-"Database connection error.","Database connectie fout."
+Host,Host
"Database host","Database host"
-"Database server does not support the InnoDB storage engine.","Database-server ondersteunt de InnoDB opslag engine niet."
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","U kunt een serverpoort specificeren, bv.: localhost:3307<br />Als u niet de standaard UNIX-socket gebruikt, kunt u deze hier specificeren in plaats van host, bv.: /var/run/mysqld/mysqld.sock"
+"Database Name","Naam Database"
"Database user name","Database gebruikersnaam"
"Database user password","Database gebruikerswachtwoord"
-"Default Currency","Standaard Currency"
-"Download","Download"
+"Tables Prefix","Tabellen Voorvoegsel"
+"(Optional. Leave blank for no prefix)","(Optioneel. Laat leeg als er geen prefix is)"
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
"Download Magento Core Modules and Updates","Download Magento Core Modules en Updates"
-"Downloading and installing Magento, please wait...","Magento aan het downloaden en installeren, wachten aub..."
-"Email","Email"
-"Email Address","e-mailadres"
-"Enable Charts","Charts instellen"
-"Enable this option if you want the charts to be displayed on Dashboard.","Schakel deze optie in als je de grafieken weergegeven wilt hebben op Dashboard."
-"Enable this option only if you have SSL available.","Schakel deze optie alleen in als je SSL geschikbaar hebt."
-"Encryption Key","Versleutel Key"
-"File System","Bestanden Systeem"
-"First Name","Voornaam"
"Full Download / SVN Installation","Volledige Download / SVN installatie"
-"Get ready to experience Open-Source eCommerce Evolved.","Maak je klaar om de nieuwe versie Open-Source eCommerce te ervaren."
-"Go to Backend","Ga naar Backend"
-"Go to Frontend","Ga naar Frontend"
-"Having trouble installing Magento?","Moeilijkheden met het installeren van Magento?"
-"Help Us to Keep Magento Healthy","Help ons Magento gezond te houden"
-"Host","Host"
-"I agree to the above terms and conditions.","Ik accepteer de bovenstaande voorwaarden en condities."
-"If you are a developer and would like to have the latest public updates, choose this option.","Kies deze optie indien u een ontwikkelaar bent en de laatste updates wilt ontvangen."
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Indien u PHP gebruikt als CGI, dan kunt u uw PHP processen onder dezelfde gebruiker uitvoeren als de gebruiker die u heeft gebruikt voor uw Magento bestanden."
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Indien u de installatiewizard over een oudere Magento versie laat installeren, moet u deze methode gebruiken."
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Indien u uw Magento folders niet beschrijfbaar wilt, of kunt maken voor het webproces, dan kunt u het PEAR bestand gelocaliseerd in de root van de Magento installatie gebruiken."
"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Als u het volledige pakket heeft gedownload, of Magento via SVN heeft geïnstalleerd, dan kan u het beste de pakket installatie en verificatie voorbij gaan door op de knop hieronder te klikken."
+"Continue Full Download / SVN Installation","Ga door Met Volledige Download / SVN Installatie"
+"Package Management through the Web","Pakket Management door het Web"
"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Als u het liefste de Magento pakketten met het web administratie bedieningspaneel wilt beheren, moeten alle Magento folders en bestanden web beschrijfbare toestemming hebben."
"If your server is running on MS Windows, most probably you will not need to change anything.","Als uw server MS Windows gebruikt hoeft u waarschijnlijk niks te veranderen."
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Indien u PHP gebruikt als CGI, dan kunt u uw PHP processen onder dezelfde gebruiker uitvoeren als de gebruiker die u heeft gebruikt voor uw Magento bestanden."
"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","In andere gevallen zult u de Magento bestanden beschrijfbare toestemming moeten geven voor de gebruiker waaronder het web proces draait."
-"Installation","Installatie"
-"Installation Guide","Installatie Handleiding"
-"Installer does not exist for %s database type","Installer bestaat niet voor de %s database soort"
-"Last Name","Achternaam"
-"License Agreement","Licentie-overeenkomst"
-"Locale","Lokaal"
-"Locale settings","Lokale instellingen"
-"Localization","Lokalisatie"
-"Login Information","Log in Gegevens"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Magento Connect Manager Deployment"
-"Magento Installation Wizard","Magento Installatiewizard"
-"Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc.","Magento is een handelsmerk van X.commerce, Inc. Copyright © %s X.commerce, Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento gebruikt deze sleutel om wachtwoorden, creditcards en dergelijke te beveiligen. Als u dit veld leeg laat zal het systeem een encryptiesleutel voor uw aanmaken en het op de volgende pagina weergeven."
-"Manual Downloads and Upgrades","Handmatig Downloaden en Upgraden"
-"No resource for %s DB model.","Geen hulpbron voor %s DB model."
-"One of PHP Extensions ""%s"" must be loaded.","Een van de PHP extensies ""%s""moet geladen zijn."
-"PHP Extension '%s' loaded","PHP Uitbreiding '%s' geladen"
-"PHP Extensions ""%s"" must be loaded.","PHP Extensions ""%s"" moeten worden geladen."
-"PHP extension ""%s"" must be loaded.","PHP extensie ""%s"" moet geladen zijn."
-"Package Management through the Web","Pakket Management door het Web"
-"Password","Wachtwoord"
-"Password Confirmation","Wachtwoord Confirmatie"
-"Path ""%s"" must be writable.","Pad ""%s"" moet beschrijfbaar zijn."
-"Personal Information","Persoonlijke Informatie"
-"Please correct the user data and try again.","Gelieve de gebruikers data de corrigeren en het nogmaals te proberen."
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Controleer of <code>mod_rewrite</code> is ingeschakeld in uw Apache configuratie."
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.","Kies deze optie indien u een ontwikkelaar bent en de laatste updates wilt ontvangen."
"Please note that it is much less stable than beta.","Houd er rekening mee dat het veel minder stabiel is dan beta."
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Let op! Op het moment worden alleen UNIX, Linux en Mac OS X shells ondersteund. Voor Windows gelieve de '%s' optie te gebruiken."
-"Please set all required settings before clicking Continue","Gelieve alle benodigde instellingen in te stellen voordat u verder gaat"
-"Preferred stability: %s","Gewenste stabiliteit: %s"
-"Proceed With Automatic Download (%s)","Verder Gaan Met Automatische Download (%s)"
-"Provide a complete base URL for SSL connection. For example: %s","Geef een volledige basis URL voor SSL connectie. Bijvoorbeeld: %s"
-"Report All Bugs","Rapporteer Alle Bugs"
-"Required Fields","Benodigde Velden"
-"Response from server isn't valid.","Antwoord van de server is niet valide."
-"Run admin interface with SSL","Start administratie bedieningspaneel met SSL"
+"Manual Downloads and Upgrades","Handmatig Downloaden en Upgraden"
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Indien u de installatiewizard over een oudere Magento versie laat installeren, moet u deze methode gebruiken."
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Indien u uw Magento folders niet beschrijfbaar wilt, of kunt maken voor het webproces, dan kunt u het PEAR bestand gelocaliseerd in de root van de Magento installatie gebruiken."
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
"Run this in your shell from Magento root folder:","Voer dit in uw shell van uw Magento root folder uit:"
-"Save Session Data In","Sla Sessie Data Op In"
-"Save Session Files In","Sla Sessie Bestanden Op In"
-"Secure Base URL","Veilige Basis URL"
-"Session Storage Options","Sessie Opslag Opties"
-"Setting preferred state to: %s","Verander gewenste staat naar: %s"
-"Skip Base URL Validation Before the Next Step","Sla Basis-URL Validatie Over Voor de Volgende Stap"
-"Skip Secure URL validation before next step","Sla Beveiligde URL validatie over voor volgende stap"
-"Tables Prefix","Tabellen Voorvoegsel"
-"The URL ""%s"" is invalid.","De URL ""%s"" is ongeldig."
-"The URL ""%s"" is not accessible.","De URL ""%s"" is niet toegankelijk."
-"The database server version doesn't match system requirements (required: %s, actual: %s).","De database server komt niet overeen met systeemvereisten (benodigd: %s, werkelijk: %s)."
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","In de tabel prefix mogen alleen letters (az), cijfers (0-9) en onderstrepingstekens (_) bevatten, het eerste karakter moet een letter zijn."
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Er was een probleem met het installeren van Magento pakketten. Lees alstublieft het logboek, verbeter fouten en probeer het opnieuw."
-"Time Zone","Tijdszone"
-"Use Secure URLs (SSL)","Gebruik Beveiligde URL's (SSL)"
-"Use Web Server (Apache) Rewrites","Gebruik Web Server (Apache) Herschrijvingen"
-"User Name","Gebruikersnaam"
-"User Password","Gebruikerswachtwoord"
-"Username","Gebruikersnaam"
-"Validation","Validatie"
-"Web access options","Webtoegangsopties"
-"Welcome","Welkom"
-"Welcome to Magento's Installation Wizard","Welkom bij Magento's Installatiewizard"
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","U kunt een serverpoort specificeren, bv.: localhost:3307<br />Als u niet de standaard UNIX-socket gebruikt, kunt u deze hier specificeren in plaats van host, bv.: /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","U zou deze optie kunnen inschakelen om webserver herschrijving functionaliteit te gebruiken voor verbeterde zoekmachines optimalisatie."
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download","Ga door Na Handmatige Download"
"You're All Set","U Bent Klaar"
+"Get ready to experience Open-Source eCommerce Evolved.","Maak je klaar om de nieuwe versie Open-Source eCommerce te ervaren."
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Voor u doorgaat met opslaan, maak a.u.b. een notitie van uw versleutelingscode (Magento gebruikt het om wachtwoorden, creditcards en meer te versleutelen)."
+"(Make sure you keep it in a safe place.)","(Zorg ervoor dat u het op een veilige plaats bewaard)"
+"Go to Frontend","Ga naar Frontend"
+"Go to Backend","Ga naar Backend"
+Localization,Lokalisatie
+"Locale settings","Lokale instellingen"
+"Magento Installation Wizard","Magento Installatiewizard"
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs","Rapporteer Alle Bugs"
+"(ver. %1)","(ver. %1)"
+Installation,Installatie
+"Having trouble installing Magento?","Moeilijkheden met het installeren van Magento?"
+"Check out our","Bekijk onze"
+"Installation Guide","Installatie Handleiding"
+"License Agreement",Licentie-overeenkomst
"You're All Set!","U Bent Klaar!"
diff --git a/app/code/Magento/Install/i18n/pt_BR.csv b/app/code/Magento/Install/i18n/pt_BR.csv
index 13257692b18..42e2fbc84f9 100644
--- a/app/code/Magento/Install/i18n/pt_BR.csv
+++ b/app/code/Magento/Install/i18n/pt_BR.csv
@@ -1,125 +1,118 @@
-"(Make sure you keep it in a safe place.)","(Certifique-se de o manter em um local seguro.)"
-"(Optional. Leave blank for no prefix)","(Opcional. Deixe em branco para nenhum prefixo)"
-"(ver. %s)","(ver. %s)"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Caminho adicional acrescentado depois do URL Base para acessar o seu Painel Administrativo (por exemplo: admin, backend, controle, etc.)"
-"Admin Path","Caminho Administrativo"
-"After successfull installation please click the button below.","Após a instalação com sucesso por favor clique no botão abaixo."
-"All packages were installed, click 'OK' to continue with installation.","Todos os pacotes foram instalados, clique em 'OK' para continuar a instalação."
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Alternativamente você poderia tentar o método""'Baixar e Atualizar Manualmente""."
+"User Name","Nome do Usuário"
+"First Name","Primeiro nome"
+"Last Name","Último nome"
+Email,E-mail
+"Password Confirmation","Confirmação de Senha"
+Configuration,Configuração
+"File System","Arquivo de Sistema"
+Database,"Base de Dados"
+Welcome,"Bem Vindo"
+"Personal Information","Informações pessoais"
+"User Password","Senha do Usuário"
+"Email Address","Endereço de e-mail"
+Password,Senha
+"Confirm Password","Confirmar a senha"
+Continue,Continue
+Download,Baixar
+"Login Information","Informações de login"
+"Required Fields","Campos Obrigatórios"
+"Save Session Files In","Salve Arquivos de Sessão Em"
+Locale,Locale
+"Time Zone","Fuso Horário"
+"Default Currency","Moeda Padrão"
+Validation,Validação
+"Magento Connect Manager Deployment","Implementação do Gerenciador de Conexão Magento"
+"Downloading and installing Magento, please wait...","Baixando e instalando o Magento, por favor, espere..."
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
+"Database server does not support the InnoDB storage engine.","O servidor do banco de dados não suporta o mecanismo de armazenamento InnoDB."
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard","Bem-vindo ao Assistente de Instalação do Magento"
+"I agree to the above terms and conditions.","Eu concordo com os termos e condições acima."
+"Web access options","Opções de acesso web"
"Base URL","URL Base"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Antes de continuar para sua loja, por favor, anote sua chave criptografada (Magento a utiliza para criptografar senhas, cartões de crédito e mais)."
-"Check out our","Confira nosso"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Marque esta caixa apenas se não é possÃvel validar automaticamente o URL Seguro, por exemplo se a autenticação HTTP é necessária."
+"Admin Path","Caminho Administrativo"
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts","Habilitar Gráficos"
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step","Pular Validação URL Base Antes do Próximo Passo"
"Check this box only if it is not possible to automatically validate the Base URL.","Marque esta caixa apenas se não é possÃvel validar automaticamente o URL Base."
-"Choose this if you would like to test frontend and backend functionality.","Escolha esta opção se você gostaria de testar as funcionalidades frontend e backend."
-"Configuration","Configuração"
-"Confirm Password","Confirmar a senha"
-"Connection","Conexão"
-"Continue","Continue"
-"Continue After Manual Download","Continue Depois de Baixar Manualmente"
-"Continue Full Download / SVN Installation","Continue a Baixar Tudo/Instalação SVN"
+"Use Web Server (Apache) Rewrites","Use Servidor Web (Apache) Reescrito"
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Por favor, certifique-se que <code>mod_rewrite</code> está ativado na configuração Apache."
+"Use Secure URLs (SSL)","Use URLs (SSL) Seguros"
+"Enable this option only if you have SSL available.","Habilite esta opção se tiver SSL disponÃvel."
+"Secure Base URL","URL Base Segura"
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL","Execute a interface de administração com SSL"
+"Skip Secure URL validation before next step","Pular Validação URL Segura antes do Próximo Passo"
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Marque esta caixa apenas se não é possÃvel validar automaticamente o URL Seguro, por exemplo se a autenticação HTTP é necessária."
+"Session Storage Options","Opções de Armazenamento de Sessão"
+"Save Session Data In","Salve Dados de Sessão Em"
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
"Create Admin Account","Crie uma Conta de Administrador"
-"Currently this is the most stable state available for Magento packages.","Atualmente esse é o estado mais estável disponÃvel para pacotes Magento."
-"Database","Base de Dados"
+Username,"Nome do usuário"
+"Encryption Key","Chave criptografada."
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,Conexão
"Database Connection","Conexão de Base de Dados"
-"Database Name","Nome da Base de Dados"
-"Database Name cannot be empty.","O nome do banco de dados não pode estar vazio."
"Database Type","Tipo de Banco de Dados"
-"Database connection error.","Erro de conexão de banco de dados."
+Host,Anfitrião
"Database host","Servidor de banco de dados"
-"Database server does not support the InnoDB storage engine.","O servidor do banco de dados não suporta o mecanismo de armazenamento InnoDB."
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Você pode especificar a porta do servidor, ex.: localhost:3307<br />Se você não estiver usando o socket UNIX predefinido, você pode especificá-lo aqui em vez do host, ex.: /var/run/mysqld/mysqld.sock"
+"Database Name","Nome da Base de Dados"
"Database user name","Nome de usuário do banco de dados"
"Database user password","Senha de usuário do banco de dados"
-"Default Currency","Moeda Padrão"
-"Download","Baixar"
+"Tables Prefix","Prefixo das Tabelas"
+"(Optional. Leave blank for no prefix)","(Opcional. Deixe em branco para nenhum prefixo)"
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
"Download Magento Core Modules and Updates","Download de atualizações e módulos centrais do Magento"
-"Downloading and installing Magento, please wait...","Baixando e instalando o Magento, por favor, espere..."
-"Email","E-mail"
-"Email Address","Endereço de e-mail"
-"Enable Charts","Habilitar Gráficos"
-"Enable this option if you want the charts to be displayed on Dashboard.","Habilite esta opção se desejar que os gráficos sejam exibidos no painel de controle."
-"Enable this option only if you have SSL available.","Habilite esta opção se tiver SSL disponÃvel."
-"Encryption Key","Chave criptografada."
-"File System","Arquivo de Sistema"
-"First Name","Primeiro nome"
"Full Download / SVN Installation","Download Completo / Instalação do SVN"
-"Get ready to experience Open-Source eCommerce Evolved.","Prepare-se para experimentar o Open-Source eCommerce Evolved."
-"Go to Backend","Ir para o Backend"
-"Go to Frontend","Ir para o Frontend"
-"Having trouble installing Magento?","Tendo problemas na instalação do Magento?"
-"Help Us to Keep Magento Healthy","Ajude-nos a manter o Magento Saudável"
-"Host","Anfitrião"
-"I agree to the above terms and conditions.","Eu concordo com os termos e condições acima."
-"If you are a developer and would like to have the latest public updates, choose this option.","Se você é um desenvolvedor e gostaria de ter as últimas atualizações públicas, escolha esta opção."
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Se você estiver executando o PHP como CGI, seus processos PHP podem ser executados sob o mesmo usuário como o usuário que você usou ao fazer o carregamento de arquivos Magento."
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Se você estiver executando o assistente de instalação sobre uma instalação anteriormente baixada e instalada de Magento, prossiga com este método."
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Se você não quiser ou não for capaz de ter pastas Magento graváveis para o processo web, você poderia usar PEAR executável localizado na raiz da instalação do Magento."
"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Se você tiver baixado o pacote completo ou instalado Magento através de SVN, você deve pular pacotes de instalação e validação clicando no botão abaixo."
+"Continue Full Download / SVN Installation","Continue a Baixar Tudo/Instalação SVN"
+"Package Management through the Web","Gerenciamento de Pacotes através da Web"
"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Se você deseja gerenciar pacotes Magento através da interface de administração web, você precisará ter permissões web graváveis aplicadas a todas as pastas e arquivos Magento."
"If your server is running on MS Windows, most probably you will not need to change anything.","Se o servidor estiver correndo em MS Windows, muito provavelmente você não vai precisar mudar nada."
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Se você estiver executando o PHP como CGI, seus processos PHP podem ser executados sob o mesmo usuário como o usuário que você usou ao fazer o carregamento de arquivos Magento."
"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","Em outros casos, você vai precisar fazer arquivos Magento graváveis para o usuário em que o processo do servidor web está em execução."
-"Installation","Instalação"
-"Installation Guide","Guia de Instalação"
-"Installer does not exist for %s database type","O Instalador não existe para %s tipos de banco de dados"
-"Last Name","Último nome"
-"License Agreement","Contrato de Licença"
-"Locale","Locale"
-"Locale settings","Configurações locais"
-"Localization","Localização"
-"Login Information","Informações de login"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Implementação do Gerenciador de Conexão Magento"
-"Magento Installation Wizard","Assistente de Instalação Magento"
-"Magento is a trademark of X.commerce, Inc. Copyright © %s X.commerce, Inc.","Magento é uma marca comercial da X.commerce, Inc.© Direitos Autorais©, %s X.commerce, Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento usa essa chave para criptografar senhas, cartões de crédito e muito mais. Se este campo é deixado em branco o sistema irá criar para você uma chave criptografada e vai exibi-la na próxima página."
-"Manual Downloads and Upgrades","Transferências de Manual e Atualizações"
-"No resource for %s DB model.","Nenhum recurso para o modelo %s DB."
-"One of PHP Extensions ""%s"" must be loaded.","Uma das Extensões PHP ""%s"" deve ser carregada."
-"PHP Extension '%s' loaded","Extensão PHP ""%s"" carregada"
-"PHP Extensions ""%s"" must be loaded.","Extensões PHP ""%s"" devem ser carregadas."
-"PHP extension ""%s"" must be loaded.","Extensão PHP ""%s'"" deve ser carregada."
-"Package Management through the Web","Gerenciamento de Pacotes através da Web"
-"Password","Senha"
-"Password Confirmation","Confirmação de Senha"
-"Path ""%s"" must be writable.","Caminho ""%s"" deve ser gravável."
-"Personal Information","Informações pessoais"
-"Please correct the user data and try again.","Por favor corrija os dados do usuário e tente novamente."
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","Por favor, certifique-se que <code>mod_rewrite</code> está ativado na configuração Apache."
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.","Se você é um desenvolvedor e gostaria de ter as últimas atualizações públicas, escolha esta opção."
"Please note that it is much less stable than beta.","Por favor note que é muito menos estável do que o beta."
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Por favor note que apenas os sistemas operativos UNIX, Linux e Mac OS X são suportados atualmente. Para o Windows use a opção ""%s""."
-"Please set all required settings before clicking Continue","Por favor defina todas as configurações necessárias antes de clicar em Continue"
-"Preferred stability: %s","Estabilidade preferida: %s"
-"Proceed With Automatic Download (%s)","Prossiga Com Baixamento Automático (%s)"
-"Provide a complete base URL for SSL connection. For example: %s","Forneça um URL base completo para a conexão SSL. Por exemplo: %s"
-"Report All Bugs","Reporte Todos os Erros"
-"Required Fields","Campos Obrigatórios"
-"Response from server isn't valid.","Resposta do servidor não é válida."
-"Run admin interface with SSL","Execute a interface de administração com SSL"
+"Manual Downloads and Upgrades","Transferências de Manual e Atualizações"
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Se você estiver executando o assistente de instalação sobre uma instalação anteriormente baixada e instalada de Magento, prossiga com este método."
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Se você não quiser ou não for capaz de ter pastas Magento graváveis para o processo web, você poderia usar PEAR executável localizado na raiz da instalação do Magento."
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
"Run this in your shell from Magento root folder:","Execute isto em seu sistema operativo a partir da pasta raiz Magento:"
-"Save Session Data In","Salve Dados de Sessão Em"
-"Save Session Files In","Salve Arquivos de Sessão Em"
-"Secure Base URL","URL Base Segura"
-"Session Storage Options","Opções de Armazenamento de Sessão"
-"Setting preferred state to: %s","Definição de estado preferido para: %s"
-"Skip Base URL Validation Before the Next Step","Pular Validação URL Base Antes do Próximo Passo"
-"Skip Secure URL validation before next step","Pular Validação URL Segura antes do Próximo Passo"
-"Tables Prefix","Prefixo das Tabelas"
-"The URL ""%s"" is invalid.","O URL ""%s"" é inválido."
-"The URL ""%s"" is not accessible.","O URL ""%s"" não está acessÃvel."
-"The database server version doesn't match system requirements (required: %s, actual: %s).","A versão do servidor do banco de dados não combina com os requisitos de sistema (requerido: %s, atual: %s)."
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","O prefixo da tabela deve conter somente letras (a-z), números (0-9) ou sublinhados (_), o primeiro caractere deve ser uma letra."
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Houve um problema ao instalar pacotes Magento. Por favor leia o registro, corrija erros e tente novamente."
-"Time Zone","Fuso Horário"
-"Use Secure URLs (SSL)","Use URLs (SSL) Seguros"
-"Use Web Server (Apache) Rewrites","Use Servidor Web (Apache) Reescrito"
-"User Name","Nome do Usuário"
-"User Password","Senha do Usuário"
-"Username","Nome do usuário"
-"Validation","Validação"
-"Web access options","Opções de acesso web"
-"Welcome","Bem Vindo"
-"Welcome to Magento's Installation Wizard","Bem-vindo ao Assistente de Instalação do Magento"
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Você pode especificar a porta do servidor, ex.: localhost:3307<br />Se você não estiver usando o socket UNIX predefinido, você pode especificá-lo aqui em vez do host, ex.: /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Você pode ativar esta opção para usar a funcionalidade servidor web reescrita para melhor otimização dos motores de busca."
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download","Continue Depois de Baixar Manualmente"
"You're All Set","Você Está Pronto"
+"Get ready to experience Open-Source eCommerce Evolved.","Prepare-se para experimentar o Open-Source eCommerce Evolved."
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Antes de continuar para sua loja, por favor, anote sua chave criptografada (Magento a utiliza para criptografar senhas, cartões de crédito e mais)."
+"(Make sure you keep it in a safe place.)","(Certifique-se de o manter em um local seguro.)"
+"Go to Frontend","Ir para o Frontend"
+"Go to Backend","Ir para o Backend"
+Localization,Localização
+"Locale settings","Configurações locais"
+"Magento Installation Wizard","Assistente de Instalação Magento"
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs","Reporte Todos os Erros"
+"(ver. %1)","(ver. %1)"
+Installation,Instalação
+"Having trouble installing Magento?","Tendo problemas na instalação do Magento?"
+"Check out our","Confira nosso"
+"Installation Guide","Guia de Instalação"
+"License Agreement","Contrato de Licença"
"You're All Set!","Você Está Pronto!"
diff --git a/app/code/Magento/Install/i18n/zh_CN.csv b/app/code/Magento/Install/i18n/zh_CN.csv
index 18671198c20..083c1904003 100644
--- a/app/code/Magento/Install/i18n/zh_CN.csv
+++ b/app/code/Magento/Install/i18n/zh_CN.csv
@@ -1,125 +1,118 @@
-"(Make sure you keep it in a safe place.)","（请务必将其ä¿å˜åœ¨å®‰å…¨çš„地点。）"
-"(Optional. Leave blank for no prefix)","（å¯é€‰ï¼Œç•™ç©ºå³å¯ä¸ä½¿ç”¨å‰ç¼€ã€‚）"
-"(ver. %s)","（版本. %s）"
-"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","在基本URLåŽæ·»åŠ é¢å¤–路径å³å¯è®¿é—®æ‚¨çš„管ç†é¢æ¿ï¼ˆä¾‹å¦‚admin, backend, controlç‰ï¼‰ã€‚"
-"Admin Path","管ç†è·¯å¾„"
-"After successfull installation please click the button below.","æˆåŠŸå®‰è£…åŽè¯·ç‚¹å‡»ä¸‹é¢çš„按钮。"
-"All packages were installed, click 'OK' to continue with installation.","所有包已安装，点击“确定â€ç»§ç»å®‰è£…。"
-"Alternatively you could try the 'Manual Downloads and Upgrades' method.","或者您å¯ä»¥å°è¯•â€œæ‰‹å·¥ä¸‹è½½å¹¶å‡çº§â€çš„方法。"
-"Base URL","备份URL"
-"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","在继ç»æ‚¨çš„店铺å‰ï¼Œè¯·è®°å½•æ‚¨çš„åŠ å¯†å¯†é’¥ï¼ˆMagentoå°†å…¶ç”¨äºŽåŠ å¯†å¯†ç ã€ä¿¡ç”¨å¡å·ç ç‰ï¼‰ã€‚"
-"Check out our","结账指å—"
-"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","如果ä¸èƒ½è‡ªåŠ¨éªŒè¯å®‰å…¨URL，例如如果需è¦HTTP验è¯ï¼Œå°±è¯·é€‰æ‹©è¯¥é€‰é¡¹ã€‚"
-"Check this box only if it is not possible to automatically validate the Base URL.","如果ä¸èƒ½è‡ªåŠ¨éªŒè¯åŸºæœ¬URL，就选ä¸è¯¥é€‰é¡¹ã€‚"
-"Choose this if you would like to test frontend and backend functionality.","如果想è¦æµ‹è¯•å‰ç«¯å’ŒåŽç«¯çš„功能，就选ä¸è¯¥é€‰é¡¹ã€‚"
-"Configuration","é…ç½®"
-"Confirm Password","确认密ç "
-"Connection","连接"
-"Continue","继ç»"
-"Continue After Manual Download","手工下载åŽè¿žæŽ¥"
-"Continue Full Download / SVN Installation","继ç»å®Œæ•´ä¸‹è½½/SVN安装"
-"Create Admin Account","创建管ç†å¸æˆ·"
-"Currently this is the most stable state available for Magento packages.","ç›®å‰è¿™æ˜¯æœ€ç¨³å®šçš„å¯ç”¨Magento版本。"
-"Database","æ•°æ®åº“"
-"Database Connection","æ•°æ®åº“连接"
-"Database Name","æ•°æ®åº“å称"
-"Database Name cannot be empty.","æ•°æ®åº“å称ä¸èƒ½ä¸ºç©ºã€‚"
-"Database Type","æ•°æ®åº“类型"
-"Database connection error.","æ•°æ®åº“连接错误。"
-"Database host","æ•°æ®åº“主机"
+"User Name",用户å
+"First Name",åå—
+"Last Name",姓æ°
+Email,电å邮件
+"Password Confirmation",密ç 确认
+Configuration,é…ç½®
+"File System",文件系统
+Database,æ•°æ®åº“
+Welcome,欢迎
+"Personal Information",个人信æ¯
+"User Password",用户密ç
+"Email Address",编辑电å邮件地å€
+Password,密ç
+"Confirm Password",确认密ç
+Continue,继ç»
+Download,下载
+"Login Information",登录信æ¯
+"Required Fields",必须的å—段
+"Save Session Files In",ä¿å˜ä¼šè¯æ–‡ä»¶è‡³
+Locale,区域
+"Time Zone",时区
+"Default Currency",默认货å¸
+Validation,验è¯
+"Magento Connect Manager Deployment",Magento内容管ç†å™¨éƒ¨ç½²
+"Downloading and installing Magento, please wait...",æ£åœ¨ä¸‹è½½å’Œå®‰è£…Magento，请ç¨å€™...
+"Setting preferred state to: %1","Setting preferred state to: %1"
+"The URL ""%1"" is not accessible.","The URL ""%1"" is not accessible."
+"The URL ""%1"" is invalid.","The URL ""%1"" is invalid."
+"Response from the server is invalid.","Response from the server is invalid."
+"PHP Extensions ""%1"" must be loaded.","PHP Extensions ""%1"" must be loaded."
+"The database server version doesn't match system requirements (required: %1, actual: %2).","The database server version doesn't match system requirements (required: %1, actual: %2)."
"Database server does not support the InnoDB storage engine.","æ•°æ®åº“æœåŠ¡å™¨ä¸æ”¯æŒ InnoDB å˜å‚¨å¼•æ“Žã€‚"
-"Database user name","æ•°æ®åº“用户å"
-"Database user password","æ•°æ®åº“用户密ç "
-"Default Currency","默认货å¸"
-"Download","下载"
-"Download Magento Core Modules and Updates","下载Magentoæ ¸å¿ƒæ¨¡å—和更新"
-"Downloading and installing Magento, please wait...","æ£åœ¨ä¸‹è½½å’Œå®‰è£…Magento，请ç¨å€™..."
-"Email","电å邮件"
-"Email Address","编辑电å邮件地å€"
-"Enable Charts","å¯ç”¨å›¾è¡¨"
-"Enable this option if you want the charts to be displayed on Dashboard.","如果希望在仪表æ¿ä¸Šæ˜¾ç¤ºå›¾è¡¨ï¼Œå°±é€‰ä¸è¯¥é€‰é¡¹ã€‚"
-"Enable this option only if you have SSL available.","如果您å¯ä»¥ä½¿ç”¨SSL，就选ä¸è¯¥é€‰é¡¹ã€‚"
-"Encryption Key","åŠ å¯†å¯†é’¥"
-"File System","文件系统"
-"First Name","åå—"
-"Full Download / SVN Installation","完整下载/SVN安装"
-"Get ready to experience Open-Source eCommerce Evolved.","准备体验开æºç”µå商务的进化。"
-"Go to Backend","转到åŽç«¯"
-"Go to Frontend","转到å‰ç«¯"
-"Having trouble installing Magento?","安装Magentoæ—¶é‡åˆ°äº†é—®é¢˜ï¼Ÿ"
-"Help Us to Keep Magento Healthy","帮助我们ä¿è¯Magentoçš„å¥åº·"
-"Host","主机"
-"I agree to the above terms and conditions.","我åŒæ„上述åˆçº¦å’Œæ¡æ¬¾ã€‚"
-"If you are a developer and would like to have the latest public updates, choose this option.","如果您是开å‘人员，希望获得最新的公开更新，请选择该选项。"
-"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","如果您将PHP作为CGIè¿è¡Œï¼Œæ‚¨PHP的处ç†ä½¿ç”¨çš„èº«ä»½åº”ä¸Žä¸Šä¼ Magento文件所用的用户身份相åŒã€‚"
-"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","如果您是在è€ç‰ˆæœ¬ä¸‹è½½å¹¶å®‰è£…好的Magento基础上è¿è¡Œå®‰è£…å‘导，请使用这ç§æ–¹æ³•ã€‚"
-"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","如果您ä¸å¸Œæœ›ï¼Œæˆ–者ä¸èƒ½æä¾›å¯å†™çš„Magento文件夹，则应使用Magento安装文件ä¸çš„PEAR执行文件。"
-"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","如果您下载了完整版，或通过SVN安装Magento，则应点击下列按钮跳过包安装æ“作和验è¯è¿‡ç¨‹ã€‚"
-"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","如果希望通过Web管ç†ç•Œé¢ç®¡ç†Magento包，则需è¦ä¸ºæ‰€æœ‰Magento文件夹和文件应用å¯å†™æƒé™ã€‚"
-"If your server is running on MS Windows, most probably you will not need to change anything.","如果您的æœåŠ¡å™¨è¿è¡Œäº†å¾®è½¯Windows，则ä¸éœ€è¦ä¿®æ”¹ä»»ä½•å†…容。"
-"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","其他情况下，您ä¾ç„¶éœ€è¦ä¸ºæœåŠ¡å™¨ä¸Šè¿è¡ŒWebæœåŠ¡çš„用户æä¾›Magento文件的写æƒé™ã€‚"
-"Installation","安装"
-"Installation Guide","安装指å—"
-"Installer does not exist for %s database type","%s æ•°æ®åº“类型的安装程åºä¸å˜åœ¨"
-"Last Name","姓æ°"
-"License Agreement","许å¯åè®®"
-"Locale","区域"
-"Locale settings","区域设置"
-"Localization","本地化"
-"Login Information","登录信æ¯"
-"Magento","Magento"
-"Magento Connect Manager Deployment","Magento内容管ç†å™¨éƒ¨ç½²"
-"Magento Installation Wizard","Magento安装å‘导"
-"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento是Magento Inc.çš„å•†æ ‡ï¼Œ Copyright © %s Magento Inc."
-"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento使用该密钥对密ç 和信用å¡å·ç ç‰è¿›è¡ŒåŠ 密。如果该å—æ®µç•™ç©ºï¼Œç³»ç»Ÿå°†ä¸ºæ‚¨åˆ›å»ºåŠ å¯†å¯†é’¥ï¼Œå¹¶ä¼šæ˜¾ç¤ºåœ¨ä¸‹ä¸€é¡µä¸Šã€‚"
-"Manual Downloads and Upgrades","手工下载和å‡çº§"
-"No resource for %s DB model.","%s DB模å—没有资æºã€‚"
-"One of PHP Extensions ""%s"" must be loaded.","å¿…é¡»åŠ è½½PHP扩展 ""%s""。"
-"PHP Extension '%s' loaded","PHP扩展 '%s' å·²åŠ è½½"
-"PHP Extensions ""%s"" must be loaded.","å¿…é¡»åŠ è½½ PHP 扩展""%s""。"
-"PHP extension ""%s"" must be loaded.","å¿…é¡»åŠ è½½PHP扩展 '%s'。"
-"Package Management through the Web","通过Web进行包管ç†"
-"Password","密ç "
-"Password Confirmation","密ç 确认"
-"Path ""%s"" must be writable.","路径 ""%s"" å¿…é¡»å¯å†™ã€‚"
-"Personal Information","个人信æ¯"
-"Please correct the user data and try again.","请改æ£ç”¨æˆ·æ•°æ®å¹¶é‡è¯•ã€‚"
-"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.","请确ä¿åœ¨Apacheé…ç½®ä¸å¯ç”¨äº†<code>mod_rewrite</code>。"
-"Please note that it is much less stable than beta.","请注æ„，该版本的稳定性ä¸å¦‚Beta版。"
-"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","请注æ„，åªæœ‰UNIXã€Linux，以åŠMac OS X外壳目å‰å¯è¢«æ”¯æŒã€‚对于Windows，请使用 '%s' 选项。"
-"Please set all required settings before clicking Continue","请在点击继ç»ä¹‹å‰è®¾ç½®æ‰€æœ‰å¿…è¦çš„选项。"
-"Preferred stability: %s","首选稳定性：%s"
-"Proceed With Automatic Download (%s)","在ä¸è‡ªåŠ¨ä¸‹è½½çš„情况下处ç†ï¼ˆ%s）"
-"Provide a complete base URL for SSL connection. For example: %s","为SSL连接æ供完整的基本UEL，例如：%s"
-"Report All Bugs","报告所有Bug"
-"Required Fields","必须的å—段"
-"Response from server isn't valid.","æ¥è‡ªæœåŠ¡å™¨çš„å“åº”æ— æ•ˆã€‚"
-"Run admin interface with SSL","使用SSLè¿è¡Œç®¡ç†ç•Œé¢ã€‚"
-"Run this in your shell from Magento root folder:","在您的外壳ä¸ä»ŽMagentoæ ¹æ–‡ä»¶å¤¹è¿è¡Œè¿™ä¸ªï¼š"
-"Save Session Data In","ä¿å˜ä¼šè¯æ•°æ®è‡³"
-"Save Session Files In","ä¿å˜ä¼šè¯æ–‡ä»¶è‡³"
-"Secure Base URL","安全基本URL"
-"Session Storage Options","会è¯å˜å‚¨é€‰é¡¹"
-"Setting preferred state to: %s","设置首选州为：%s"
-"Skip Base URL Validation Before the Next Step","在开始下一æ¥ä¹‹å‰è·³è¿‡åŸºæœ¬URL验è¯"
-"Skip Secure URL validation before next step","在开始下一æ¥ä¹‹å‰è·³è¿‡å®‰å…¨URL验è¯"
-"Tables Prefix","è¡¨æ ¼å‰ç¼€"
-"The URL ""%s"" is invalid.","URL ""%s"" æ— æ•ˆã€‚"
-"The URL ""%s"" is not accessible.","URL “%sâ€ æ— æ³•è®¿é—®ã€‚"
-"The database server version doesn't match system requirements (required: %s, actual: %s).","æ•°æ®åº“æœåŠ¡å™¨ç‰ˆæœ¬ä¸æ»¡è¶³è¦æ±‚（需è¦ï¼š%s，实际：%s）。"
-"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","表å‰ç¼€åªèƒ½åŒ…å«å—æ¯ (a-z)ã€æ•°å— (0-9)，或下划线 (_)，第一个å—符必须是å—æ¯ã€‚"
-"There was a problem installing Magento packages. Please read the log, correct errors and try again.","安装Magento包时é‡åˆ°äº†é”™è¯¯ã€‚请阅读日志，解决问题，并é‡è¯•ã€‚"
-"Time Zone","时区"
-"Use Secure URLs (SSL)","使用安全URL（SSL）"
-"Use Web Server (Apache) Rewrites","使用WebæœåŠ¡å™¨ï¼ˆApache）é‡å†™"
-"User Name","用户å"
-"User Password","用户密ç "
-"Username","用户å"
-"Validation","验è¯"
-"Web access options","Web访问选项"
-"Welcome","欢迎"
-"Welcome to Magento's Installation Wizard","欢迎使用Magento安装å‘导"
+"Something went wrong while connecting to the database.","Something went wrong while connecting to the database."
+"The Database Name field cannot be empty.","The Database Name field cannot be empty."
+"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.","The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter."
+"Path ""%1"" must be writable.","Path ""%1"" must be writable."
+"Welcome to Magento's Installation Wizard",欢迎使用Magento安装å‘导
+"I agree to the above terms and conditions.",我åŒæ„上述åˆçº¦å’Œæ¡æ¬¾ã€‚
+"Web access options",Web访问选项
+"Base URL",备份URL
+"Admin Path",管ç†è·¯å¾„
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).","This is the additional path used after your base URL to access your store Admin (e.g, Admin)."
+"Enable Charts",å¯ç”¨å›¾è¡¨
+"Enable this option if you want to see the charts on your dashboard.","Enable this option if you want to see the charts on your dashboard."
+"Skip Base URL Validation Before the Next Step",在开始下一æ¥ä¹‹å‰è·³è¿‡åŸºæœ¬URL验è¯
+"Check this box only if it is not possible to automatically validate the Base URL.",如果ä¸èƒ½è‡ªåŠ¨éªŒè¯åŸºæœ¬URL，就选ä¸è¯¥é€‰é¡¹ã€‚
+"Use Web Server (Apache) Rewrites",使用WebæœåŠ¡å™¨ï¼ˆApache）é‡å†™
+"You could enable this option to use web server rewrites functionality for improved Search Engine Optimization.","You could enable this option to use web server rewrites functionality for improved Search Engine Optimization."
+"Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.",请确ä¿åœ¨Apacheé…ç½®ä¸å¯ç”¨äº†<code>mod_rewrite</code>。
+"Use Secure URLs (SSL)",使用安全URL（SSL）
+"Enable this option only if you have SSL available.",如果您å¯ä»¥ä½¿ç”¨SSL，就选ä¸è¯¥é€‰é¡¹ã€‚
+"Secure Base URL",安全基本URL
+"Provide a complete base URL for SSL connection. For example: %1.","Provide a complete base URL for SSL connection. For example: %1."
+"Run admin interface with SSL",使用SSLè¿è¡Œç®¡ç†ç•Œé¢ã€‚
+"Skip Secure URL validation before next step",在开始下一æ¥ä¹‹å‰è·³è¿‡å®‰å…¨URL验è¯
+"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.",如果ä¸èƒ½è‡ªåŠ¨éªŒè¯å®‰å…¨URL，例如如果需è¦HTTP验è¯ï¼Œå°±è¯·é€‰æ‹©è¯¥é€‰é¡¹ã€‚
+"Session Storage Options",会è¯å˜å‚¨é€‰é¡¹
+"Save Session Data In",ä¿å˜ä¼šè¯æ•°æ®è‡³
+"Please set all required settings before clicking ""Continue"".","Please set all required settings before clicking ""Continue""."
+"Create Admin Account",创建管ç†å¸æˆ·
+Username,用户å
+"Encryption Key",åŠ å¯†å¯†é’¥
+"Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page.","Magento uses this key to encrypt passwords, credit cards and more. If you don't fill in this field, we'll create your encryption key and show it to you on the next page."
+Connection,连接
+"Database Connection",æ•°æ®åº“连接
+"Database Type",æ•°æ®åº“类型
+Host,主机
+"Database host",æ•°æ®åº“主机
"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","您å¯ä»¥æŒ‡å®šæœåŠ¡å™¨ç«¯å£ï¼Œä¾‹å¦‚： localhost:3307<br />如果没有使用默认的UNIX socket，则å¯ä»¥åœ¨æ¤æŒ‡å®šï¼Œè€Œä¸ç”¨åœ¨ä¸»æœºä¸æŒ‡å®šï¼Œä¾‹å¦‚： /var/run/mysqld/mysqld.sock"
-"You could enable this option to use web server rewrites functionality for improved search engines optimization.","您å¯ä»¥å¯ç”¨è¯¥é€‰é¡¹ï¼Œä»¥ä¾¿é€šè¿‡WebæœåŠ¡å™¨çš„é‡å†™åŠŸèƒ½æ”¹å–„æœç´¢å¼•æ“Žä¼˜åŒ–效果。"
-"You're All Set","您已ç»è®¾ç½®å®Œæ¯•ã€‚"
-"You're All Set!","您已ç»è®¾ç½®å®Œæ¯•ï¼"
+"Database Name",æ•°æ®åº“å称
+"Database user name",æ•°æ®åº“用户å
+"Database user password",æ•°æ®åº“用户密ç
+"Tables Prefix",è¡¨æ ¼å‰ç¼€
+"(Optional. Leave blank for no prefix)",（å¯é€‰ï¼Œç•™ç©ºå³å¯ä¸ä½¿ç”¨å‰ç¼€ã€‚）
+"All packages were installed. Click 'OK' to continue with installation.","All packages were installed. Click 'OK' to continue with installation."
+"Something went wrong installing the Magento packages. Please read the log, correct any errors and try again.","Something went wrong installing the Magento packages. Please read the log, correct any errors and try again."
+"As another option, you could try the ""Manual Downloads and Upgrades"" method.","As another option, you could try the ""Manual Downloads and Upgrades"" method."
+"Download Magento Core Modules and Updates",下载Magentoæ ¸å¿ƒæ¨¡å—和更新
+"Full Download / SVN Installation",完整下载/SVN安装
+"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.",如果您下载了完整版，或通过SVN安装Magento，则应点击下列按钮跳过包安装æ“作和验è¯è¿‡ç¨‹ã€‚
+"Continue Full Download / SVN Installation",继ç»å®Œæ•´ä¸‹è½½/SVN安装
+"Package Management through the Web",通过Web进行包管ç†
+"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.",如果希望通过Web管ç†ç•Œé¢ç®¡ç†Magento包，则需è¦ä¸ºæ‰€æœ‰Magento文件夹和文件应用å¯å†™æƒé™ã€‚
+"If your server is running on MS Windows, most probably you will not need to change anything.",如果您的æœåŠ¡å™¨è¿è¡Œäº†å¾®è½¯Windows，则ä¸éœ€è¦ä¿®æ”¹ä»»ä½•å†…容。
+"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.",如果您将PHP作为CGIè¿è¡Œï¼Œæ‚¨PHP的处ç†ä½¿ç”¨çš„èº«ä»½åº”ä¸Žä¸Šä¼ Magento文件所用的用户身份相åŒã€‚
+"In other cases you will need to make Magento files writeable for the user that the web server process is running under.",其他情况下，您ä¾ç„¶éœ€è¦ä¸ºæœåŠ¡å™¨ä¸Šè¿è¡ŒWebæœåŠ¡çš„用户æä¾›Magento文件的写æƒé™ã€‚
+"Preferred stability: %1","Preferred stability: %1"
+"This is the most stable state available for Magento packages.","This is the most stable state available for Magento packages."
+"Choose this if you would like to test storefront and admin functionality.","Choose this if you would like to test storefront and admin functionality."
+"Proceed With Automatic Download (%1)","Proceed With Automatic Download (%1)"
+"If you are a developer and would like to have the latest public updates, choose this option.",如果您是开å‘人员，希望获得最新的公开更新，请选择该选项。
+"Please note that it is much less stable than beta.",请注æ„，该版本的稳定性ä¸å¦‚Beta版。
+"Manual Downloads and Upgrades",手工下载和å‡çº§
+"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.",如果您是在è€ç‰ˆæœ¬ä¸‹è½½å¹¶å®‰è£…好的Magento基础上è¿è¡Œå®‰è£…å‘导，请使用这ç§æ–¹æ³•ã€‚
+"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.",如果您ä¸å¸Œæœ›ï¼Œæˆ–者ä¸èƒ½æä¾›å¯å†™çš„Magento文件夹，则应使用Magento安装文件ä¸çš„PEAR执行文件。
+"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option.","Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%1' option."
+"Run this in your shell from Magento root folder:",在您的外壳ä¸ä»ŽMagentoæ ¹æ–‡ä»¶å¤¹è¿è¡Œè¿™ä¸ªï¼š
+"Click the button below when the installation is finished.","Click the button below when the installation is finished."
+"Continue After Manual Download",手工下载åŽè¿žæŽ¥
+"You're All Set",您已ç»è®¾ç½®å®Œæ¯•ã€‚
+"Get ready to experience Open-Source eCommerce Evolved.",准备体验开æºç”µå商务的进化。
+"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).",在继ç»æ‚¨çš„店铺å‰ï¼Œè¯·è®°å½•æ‚¨çš„åŠ å¯†å¯†é’¥ï¼ˆMagentoå°†å…¶ç”¨äºŽåŠ å¯†å¯†ç ã€ä¿¡ç”¨å¡å·ç ç‰ï¼‰ã€‚
+"(Make sure you keep it in a safe place.)",（请务必将其ä¿å˜åœ¨å®‰å…¨çš„地点。）
+"Go to Frontend",转到å‰ç«¯
+"Go to Backend",转到åŽç«¯
+Localization,本地化
+"Locale settings",区域设置
+"Magento Installation Wizard",Magento安装å‘导
+Magento,Magento
+"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy"
+"Report All Bugs",报告所有Bug
+"(ver. %1)","(ver. %1)"
+Installation,安装
+"Having trouble installing Magento?",安装Magentoæ—¶é‡åˆ°äº†é—®é¢˜ï¼Ÿ
+"Check out our",结账指å—
+"Installation Guide",安装指å—
+"License Agreement",许å¯åè®®
+"You're All Set!",您已ç»è®¾ç½®å®Œæ¯•ï¼
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
index 2e270d68ff8..4b60cac8516 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
@@ -38,10 +38,22 @@ class Name extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
*/
public function render(\Magento\Framework\Object $row)
{
+ /** @var \Magento\Integration\Model\Integration $row */
$text = parent::render($row);
- if (strpos($row->getEndpoint(), 'http:') === 0) {
+ if (!$this->isUrlSecure($row->getEndpoint()) || !$this->isUrlSecure($row->getIdentityLinkUrl())) {
$text .= '<span class="icon-error"><span>Integration not secure</span></span>';
}
return $text;
}
+
+ /**
+ * Check if URL is secure.
+ *
+ * @param string $url
+ * @return bool
+ */
+ protected function isUrlSecure($url)
+ {
+ return (strpos($url, 'http:') !== 0);
+ }
}
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
index e161451c1eb..4a34748a8d0 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
@@ -113,8 +113,8 @@ class Integration extends Action
*/
public function indexAction()
{
- $unsecureEndpointsCount = $this->_integrationCollection->addUnsecureEndpointFilter()->getSize();
- if ($unsecureEndpointsCount > 0) {
+ $unsecureIntegrationsCount = $this->_integrationCollection->addUnsecureUrlsFilter()->getSize();
+ if ($unsecureIntegrationsCount > 0) {
// @codingStandardsIgnoreStart
$this->messageManager->addNotice(__('Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information')
// @codingStandardsIgnoreEnd
diff --git a/app/code/Magento/Integration/Model/Resource/Integration/Collection.php b/app/code/Magento/Integration/Model/Resource/Integration/Collection.php
index 7000a98e044..819343afaec 100644
--- a/app/code/Magento/Integration/Model/Resource/Integration/Collection.php
+++ b/app/code/Magento/Integration/Model/Resource/Integration/Collection.php
@@ -39,12 +39,15 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
}
/**
- * Get unsecure enpoints
+ * Add filter for finding integrations with unsecure URLs.
*
* @return $this
*/
- public function addUnsecureEndpointFilter()
+ public function addUnsecureUrlsFilter()
{
- return $this->addFieldToFilter('endpoint', ['like' => 'http:%']);
+ return $this->addFieldToFilter(
+ ['endpoint', 'identity_link_url'],
+ [['like' => 'http:%'], ['like' => 'http:%']]
+ );
}
}
diff --git a/app/code/Magento/Integration/i18n/de_DE.csv b/app/code/Magento/Integration/i18n/de_DE.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/de_DE.csv
+++ b/app/code/Magento/Integration/i18n/de_DE.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/Integration/i18n/en_US.csv b/app/code/Magento/Integration/i18n/en_US.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/en_US.csv
+++ b/app/code/Magento/Integration/i18n/en_US.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/Integration/i18n/es_ES.csv b/app/code/Magento/Integration/i18n/es_ES.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/es_ES.csv
+++ b/app/code/Magento/Integration/i18n/es_ES.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/Integration/i18n/fr_FR.csv b/app/code/Magento/Integration/i18n/fr_FR.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/fr_FR.csv
+++ b/app/code/Magento/Integration/i18n/fr_FR.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/Integration/i18n/nl_NL.csv b/app/code/Magento/Integration/i18n/nl_NL.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/nl_NL.csv
+++ b/app/code/Magento/Integration/i18n/nl_NL.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/Integration/i18n/pt_BR.csv b/app/code/Magento/Integration/i18n/pt_BR.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/pt_BR.csv
+++ b/app/code/Magento/Integration/i18n/pt_BR.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/Integration/i18n/zh_CN.csv b/app/code/Magento/Integration/i18n/zh_CN.csv
index e69de29bb2d..97f437e8673 100644
--- a/app/code/Magento/Integration/i18n/zh_CN.csv
+++ b/app/code/Magento/Integration/i18n/zh_CN.csv
@@ -0,0 +1,72 @@
+Remove,Remove
+Cancel,Cancel
+Edit,Edit
+Email,Email
+Save,Save
+General,General
+Name,Name
+Status,Status
+View,View
+Active,Active
+"Basic Settings","Basic Settings"
+Allow,Allow
+Inactive,Inactive
+Integrations,Integrations
+"Add New Integration","Add New Integration"
+"Save & Activate","Save & Activate"
+"New Integration","New Integration"
+"Edit Integration '%1'","Edit Integration '%1'"
+"Integration Info","Integration Info"
+"Callback URL","Callback URL"
+"Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://.","Enter URL where Oauth credentials can be sent when using Oauth for token exchange. We strongly recommend using https://."
+"Identity link URL","Identity link URL"
+"URL to redirect user to link their 3rd party account with this Magento integration credentials.","URL to redirect user to link their 3rd party account with this Magento integration credentials."
+"Integration Details","Integration Details"
+"Integration Tokens for Extensions","Integration Tokens for Extensions"
+"Consumer Key","Consumer Key"
+"Consumer Secret","Consumer Secret"
+"Access Token","Access Token"
+"Access Token Secret","Access Token Secret"
+"Uninstall the extension to remove this integration","Uninstall the extension to remove this integration"
+Activate,Activate
+Reauthorize,Reauthorize
+"Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information","Warning! Integrations not using HTTPS are insecure and potentially expose private or personally identifiable information"
+"Internal error. Check exception log for details.","Internal error. Check exception log for details."
+"Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid."
+"View ""%1"" Integration","View ""%1"" Integration"
+"Edit ""%1"" Integration","Edit ""%1"" Integration"
+"The integration '%1' has been saved.","The integration '%1' has been saved."
+"The integration was not saved.","The integration was not saved."
+"Uninstall the extension to remove integration '%1'.","Uninstall the extension to remove integration '%1'."
+"This integration no longer exists.","This integration no longer exists."
+"The integration '%1' has been deleted.","The integration '%1' has been deleted."
+"The integration '%1' has been re-authorized.","The integration '%1' has been re-authorized."
+"The integration '%1' has been activated.","The integration '%1' has been activated."
+"Integration '%1' re-authorization has been failed.","Integration '%1' re-authorization has been failed."
+"Integration '%1' activation has been failed.","Integration '%1' activation has been failed."
+"Integration '%1' has been sent for re-authorization.","Integration '%1' has been sent for re-authorization."
+"Integration '%1' has been sent for activation.","Integration '%1' has been sent for activation."
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"Integration with name '%1' exists.","Integration with name '%1' exists."
+"Integration with ID '%1' does not exist.","Integration with ID '%1' does not exist."
+"A consumer with ID %1 does not exist","A consumer with ID %1 does not exist"
+"Consumer with ID '%1' does not exist.","Consumer with ID '%1' does not exist."
+"The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
+"Are you sure ?","Are you sure ?"
+"Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
+"Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
+Done,Done
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+OAuth,OAuth
+"Cleanup Settings","Cleanup Settings"
+"Cleanup Probability","Cleanup Probability"
+"Expiration Period","Expiration Period"
+"Consumer Settings","Consumer Settings"
+"OAuth consumer credentials HTTP Post maxredirects","OAuth consumer credentials HTTP Post maxredirects"
+"OAuth consumer credentials HTTP Post timeout","OAuth consumer credentials HTTP Post timeout"
+"Integrations Configuration","Integrations Configuration"
+"Integration configuration file.","Integration configuration file."
+"No Integrations Found","No Integrations Found"
diff --git a/app/code/Magento/LayeredNavigation/i18n/de_DE.csv b/app/code/Magento/LayeredNavigation/i18n/de_DE.csv
index d92313cfbf8..d5fbd1f8b57 100644
--- a/app/code/Magento/LayeredNavigation/i18n/de_DE.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/de_DE.csv
@@ -1,2 +1,26 @@
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
"Use In Layered Navigation","Filternavigation auf Suchergebnisseiten verwenden"
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
"Use In Search Results Layered Navigation","Navigation in Suchergebnissen nutzen"
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/i18n/en_US.csv b/app/code/Magento/LayeredNavigation/i18n/en_US.csv
index eb28b136381..458c5d75565 100644
--- a/app/code/Magento/LayeredNavigation/i18n/en_US.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/en_US.csv
@@ -1,2 +1,26 @@
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
"Use In Layered Navigation","Use In Layered Navigation"
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
"Use In Search Results Layered Navigation","Use In Search Results Layered Navigation"
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/i18n/es_ES.csv b/app/code/Magento/LayeredNavigation/i18n/es_ES.csv
index 3c289d76d77..ecf82268839 100644
--- a/app/code/Magento/LayeredNavigation/i18n/es_ES.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/es_ES.csv
@@ -1,2 +1,26 @@
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
"Use In Layered Navigation","Utilizar en navegación en capas"
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
"Use In Search Results Layered Navigation","Utilizar en la navegación por capas de los resultados de búsqueda"
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/i18n/fr_FR.csv b/app/code/Magento/LayeredNavigation/i18n/fr_FR.csv
index 7a1bae786a5..c721116798b 100644
--- a/app/code/Magento/LayeredNavigation/i18n/fr_FR.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/fr_FR.csv
@@ -1,2 +1,26 @@
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
"Use In Layered Navigation","Utiliser en Navigation par Couches"
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
"Use In Search Results Layered Navigation","Utilisez la page de résultats de navigation en couches"
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/i18n/nl_NL.csv b/app/code/Magento/LayeredNavigation/i18n/nl_NL.csv
index aa741c0f8f9..c7c1e28bb47 100644
--- a/app/code/Magento/LayeredNavigation/i18n/nl_NL.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/nl_NL.csv
@@ -1,2 +1,26 @@
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
"Use In Layered Navigation","Gebruik in Layered Navigatie"
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
"Use In Search Results Layered Navigation","Gebruik in Zoek Resultaten een Gelaagde Navigatie"
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/i18n/pt_BR.csv b/app/code/Magento/LayeredNavigation/i18n/pt_BR.csv
index e9784d6faa1..cad381e8fcf 100644
--- a/app/code/Magento/LayeredNavigation/i18n/pt_BR.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/pt_BR.csv
@@ -1,2 +1,26 @@
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
"Use In Layered Navigation","Use em Navegação em Camadas"
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
"Use In Search Results Layered Navigation","Use Em Resultados de Pesquisa de Navegação em Camadas"
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/i18n/zh_CN.csv b/app/code/Magento/LayeredNavigation/i18n/zh_CN.csv
index 36982cb3ff9..b78842db188 100644
--- a/app/code/Magento/LayeredNavigation/i18n/zh_CN.csv
+++ b/app/code/Magento/LayeredNavigation/i18n/zh_CN.csv
@@ -1,2 +1,26 @@
-"Use In Layered Navigation","使用分层导航"
-"Use In Search Results Layered Navigation","使用æœç´¢ç»“果内层次导航"
+No,No
+Previous,Previous
+Position,Position
+"Shop By","Shop By"
+"Shopping Options","Shopping Options"
+"Remove This Item","Remove This Item"
+"Clear All","Clear All"
+"Use In Layered Navigation",使用分层导航
+"Can be used only with catalog input type Dropdown, Multiple Select and Price","Can be used only with catalog input type Dropdown, Multiple Select and Price"
+"Filterable (with results)","Filterable (with results)"
+"Filterable (no results)","Filterable (no results)"
+"Use In Search Results Layered Navigation",使用æœç´¢ç»“果内层次导航
+"Position in Layered Navigation","Position in Layered Navigation"
+"Position of attribute in layered navigation block","Position of attribute in layered navigation block"
+"Use in Layered Navigation","Use in Layered Navigation"
+"Currently Shopping by:","Currently Shopping by:"
+"Layered Navigation","Layered Navigation"
+"Display Product Count","Display Product Count"
+"Price Navigation Step Calculation","Price Navigation Step Calculation"
+"Default Price Navigation Step","Default Price Navigation Step"
+"Maximum Number of Price Intervals","Maximum Number of Price Intervals"
+"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
+"Display Price Interval as One Price","Display Price Interval as One Price"
+"This setting will be applied when all prices in the specific price interval are equal.","This setting will be applied when all prices in the specific price interval are equal."
+"Interval Division Limit","Interval Division Limit"
+"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml
index c82509c98ed..2aeabcd9871 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <referenceContainer name="left">
+ <referenceContainer name="sidebar.main">
<block class="Magento\LayeredNavigation\Block\Navigation\Category" name="catalog.leftnav" before="-" template="layer/view.phtml">
<block class="Magento\LayeredNavigation\Block\Navigation\State\Category" name="catalog.navigation.state" as="state" />
<block class="Magento\LayeredNavigation\Block\Navigation\FilterRenderer" name="catalog.navigation.renderer" as="renderer" template="layer/filter.phtml"/>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
index 10bf5ad1e7c..5f9ee15d0d3 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <referenceContainer name="left">
+ <referenceContainer name="sidebar.main">
<block class="Magento\LayeredNavigation\Block\Navigation\Search" name="catalogsearch.leftnav" before="-" template="layer/view.phtml">
<block class="Magento\LayeredNavigation\Block\Navigation\State\Search" name="catalogsearch.navigation.state" as="state" />
<block class="Magento\LayeredNavigation\Block\Navigation\FilterRenderer" name="catalogsearch.navigation.renderer" as="renderer" template="layer/filter.phtml"/>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml
new file mode 100644
index 00000000000..5aefb996391
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd" label="All Empty Layout Pages" design_abstraction="page_layout">
+ <move element="catalog.leftnav" destination="category.product.list.additional" before="-" />
+</layout>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_one_column.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_one_column.xml
new file mode 100644
index 00000000000..a73bba5fcad
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_one_column.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd" label="All One-Column Layout Pages" design_abstraction="page_layout">
+ <move element="catalog.leftnav" destination="category.product.list.additional" before="-" />
+</layout>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_three_columns.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_three_columns.xml
new file mode 100644
index 00000000000..2cdd12bf70a
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_three_columns.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd" label="All Three-Column Layout Pages" design_abstraction="page_layout">
+ <move element="catalog.leftnav" destination="sidebar.main" before="-" />
+</layout>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_left.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_left.xml
new file mode 100644
index 00000000000..8b4350abcef
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_left.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd" label="All Two-Column Layout Pages (Left Column)" design_abstraction="page_layout">
+ <move element="catalog.leftnav" destination="sidebar.main" before="-" />
+</layout>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_right.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_right.xml
new file mode 100644
index 00000000000..c6aa58afafd
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_two_columns_right.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd" label="All Two-Column Layout Pages (Right Column)" design_abstraction="page_layout">
+ <move element="catalog.leftnav" destination="sidebar.main" before="-" />
+</layout>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
index 5d748089c36..77cb12ee001 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
@@ -31,13 +31,13 @@
?>
<?php $_filters = $this->getActiveFilters() ?>
<?php if(!empty($_filters)): ?>
-<div class="filtered">
- <strong class="subtitle"><?php echo __('Currently Shopping by:') ?></strong>
+<div class="filter-current" data-count="<?php echo count($_filters); ?>">
+ <strong class="block-subtitle filter-current-subtitle"><?php echo __('Currently Shopping by') ?></strong>
<ol class="items">
<?php foreach ($_filters as $_filter): ?>
<li class="item">
- <span class="label"><?php echo __($_filter->getName()) ?>:</span>
- <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
+ <span class="filter-label"><?php echo $this->escapeHtml(__($_filter->getName())); ?></span>
+ <span class="filter-value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
<?php
$clearLinkUrl = $_filter->getClearLinkUrl();
if ($clearLinkUrl):
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
index f061ad515b3..6af9a7ed80e 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
@@ -32,26 +32,27 @@
<?php if($this->canShowBlock()): ?>
<div class="block filter">
- <div class="title">
+ <div class="block-title filter-title">
<strong><?php echo __('Shop By') ?></strong>
+ <span class="block-triger filter-trigger"><?php echo __('Filter') ?> <span class="qty counter"><?php echo count($this->getLayer()->getState()->getActiveFilters()) ?></span></span>
</div>
- <div class="content">
+ <div class="block-content filter-content">
<?php echo $this->getChildHtml('state') ?>
<?php if ($this->getLayer()->getState()->getFilters()): ?>
- <div class="actions">
- <a href="<?php echo $this->getClearUrl() ?>" class="action clear"><span><?php echo __('Clear All') ?></span></a>
+ <div class="block-actions filter-actions">
+ <a href="<?php echo $this->getClearUrl() ?>" class="action clear filter-clear"><span><?php echo __('Clear All') ?></span></a>
</div>
<?php endif; ?>
- <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
+ <strong class="block-subtitle filter-subtitle"><?php echo __('Shopping Options') ?></strong>
- <dl class="options" id="narrow-by-list">
+ <dl class="filter-options" id="narrow-by-list">
<?php foreach ($this->getFilters() as $filter): ?>
<?php if ($filter->getItemsCount()): ?>
- <dt><?php echo __($filter->getName()) ?></dt>
- <dd><?php echo $this->getChildBlock('renderer')->render($filter); ?></dd>
+ <dt class="filter-options-title"><?php echo $this->escapeHtml(__($filter->getName())) ?></dt>
+ <dd class="filter-options-content"><?php echo $this->getChildBlock('renderer')->render($filter); ?></dd>
<?php endif; ?>
<?php endforeach; ?>
</dl>
diff --git a/app/code/Magento/Log/i18n/de_DE.csv b/app/code/Magento/Log/i18n/de_DE.csv
index 6d7f2c1d820..a0b3a6563e8 100644
--- a/app/code/Magento/Log/i18n/de_DE.csv
+++ b/app/code/Magento/Log/i18n/de_DE.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","Aufräumen des Verlaufs anschalten"
+"Start Time",Startzeit
+Frequency,Frequenz
"Error Email Recipient","Email-Empfänger bei auftretenden Fehlern"
"Error Email Sender","Email-Absender bei auftretenden Fehlern"
"Error Email Template","Email-Vorlage bei auftretenden Fehlern"
-"Frequency","Frequenz"
"Log Cleaning","Aufräumen des Verlaufs"
-"Log cleanup Warnings","Warnungen während Aufräumen des Verlaufs"
"Save Log, Days","Speichere Verlauf, Tage"
-"Start Time","Startzeit"
+"Enable Log Cleaning","Aufräumen des Verlaufs anschalten"
diff --git a/app/code/Magento/Log/i18n/en_US.csv b/app/code/Magento/Log/i18n/en_US.csv
index 5b1d7d6f0e7..3ef19efb16c 100644
--- a/app/code/Magento/Log/i18n/en_US.csv
+++ b/app/code/Magento/Log/i18n/en_US.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","Enable Log Cleaning"
+"Start Time","Start Time"
+Frequency,Frequency
"Error Email Recipient","Error Email Recipient"
"Error Email Sender","Error Email Sender"
"Error Email Template","Error Email Template"
-"Frequency","Frequency"
"Log Cleaning","Log Cleaning"
-"Log cleanup Warnings","Log cleanup Warnings"
"Save Log, Days","Save Log, Days"
-"Start Time","Start Time"
+"Enable Log Cleaning","Enable Log Cleaning"
diff --git a/app/code/Magento/Log/i18n/es_ES.csv b/app/code/Magento/Log/i18n/es_ES.csv
index b5cbd31a124..4235ce8fc77 100644
--- a/app/code/Magento/Log/i18n/es_ES.csv
+++ b/app/code/Magento/Log/i18n/es_ES.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","Activar limpieza de registros"
+"Start Time","Tiempo de inicio."
+Frequency,Frecuencia
"Error Email Recipient","Error en el destinatario del mensaje"
"Error Email Sender","Error en el remitente del mensaje"
"Error Email Template","Error en la plantilla del mensaje"
-"Frequency","Frecuencia"
"Log Cleaning","Limpieza de registros"
-"Log cleanup Warnings","Advertencia de limpieza de registros"
"Save Log, Days","Guardar registro (dÃas)"
-"Start Time","Tiempo de inicio."
+"Enable Log Cleaning","Activar limpieza de registros"
diff --git a/app/code/Magento/Log/i18n/fr_FR.csv b/app/code/Magento/Log/i18n/fr_FR.csv
index b0cf3d49fd8..b5cc876151c 100644
--- a/app/code/Magento/Log/i18n/fr_FR.csv
+++ b/app/code/Magento/Log/i18n/fr_FR.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","Activer l'effacement des logs"
+"Start Time","Heure de début"
+Frequency,Fréquence
"Error Email Recipient","Erreur dans le destinataire du mail"
"Error Email Sender","Erreur dans l'expéditeur du mail"
"Error Email Template","Erreur dans le modèle du mail"
-"Frequency","Fréquence"
"Log Cleaning","Effacement des logs"
-"Log cleanup Warnings","Avertissements d'effacement des logs"
"Save Log, Days","Enregistrer logs, jours"
-"Start Time","Heure de début"
+"Enable Log Cleaning","Activer l'effacement des logs"
diff --git a/app/code/Magento/Log/i18n/nl_NL.csv b/app/code/Magento/Log/i18n/nl_NL.csv
index 44c250e50e9..79b61bb7423 100644
--- a/app/code/Magento/Log/i18n/nl_NL.csv
+++ b/app/code/Magento/Log/i18n/nl_NL.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","Schonen van log toestaan"
+"Start Time",Begintijd
+Frequency,Frequentie
"Error Email Recipient","Foutmelding Email Ontvanger"
"Error Email Sender","Foutmelding Email Verstuurder"
"Error Email Template","Foutmelding Email Template"
-"Frequency","Frequentie"
"Log Cleaning","Log aan het schonen"
-"Log cleanup Warnings","Log schoonmaak waarschuwingen"
"Save Log, Days","Log opslaan, dagen"
-"Start Time","Begintijd"
+"Enable Log Cleaning","Schonen van log toestaan"
diff --git a/app/code/Magento/Log/i18n/pt_BR.csv b/app/code/Magento/Log/i18n/pt_BR.csv
index 88577062fd6..6f2c8ab8e44 100644
--- a/app/code/Magento/Log/i18n/pt_BR.csv
+++ b/app/code/Magento/Log/i18n/pt_BR.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","Ativar Limpeza de Registro"
+"Start Time","Tempo de InÃcio"
+Frequency,Freqüência
"Error Email Recipient","Erro de Destinatário de Email"
"Error Email Sender","Erro de Remetente de Email"
"Error Email Template","Erro de Template de Email"
-"Frequency","Freqüência"
"Log Cleaning","Limpeza de Registro"
-"Log cleanup Warnings","Avisos de Limpeza de Registro"
"Save Log, Days","Salvar Registro, Dias"
-"Start Time","Tempo de InÃcio"
+"Enable Log Cleaning","Ativar Limpeza de Registro"
diff --git a/app/code/Magento/Log/i18n/zh_CN.csv b/app/code/Magento/Log/i18n/zh_CN.csv
index c98cd14c07f..72a7f3132d4 100644
--- a/app/code/Magento/Log/i18n/zh_CN.csv
+++ b/app/code/Magento/Log/i18n/zh_CN.csv
@@ -1,9 +1,8 @@
-"Enable Log Cleaning","å¯ç”¨æ—¥å¿—清ç†"
-"Error Email Recipient","邮件接收有误"
-"Error Email Sender","邮件å‘é€æœ‰è¯¯"
-"Error Email Template","邮件模æ¿æœ‰è¯¯"
-"Frequency","频率"
-"Log Cleaning","日志清ç†"
-"Log cleanup Warnings","日志清ç†è¦å‘Š"
-"Save Log, Days","ä¿å˜æ—¥å¿—，天"
-"Start Time","开始时间"
+"Start Time",开始时间
+Frequency,频率
+"Error Email Recipient",邮件接收有误
+"Error Email Sender",邮件å‘é€æœ‰è¯¯
+"Error Email Template",邮件模æ¿æœ‰è¯¯
+"Log Cleaning",日志清ç†
+"Save Log, Days",ä¿å˜æ—¥å¿—，天
+"Enable Log Cleaning",å¯ç”¨æ—¥å¿—清ç†
diff --git a/app/code/Magento/Multishipping/i18n/de_DE.csv b/app/code/Magento/Multishipping/i18n/de_DE.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/de_DE.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/en_US.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/i18n/es_ES.csv b/app/code/Magento/Multishipping/i18n/es_ES.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/es_ES.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/i18n/fr_FR.csv b/app/code/Magento/Multishipping/i18n/fr_FR.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/fr_FR.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/i18n/nl_NL.csv b/app/code/Magento/Multishipping/i18n/nl_NL.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/nl_NL.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/i18n/pt_BR.csv b/app/code/Magento/Multishipping/i18n/pt_BR.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/pt_BR.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/i18n/zh_CN.csv b/app/code/Magento/Multishipping/i18n/zh_CN.csv
new file mode 100644
index 00000000000..f4d30b90b52
--- /dev/null
+++ b/app/code/Magento/Multishipping/i18n/zh_CN.csv
@@ -0,0 +1,79 @@
+Product,Product
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Remove item","Remove item"
+Items,Items
+Change,Change
+"Product Name","Product Name"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Continue Shopping","Continue Shopping"
+"Billing Address","Billing Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Thank you for your purchase!","Thank you for your purchase!"
+"Edit Address","Edit Address"
+"Add New Address","Add New Address"
+"Change Billing Address","Change Billing Address"
+"Remove Item","Remove Item"
+"Ship to Multiple Addresses","Ship to Multiple Addresses"
+"Billing Information - %1","Billing Information - %1"
+"Review Order - %1","Review Order - %1"
+"Total for this address","Total for this address"
+"Shipping Methods","Shipping Methods"
+"Data saving problem","Data saving problem"
+"We cannot open the overview page.","We cannot open the overview page."
+"Please agree to all Terms and Conditions before placing the order.","Please agree to all Terms and Conditions before placing the order."
+"Order place error","Order place error"
+"Create Shipping Address","Create Shipping Address"
+"Edit Shipping Address","Edit Shipping Address"
+"Create Billing Address","Create Billing Address"
+"Edit Billing Address","Edit Billing Address"
+"Maximum qty allowed for Shipping to multiple addresses is %1","Maximum qty allowed for Shipping to multiple addresses is %1"
+"Please select shipping methods for all addresses.","Please select shipping methods for all addresses."
+"Payment method is not defined","Payment method is not defined"
+"The requested Payment Method is not available for multishipping.","The requested Payment Method is not available for multishipping."
+"Item not found or already ordered","Item not found or already ordered"
+"Please specify a payment method.","Please specify a payment method."
+"Please check shipping addresses information.","Please check shipping addresses information."
+"Please specify shipping methods for all addresses.","Please specify shipping methods for all addresses."
+"Please check billing address information.","Please check billing address information."
+"Select Addresses","Select Addresses"
+"Order Success","Order Success"
+"Default Billing","Default Billing"
+"Default Shipping","Default Shipping"
+"Select Address","Select Address"
+"Back to Billing Information","Back to Billing Information"
+"Please select a shipping address for applicable items.","Please select a shipping address for applicable items."
+"Enter a New Address","Enter a New Address"
+"Send To","Send To"
+"Shipping selection is not applicable.","Shipping selection is not applicable."
+"Continue to Shipping Information","Continue to Shipping Information"
+"Update Qty & Addresses","Update Qty & Addresses"
+"Back to Shopping Cart","Back to Shopping Cart"
+"Continue to Review Your Order","Continue to Review Your Order"
+"Back to Shipping Information","Back to Shipping Information"
+"Other items in your order","Other items in your order"
+"Edit Items","Edit Items"
+"Checkout with Multiple Addresses","Checkout with Multiple Addresses"
+"Address %1 of %2","Address %1 of %2"
+"Shipping To","Shipping To"
+"Grand Total:","Grand Total:"
+"Submitting order information...","Submitting order information..."
+"Select Shipping Method","Select Shipping Method"
+"Continue to Billing Information","Continue to Billing Information"
+"Back to Select Addresses","Back to Select Addresses"
+"Thanks for your order. We'll send you emails with order details and tracking information.","Thanks for your order. We'll send you emails with order details and tracking information."
+"Your order number is ","Your order number is "
+"Review Order","Review Order"
+Options,Options
+"Your order has been received.","Your order has been received."
+"Multishipping Settings","Multishipping Settings"
+"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
+"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
index 3336ebdb801..594d2708bc2 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd" label="Multishipping Checkout" design_abstraction="custom">
<update handle="page_two_columns_left"/>
- <referenceContainer name="left">
+ <referenceContainer name="sidebar.main">
<block class="Magento\Multishipping\Block\Checkout\State" name="checkout_state" template="checkout/state.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
index 7a5795e1033..dba725d6854 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
@@ -45,7 +45,7 @@
<?php endforeach; ?>
</div>
</div>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="primary">
<button type="button" class="action add primary" role="add-address" title="<?php echo __('Add New Address') ?>"><span><?php echo __('Add New Address') ?></span></button>
</div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index 4d5183219a5..67392762626 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -77,7 +77,7 @@
</tbody>
</table>
</div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" title="<?php echo __('Continue to Shipping Information') ?>" class="action primary continue<?php if ($this->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?php echo __('Continue to Shipping Information') ?></span></button>
<button type="submit" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty & Addresses') ?></span></button>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index 9b5dd41476b..a30fb3bd376 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -68,7 +68,7 @@
<?php echo $this->getChildHtml('checkout_billing_items') ?>
</div>
</div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button id="payment-continue" type="submit" class="action primary continue"><span><?php echo __('Continue to Review Your Order') ?></span></button>
</div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index c503a5d1b71..0db20192725 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -170,7 +170,7 @@
<strong class="mark"><?php echo __('Grand Total:') ?></strong>
<strong class="amount"><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()) ?></strong>
</div>
- <div class="actions toolbar" id="review-buttons-container">
+ <div class="actions-toolbar" id="review-buttons-container">
<div class="primary">
<button type="submit" class="action primary submit" id="review-button"><span><?php echo __('Place Order') ?></span></button>
</div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
index 922adffa6bd..6cf29ce77f7 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
@@ -111,7 +111,7 @@
</div>
<?php endforeach; ?>
<?php echo $this->getChildHtml('checkout_billing_items') ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button class="action primary continue" type="submit"><span><?php echo __('Continue to Billing Information') ?></span></button>
</div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
index c115d089fc2..c20f8740b74 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -26,14 +26,10 @@
<h2 class="subtitle"><?php echo __('Thank you for your purchase!') ?></h2>
<p><?php echo __('Thanks for your order. We\'ll send you emails with order details and tracking information.') ?></p>
<?php if($_orderIds = $this->getOrderIds()): ?>
- <p>
+ <p class="order-number">
<?php $flag = false ?>
- <?php echo __('Your order number is ') ?>
- <?php foreach ($_orderIds as $orderId=>$incrementId): ?>
- <?php if ($flag): ?><?php echo ', ' ?><?php endif; ?>
- <?php $flag = true ?>
- <a href="<?php echo $this->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a>
- <?php endforeach; ?>
+ <span><?php echo __('Your order number is ') ?></span>
+ <?php foreach ($_orderIds as $orderId=>$incrementId): ?><?php if ($flag): ?><?php echo ', ' ?><?php endif; ?><?php $flag = true ?><a href="<?php echo $this->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a><?php endforeach; ?>
</p>
<?php endif; ?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Newsletter/i18n/de_DE.csv b/app/code/Magento/Newsletter/i18n/de_DE.csv
index fd44fff744f..2fc3bee3bc6 100644
--- a/app/code/Magento/Newsletter/i18n/de_DE.csv
+++ b/app/code/Magento/Newsletter/i18n/de_DE.csv
@@ -1,134 +1,140 @@
-" Copy","Kopie"
-"Action","Aktion"
+Cancel,Abbrechen
+Back,Zurück
+ID,ID
+Action,Aktion
+Reset,Zurücksetzen
+Customer,Kunde
+Guest,Gast
+Email,E-Mail
+Delete,Löschen
+Store,Shop
+"Web Site","Web Site"
+Status,Status
+"Store View",Store-Ansicht
+Type,Typ
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,Vorschau
+Subject,Betreff
+Sent,Gesendet
+"Not Sent","Nicht gesendet"
+Sending,"Wird gesendet"
+Paused,Pausiert
+Newsletter,Newsletter
+Updated,Updated
+"Newsletter Subscription","Newsletter abonnieren"
"Add New Template","Neues Template hinzufügen"
-"Add to Queue","Zur Warteschlange hinzufügen"
-"Allow Guest Subscription","Gast-Abonnement erlauben"
-"An error occurred while saving your subscription.","Ein Fehler ist beim Speichern Ihres Abonnements aufgetreten."
-"Are you sure that you want to delete this template?","Sind Sie sicher, dass Sie diese Vorlage löschen möchten?"
-"Are you sure that you want to strip all tags?","Sind Sie sicher, dass Sie alle Tags entfernen wollen?"
-"Back","Zurück"
-"Cancel","Abbrechen"
-"Cancelled","Abgebrochen"
-"Cannot mark as received subscriber.","Nicht als emfangender Abonnent markierbar."
-"Confirmation Email Sender","Bestätigungs-E-Mail-Absender"
-"Confirmation Email Template","Bestätigungs-E-Mail-Template"
-"Confirmation request has been sent.","Bestätigungs-Anfrage wurde gesendet."
+"Delete Template","Template löschen"
"Convert to Plain Text","In einfachen Text umwandeln"
-"Create Newsletter Template","Newsletter-Template erstellen"
-"Customer","Kunde"
-"Customer First Name","Kunden-Vorname"
-"Customer Last Name","Nachname des Kunden"
-"Customer My Account Newsletter Subscriptions","Kunde Mein Konto Newsletter Abonnements"
-"Date Added","Hinzugefügt am"
-"Date Updated","Aktualisierungsdatum"
-"Delete","Löschen"
+"Preview Template","Vorschau der Vorlage"
+"Save Template","Vorlage speichern"
+"Template Information",Vorlagen-Information
+"Template Name","Name der Vorlage"
+"Template Subject",Vorlagen-Betreff
+"Template Content",Vorlagen-Inhalt
+"Template Styles",Vorlagenstile
+"Edit Template","Template bearbeiten"
+"New Template","Neue Vorlage"
+Template,Template
+"Are you sure that you want to delete this template?","Sind Sie sicher, dass Sie diese Vorlage löschen möchten?"
+"Sender Name","Absender Name"
+"Sender Email","Absender E-Mail"
+Message,Nachricht
+Recipients,Empfänger
+"Please enter a valid email address.","Bitte geben Sie eine gültige E-Mail Adresse ein"
"Delete Selected Problems","Ausgewählte Probleme löschen"
-"Delete Template","Template löschen"
-"Do you really want to cancel the queue?","Wollen Sie wirklich die Warteschlange abbrechen?"
-"Duplicate template code.","Doppelter Template-Code."
+"Unsubscribe Selected","""Abonnement beenden"" ausgewählt"
+"Save Newsletter","Newsletter speichern"
+"Save and Resume","Speichern und fortfahren"
+"View Newsletter","Newsletter ansehen"
"Edit Newsletter","Newsletter bearbeiten"
+"Queue Information","Warteschlange Informationen"
+"Queue Date Start","Queue Date Start"
+"Subscribers From","Abonennten aus"
+"Newsletter Styles",Newsletterstile
+Start,Start
+Pause,Pause
+"Do you really want to cancel the queue?","Wollen Sie wirklich die Warteschlange abbrechen?"
+Resume,Fortfahren
+"Newsletter Templates","Newsletter Vorlagen"
+"Return HTML Version","HTML Version zurückholen"
+"Save As","Speichern unter"
"Edit Newsletter Template","Newsletter-Template bearbeiten"
-"Edit Queue","Warteschlange bearbeiten"
-"Edit Template","Template bearbeiten"
-"Email","E-Mail"
-"Error Code","Fehlercode"
-"Error Text","Fehlertext"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Folgen sie diesem Link um sich abzumelden <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","Gast"
-"ID","ID"
-"Invalid queue selected.","Ungültige Warteschlange ausgewählt."
-"Invalid subscription ID.","Ungültige Abonnement ID."
-"Invalid subscription confirmation code.","Ungültiger Abonnement Bestätigungscode."
-"Message","Nachricht"
-"Need to Confirm","Bestätigung erforderlich"
"New Newsletter Template","Neue Newsletter Vorlage"
-"New Template","Neue Vorlage"
-"Newsletter","Newsletter"
-"Newsletter Message Preview","Newsletternachricht Vorschau"
+"No Templates Found","Keine Vorlagen gefunden"
+Added,Added
+Sender,Absender
+"Template Type",Vorlagentyp
+"Queue Newsletter...","Warteschlange Newsletter..."
+"Newsletter Problems Report","Newsletter Problems Report"
"Newsletter Problem Reports","Newsletter Problembericht"
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
"Newsletter Queue","Newsletter Warteschlange"
-"Newsletter Section","Newsletterabschnitt"
-"Newsletter Styles","Newsletterstile"
+"Edit Queue","Warteschlange bearbeiten"
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
"Newsletter Subscribers","Newsletter Bezieher"
-"Newsletter Subscription","Newsletter abonnieren"
-"Newsletter Subscription Form Before","Vorhergehende Anmeldung zum Newsletter"
-"Newsletter Subscriptions","Newsletter Abos"
-"Newsletter Templates","Newsletter Vorlagen"
-"Newsletter subscription confirmation","Newsletter Abonnementbestätigung"
-"Newsletter subscription success","Newsletter Abonnement erfolgreich"
-"Newsletter unsubscription success","Newsletter Abonnement erfolgreich gekündigt"
-"No Templates Found","Keine Vorlagen gefunden"
-"No problems found.","Keine Probleme gefunden."
-"No subscribers selected.","Keine Abonnenten gewählt."
-"Not Activated","Nicht aktiviert"
-"Not Sent","Nicht gesendet"
-"Pause","Pause"
-"Paused","Pausiert"
-"Please enter a valid email address.","Bitte geben Sie eine gültige E-Mail Adresse ein"
-"Please enter new template name","Bitte geben Sie einen neuen Vorlagennamen ein"
-"Please refer to exeption.log","Bitte sehen sie hier nach: Ausnahmen.log"
-"Please select subscriber(s)","Bitte wählen Sie den/die Abonnent/en"
-"Preview","Vorschau"
-"Preview Template","Vorschau der Vorlage"
-"Processed","Verarbeitet"
-"Queue Start Date","Warteschlange Datum Start"
-"Queue End","Warteschlange Fertig"
-"Queue Information","Warteschlange Informationen"
-"Queue Newsletter...","Warteschlange Newsletter..."
-"Queue Start","Warteschlange Start"
-"Queue Subject","Warteschlange Gegendstand"
-"Recipients","Empfänger"
-"Reset","Zurücksetzen"
-"Resume","Fortfahren"
-"Return HTML Version","HTML Version zurückholen"
-"Save As","Speichern unter"
-"Save Newsletter","Newsletter speichern"
-"Save Template","Vorlage speichern"
-"Save and Resume","Speichern und fortfahren"
-"Selected problem subscribers have been unsubscribed.","Ausgewählte Problemabonnenten wurden gekündigt."
-"Selected problems have been deleted.","Ausgewählte Probleme wurden gelöscht."
-"Sender","Absender"
-"Sender Email","Absender E-Mail"
-"Sender Name","Absender Name"
-"Sending","Wird gesendet"
-"Sent","Gesendet"
-"Sign Up for Our Newsletter:","Melden Sie sich für unseren Newsletter an:"
-"Sign up for our newsletter","Melden Sie sich für unseren Newsletter an"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","Wir bitten um Entschuldigung, aber der Administrator hat die Anmeldung für Gäste verweigert. Bitte <a href=""%s"">register</a>."
-"Start","Start"
-"Status","Status"
-"Store","Shop"
-"Store View","Store-Ansicht"
-"Subject","Betreff"
-"Subscribe","Abonnieren"
-"Subscribed","Abonniert"
-"Subscriber","Abonnent"
-"Subscribers","Abonnenten"
-"Subscribers From","Abonennten aus"
-"Subscription Options","Abonnement Optionen"
-"Success Email Sender","Erfolg E-Mail-Absender"
-"Success Email Template","Erfolg E-Mail-Vorlage"
-"Template Content","Vorlagen-Inhalt"
-"Template Information","Vorlagen-Information"
-"Template Name","Name der Vorlage"
-"Template Styles","Vorlagenstile"
-"Template Subject","Vorlagen-Betreff"
-"Template Type","Vorlagentyp"
+Subscribers,Abonnenten
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template","Newsletter-Template erstellen"
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
"Thank you for your subscription.","Danke für Ihr Abonnement."
-"The subscription has been removed.","Das Abonnement wurde entfernt."
-"The subscription has been saved.","Das Abonnement wurde gespeichert."
-"There was a problem with the subscription.","Bei dem Abonnement ist ein Problem aufgetreten."
-"There was a problem with the subscription: %s","Beim Abonnement ist ein Problem aufgetreten: %s"
-"There was a problem with the un-subscription.","Bei der Kündigung des Abonnements ist ein Problem aufgetreten."
-"This email address is already assigned to another user.","Diese E-Mail-Adresse wird schon von einem anderen Nutzer verwendet."
-"Type","Typ"
-"Unconfirmed","Unbestätigt"
-"Unsubscribe","Abonnement kündigen"
-"Unsubscribe Selected","""Abonnement beenden"" ausgewählt"
-"Unsubscribed","Abonnements gekündigt"
-"Unsubscription Email Sender","Kündigungs-E-Mail-Absender"
-"Unsubscription Email Template","E-Mail-Vorlage zur Beendigung des Abonnements"
-"View Newsletter","Newsletter ansehen"
-"Website","Website"
-"You have been unsubscribed.","Ihr Abonnement wurde gekündigt."
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
"Your subscription has been confirmed.","Ihr Abonnement wurde bestätigt."
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.","Ihr Abonnement wurde gekündigt."
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.","Diese E-Mail-Adresse wird schon von einem anderen Nutzer verwendet."
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,Abgebrochen
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview","Newsletternachricht Vorschau"
+"Add to Queue","Zur Warteschlange hinzufügen"
+"Are you sure that you want to strip all tags?","Sind Sie sicher, dass Sie alle Tags entfernen wollen?"
+"Please enter new template name.","Please enter new template name."
+" Copy",Kopie
+"Sign Up for Our Newsletter:","Melden Sie sich für unseren Newsletter an:"
+"Enter your email address","Enter your email address"
+Subscribe,Abonnieren
+CSV,CSV
+"Excel XML","Excel XML"
+"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
+"Success Email Sender","Success Email Sender"
+"Success Email Template","Success Email Template"
+"Unsubscription Email Sender","Unsubscription Email Sender"
+"Unsubscription Email Template","Unsubscription Email Template"
+"We found no problems.","We found no problems."
+Subscriber,Abonnent
+"Queue Start Date","Warteschlange Datum Start"
+"Queue Subject","Warteschlange Gegendstand"
+"Error Code",Fehlercode
+"Error Text",Fehlertext
+"Queue Start","Warteschlange Start"
+"Queue End","Warteschlange Fertig"
+Processed,Verarbeitet
+Unsubscribe,"Abonnement kündigen"
+"Customer First Name",Kunden-Vorname
+"Customer Last Name","Nachname des Kunden"
+"Not Activated","Nicht aktiviert"
+Subscribed,Abonniert
+Unsubscribed,"Abonnements gekündigt"
+Unconfirmed,Unbestätigt
diff --git a/app/code/Magento/Newsletter/i18n/en_US.csv b/app/code/Magento/Newsletter/i18n/en_US.csv
index bc3c12f9c96..ac79fef143e 100644
--- a/app/code/Magento/Newsletter/i18n/en_US.csv
+++ b/app/code/Magento/Newsletter/i18n/en_US.csv
@@ -1,137 +1,140 @@
-" Copy"," Copy"
-"Action","Action"
+Cancel,Cancel
+Back,Back
+ID,ID
+Action,Action
+Reset,Reset
+Customer,Customer
+Guest,Guest
+Email,Email
+Delete,Delete
+Store,Store
+"Web Site","Web Site"
+Status,Status
+"Store View","Store View"
+Type,Type
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,Preview
+Subject,Subject
+Sent,Sent
+"Not Sent","Not Sent"
+Sending,Sending
+Paused,Paused
+Newsletter,Newsletter
+Updated,Updated
+"Newsletter Subscription","Newsletter Subscription"
"Add New Template","Add New Template"
-"Add to Queue","Add to Queue"
-"Allow Guest Subscription","Allow Guest Subscription"
-"An error occurred while saving your subscription.","An error occurred while saving your subscription."
-"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
-"Are you sure that you want to strip all tags?","Are you sure that you want to strip all tags?"
-"Back","Back"
-"Cancel","Cancel"
-"Cancelled","Cancelled"
-"Cannot mark as received subscriber.","Cannot mark as received subscriber."
-"Confirmation Email Sender","Confirmation Email Sender"
-"Confirmation Email Template","Confirmation Email Template"
-"Confirmation request has been sent.","Confirmation request has been sent."
+"Delete Template","Delete Template"
"Convert to Plain Text","Convert to Plain Text"
-"Create Newsletter Template","Create Newsletter Template"
-"Customer","Customer"
-"Customer First Name","Customer First Name"
-"Customer Last Name","Customer Last Name"
-"Customer My Account Newsletter Subscriptions","Customer My Account Newsletter Subscriptions"
-"Date Added","Date Added"
-"Date Updated","Date Updated"
-"Delete","Delete"
+"Preview Template","Preview Template"
+"Save Template","Save Template"
+"Template Information","Template Information"
+"Template Name","Template Name"
+"Template Subject","Template Subject"
+"Template Content","Template Content"
+"Template Styles","Template Styles"
+"Edit Template","Edit Template"
+"New Template","New Template"
+Template,Template
+"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
+"Sender Name","Sender Name"
+"Sender Email","Sender Email"
+Message,Message
+Recipients,Recipients
+"Please enter a valid email address.","Please enter a valid email address."
"Delete Selected Problems","Delete Selected Problems"
-"Delete Template","Delete Template"
-"Do you really want to cancel the queue?","Do you really want to cancel the queue?"
-"Duplicate template code.","Duplicate template code."
+"Unsubscribe Selected","Unsubscribe Selected"
+"Save Newsletter","Save Newsletter"
+"Save and Resume","Save and Resume"
+"View Newsletter","View Newsletter"
"Edit Newsletter","Edit Newsletter"
+"Queue Information","Queue Information"
+"Queue Date Start","Queue Date Start"
+"Subscribers From","Subscribers From"
+"Newsletter Styles","Newsletter Styles"
+Start,Start
+Pause,Pause
+"Do you really want to cancel the queue?","Do you really want to cancel the queue?"
+Resume,Resume
+"Newsletter Templates","Newsletter Templates"
+"Return HTML Version","Return HTML Version"
+"Save As","Save As"
"Edit Newsletter Template","Edit Newsletter Template"
-"Edit Queue","Edit Queue"
-"Edit Template","Edit Template"
-"Email","Email"
-"Enter your email address","Enter your email address"
-"Error Code","Error Code"
-"Error Text","Error Text"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","Guest"
-"ID","ID"
-"Invalid queue selected.","Invalid queue selected."
-"Invalid subscription ID.","Invalid subscription ID."
-"Invalid subscription confirmation code.","Invalid subscription confirmation code."
-"Message","Message"
-"Need to Confirm","Need to Confirm"
"New Newsletter Template","New Newsletter Template"
-"New Template","New Template"
-"Newsletter","Newsletter"
-"Newsletter Message Preview","Newsletter Message Preview"
+"No Templates Found","No Templates Found"
+Added,Added
+Sender,Sender
+"Template Type","Template Type"
+"Queue Newsletter...","Queue Newsletter..."
+"Newsletter Problems Report","Newsletter Problems Report"
"Newsletter Problem Reports","Newsletter Problem Reports"
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
"Newsletter Queue","Newsletter Queue"
-"Newsletter Section","Newsletter Section"
-"Newsletter Sign-up:","Newsletter Sign-up:"
-"Newsletter Styles","Newsletter Styles"
+"Edit Queue","Edit Queue"
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
"Newsletter Subscribers","Newsletter Subscribers"
-"Newsletter Subscription","Newsletter Subscription"
-"Newsletter Subscription Form Before","Newsletter Subscription Form Before"
-"Newsletter Subscriptions","Newsletter Subscriptions"
-"Newsletter Templates","Newsletter Templates"
-"Newsletter subscription confirmation","Newsletter subscription confirmation"
-"Newsletter subscription success","Newsletter subscription success"
-"Newsletter unsubscription success","Newsletter unsubscription success"
-"No Templates Found","No Templates Found"
-"No problems found.","No problems found."
-"No subscribers selected.","No subscribers selected."
-"Not Activated","Not Activated"
-"Not Sent","Not Sent"
-"Pause","Pause"
-"Paused","Paused"
-"Please enter a valid email address.","Please enter a valid email address."
-"Please enter new template name","Please enter new template name"
-"Please refer to exeption.log","Please refer to exeption.log"
-"Please select subscriber(s)","Please select subscriber(s)"
-"Preview","Preview"
-"Preview Template","Preview Template"
-"Processed","Processed"
-"Queue Start Date","Queue Start Date"
-"Queue End","Queue End"
-"Queue Information","Queue Information"
-"Queue Newsletter...","Queue Newsletter..."
-"Queue Start","Queue Start"
-"Queue Subject","Queue Subject"
-"Recipients","Recipients"
-"Reset","Reset"
-"Resume","Resume"
-"Return HTML Version","Return HTML Version"
-"Save As","Save As"
-"Save Newsletter","Save Newsletter"
-"Save Template","Save Template"
-"Save and Resume","Save and Resume"
-"Selected problem subscribers have been unsubscribed.","Selected problem subscribers have been unsubscribed."
-"Selected problems have been deleted.","Selected problems have been deleted."
-"Sender","Sender"
-"Sender Email","Sender Email"
-"Sender Name","Sender Name"
-"Sending","Sending"
-"Sent","Sent"
+Subscribers,Subscribers
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template","Create Newsletter Template"
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
+"Thank you for your subscription.","Thank you for your subscription."
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
+"Your subscription has been confirmed.","Your subscription has been confirmed."
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.","You have been unsubscribed."
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.","This email address is already assigned to another user."
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,Cancelled
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview","Newsletter Message Preview"
+"Add to Queue","Add to Queue"
+"Are you sure that you want to strip all tags?","Are you sure that you want to strip all tags?"
+"Please enter new template name.","Please enter new template name."
+" Copy"," Copy"
"Sign Up for Our Newsletter:","Sign Up for Our Newsletter:"
-"Sign up for our newsletter","Sign up for our newsletter"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>."
-"Start","Start"
-"Status","Status"
-"Store","Store"
-"Store View","Store View"
-"Subject","Subject"
-"Submit","Submit"
-"Subscribe","Subscribe"
-"Subscribed","Subscribed"
-"Subscriber","Subscriber"
-"Subscribers","Subscribers"
-"Subscribers From","Subscribers From"
+"Enter your email address","Enter your email address"
+Subscribe,Subscribe
+CSV,CSV
+"Excel XML","Excel XML"
"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
"Success Email Sender","Success Email Sender"
"Success Email Template","Success Email Template"
-"Template Content","Template Content"
-"Template Information","Template Information"
-"Template Name","Template Name"
-"Template Styles","Template Styles"
-"Template Subject","Template Subject"
-"Template Type","Template Type"
-"Thank you for your subscription.","Thank you for your subscription."
-"The subscription has been removed.","The subscription has been removed."
-"The subscription has been saved.","The subscription has been saved."
-"There was a problem with the subscription.","There was a problem with the subscription."
-"There was a problem with the subscription: %s","There was a problem with the subscription: %s"
-"There was a problem with the un-subscription.","There was a problem with the un-subscription."
-"This email address is already assigned to another user.","This email address is already assigned to another user."
-"Type","Type"
-"Unconfirmed","Unconfirmed"
-"Unsubscribe","Unsubscribe"
-"Unsubscribe Selected","Unsubscribe Selected"
-"Unsubscribed","Unsubscribed"
"Unsubscription Email Sender","Unsubscription Email Sender"
"Unsubscription Email Template","Unsubscription Email Template"
-"View Newsletter","View Newsletter"
-"Website","Website"
-"You have been unsubscribed.","You have been unsubscribed."
-"Your subscription has been confirmed.","Your subscription has been confirmed."
+"We found no problems.","We found no problems."
+Subscriber,Subscriber
+"Queue Start Date","Queue Start Date"
+"Queue Subject","Queue Subject"
+"Error Code","Error Code"
+"Error Text","Error Text"
+"Queue Start","Queue Start"
+"Queue End","Queue End"
+Processed,Processed
+Unsubscribe,Unsubscribe
+"Customer First Name","Customer First Name"
+"Customer Last Name","Customer Last Name"
+"Not Activated","Not Activated"
+Subscribed,Subscribed
+Unsubscribed,Unsubscribed
+Unconfirmed,Unconfirmed
diff --git a/app/code/Magento/Newsletter/i18n/es_ES.csv b/app/code/Magento/Newsletter/i18n/es_ES.csv
index 64719c1eb2f..3be9617100d 100644
--- a/app/code/Magento/Newsletter/i18n/es_ES.csv
+++ b/app/code/Magento/Newsletter/i18n/es_ES.csv
@@ -1,134 +1,140 @@
-" Copy","Copiar"
-"Action","Acción"
+Cancel,Cancelar
+Back,Volver
+ID,ID
+Action,Acción
+Reset,Restablecer
+Customer,Cliente
+Guest,Invitado
+Email,"Correo electrónico"
+Delete,Eliminar
+Store,Tienda
+"Web Site","Web Site"
+Status,Estado
+"Store View","Ver Tienda"
+Type,Tipo
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,"Vista Previa"
+Subject,Asunto
+Sent,Enviada
+"Not Sent","No enviado"
+Sending,Enviando
+Paused,"En pausa"
+Newsletter,"BoletÃn informativo"
+Updated,Updated
+"Newsletter Subscription","Suscripción al boletÃn de noticias"
"Add New Template","Agregar nueva plantilla"
-"Add to Queue","Agregar a la cola"
-"Allow Guest Subscription","Permitir suscripción de invitados"
-"An error occurred while saving your subscription.","Se produjo un error al guardar su suscripción."
-"Are you sure that you want to delete this template?","¿Está seguro de que quiere borrar esta plantilla?"
-"Are you sure that you want to strip all tags?","¿Está seguro de que desea eliminar todas las etiquetas?"
-"Back","Volver"
-"Cancel","Cancelar"
-"Cancelled","Cancelado"
-"Cannot mark as received subscriber.","No se puede marcar como suscriptor recibido."
-"Confirmation Email Sender","Remitente del correo electrónico de confirmación"
-"Confirmation Email Template","Plantilla de correo electrónico de confimación"
-"Confirmation request has been sent.","Se envió la solicitud de confirmación."
-"Convert to Plain Text","Convertir a texto sin formato"
-"Create Newsletter Template","Crear plantilla de boletÃn informativo"
-"Customer","Cliente"
-"Customer First Name","Nombre del cliente"
-"Customer Last Name","Apellido del cliente"
-"Customer My Account Newsletter Subscriptions","Suscripciones al boletÃn informativo Mi cuenta del cliente"
-"Date Added","Añadido el dÃa"
-"Date Updated","Fecha de actualización"
-"Delete","Eliminar"
-"Delete Selected Problems","Eliminar problemas seleccionados"
"Delete Template","Eliminar plantilla"
-"Do you really want to cancel the queue?","¿Realmente desea cancelar la cola?"
-"Duplicate template code.","Código de plantilla duplicado."
-"Edit Newsletter","Editar boletÃn informativo"
-"Edit Newsletter Template","Editar plantilla de boletÃn informativo"
-"Edit Queue","Editar cola"
+"Convert to Plain Text","Convertir a texto sin formato"
+"Preview Template","Vista previa de plantilla"
+"Save Template","Guardar Plantilla"
+"Template Information","Información de la plantilla"
+"Template Name","Nombre de Plantilla"
+"Template Subject","Tema de la plantilla"
+"Template Content","Contenido de la plantilla"
+"Template Styles","Estilos de Plantilla"
"Edit Template","Editar plantilla"
-"Email","Correo electrónico"
-"Error Code","Código de error"
-"Error Text","Texto de error"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Siga este enlace para anular su suscripción <!-- Esta etiqueta es para el enlace de anulación--><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","Invitado"
-"ID","ID"
-"Invalid queue selected.","La cola seleccionada es inválida."
-"Invalid subscription ID.","ID de suscripción no válido."
-"Invalid subscription confirmation code.","Código de confirmación de suscripción inválido."
-"Message","Mensaje"
-"Need to Confirm","Debe Confirmar"
-"New Newsletter Template","Plantilla de BoletÃn de Noticias Nueva"
"New Template","Nueva Plantilla"
-"Newsletter","BoletÃn informativo"
-"Newsletter Message Preview","Vista Previa del Mensaje del BoletÃn de Noticias"
-"Newsletter Problem Reports","Informe de Problemas del BoletÃn de Noticias"
-"Newsletter Queue","Cola de BoletÃn de Noticias"
-"Newsletter Section","Sección del BoletÃn de Noticias"
-"Newsletter Styles","Estilos del BoletÃn de Noticias"
-"Newsletter Subscribers","Suscriptores de BoletÃn de Noticias"
-"Newsletter Subscription","Suscripción al boletÃn de noticias"
-"Newsletter Subscription Form Before","Formulario de suscripción al boletÃn antes"
-"Newsletter Subscriptions","Suscripciones al BoletÃn de Noticias"
-"Newsletter Templates","Plantillas de BoletÃn de Noticias"
-"Newsletter subscription confirmation","Confirmación de suscripción al BoletÃn de Noticias"
-"Newsletter subscription success","Suscripción al BoletÃn de Noticias finalizada con éxito"
-"Newsletter unsubscription success","Cancelación de suscripción al BoletÃn de Noticias finalizada con éxito"
-"No Templates Found","No se Encontraron Plantillas"
-"No problems found.","No se Encontraron Problemas."
-"No subscribers selected.","No se seleccionaron suscriptores."
-"Not Activated","No Activado"
-"Not Sent","No enviado"
-"Pause","Pausa"
-"Paused","En pausa"
+Template,Template
+"Are you sure that you want to delete this template?","¿Está seguro de que quiere borrar esta plantilla?"
+"Sender Name","Nombre del Remitente"
+"Sender Email","E-mail del Remitente"
+Message,Mensaje
+Recipients,Destinatarios
"Please enter a valid email address.","Introduzca una dirección de correo electrónico válida."
-"Please enter new template name","Introduzca un nombre de nueva plantilla"
-"Please refer to exeption.log","Por favor vaya a exeption.log"
-"Please select subscriber(s)","Seleccione suscriptor(es)"
-"Preview","Vista Previa"
-"Preview Template","Vista previa de plantilla"
-"Processed","Procesado"
-"Queue Start Date","Fecha de Inicio de la Cola"
-"Queue End","Final de Cola"
-"Queue Information","Información de Cola"
-"Queue Newsletter...","BoletÃn de Noticias en Cola..."
-"Queue Start","Inicio de Cola"
-"Queue Subject","Asunto de Cola"
-"Recipients","Destinatarios"
-"Reset","Restablecer"
-"Resume","Reanudar"
-"Return HTML Version","Devolver Versión HTML"
-"Save As","Guardar Como"
+"Delete Selected Problems","Eliminar problemas seleccionados"
+"Unsubscribe Selected","Cancelar Suscripción Seleccionado"
"Save Newsletter","Guardar BoletÃn de Noticias"
-"Save Template","Guardar Plantilla"
"Save and Resume","Guardar y Reanudar"
-"Selected problem subscribers have been unsubscribed.","Se ha cancelado la suscripción de los suscriptores con problemas."
-"Selected problems have been deleted.","Se han borrado los problemas seleccionados."
-"Sender","Remitente"
-"Sender Email","E-mail del Remitente"
-"Sender Name","Nombre del Remitente"
-"Sending","Enviando"
-"Sent","Enviada"
-"Sign Up for Our Newsletter:","SuscrÃbase a Nuestro BoletÃn de Noticias:"
-"Sign up for our newsletter","SuscrÃbase a nuestro boletÃn de noticias"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","Lo sentimos pero el administrador denegó la suscripción para invitados. Por favor, <a href=""%s"">register</a>."
-"Start","Comenzar"
-"Status","Estado"
-"Store","Tienda"
-"Store View","Ver Tienda"
-"Subject","Asunto"
-"Subscribe","Suscribirse"
-"Subscribed","Suscrito"
-"Subscriber","Suscriptor"
-"Subscribers","Suscriptores"
+"View Newsletter","Ver boletÃn de noticias"
+"Edit Newsletter","Editar boletÃn informativo"
+"Queue Information","Información de Cola"
+"Queue Date Start","Queue Date Start"
"Subscribers From","Suscriptores De"
-"Subscription Options","Opciones de Suscripción"
-"Success Email Sender","Remitente de Correo Electrónico Finalizado con Éxito"
-"Success Email Template","Plantilla de Correo Electrónico Finalizada con Éxito"
-"Template Content","Contenido de la plantilla"
-"Template Information","Información de la plantilla"
-"Template Name","Nombre de Plantilla"
-"Template Styles","Estilos de Plantilla"
-"Template Subject","Tema de la plantilla"
+"Newsletter Styles","Estilos del BoletÃn de Noticias"
+Start,Comenzar
+Pause,Pausa
+"Do you really want to cancel the queue?","¿Realmente desea cancelar la cola?"
+Resume,Reanudar
+"Newsletter Templates","Plantillas de BoletÃn de Noticias"
+"Return HTML Version","Devolver Versión HTML"
+"Save As","Guardar Como"
+"Edit Newsletter Template","Editar plantilla de boletÃn informativo"
+"New Newsletter Template","Plantilla de BoletÃn de Noticias Nueva"
+"No Templates Found","No se Encontraron Plantillas"
+Added,Added
+Sender,Remitente
"Template Type","Tipo de Plantilla"
+"Queue Newsletter...","BoletÃn de Noticias en Cola..."
+"Newsletter Problems Report","Newsletter Problems Report"
+"Newsletter Problem Reports","Informe de Problemas del BoletÃn de Noticias"
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
+"Newsletter Queue","Cola de BoletÃn de Noticias"
+"Edit Queue","Editar cola"
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
+"Newsletter Subscribers","Suscriptores de BoletÃn de Noticias"
+Subscribers,Suscriptores
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template","Crear plantilla de boletÃn informativo"
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
"Thank you for your subscription.","Gracias por su suscripción."
-"The subscription has been removed.","La suscripción ha sido eliminada."
-"The subscription has been saved.","La suscripción se ha guardado."
-"There was a problem with the subscription.","Hubo un problema con la suscripción."
-"There was a problem with the subscription: %s","Hubo un problema con la suscripción: %s"
-"There was a problem with the un-subscription.","Hubo un problema con la cancelación de la suscripción."
-"This email address is already assigned to another user.","Esta dirección de correo ya se asignó a otro usuario."
-"Type","Tipo"
-"Unconfirmed","Sin confirmar"
-"Unsubscribe","Cancelar suscripción"
-"Unsubscribe Selected","Cancelar Suscripción Seleccionado"
-"Unsubscribed","Suscripción cancelada"
-"Unsubscription Email Sender","Remitente del Email de cancelación de suscripción"
-"Unsubscription Email Template","Plantilla de Email de Cancelar Suscripción"
-"View Newsletter","Ver boletÃn de noticias"
-"Website","Sitio web"
-"You have been unsubscribed.","Ha cancelado su subscripción."
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
"Your subscription has been confirmed.","Su suscripción ha sido confirmada."
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.","Ha cancelado su subscripción."
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.","Esta dirección de correo ya se asignó a otro usuario."
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,Cancelado
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview","Vista Previa del Mensaje del BoletÃn de Noticias"
+"Add to Queue","Agregar a la cola"
+"Are you sure that you want to strip all tags?","¿Está seguro de que desea eliminar todas las etiquetas?"
+"Please enter new template name.","Please enter new template name."
+" Copy",Copiar
+"Sign Up for Our Newsletter:","SuscrÃbase a Nuestro BoletÃn de Noticias:"
+"Enter your email address","Enter your email address"
+Subscribe,Suscribirse
+CSV,CSV
+"Excel XML","Excel XML"
+"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
+"Success Email Sender","Success Email Sender"
+"Success Email Template","Success Email Template"
+"Unsubscription Email Sender","Unsubscription Email Sender"
+"Unsubscription Email Template","Unsubscription Email Template"
+"We found no problems.","We found no problems."
+Subscriber,Suscriptor
+"Queue Start Date","Fecha de Inicio de la Cola"
+"Queue Subject","Asunto de Cola"
+"Error Code","Código de error"
+"Error Text","Texto de error"
+"Queue Start","Inicio de Cola"
+"Queue End","Final de Cola"
+Processed,Procesado
+Unsubscribe,"Cancelar suscripción"
+"Customer First Name","Nombre del cliente"
+"Customer Last Name","Apellido del cliente"
+"Not Activated","No Activado"
+Subscribed,Suscrito
+Unsubscribed,"Suscripción cancelada"
+Unconfirmed,"Sin confirmar"
diff --git a/app/code/Magento/Newsletter/i18n/fr_FR.csv b/app/code/Magento/Newsletter/i18n/fr_FR.csv
index 24b91b5113c..cec853133f4 100644
--- a/app/code/Magento/Newsletter/i18n/fr_FR.csv
+++ b/app/code/Magento/Newsletter/i18n/fr_FR.csv
@@ -1,134 +1,140 @@
-" Copy","Copier"
-"Action","Action"
+Cancel,Annuler
+Back,Retour
+ID,ID
+Action,Action
+Reset,Réinitialiser
+Customer,Client
+Guest,Invité
+Email,Email
+Delete,Supprimer
+Store,Magasin
+"Web Site","Web Site"
+Status,Statut
+"Store View","Vue du magasin"
+Type,Type
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,Prévisualisation
+Subject,Sujet
+Sent,Envoyé
+"Not Sent","Non envoyé"
+Sending,Envoi
+Paused,"En pause"
+Newsletter,Newsletter
+Updated,Updated
+"Newsletter Subscription","Abonnement à la newsletter"
"Add New Template","Ajouter un nouveau modèle"
-"Add to Queue","Ajouter à la file d'attente"
-"Allow Guest Subscription","Autoriser l'abonnement d'invités"
-"An error occurred while saving your subscription.","Une erreur est survenue lors de l'enregistrement de vous abonnement."
-"Are you sure that you want to delete this template?","Voulez-vous vraiment supprimer ce modèle ?"
-"Are you sure that you want to strip all tags?","Voulez-vous vraiment enlever tous les tags ?"
-"Back","Retour"
-"Cancel","Annuler"
-"Cancelled","Annulé"
-"Cannot mark as received subscriber.","Impossible de marquer comme abonné reçu."
-"Confirmation Email Sender","Expéditeur de l'e-mail de confirmation"
-"Confirmation Email Template","Modèle de l'e-mail de confirmation"
-"Confirmation request has been sent.","La demande de confirmation a été envoyée."
-"Convert to Plain Text","Convertir en texte intégral"
-"Create Newsletter Template","Créer un modèle de newsletter"
-"Customer","Client"
-"Customer First Name","Prénom du client"
-"Customer Last Name","Nom du client"
-"Customer My Account Newsletter Subscriptions","Client Mon Compte Abonnements à la newsletter"
-"Date Added","Date ajoutée"
-"Date Updated","Date de mise à jour"
-"Delete","Supprimer"
-"Delete Selected Problems","Supprimer les problèmes sélectionnés."
"Delete Template","Supprimer le modèle"
-"Do you really want to cancel the queue?","Voulez-vous vraiment effacer la fille d'attente ?"
-"Duplicate template code.","Dupliquer le code du modèle."
-"Edit Newsletter","Modifier la newsletter"
-"Edit Newsletter Template","Modifier le modèle de la newsletter"
-"Edit Queue","Modifier la file d'attente"
+"Convert to Plain Text","Convertir en texte intégral"
+"Preview Template","Voir un aperçu du modèle"
+"Save Template","Enregistrer le modèle"
+"Template Information","Information du modèle"
+"Template Name","Nom du formulaire"
+"Template Subject","Sujet du modèle"
+"Template Content","Contenu du modèle"
+"Template Styles","Styles de modèle"
"Edit Template","Modifier le modèle"
-"Email","Email"
-"Error Code","Erreur code"
-"Error Text","Erreur texte"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Cliquez sur ce lien pour vous désabonner <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","Invité"
-"ID","ID"
-"Invalid queue selected.","La file d'attente sélectionnée est invalide."
-"Invalid subscription ID.","L'ID de souscription est invalide."
-"Invalid subscription confirmation code.","Le code de confirmation de l'abonnement est invalide."
-"Message","Message"
-"Need to Confirm","Besoin de confirmation"
-"New Newsletter Template","Nouveau modèle de newsletter"
"New Template","Nouveau modèle"
-"Newsletter","Newsletter"
-"Newsletter Message Preview","Prévisualisation du message de la newsletter"
-"Newsletter Problem Reports","Rapport des problèmes de la newsletter"
-"Newsletter Queue","Fille d'attente de la newsletter"
-"Newsletter Section","Section newsletter"
-"Newsletter Styles","Styles de newsletter"
-"Newsletter Subscribers","Abonnés à la newsletter"
-"Newsletter Subscription","Abonnement à la newsletter"
-"Newsletter Subscription Form Before","Formulaire d'abonnement à la lettre d'information avant"
-"Newsletter Subscriptions","Abonnements à la newsletter"
-"Newsletter Templates","Modèles de newsletter"
-"Newsletter subscription confirmation","Confirmation de l'abonnement à la newsletter"
-"Newsletter subscription success","Abonnement à la newsletter effectué"
-"Newsletter unsubscription success","Désabonnement à la newsletter effectué"
-"No Templates Found","Aucun modèle trouvé"
-"No problems found.","Aucun problème trouvé."
-"No subscribers selected.","Aucun abonné sélectionné."
-"Not Activated","Non activé"
-"Not Sent","Non envoyé"
-"Pause","Pause"
-"Paused","En pause"
+Template,Template
+"Are you sure that you want to delete this template?","Voulez-vous vraiment supprimer ce modèle ?"
+"Sender Name","Nom de l'expéditeur"
+"Sender Email","Expéditeur de l'e-mail"
+Message,Message
+Recipients,Destinataires
"Please enter a valid email address.","Veuillez entrer une adresse e-mail valide."
-"Please enter new template name","Veuillez entrer le nom du nouveau modèle"
-"Please refer to exeption.log","Veuillez vous reporter à exeption.log"
-"Please select subscriber(s)","Veuillez sélectionner un (ou plusieurs) abonné(s)"
-"Preview","Prévisualisation"
-"Preview Template","Voir un aperçu du modèle"
-"Processed","Traité"
-"Queue Start Date","Date de départ de la file d'attente"
-"Queue End","Fin de la file d'attente"
-"Queue Information","Information sur la file d'attente"
-"Queue Newsletter...","File d'attente de la newsletter..."
-"Queue Start","Départ de la file d'attente"
-"Queue Subject","Sujet de la file d'attente"
-"Recipients","Destinataires"
-"Reset","Réinitialiser"
-"Resume","Reprendre"
-"Return HTML Version","Renvoyer la version HTML"
-"Save As","Enregistrer sous"
+"Delete Selected Problems","Supprimer les problèmes sélectionnés."
+"Unsubscribe Selected","Désabonnement sélectionné"
"Save Newsletter","Enregistrer la newsletter"
-"Save Template","Enregistrer le modèle"
"Save and Resume","Enregistrer et reprendre"
-"Selected problem subscribers have been unsubscribed.","Les abonnés à problèmes ont été désabonnés."
-"Selected problems have been deleted.","Les problèmes sélectionnés ont été supprimés."
-"Sender","Expéditeur"
-"Sender Email","Expéditeur de l'e-mail"
-"Sender Name","Nom de l'expéditeur"
-"Sending","Envoi"
-"Sent","Envoyé"
-"Sign Up for Our Newsletter:","Inscrivez-vous à notre newsletter"
-"Sign up for our newsletter","Inscrivez-vous à notre newsletter"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","Désolé, mais l'administrateur n'a pas autorisé l'abonnement des invités. Veuillez <a href=""%s"">vous inscrire</a>."
-"Start","Début"
-"Status","Statut"
-"Store","Magasin"
-"Store View","Vue du magasin"
-"Subject","Sujet"
-"Subscribe","S'inscrire"
-"Subscribed","Inscrit"
-"Subscriber","Abonné"
-"Subscribers","Abonnés"
+"View Newsletter","Voir la newsletter"
+"Edit Newsletter","Modifier la newsletter"
+"Queue Information","Information sur la file d'attente"
+"Queue Date Start","Queue Date Start"
"Subscribers From","Abonnés de"
-"Subscription Options","Options d'abonnement"
-"Success Email Sender","Expéditeur de l'email de succès"
-"Success Email Template","Modèle d'email de succès"
-"Template Content","Contenu du modèle"
-"Template Information","Information du modèle"
-"Template Name","Nom du formulaire"
-"Template Styles","Styles de modèle"
-"Template Subject","Sujet du modèle"
+"Newsletter Styles","Styles de newsletter"
+Start,Début
+Pause,Pause
+"Do you really want to cancel the queue?","Voulez-vous vraiment effacer la fille d'attente ?"
+Resume,Reprendre
+"Newsletter Templates","Modèles de newsletter"
+"Return HTML Version","Renvoyer la version HTML"
+"Save As","Enregistrer sous"
+"Edit Newsletter Template","Modifier le modèle de la newsletter"
+"New Newsletter Template","Nouveau modèle de newsletter"
+"No Templates Found","Aucun modèle trouvé"
+Added,Added
+Sender,Expéditeur
"Template Type","Type de modèle"
+"Queue Newsletter...","File d'attente de la newsletter..."
+"Newsletter Problems Report","Newsletter Problems Report"
+"Newsletter Problem Reports","Rapport des problèmes de la newsletter"
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
+"Newsletter Queue","Fille d'attente de la newsletter"
+"Edit Queue","Modifier la file d'attente"
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
+"Newsletter Subscribers","Abonnés à la newsletter"
+Subscribers,Abonnés
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template","Créer un modèle de newsletter"
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
"Thank you for your subscription.","Merci de vous être inscrit"
-"The subscription has been removed.","L'inscription a été annulée"
-"The subscription has been saved.","L'abonnement a été sauvegardé."
-"There was a problem with the subscription.","Il y a eu un problème dans l'inscription."
-"There was a problem with the subscription: %s","Un problème est survenu avec l'abonnement : %s"
-"There was a problem with the un-subscription.","Il y a eu un problème dans la désinscription."
-"This email address is already assigned to another user.","Cette adresse de courrier électronique a déjà été attribuée à un autre utilisateur."
-"Type","Type"
-"Unconfirmed","Non confirmé"
-"Unsubscribe","Se désinscrire"
-"Unsubscribe Selected","Désabonnement sélectionné"
-"Unsubscribed","Désinscrit"
-"Unsubscription Email Sender","Expéditeur du mail de désinscription"
-"Unsubscription Email Template","Modèle d'e-mail de désabonnement"
-"View Newsletter","Voir la newsletter"
-"Website","Site"
-"You have been unsubscribed.","Votre demande de désinscription a été prise en compte."
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
"Your subscription has been confirmed.","Votre inscription a été confirmée."
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.","Votre demande de désinscription a été prise en compte."
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.","Cette adresse de courrier électronique a déjà été attribuée à un autre utilisateur."
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,Annulé
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview","Prévisualisation du message de la newsletter"
+"Add to Queue","Ajouter à la file d'attente"
+"Are you sure that you want to strip all tags?","Voulez-vous vraiment enlever tous les tags ?"
+"Please enter new template name.","Please enter new template name."
+" Copy",Copier
+"Sign Up for Our Newsletter:","Inscrivez-vous à notre newsletter"
+"Enter your email address","Enter your email address"
+Subscribe,S'inscrire
+CSV,CSV
+"Excel XML","Excel XML"
+"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
+"Success Email Sender","Success Email Sender"
+"Success Email Template","Success Email Template"
+"Unsubscription Email Sender","Unsubscription Email Sender"
+"Unsubscription Email Template","Unsubscription Email Template"
+"We found no problems.","We found no problems."
+Subscriber,Abonné
+"Queue Start Date","Date de départ de la file d'attente"
+"Queue Subject","Sujet de la file d'attente"
+"Error Code","Erreur code"
+"Error Text","Erreur texte"
+"Queue Start","Départ de la file d'attente"
+"Queue End","Fin de la file d'attente"
+Processed,Traité
+Unsubscribe,"Se désinscrire"
+"Customer First Name","Prénom du client"
+"Customer Last Name","Nom du client"
+"Not Activated","Non activé"
+Subscribed,Inscrit
+Unsubscribed,Désinscrit
+Unconfirmed,"Non confirmé"
diff --git a/app/code/Magento/Newsletter/i18n/nl_NL.csv b/app/code/Magento/Newsletter/i18n/nl_NL.csv
index 93fb4b6c7a4..9280f66bdc0 100644
--- a/app/code/Magento/Newsletter/i18n/nl_NL.csv
+++ b/app/code/Magento/Newsletter/i18n/nl_NL.csv
@@ -1,134 +1,140 @@
-" Copy","Kopieer"
-"Action","Actie"
+Cancel,Annuleren
+Back,Terug
+ID,ID
+Action,Actie
+Reset,Opnieuw
+Customer,Klant
+Guest,Gast
+Email,Email
+Delete,Verwijderen
+Store,Winkel
+"Web Site","Web Site"
+Status,Status
+"Store View","Aanblik winkel"
+Type,Type
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,Preview
+Subject,Onderwerp
+Sent,Verzonden
+"Not Sent","Niet verstuurd"
+Sending,Verzenden
+Paused,Gepauzeerd
+Newsletter,Nieuwsbrief
+Updated,Updated
+"Newsletter Subscription","Nieuwsbrief abonnement"
"Add New Template","Nieuw Sjabloon Toevoegen"
-"Add to Queue","Toevoegen aan de wachtrij"
-"Allow Guest Subscription","Sta Gast Subscriptie Toe"
-"An error occurred while saving your subscription.","Er heeft een fout plaatsgevonden tijdens het opslaan van uw subscriptie."
-"Are you sure that you want to delete this template?","Weet je zeker dat je dit sjabloon wilt verwijderen?"
-"Are you sure that you want to strip all tags?","Weet u zeker dat uw alle labels wilt verwijderen?"
-"Back","Terug"
-"Cancel","Annuleren"
-"Cancelled","Geannuleerd"
-"Cannot mark as received subscriber.","Kan niet markeren als ontvangen aanmelder."
-"Confirmation Email Sender","Confirmatie E-mail Verstuurder"
-"Confirmation Email Template","Confirmatie E-mail Sjabloon"
-"Confirmation request has been sent.","Confirmatie verzoek verzonden."
-"Convert to Plain Text","Verander naar Gewone Tekst"
-"Create Newsletter Template","Maak een Nieuw Nieuwsbrief Sjabloon"
-"Customer","Klant"
-"Customer First Name","Voornaam Klant"
-"Customer Last Name","Achternaam Klant"
-"Customer My Account Newsletter Subscriptions","Klant Mijn Account Nieuwsbrief Aanmeldingen"
-"Date Added","Datum Toegevoegd"
-"Date Updated","Bijgewerkt op datum"
-"Delete","Verwijderen"
-"Delete Selected Problems","Verwijder Geselecteerde Problemen"
"Delete Template","Verwijder Template"
-"Do you really want to cancel the queue?","Weet u zeker dat u de wachtrij wilt opheffen?"
-"Duplicate template code.","Sjabloon code is al in gebruik."
-"Edit Newsletter","Nieuwsbrief Aanpassen"
-"Edit Newsletter Template","Nieuwsbrief Sjabloon Aanpassen"
-"Edit Queue","Bewerk Rij"
+"Convert to Plain Text","Verander naar Gewone Tekst"
+"Preview Template","Voorbeeld sjabloon"
+"Save Template","Sjabloon Opslaan"
+"Template Information","Sjabloon informatie"
+"Template Name","Naam sjabloon"
+"Template Subject","Sjabloon Onderwerp"
+"Template Content","Inhoud sjabloon"
+"Template Styles","Sjabloon Stijlen"
"Edit Template","Bewerk Sjabloon"
-"Email","Email"
-"Error Code","Fout Code"
-"Error Text","Fout Omschrijving"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Volg deze link om je af te melden <!-- Deze tag is voor de afmeldingslink --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","Gast"
-"ID","ID"
-"Invalid queue selected.","Ongeldige wachtrij geselecteerd"
-"Invalid subscription ID.","Ongeldig abonnement."
-"Invalid subscription confirmation code.","Ongeldige bevestigingscode abonnement"
-"Message","Boodschap"
-"Need to Confirm","Bevestiging vereist"
-"New Newsletter Template","Nieuwe Nieuwsbrief Sjabloon"
"New Template","Nieuw Sjabloon"
-"Newsletter","Nieuwsbrief"
-"Newsletter Message Preview","Voorbeeld Nieuwsbrief Bericht"
-"Newsletter Problem Reports","Nieuwsbrief Probleem Overzichten"
-"Newsletter Queue","Nieuwsbrief Wachtrij"
-"Newsletter Section","Nieuwsbrief sectie"
-"Newsletter Styles","Nieuwsbrief stijlen"
-"Newsletter Subscribers","Nieuwsbrief abonnees"
-"Newsletter Subscription","Nieuwsbrief abonnement"
-"Newsletter Subscription Form Before","Aanmeldingsformulier nieuwsbrief eerst"
-"Newsletter Subscriptions","Nieuwsbrief abonnementen"
-"Newsletter Templates","Nieuwsbrief sjablonen"
-"Newsletter subscription confirmation","Nieuwsbrief abonnementsbevestiging"
-"Newsletter subscription success","Nieuwsbrief inschrijven geslaagd"
-"Newsletter unsubscription success","Nieuwsbrief uitschrijven geslaagd"
-"No Templates Found","Geen sjablonen gevonden"
-"No problems found.","Geen problemen gevonden."
-"No subscribers selected.","Geen abonnees geselecteerd."
-"Not Activated","Niet geactiveerd"
-"Not Sent","Niet verstuurd"
-"Pause","Pauzeer"
-"Paused","Gepauzeerd"
+Template,Template
+"Are you sure that you want to delete this template?","Weet je zeker dat je dit sjabloon wilt verwijderen?"
+"Sender Name","Naam Afzender"
+"Sender Email","Afzender Email"
+Message,Boodschap
+Recipients,Ontvangers
"Please enter a valid email address.","Voer een geldig email adres in."
-"Please enter new template name","Voer een nieuwe sjabloonnaam in"
-"Please refer to exeption.log","Raadpleeg alstublieft exeption.log"
-"Please select subscriber(s)","Selecteer abonnee(s)"
-"Preview","Preview"
-"Preview Template","Voorbeeld sjabloon"
-"Processed","Verwerkt"
-"Queue Start Date","Startdatum wachtrij"
-"Queue End","Einde Wachtrij"
+"Delete Selected Problems","Verwijder Geselecteerde Problemen"
+"Unsubscribe Selected","Uitschrijving geselecteerd"
+"Save Newsletter","Nieuwsbrief Opslaan"
+"Save and Resume","Opslaan en Doorgaan"
+"View Newsletter","Bekijk nieuwsbrief"
+"Edit Newsletter","Nieuwsbrief Aanpassen"
"Queue Information","Informatie Wachtrij"
-"Queue Newsletter...","Nieuwsbrief Wachtrij..."
-"Queue Start","Begin Wachtrij"
-"Queue Subject","Onderwerp Wachtrij"
-"Recipients","Ontvangers"
-"Reset","Opnieuw"
-"Resume","Ga door (meaning ' continue')"
+"Queue Date Start","Queue Date Start"
+"Subscribers From",Inschrijfformulier
+"Newsletter Styles","Nieuwsbrief stijlen"
+Start,Begin
+Pause,Pauzeer
+"Do you really want to cancel the queue?","Weet u zeker dat u de wachtrij wilt opheffen?"
+Resume,"Ga door (meaning ' continue')"
+"Newsletter Templates","Nieuwsbrief sjablonen"
"Return HTML Version","Laat Zien in HTML"
"Save As","Opslaan Als"
-"Save Newsletter","Nieuwsbrief Opslaan"
-"Save Template","Sjabloon Opslaan"
-"Save and Resume","Opslaan en Doorgaan"
-"Selected problem subscribers have been unsubscribed.","Geselecteerde probleem abonnees zijn losgekoppeld"
-"Selected problems have been deleted.","Geselecteerde problemen zijn verwijderd"
-"Sender","Verzender"
-"Sender Email","Afzender Email"
-"Sender Name","Naam Afzender"
-"Sending","Verzenden"
-"Sent","Verzonden"
-"Sign Up for Our Newsletter:","Schrijf in voor Onze Nieuwsbrief"
-"Sign up for our newsletter","Schrijf in voor onze nieuwsbrief"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","Sorry, maar de beheerder heeft aanmelding voor gasten uitgeschakeld. <a href=""%s"">Registreer u</a> alstublieft."
-"Start","Begin"
-"Status","Status"
-"Store","Winkel"
-"Store View","Aanblik winkel"
-"Subject","Onderwerp"
-"Subscribe","Inschrijven"
-"Subscribed","Uitschrijven"
-"Subscriber","Abonnee"
-"Subscribers","Abonnees"
-"Subscribers From","Inschrijfformulier"
-"Subscription Options","Abonnee opties"
-"Success Email Sender","Email afzender geslaagd"
-"Success Email Template","Email sjabloon geslaagd"
-"Template Content","Inhoud sjabloon"
-"Template Information","Sjabloon informatie"
-"Template Name","Naam sjabloon"
-"Template Styles","Sjabloon Stijlen"
-"Template Subject","Sjabloon Onderwerp"
+"Edit Newsletter Template","Nieuwsbrief Sjabloon Aanpassen"
+"New Newsletter Template","Nieuwe Nieuwsbrief Sjabloon"
+"No Templates Found","Geen sjablonen gevonden"
+Added,Added
+Sender,Verzender
"Template Type","Sjabloon Type"
+"Queue Newsletter...","Nieuwsbrief Wachtrij..."
+"Newsletter Problems Report","Newsletter Problems Report"
+"Newsletter Problem Reports","Nieuwsbrief Probleem Overzichten"
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
+"Newsletter Queue","Nieuwsbrief Wachtrij"
+"Edit Queue","Bewerk Rij"
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
+"Newsletter Subscribers","Nieuwsbrief abonnees"
+Subscribers,Abonnees
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template","Maak een Nieuw Nieuwsbrief Sjabloon"
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
"Thank you for your subscription.","Bedankt voor het inschrijven."
-"The subscription has been removed.","Het abonnement is verwijderd."
-"The subscription has been saved.","Het abonnement is opgeslagen."
-"There was a problem with the subscription.","Er was een probleem bij het inschrijven."
-"There was a problem with the subscription: %s","Er was een probleem bij het inschrijven: %s"
-"There was a problem with the un-subscription.","Er was een probleem bij het uitschrijven."
-"This email address is already assigned to another user.","Dit emailadres wordt al door een andere gebruiker gebruikt."
-"Type","Type"
-"Unconfirmed","Onbevestigd"
-"Unsubscribe","Uitschrijven"
-"Unsubscribe Selected","Uitschrijving geselecteerd"
-"Unsubscribed","Uitgeschreven"
-"Unsubscription Email Sender","Uitschrijving email zender"
-"Unsubscription Email Template","Sjabloon uitschrijvingsbericht"
-"View Newsletter","Bekijk nieuwsbrief"
-"Website","Website"
-"You have been unsubscribed.","U bent uitgeschreven."
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
"Your subscription has been confirmed.","Uw uitschrijving is bevestigd."
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.","U bent uitgeschreven."
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.","Dit emailadres wordt al door een andere gebruiker gebruikt."
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,Geannuleerd
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview","Voorbeeld Nieuwsbrief Bericht"
+"Add to Queue","Toevoegen aan de wachtrij"
+"Are you sure that you want to strip all tags?","Weet u zeker dat uw alle labels wilt verwijderen?"
+"Please enter new template name.","Please enter new template name."
+" Copy",Kopieer
+"Sign Up for Our Newsletter:","Schrijf in voor Onze Nieuwsbrief"
+"Enter your email address","Enter your email address"
+Subscribe,Inschrijven
+CSV,CSV
+"Excel XML","Excel XML"
+"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
+"Success Email Sender","Success Email Sender"
+"Success Email Template","Success Email Template"
+"Unsubscription Email Sender","Unsubscription Email Sender"
+"Unsubscription Email Template","Unsubscription Email Template"
+"We found no problems.","We found no problems."
+Subscriber,Abonnee
+"Queue Start Date","Startdatum wachtrij"
+"Queue Subject","Onderwerp Wachtrij"
+"Error Code","Fout Code"
+"Error Text","Fout Omschrijving"
+"Queue Start","Begin Wachtrij"
+"Queue End","Einde Wachtrij"
+Processed,Verwerkt
+Unsubscribe,Uitschrijven
+"Customer First Name","Voornaam Klant"
+"Customer Last Name","Achternaam Klant"
+"Not Activated","Niet geactiveerd"
+Subscribed,Uitschrijven
+Unsubscribed,Uitgeschreven
+Unconfirmed,Onbevestigd
diff --git a/app/code/Magento/Newsletter/i18n/pt_BR.csv b/app/code/Magento/Newsletter/i18n/pt_BR.csv
index 07593b96ada..4ec9dd0d67d 100644
--- a/app/code/Magento/Newsletter/i18n/pt_BR.csv
+++ b/app/code/Magento/Newsletter/i18n/pt_BR.csv
@@ -1,134 +1,140 @@
-" Copy","Copiar"
-"Action","Ação"
+Cancel,Cancelar
+Back,Voltar
+ID,Identidade
+Action,Ação
+Reset,Redefinir
+Customer,Cliente
+Guest,Convidado
+Email,E-mail
+Delete,Excluir
+Store,Loja
+"Web Site","Web Site"
+Status,Status
+"Store View","Visualização da loja"
+Type,Tipo
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,Visualizar
+Subject,Assunto
+Sent,Enviado
+"Not Sent","Não Enviado"
+Sending,Enviando
+Paused,Parado.
+Newsletter,Newsletter
+Updated,Updated
+"Newsletter Subscription","Assinatura do boletim informativo"
"Add New Template","Adicionar novo modelo"
-"Add to Queue","Adicionar à Fila"
-"Allow Guest Subscription","Permitir assinatura de convidado"
-"An error occurred while saving your subscription.","Um erro ocorreu enquanto sua assinatura era salva."
-"Are you sure that you want to delete this template?","Tem certeza de que deseja apagar este modelo?"
-"Are you sure that you want to strip all tags?","Tem certeza de que deseja remover todas as tags?"
-"Back","Voltar"
-"Cancel","Cancelar"
-"Cancelled","Cancelado"
-"Cannot mark as received subscriber.","Não é possÃvel marcar como assinante recebido."
-"Confirmation Email Sender","Remetente do e-mail de confirmação"
-"Confirmation Email Template","Modelo de e-mail de confirmação"
-"Confirmation request has been sent.","O pedido de confirmação foi enviado."
-"Convert to Plain Text","Converter para Texto Simples"
-"Create Newsletter Template","Criar modelo de boletim informativo"
-"Customer","Cliente"
-"Customer First Name","Primeiro Nome do Cliente"
-"Customer Last Name","Último Nome do Cliente"
-"Customer My Account Newsletter Subscriptions","Assinatura do Boletim Informativo da Conta do Cliente"
-"Date Added","Data de Adição"
-"Date Updated","Data de Atualização"
-"Delete","Excluir"
-"Delete Selected Problems","Excluir Problemas Selecionados"
"Delete Template","Apagar Modelo"
-"Do you really want to cancel the queue?","Você realmente quer cancelar a fila?"
-"Duplicate template code.","Duplicar código de modelos"
-"Edit Newsletter","Editar Boletim Informativo"
-"Edit Newsletter Template","Editar Modelo do Boletim Informativo"
-"Edit Queue","Editar fila"
+"Convert to Plain Text","Converter para Texto Simples"
+"Preview Template","Visualização do Modelo"
+"Save Template","Salvar Modelo"
+"Template Information","Informação do Modelo"
+"Template Name","Nome do Modelo"
+"Template Subject","Assunto do Modelo"
+"Template Content","Conteúdo do Modelo"
+"Template Styles","Estilos do Modelo"
"Edit Template","Editar modelo"
-"Email","E-mail"
-"Error Code","Erro do código"
-"Error Text","Erro do texto"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Siga esse link para cancelar assinatura <! Essa tag é para o link de cancelamento de assinatura --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","Convidado"
-"ID","Identidade"
-"Invalid queue selected.","Fila selecionada inválida"
-"Invalid subscription ID.","ID de assinatura inválida"
-"Invalid subscription confirmation code.","Código de confirmação de assinatura inválido."
-"Message","Mensagem"
-"Need to Confirm","Necessário confirmar"
-"New Newsletter Template","Novo modelo de boletim informativo"
"New Template","Novo Modelo"
-"Newsletter","Newsletter"
-"Newsletter Message Preview","Visualização de mensagem do Boletim informativo"
-"Newsletter Problem Reports","Reportar Problemas do Boletim Informativo."
-"Newsletter Queue","Fila do Boletim Informativo"
-"Newsletter Section","Seção do Boletim Informativo"
-"Newsletter Styles","Estilos de Boletim Informativo"
-"Newsletter Subscribers","Assinantes do Boletim Informativo"
-"Newsletter Subscription","Assinatura do boletim informativo"
-"Newsletter Subscription Form Before","Formulário Anterior de Assinatura do Boletim Informativo"
-"Newsletter Subscriptions","Assinaturas do Boletim Informativo"
-"Newsletter Templates","Modelos de Boletim Informativo"
-"Newsletter subscription confirmation","Confirmação da assinatura do boletim informativo"
-"Newsletter subscription success","Assinatura do boletim informativo confirmado com sucesso."
-"Newsletter unsubscription success","Cancelamento de assinatura do boletim informativo confirmado com sucesso."
-"No Templates Found","Nenhum Modelo Encontrado"
-"No problems found.","Nenhum problema encontrado."
-"No subscribers selected.","Nenhuma assinatura selecionada."
-"Not Activated","Não ativado."
-"Not Sent","Não Enviado"
-"Pause","Parar."
-"Paused","Parado."
+Template,Template
+"Are you sure that you want to delete this template?","Tem certeza de que deseja apagar este modelo?"
+"Sender Name","Nome do remetente"
+"Sender Email","E-mail do remetente"
+Message,Mensagem
+Recipients,Destinatários
"Please enter a valid email address.","Entre com um e-mail válido."
-"Please enter new template name","Entre com um novo nome de modelo."
-"Please refer to exeption.log","Por favor consulte exeption.log"
-"Please select subscriber(s)","Selecione assinante(s)"
-"Preview","Visualizar"
-"Preview Template","Visualização do Modelo"
-"Processed","Processado"
-"Queue Start Date","InÃcio da fila de dados"
-"Queue End","Fim da Fila"
-"Queue Information","Informações sobre a Fila"
-"Queue Newsletter...","Newsletter da Fila..."
-"Queue Start","Começo da Fila"
-"Queue Subject","Assunto da Fila"
-"Recipients","Destinatários"
-"Reset","Redefinir"
-"Resume","Reiniciar"
-"Return HTML Version","Retornar Versão HTML"
-"Save As","Salvar Como"
+"Delete Selected Problems","Excluir Problemas Selecionados"
+"Unsubscribe Selected","Desinscrever Selecionado"
"Save Newsletter","Salvar Newsletter"
-"Save Template","Salvar Modelo"
"Save and Resume","Salvar e Reiniciar"
-"Selected problem subscribers have been unsubscribed.","Assinantes com problema selecionado tiveram assinatura cancelada."
-"Selected problems have been deleted.","Problemas selecionados foram deletados."
-"Sender","Remetente"
-"Sender Email","E-mail do remetente"
-"Sender Name","Nome do remetente"
-"Sending","Enviando"
-"Sent","Enviado"
-"Sign Up for Our Newsletter:","Assinar Nossa Newsletter:"
-"Sign up for our newsletter","Assinar nossa newsletter"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","Desculpe, mas o administrador negou assinatura para visitantes. Por favor, <a href=""%s"">registre-se</a>."
-"Start","Iniciar"
-"Status","Status"
-"Store","Loja"
-"Store View","Visualização da loja"
-"Subject","Assunto"
-"Subscribe","Assinar"
-"Subscribed","Assinado"
-"Subscriber","Assinante"
-"Subscribers","Assinantes"
+"View Newsletter","Ver Newsletter"
+"Edit Newsletter","Editar Boletim Informativo"
+"Queue Information","Informações sobre a Fila"
+"Queue Date Start","Queue Date Start"
"Subscribers From","Formulário para assinantes"
-"Subscription Options","Opções de assinaturas"
-"Success Email Sender","Remetente para email de sucesso"
-"Success Email Template","Modelo para email de sucesso"
-"Template Content","Conteúdo do Modelo"
-"Template Information","Informação do Modelo"
-"Template Name","Nome do Modelo"
-"Template Styles","Estilos do Modelo"
-"Template Subject","Assunto do Modelo"
+"Newsletter Styles","Estilos de Boletim Informativo"
+Start,Iniciar
+Pause,Parar.
+"Do you really want to cancel the queue?","Você realmente quer cancelar a fila?"
+Resume,Reiniciar
+"Newsletter Templates","Modelos de Boletim Informativo"
+"Return HTML Version","Retornar Versão HTML"
+"Save As","Salvar Como"
+"Edit Newsletter Template","Editar Modelo do Boletim Informativo"
+"New Newsletter Template","Novo modelo de boletim informativo"
+"No Templates Found","Nenhum Modelo Encontrado"
+Added,Added
+Sender,Remetente
"Template Type","Tipo de Modelo"
+"Queue Newsletter...","Newsletter da Fila..."
+"Newsletter Problems Report","Newsletter Problems Report"
+"Newsletter Problem Reports","Reportar Problemas do Boletim Informativo."
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
+"Newsletter Queue","Fila do Boletim Informativo"
+"Edit Queue","Editar fila"
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
+"Newsletter Subscribers","Assinantes do Boletim Informativo"
+Subscribers,Assinantes
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template","Criar modelo de boletim informativo"
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
"Thank you for your subscription.","Obrigado por sua assinatura."
-"The subscription has been removed.","A assinatura foi removida."
-"The subscription has been saved.","A assinatura foi salva."
-"There was a problem with the subscription.","Houve um problema com a assinatura."
-"There was a problem with the subscription: %s","Houve um problema com a assinatura: %s"
-"There was a problem with the un-subscription.","Houve um problema no cancelamento da assinatura."
-"This email address is already assigned to another user.","Este endereço de email já está atribuÃdo a outro usuário."
-"Type","Tipo"
-"Unconfirmed","Não Confirmado"
-"Unsubscribe","Desinscrever"
-"Unsubscribe Selected","Desinscrever Selecionado"
-"Unsubscribed","Desinscrito"
-"Unsubscription Email Sender","Desinscrever Email do Remetente"
-"Unsubscription Email Template","Desinscrição do Modelo de Email"
-"View Newsletter","Ver Newsletter"
-"Website","Website"
-"You have been unsubscribed.","Sua inscrição foi cancelada."
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
"Your subscription has been confirmed.","Sua inscrição foi confirmada."
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.","Sua inscrição foi cancelada."
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.","Este endereço de email já está atribuÃdo a outro usuário."
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,Cancelado
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview","Visualização de mensagem do Boletim informativo"
+"Add to Queue","Adicionar à Fila"
+"Are you sure that you want to strip all tags?","Tem certeza de que deseja remover todas as tags?"
+"Please enter new template name.","Please enter new template name."
+" Copy",Copiar
+"Sign Up for Our Newsletter:","Assinar Nossa Newsletter:"
+"Enter your email address","Enter your email address"
+Subscribe,Assinar
+CSV,CSV
+"Excel XML","Excel XML"
+"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
+"Success Email Sender","Success Email Sender"
+"Success Email Template","Success Email Template"
+"Unsubscription Email Sender","Unsubscription Email Sender"
+"Unsubscription Email Template","Unsubscription Email Template"
+"We found no problems.","We found no problems."
+Subscriber,Assinante
+"Queue Start Date","InÃcio da fila de dados"
+"Queue Subject","Assunto da Fila"
+"Error Code","Erro do código"
+"Error Text","Erro do texto"
+"Queue Start","Começo da Fila"
+"Queue End","Fim da Fila"
+Processed,Processado
+Unsubscribe,Desinscrever
+"Customer First Name","Primeiro Nome do Cliente"
+"Customer Last Name","Último Nome do Cliente"
+"Not Activated","Não ativado."
+Subscribed,Assinado
+Unsubscribed,Desinscrito
+Unconfirmed,"Não Confirmado"
diff --git a/app/code/Magento/Newsletter/i18n/zh_CN.csv b/app/code/Magento/Newsletter/i18n/zh_CN.csv
index de83adc5347..96d65bc5352 100644
--- a/app/code/Magento/Newsletter/i18n/zh_CN.csv
+++ b/app/code/Magento/Newsletter/i18n/zh_CN.csv
@@ -1,134 +1,140 @@
-" Copy","å¤åˆ¶"
-"Action","æ“作"
-"Add New Template","æ·»åŠ æ–°æ¨¡æ¿"
-"Add to Queue","æ·»åŠ åˆ°é˜Ÿåˆ—"
-"Allow Guest Subscription","å…许游客订阅"
-"An error occurred while saving your subscription.","ä¿å˜æ‚¨çš„订阅时å‘生错误。"
-"Are you sure that you want to delete this template?","您是å¦ç¡®è®¤è¦åˆ 除该模æ¿ï¼Ÿ"
-"Are you sure that you want to strip all tags?","您确认è¦åŽ»é™¤æ‰€æœ‰æ ‡ç¾å—？"
-"Back","返回"
-"Cancel","å–消"
-"Cancelled","å·²å–消"
-"Cannot mark as received subscriber.","æ— æ³•æ ‡è®°ä¸ºå·²æŽ¥æ”¶çš„è®¢é˜…è€…ã€‚"
-"Confirmation Email Sender","确认电å邮件å‘é€è€…"
-"Confirmation Email Template","确认电å邮件模版"
-"Confirmation request has been sent.","确认请求已å‘é€ã€‚"
-"Convert to Plain Text","转æ¢ä¸ºçº¯æ–‡æœ¬"
-"Create Newsletter Template","创建新闻通讯模æ¿"
-"Customer","客户"
-"Customer First Name","客户åå—"
-"Customer Last Name","客户姓æ°"
-"Customer My Account Newsletter Subscriptions","客户我的账户新闻通讯订阅"
-"Date Added","æ·»åŠ æ—¥æœŸ"
-"Date Updated","更新日期"
-"Delete","åˆ é™¤"
-"Delete Selected Problems","åˆ é™¤å·²é€‰æ‹©çš„é—®é¢˜"
-"Delete Template","åˆ é™¤æ¨¡æ¿"
-"Do you really want to cancel the queue?","您确认è¦åˆ 除队列å—？"
-"Duplicate template code.","é‡å¤çš„模版代ç 。"
-"Edit Newsletter","编辑新闻通讯"
-"Edit Newsletter Template","编辑新闻通讯模版"
-"Edit Queue","编辑队列"
-"Edit Template","编辑模æ¿"
-"Email","电å邮件"
-"Error Code","错误代ç "
-"Error Text","错误文本"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","使用æ¤é“¾æŽ¥æ¥é€€è®¢<!-- è¯¥æ ‡è®°ç”¨äºŽé€€è®¢é“¾æŽ¥ --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
-"Guest","æ¥å®¾"
-"ID","ID"
-"Invalid queue selected.","å·²é€‰æ‹©æ— æ•ˆçš„é˜Ÿåˆ—ã€‚"
-"Invalid subscription ID.","æ— æ•ˆçš„è®¢é˜… ID。"
-"Invalid subscription confirmation code.","æ— æ•ˆçš„è®¢é˜…ç¡®è®¤ä»£ç 。"
-"Message","ä¿¡æ¯"
-"Need to Confirm","需è¦ç¡®è®¤"
-"New Newsletter Template","新新闻通讯模æ¿"
-"New Template","新模æ¿"
-"Newsletter","新闻邮件"
-"Newsletter Message Preview","新闻通讯消æ¯é¢„览"
-"Newsletter Problem Reports","新闻通讯问题报告"
-"Newsletter Queue","新闻邮件队列"
-"Newsletter Section","新闻邮件区域"
-"Newsletter Styles","æ–°é—»é‚®ä»¶é£Žæ ¼"
-"Newsletter Subscribers","新闻邮件订阅者"
-"Newsletter Subscription","新闻邮件订阅"
-"Newsletter Subscription Form Before","新闻邮件订阅表å•å‰"
-"Newsletter Subscriptions","新闻邮件订阅"
-"Newsletter Templates","新闻邮件模æ¿"
-"Newsletter subscription confirmation","新闻邮件订阅确认"
-"Newsletter subscription success","新闻邮件订阅æˆåŠŸ"
-"Newsletter unsubscription success","新闻邮件退订æˆåŠŸ"
-"No Templates Found","模æ¿æœªæ‰¾åˆ°"
-"No problems found.","未找到问题。"
-"No subscribers selected.","未选择订阅者。"
-"Not Activated","未激活"
-"Not Sent","未å‘é€"
-"Pause","æš‚åœ"
-"Paused","已暂åœ"
-"Please enter a valid email address.","请输入有效的电å邮件地å€ã€‚"
-"Please enter new template name","请输入新的模æ¿å称"
-"Please refer to exeption.log","请å‚考 exeption.log"
-"Please select subscriber(s)","请选择订阅者"
-"Preview","预览"
-"Preview Template","预览模æ¿"
-"Processed","已处ç†"
-"Queue Start Date","队列数æ®å¼€å§‹"
-"Queue End","队列完æˆ"
-"Queue Information","队列信æ¯"
-"Queue Newsletter...","队列新闻邮件..."
-"Queue Start","队列开始"
-"Queue Subject","队列主题"
-"Recipients","收件人"
-"Reset","é‡ç½®çŠ¶æ€"
-"Resume","æ¢å¤"
-"Return HTML Version","返回HTML版本"
-"Save As","å¦å˜ä¸º"
-"Save Newsletter","ä¿å˜æ–°é—»é‚®ä»¶"
-"Save Template","ä¿å˜æ¨¡æ¿"
-"Save and Resume","ä¿å˜å¹¶æ¢å¤"
-"Selected problem subscribers have been unsubscribed.","选ä¸çš„有问题订阅者已退订。"
-"Selected problems have been deleted.","选ä¸çš„é—®é¢˜å·²åˆ é™¤ã€‚"
-"Sender","å‘é€æ–¹"
-"Sender Email","å‘é€äººé‚®ä»¶"
-"Sender Name","å‘é€äººå§“å"
-"Sending","æ£åœ¨å‘é€"
-"Sent","å·²å‘é€"
-"Sign Up for Our Newsletter:","订阅我们的新闻邮件："
-"Sign up for our newsletter","订阅我们的新闻邮件"
-"Sorry, but administrator denied subscription for guests. Please <a href=""%s"">register</a>.","对ä¸èµ·ï¼Œä½†ç®¡ç†å‘˜æ‹’ç»äº†æ¥å®¾çš„订阅。请 <a href=""%s"">注册</a>。"
-"Start","开始"
-"Status","状æ€"
-"Store","商店"
-"Store View","店铺视图"
-"Subject","主题"
-"Subscribe","订阅"
-"Subscribed","已订阅"
-"Subscriber","订阅者"
-"Subscribers","订阅者"
-"Subscribers From","订阅者æ¥è‡ª"
-"Subscription Options","订阅选项"
-"Success Email Sender","æˆåŠŸç”µå邮件å‘é€è€…"
-"Success Email Template","æˆåŠŸç”µå邮件模æ¿"
-"Template Content","模æ¿å†…容"
-"Template Information","模æ¿ä¿¡æ¯"
-"Template Name","模æ¿å称"
-"Template Styles","模æ¿é£Žæ ¼"
-"Template Subject","模æ¿ä¸»é¢˜"
-"Template Type","模æ¿ç±»åž‹"
-"Thank you for your subscription.","感谢您的订阅。"
-"The subscription has been removed.","è®¢é˜…å·²åˆ é™¤ã€‚"
-"The subscription has been saved.","订阅已ä¿å˜ã€‚"
-"There was a problem with the subscription.","订阅é‡åˆ°é—®é¢˜ã€‚"
-"There was a problem with the subscription: %s","订阅 %s é‡åˆ°é—®é¢˜"
-"There was a problem with the un-subscription.","å–消订阅é‡åˆ°é—®é¢˜ã€‚"
-"This email address is already assigned to another user.","该电å邮件地å€å·²åˆ†é…ç»™å¦ä¸€ç”¨æˆ·ã€‚"
-"Type","类型"
-"Unconfirmed","未确认"
-"Unsubscribe","退订"
-"Unsubscribe Selected","退订所选者"
-"Unsubscribed","已退订"
-"Unsubscription Email Sender","退订邮件å‘é€ç¨‹åº"
-"Unsubscription Email Template","退订邮件模æ¿"
-"View Newsletter","查看新闻邮件"
-"Website","网站"
-"You have been unsubscribed.","您已ç»é€€è®¢ã€‚"
-"Your subscription has been confirmed.","您的订阅已确认。"
+Cancel,å–消
+Back,返回
+ID,ID
+Action,æ“作
+Reset,é‡ç½®çŠ¶æ€
+Customer,客户
+Guest,æ¥å®¾
+Email,电å邮件
+Delete,åˆ é™¤
+Store,商店
+"Web Site","Web Site"
+Status,状æ€
+"Store View",店铺视图
+Type,类型
+"A total of %1 record(s) were updated.","A total of %1 record(s) were updated."
+"Total of %1 record(s) were deleted","Total of %1 record(s) were deleted"
+Preview,预览
+Subject,主题
+Sent,å·²å‘é€
+"Not Sent",未å‘é€
+Sending,æ£åœ¨å‘é€
+Paused,已暂åœ
+Newsletter,新闻邮件
+Updated,Updated
+"Newsletter Subscription",新闻邮件订阅
+"Add New Template",æ·»åŠ æ–°æ¨¡æ¿
+"Delete Template",åˆ é™¤æ¨¡æ¿
+"Convert to Plain Text",转æ¢ä¸ºçº¯æ–‡æœ¬
+"Preview Template",预览模æ¿
+"Save Template",ä¿å˜æ¨¡æ¿
+"Template Information",模æ¿ä¿¡æ¯
+"Template Name",模æ¿å称
+"Template Subject",模æ¿ä¸»é¢˜
+"Template Content",模æ¿å†…容
+"Template Styles",模æ¿é£Žæ ¼
+"Edit Template",编辑模æ¿
+"New Template",新模æ¿
+Template,Template
+"Are you sure that you want to delete this template?",您是å¦ç¡®è®¤è¦åˆ 除该模æ¿ï¼Ÿ
+"Sender Name",å‘é€äººå§“å
+"Sender Email",å‘é€äººé‚®ä»¶
+Message,ä¿¡æ¯
+Recipients,收件人
+"Please enter a valid email address.",请输入有效的电å邮件地å€ã€‚
+"Delete Selected Problems",åˆ é™¤å·²é€‰æ‹©çš„é—®é¢˜
+"Unsubscribe Selected",退订所选者
+"Save Newsletter",ä¿å˜æ–°é—»é‚®ä»¶
+"Save and Resume",ä¿å˜å¹¶æ¢å¤
+"View Newsletter",查看新闻邮件
+"Edit Newsletter",编辑新闻通讯
+"Queue Information",队列信æ¯
+"Queue Date Start","Queue Date Start"
+"Subscribers From",订阅者æ¥è‡ª
+"Newsletter Styles",æ–°é—»é‚®ä»¶é£Žæ ¼
+Start,开始
+Pause,æš‚åœ
+"Do you really want to cancel the queue?",您确认è¦åˆ 除队列å—？
+Resume,æ¢å¤
+"Newsletter Templates",新闻邮件模æ¿
+"Return HTML Version",返回HTML版本
+"Save As",å¦å˜ä¸º
+"Edit Newsletter Template",编辑新闻通讯模版
+"New Newsletter Template",新新闻通讯模æ¿
+"No Templates Found",模æ¿æœªæ‰¾åˆ°
+Added,Added
+Sender,å‘é€æ–¹
+"Template Type",模æ¿ç±»åž‹
+"Queue Newsletter...",队列新闻邮件...
+"Newsletter Problems Report","Newsletter Problems Report"
+"Newsletter Problem Reports",新闻通讯问题报告
+"We unsubscribed the people you identified.","We unsubscribed the people you identified."
+"The problems you identified have been deleted.","The problems you identified have been deleted."
+"Newsletter Queue",新闻邮件队列
+"Edit Queue",编辑队列
+"Please correct the newsletter template and try again.","Please correct the newsletter template and try again."
+"The newsletter queue has been saved.","The newsletter queue has been saved."
+"Newsletter Subscribers",新闻邮件订阅者
+Subscribers,订阅者
+"Please select one or more subscribers.","Please select one or more subscribers."
+"Create Newsletter Template",创建新闻通讯模æ¿
+"The newsletter template has been saved.","The newsletter template has been saved."
+"An error occurred while saving this template.","An error occurred while saving this template."
+"The newsletter template has been deleted.","The newsletter template has been deleted."
+"An error occurred while deleting this template.","An error occurred while deleting this template."
+"Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
+"We saved the subscription.","We saved the subscription."
+"We removed the subscription.","We removed the subscription."
+"The confirmation request has been sent.","The confirmation request has been sent."
+"Thank you for your subscription.",感谢您的订阅。
+"There was a problem with the subscription: %1","There was a problem with the subscription: %1"
+"Something went wrong with the subscription.","Something went wrong with the subscription."
+"Your subscription has been confirmed.",您的订阅已确认。
+"This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
+"This is an invalid subscription ID.","This is an invalid subscription ID."
+"You have been unsubscribed.",您已ç»é€€è®¢ã€‚
+"Something went wrong with the un-subscription.","Something went wrong with the un-subscription."
+"This email address is already assigned to another user.",该电å邮件地å€å·²åˆ†é…ç»™å¦ä¸€ç”¨æˆ·ã€‚
+"Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. ' 'Please <a href=""%1"">register</a>."
+Cancelled,å·²å–消
+"There are no subscribers selected.","There are no subscribers selected."
+"You selected an invalid queue.","You selected an invalid queue."
+"We cannot mark as received subscriber.","We cannot mark as received subscriber."
+"Duplicate template code","Duplicate template code"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link -->' '<a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}' '</a>"
+"Choose Store View:","Choose Store View:"
+"Newsletter Message Preview",新闻通讯消æ¯é¢„览
+"Add to Queue",æ·»åŠ åˆ°é˜Ÿåˆ—
+"Are you sure that you want to strip all tags?",您确认è¦åŽ»é™¤æ‰€æœ‰æ ‡ç¾å—？
+"Please enter new template name.","Please enter new template name."
+" Copy",å¤åˆ¶
+"Sign Up for Our Newsletter:",订阅我们的新闻邮件：
+"Enter your email address","Enter your email address"
+Subscribe,订阅
+CSV,CSV
+"Excel XML","Excel XML"
+"Subscription Options","Subscription Options"
+"Allow Guest Subscription","Allow Guest Subscription"
+"Need to Confirm","Need to Confirm"
+"Confirmation Email Sender","Confirmation Email Sender"
+"Confirmation Email Template","Confirmation Email Template"
+"Success Email Sender","Success Email Sender"
+"Success Email Template","Success Email Template"
+"Unsubscription Email Sender","Unsubscription Email Sender"
+"Unsubscription Email Template","Unsubscription Email Template"
+"We found no problems.","We found no problems."
+Subscriber,订阅者
+"Queue Start Date",队列数æ®å¼€å§‹
+"Queue Subject",队列主题
+"Error Code",错误代ç
+"Error Text",错误文本
+"Queue Start",队列开始
+"Queue End",队列完æˆ
+Processed,已处ç†
+Unsubscribe,退订
+"Customer First Name",客户åå—
+"Customer Last Name",客户姓æ°
+"Not Activated",未激活
+Subscribed,已订阅
+Unsubscribed,已退订
+Unconfirmed,未确认
diff --git a/app/code/Magento/OfflinePayments/i18n/de_DE.csv b/app/code/Magento/OfflinePayments/i18n/de_DE.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/de_DE.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflinePayments/i18n/en_US.csv b/app/code/Magento/OfflinePayments/i18n/en_US.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/en_US.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflinePayments/i18n/es_ES.csv b/app/code/Magento/OfflinePayments/i18n/es_ES.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/es_ES.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflinePayments/i18n/fr_FR.csv b/app/code/Magento/OfflinePayments/i18n/fr_FR.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/fr_FR.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflinePayments/i18n/nl_NL.csv b/app/code/Magento/OfflinePayments/i18n/nl_NL.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/nl_NL.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflinePayments/i18n/pt_BR.csv b/app/code/Magento/OfflinePayments/i18n/pt_BR.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/pt_BR.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflinePayments/i18n/zh_CN.csv b/app/code/Magento/OfflinePayments/i18n/zh_CN.csv
new file mode 100644
index 00000000000..467224e20ad
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/i18n/zh_CN.csv
@@ -0,0 +1,24 @@
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"<label class=""label""><span>Make Check payable to:</span></label> %1","<label class=""label""><span>Make Check payable to:</span></label> %1"
+"Send Check to:","Send Check to:"
+"Purchase Order Number","Purchase Order Number"
+"Make Check payable to: %1","Make Check payable to: %1"
+"Purchase Order Number: %1","Purchase Order Number: %1"
+"Make Check payable to:","Make Check payable to:"
+"Make Check payable to","Make Check payable to"
+"Send Check to","Send Check to"
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Check / Money Order","Check / Money Order"
+"Make Check Payable to","Make Check Payable to"
+"Purchase Order","Purchase Order"
+"Bank Transfer Payment","Bank Transfer Payment"
+Instructions,Instructions
+"Cash On Delivery Payment","Cash On Delivery Payment"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/OfflineShipping/i18n/de_DE.csv b/app/code/Magento/OfflineShipping/i18n/de_DE.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/de_DE.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/OfflineShipping/i18n/en_US.csv b/app/code/Magento/OfflineShipping/i18n/en_US.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/en_US.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/OfflineShipping/i18n/es_ES.csv b/app/code/Magento/OfflineShipping/i18n/es_ES.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/es_ES.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/OfflineShipping/i18n/fr_FR.csv b/app/code/Magento/OfflineShipping/i18n/fr_FR.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/fr_FR.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/OfflineShipping/i18n/nl_NL.csv b/app/code/Magento/OfflineShipping/i18n/nl_NL.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/nl_NL.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/OfflineShipping/i18n/pt_BR.csv b/app/code/Magento/OfflineShipping/i18n/pt_BR.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/pt_BR.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/OfflineShipping/i18n/zh_CN.csv b/app/code/Magento/OfflineShipping/i18n/zh_CN.csv
new file mode 100644
index 00000000000..7e5f5065d38
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/i18n/zh_CN.csv
@@ -0,0 +1,49 @@
+None,None
+Price,Price
+No,No
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+Type,Type
+Export,Export
+Import,Import
+Country,Country
+"Zip/Postal Code","Zip/Postal Code"
+Condition,Condition
+Region/State,Region/State
+"Shipping Price","Shipping Price"
+"Export CSV","Export CSV"
+"Store Pickup","Store Pickup"
+"Weight vs. Destination","Weight vs. Destination"
+"Price vs. Destination","Price vs. Destination"
+"# of Items vs. Destination","# of Items vs. Destination"
+"Weight (and above)","Weight (and above)"
+"Order Subtotal (and above)","Order Subtotal (and above)"
+"# of Items (and above)","# of Items (and above)"
+"Please correct Table Rate code type: %1.","Please correct Table Rate code type: %1."
+"Please correct Table Rate code for type %1: %2.","Please correct Table Rate code for type %1: %2."
+"Per Order","Per Order"
+"Per Item","Per Item"
+"Free Shipping","Free Shipping"
+"For matching items only","For matching items only"
+"For shipment with matching items","For shipment with matching items"
+"Please correct Table Rates File Format.","Please correct Table Rates File Format."
+"Something went wrong while importing table rates.","Something went wrong while importing table rates."
+"We couldn't import this file because of these errors: %1","We couldn't import this file because of these errors: %1"
+"Please correct Table Rates format in the Row #%1.","Please correct Table Rates format in the Row #%1."
+"Please correct Country ""%1"" in the Row #%2.","Please correct Country ""%1"" in the Row #%2."
+"Please correct Region/State ""%1"" in the Row #%2.","Please correct Region/State ""%1"" in the Row #%2."
+"Please correct %1 ""%2"" in the Row #%3.","Please correct %1 ""%2"" in the Row #%3."
+"Please correct Shipping Price ""%1"" in the Row #%2.","Please correct Shipping Price ""%1"" in the Row #%2."
+"Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")","Duplicate Row #%1 (Country ""%2"", Region/State ""%3"", Zip ""%4"" and Value ""%5"")"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Fee","Handling Fee"
+"Displayed Error Message","Displayed Error Message"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Flat Rate","Flat Rate"
+"Method Name","Method Name"
+"Table Rates","Table Rates"
+"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
+"Minimum Order Amount","Minimum Order Amount"
diff --git a/app/code/Magento/Ogone/Helper/Data.php b/app/code/Magento/Ogone/Helper/Data.php
deleted file mode 100644
index b8c20633b09..00000000000
--- a/app/code/Magento/Ogone/Helper/Data.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Ogone data helper
- */
-namespace Magento\Ogone\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
-{
-}
diff --git a/app/code/Magento/Ogone/i18n/de_DE.csv b/app/code/Magento/Ogone/i18n/de_DE.csv
index c929fbab689..97a08d942c6 100644
--- a/app/code/Magento/Ogone/i18n/de_DE.csv
+++ b/app/code/Magento/Ogone/i18n/de_DE.csv
@@ -1,66 +1,122 @@
-"Authorization","Berechtigung"
-"Authorization Waiting from Ogone","Warte auf Authorisierung von Ogone"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","Authorisierung ist nicht bekannt: Während der Authorisierungsvorgangs ist ein Problem aufgetreten, das zu unvorhersehbaren Ergebnissen führt"
-"Background Color of Ogone Template","Hintergrundfarbe des Ogone Templates"
-"Button Background Color of the Ogone Template","Schaltflächenhintergrundfarbe des Ogone Templates"
-"Button Text Color of the Ogone Template","Schaltflächentextfarbe des Ogone Templates"
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing","Ogone-Bearbeitung starten"
"Can't detect Ogone payment action","Ogone Zahlungsvorgang konnte nicht erkannt werden"
-"Cancelled Ogone","Ogone wurde abgebrochen"
-"Debug","Fehlerbeseitigung"
-"Declined Ogone","Ogone wurde abgelehnt"
-"Declined Order on Ogone side.","Bestellung wurde von Ogone abgelehnt"
-"Direct Sale","Direktverkauf"
-"E.g: ""Verdana"".","z.B.: ""Verdana""."
-"E.g: ""black"".","z.B.: ""schwarz""."
-"E.g: ""white"".","z.B. ""weiß""."
-"Enabled","Aktiviert"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","Um dieses Feature zu aktivieren, müssen Sie unter ""Technische Informationen > Globale Sicherheitsparameter"" unter der Verkäuferverwaltung weitere Einstellungen vornehmen."
+"The order cannot be saved.","Die Bestellung kann nicht gespeichert werden."
+"Authorization Waiting from Ogone","Warte auf Authorisierung von Ogone"
+"Processed by Ogone","Durch Ogone bearbeitet"
+"Order can't save","Bestellung kann/nicht gespeichert werden"
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception","Unbekannte Ausnahme"
+"Something went wrong while saving this order.","Something went wrong while saving this order."
"Exception not defined","Ausnahme ist nicht definiert"
-"Font Family of the Ogone Template","Schriftartfamilie des Ogone Templates"
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","Für die Produktion ersetzen Sie ""test"" mit ""prod"". Beispiel unter: https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","Gateway URL"
-"Hash All Parameters","Alle Parameter vermischen"
-"Hashing Algorithm","Hashing-Algorithmus"
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation","Ogone Standard-Operation"
+Authorization,Berechtigung
+"Direct Sale",Direktverkauf
"Horizontally grouped logo with group name on left","horizontal angeordnetes Logo mit dem Gruppennamen links"
"Horizontally grouped logo with no group name","horizontal angeordnetes Logo ohne Gruppenname"
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","Wenn Sie ""Keine Operation"" wählen, verfährt Ogone nach dem Standard-Bezahlverfahren in der Ogone-Konfiguration."
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","Wenn Sie ""Ogone Template"" wählen, müssen Sie alle nachfolgenden Felder ausfüllen."
-"Layout of Payment Methods","Layout der Zahlungsmethoden"
-"Logo of the Ogone Template","Logo des Ogone-Templates"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Ogone Standard-Operation"
-"Order can't save","Bestellung kann/nicht gespeichert werden"
-"PSPID","PSPID"
-"Payment Action","Zahlungsaktion"
-"Payment Template","Zahlungs-Template"
-"Payment transaction has been declined.","Zahlungstransaktion wurde verweigert."
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","Zahlung ungewiss: Während des Zahlungsvorganges ist ein Fehler aufgetreten, der zu nicht gesicherten Ergebnissen geführt hat"
+"Verical list","Vertikale Liste"
+Ogone,Ogone
"Pending Ogone","Ogone in Bearbeitung"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","Bitte warten Sie einen Moment. Diese Seite überträgt Ihre Daten in wenigen Sekunden zum Ogone-Zahlungsbereich."
-"Processed Ogone Payment","Bearbeitete Ogone-Zahlung"
-"Processed by Ogone","Durch Ogone bearbeitet"
+"Cancelled Ogone","Ogone wurde abgebrochen"
+"Declined Ogone","Ogone wurde abgelehnt"
"Processing Ogone Payment","Ogone-Zahlung in Bearbeitung"
-"SHA-IN Pass Phrase","SHA-IN Passwortsatz"
-"SHA-OUT Pass Phrase","SHA-OUT Passwortsatz"
-"Start Ogone Processing","Ogone-Bearbeitung starten"
-"Table Background Color of the Ogone Template","Tafel-Hintergrundfarbe des Ogone-Templates"
-"Table Text Color of the Ogone Template","Tafel-Textfarbe des Ogone-Templates"
-"Text Color of the Ogone Template","Textfarbe des Ogone-Templates"
-"The hash is not valid","Die Mischung ist ungültig"
-"The order cannot be canceled for a system reason.","Die Bestellung kann aus Systemgründen nicht storniert werden."
-"The order cannot be saved for a system reason.","Die Bestellung kann aus Systemgründen nicht gespeichert werden."
-"The order cannot be saved.","Die Bestellung kann nicht gespeichert werden."
-"The order is not valid","Die Bestellung ist nicht gültig"
-"The order was canceled on ogone side.","Die Bestellung wurde von Ogone aus storniert."
-"Title","Titel"
-"Title of the Ogone Template","Titel des Ogone-Templates"
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","Um <strong>alle Parameter</strong> zu hashen, wählen Sie die folgenden Optionen im Formularfeld ""Globale Sicherheitsparameter"" aus: <ul><li>Jeder Parameter gefolgt von der Passphrase.</li><li>""Hash-Algorithmus"" wie ""Hashing-Algorithmus"" unter</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","URL/Dateiname des Logos.<br/>Die URL muss absolut sein und auf einem sicheren Server gespeichert sein."
-"Unknown exception","Unbekannte Ausnahme"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","Verwenden Sie beim Posting Daten von Magento zu Ogone.<br/>Verwenden Sie Datenprüfung durch Ogone vor der Zahlung."
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","Verwenden Sie beim Posting Daten von Ogone zu Magento.<br/>Verwenden Sie in Feedback Datenprüfung durch Magento."
-"Verical list","Vertikale Liste"
+"Processed Ogone Payment","Bearbeitete Ogone-Zahlung"
"Waiting Authorization","Erwarte Authorisierung"
-"You can arrange the layout/list of the payment methods on Ogone payment page.","Sie können das Layout bzw. die Liste der Bezahlungsmethoden neu ordnen auf der Ogone-Zahlungsseite."
+"Payment ID: %1","Payment ID: %1"
"You will be redirected to Ogone website when you place an order.","Sie werden weitergeleitet zur Ogone-Webseite, wenn Sie eine Bestellung aufgeben."
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
+"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
+"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
+"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
+"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
+"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
diff --git a/app/code/Magento/Ogone/i18n/en_US.csv b/app/code/Magento/Ogone/i18n/en_US.csv
index 8c59ccf0a86..adbb9511a39 100644
--- a/app/code/Magento/Ogone/i18n/en_US.csv
+++ b/app/code/Magento/Ogone/i18n/en_US.csv
@@ -1,66 +1,122 @@
-"Authorization","Authorization"
-"Authorization Waiting from Ogone","Authorization Waiting from Ogone"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","Authorization not known: A technical problem arose during authorization process, giving unpredictable result"
-"Background Color of Ogone Template","Background Color of Ogone Template"
-"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
-"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing","Start Ogone Processing"
"Can't detect Ogone payment action","Can't detect Ogone payment action"
-"Cancelled Ogone","Cancelled Ogone"
-"Debug","Debug"
-"Declined Ogone","Declined Ogone"
-"Declined Order on Ogone side.","Declined Order on Ogone side."
-"Direct Sale","Direct Sale"
-"E.g: ""Verdana"".","E.g: ""Verdana""."
-"E.g: ""black"".","E.g: ""black""."
-"E.g: ""white"".","E.g: ""white""."
-"Enabled","Enabled"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration."
+"The order cannot be saved.","The order cannot be saved."
+"Authorization Waiting from Ogone","Authorization Waiting from Ogone"
+"Processed by Ogone","Processed by Ogone"
+"Order can't save","Order can't save"
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception","Unknown exception"
+"Something went wrong while saving this order.","Something went wrong while saving this order."
"Exception not defined","Exception not defined"
-"Font Family of the Ogone Template","Font Family of the Ogone Template"
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","Gateway URL"
-"Hash All Parameters","Hash All Parameters"
-"Hashing Algorithm","Hashing Algorithm"
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation","Ogone Default Operation"
+Authorization,Authorization
+"Direct Sale","Direct Sale"
"Horizontally grouped logo with group name on left","Horizontally grouped logo with group name on left"
"Horizontally grouped logo with no group name","Horizontally grouped logo with no group name"
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration."
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
-"Layout of Payment Methods","Layout of Payment Methods"
-"Logo of the Ogone Template","Logo of the Ogone Template"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Ogone Default Operation"
-"Order can't save","Order can't save"
-"PSPID","PSPID"
-"Payment Action","Payment Action"
-"Payment Template","Payment Template"
-"Payment transaction has been declined.","Payment transaction has been declined."
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","Payment uncertain: A technical problem arose during payment process, giving unpredictable result"
+"Verical list","Verical list"
+Ogone,Ogone
"Pending Ogone","Pending Ogone"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds."
-"Processed Ogone Payment","Processed Ogone Payment"
-"Processed by Ogone","Processed by Ogone"
+"Cancelled Ogone","Cancelled Ogone"
+"Declined Ogone","Declined Ogone"
"Processing Ogone Payment","Processing Ogone Payment"
+"Processed Ogone Payment","Processed Ogone Payment"
+"Waiting Authorization","Waiting Authorization"
+"Payment ID: %1","Payment ID: %1"
+"You will be redirected to Ogone website when you place an order.","You will be redirected to Ogone website when you place an order."
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
-"Start Ogone Processing","Start Ogone Processing"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
-"Text Color of the Ogone Template","Text Color of the Ogone Template"
-"The hash is not valid","The hash is not valid"
-"The order cannot be canceled for a system reason.","The order cannot be canceled for a system reason."
-"The order cannot be saved for a system reason.","The order cannot be saved for a system reason."
-"The order cannot be saved.","The order cannot be saved."
-"The order is not valid","The order is not valid"
-"The order was canceled on ogone side.","The order was canceled on ogone side."
-"Title","Title"
-"Title of the Ogone Template","Title of the Ogone Template"
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","URL/filename of the logo.<br />The URL must be absolute and stored on a secure server."
-"Unknown exception","Unknown exception"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment."
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento."
-"Verical list","Verical list"
-"Waiting Authorization","Waiting Authorization"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
-"You will be redirected to Ogone website when you place an order.","You will be redirected to Ogone website when you place an order."
diff --git a/app/code/Magento/Ogone/i18n/es_ES.csv b/app/code/Magento/Ogone/i18n/es_ES.csv
index fdb268e4089..e4f02710790 100644
--- a/app/code/Magento/Ogone/i18n/es_ES.csv
+++ b/app/code/Magento/Ogone/i18n/es_ES.csv
@@ -1,66 +1,122 @@
-"Authorization","Autorización"
-"Authorization Waiting from Ogone","Autorización en espera de Ogone"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","Autorización no confirmada: hubo un problema técnico durante el proceso de autorización, lo que dio un resultado impredecible."
-"Background Color of Ogone Template","Color de fondo del modelo de Ogone"
-"Button Background Color of the Ogone Template","Color de fondo del botón del modelo de Ogone"
-"Button Text Color of the Ogone Template","Color del texto del botón del modelo de Ogone"
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing","Iniciar Procesamiento Ogone"
"Can't detect Ogone payment action","No se puede detectar la acción de pago de Ogone"
-"Cancelled Ogone","Ogone cancelado"
-"Debug","Depurar"
-"Declined Ogone","Ogone rechazado"
-"Declined Order on Ogone side.","Solicitud rechazada por Ogone."
-"Direct Sale","Venta directa"
-"E.g: ""Verdana"".","Ej.; ""Verdana""."
-"E.g: ""black"".","Ej.: ""negro""."
-"E.g: ""white"".","Ej.; ""blanco""."
-"Enabled","Habilitado"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","Para activar esta función se necesita ajustar ""Información técnica > Parámetros globales de seguridad"" en la administración del comerciante."
+"The order cannot be saved.","El pedido no puede ser guardado."
+"Authorization Waiting from Ogone","Autorización en espera de Ogone"
+"Processed by Ogone","Procesado por Ogone"
+"Order can't save","La solicitud no se puede archivar"
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception","Excepción desconocida"
+"Something went wrong while saving this order.","Something went wrong while saving this order."
"Exception not defined","Excepción no definida."
-"Font Family of the Ogone Template","Familia de fuente del modelo de Ogone"
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","Para la producción, sustituir ""test"" por ""prod"". Ejemplo: https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","URL de la puerta de enlace"
-"Hash All Parameters","Comprobar todos los parámetros"
-"Hashing Algorithm","Algoritmo de comprobación"
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation","Operación por Defecto de Ogone"
+Authorization,Autorización
+"Direct Sale","Venta directa"
"Horizontally grouped logo with group name on left","Logo agrupado horizontalmente con el nombre del grupo a la izquierda"
"Horizontally grouped logo with no group name","Logo agrupado horizontalmente sin nombre del grupo"
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","Si elige ""Ninguna Operación"", Ogone usará el prodecimiento de pago por defecto en la configuración."
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","Si elige la ""Plantilla Ogone"", tendrá que rellenar todos los campos siguientes."
-"Layout of Payment Methods","Presentación de Métodos de Pago"
-"Logo of the Ogone Template","Logo de la Plantilla de Ogone"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Operación por Defecto de Ogone"
-"Order can't save","La solicitud no se puede archivar"
-"PSPID","PSPID"
-"Payment Action","Acción de Pago"
-"Payment Template","Plantilla de Pago"
-"Payment transaction has been declined.","La transacción de pago ha sido rechazada"
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","Pago dudoso: ha surgido un problema técnico durante el proceso de pago con resultados impredecibles"
+"Verical list","Lista vertical"
+Ogone,Ogone
"Pending Ogone","Ogone pendiente"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","Por favor, espere un momento. Esta página transferirá sus datos a la pasarela de pago de Ogone en unos segundos."
-"Processed Ogone Payment","Pago de Ogone procesado"
-"Processed by Ogone","Procesado por Ogone"
+"Cancelled Ogone","Ogone cancelado"
+"Declined Ogone","Ogone rechazado"
"Processing Ogone Payment","Procesando Pago de Ogone"
-"SHA-IN Pass Phrase","Contraseña SHA-IN"
-"SHA-OUT Pass Phrase","Contraseña SHA-OUT"
-"Start Ogone Processing","Iniciar Procesamiento Ogone"
-"Table Background Color of the Ogone Template","Color del Fondo de la Tabla de la Plantilla Ogone"
-"Table Text Color of the Ogone Template","Color del Texto de la Tabla de la Plantilla Ogone"
-"Text Color of the Ogone Template","Color del Texto de la Plantilla Ogone"
-"The hash is not valid","El hash no es válido"
-"The order cannot be canceled for a system reason.","El pedido no puede ser cancelado por una razón sistema."
-"The order cannot be saved for a system reason.","El pedido no puede ser guardado por una razón del sistema."
-"The order cannot be saved.","El pedido no puede ser guardado."
-"The order is not valid","El pedido no es válido"
-"The order was canceled on ogone side.","El pedido fue cancelado por parte de Ogone."
-"Title","TÃtulo"
-"Title of the Ogone Template","TÃtulo de la Plantilla de Ogone"
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","Para hacer el hash <strong> de todos los parámetros</strong>, selecciona las siguientes opciones en el fieldset ""parámetros de seguridad Global"": <ul><li>Cada parámetro seguido de la contraseña.</li><li>""Hash algorithm"" igual a ""Hashing Algorithm"" debajo de</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","URL/nombre de fichero del logotipo.<br />La dirección URL debe ser absoluta y estar almacenada en un servidor seguro."
-"Unknown exception","Excepción desconocida"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","Uso de los datos publicados de Magento a Ogone.<br/>Uso de los datos analizados por Ogone antes del pago."
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","Uso de los datos publicados de Ogone a Magento.<br/>Uso de los datos de observación analizados por Magento."
-"Verical list","Lista vertical"
+"Processed Ogone Payment","Pago de Ogone procesado"
"Waiting Authorization","Esperando Autorización"
-"You can arrange the layout/list of the payment methods on Ogone payment page.","Puedes manejar el diseño y la lista de los métodos de pago en la página de pago de Ogone."
+"Payment ID: %1","Payment ID: %1"
"You will be redirected to Ogone website when you place an order.","Serás redirigido/a a la página web de Ogone cuando hagas un pedido."
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
+"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
+"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
+"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
+"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
+"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
diff --git a/app/code/Magento/Ogone/i18n/fr_FR.csv b/app/code/Magento/Ogone/i18n/fr_FR.csv
index 7826499919b..a8276944ec8 100644
--- a/app/code/Magento/Ogone/i18n/fr_FR.csv
+++ b/app/code/Magento/Ogone/i18n/fr_FR.csv
@@ -1,66 +1,122 @@
-"Authorization","Autorisation"
-"Authorization Waiting from Ogone","Autorisation en attente d'Ogone"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","Autorisation non accordée : un problème technique est survenu pendant le processus d'autorisation, aboutissant à un résultat inhabituel."
-"Background Color of Ogone Template","Couleur de fond du modèle d'Ogone."
-"Button Background Color of the Ogone Template","Bouton de la couleur de fond du modèle d'Ogone."
-"Button Text Color of the Ogone Template","Bouton de la couleur du texte du modèle d'Ogone."
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing","Commencer traitement Ogone"
"Can't detect Ogone payment action","N'arrive pas à détecter le paiement par Ogone."
-"Cancelled Ogone","Ogone annulé."
-"Debug","Déboguer"
-"Declined Ogone","Ogone refusé."
-"Declined Order on Ogone side.","Commande annulée par Ogone."
-"Direct Sale","Vente directe"
-"E.g: ""Verdana"".","Par exemple : « Verdana »."
-"E.g: ""black"".","Par exemple : « noir »."
-"E.g: ""white"".","Par exemple : « blanc »."
-"Enabled","Actif"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","Pour activer cette fonction, vous devez aller dans : « Information technique > paramètres de sécurité mondiaux » sur l'administration pour entreprises."
+"The order cannot be saved.","La commande ne peut être sauvegardée."
+"Authorization Waiting from Ogone","Autorisation en attente d'Ogone"
+"Processed by Ogone","Traité par Ogone"
+"Order can't save","Impossible de sauvegarder commande"
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception","Exception inconnue"
+"Something went wrong while saving this order.","Something went wrong while saving this order."
"Exception not defined","Exception non définie."
-"Font Family of the Ogone Template","Famille de polices du modèle d'Ogone."
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","Pour la production, remplacer « Test » par « prod ». Par exemple : https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","URL passerelle"
-"Hash All Parameters","Condenser tous les paramètres."
-"Hashing Algorithm","Algorithme de hachage."
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation","Opération par défaut Ogone"
+Authorization,Autorisation
+"Direct Sale","Vente directe"
"Horizontally grouped logo with group name on left","Logo regroupé horizontalement, avec le nom du groupe à gauche."
"Horizontally grouped logo with no group name","Logo regroupé horizontalement, sans nom de groupe."
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","Si vous choisissez «Pas d'opération», Ogone utilisera la l'installation de la procédure de paiement par défaut dans la configuration Ogone."
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","Si vous choisissez «Modèle Ogone», il vous faudra remplir tous les champs suivants."
-"Layout of Payment Methods","Présentation des méthodes de paiement"
-"Logo of the Ogone Template","Logo du modèle Ogone"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Opération par défaut Ogone"
-"Order can't save","Impossible de sauvegarder commande"
-"PSPID","PSPID"
-"Payment Action","Action de paiement"
-"Payment Template","Modèle paiement"
-"Payment transaction has been declined.","La transaction de paiement a été refusée."
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","Paiement en suspens : en raison d'un problème technique durant le processus de paiement, celui-ci ne peut encore être confirmé."
+"Verical list","Liste verticale"
+Ogone,Ogone
"Pending Ogone","En attente Ogone"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","Veuillez patienter un instant. Cette page va transférer vos données vers la passerelle de paiement Ogone dans quelques secondes."
-"Processed Ogone Payment","Paiement Ogone traité"
-"Processed by Ogone","Traité par Ogone"
+"Cancelled Ogone","Ogone annulé."
+"Declined Ogone","Ogone refusé."
"Processing Ogone Payment","Paiement Ogone en cours de traitement"
-"SHA-IN Pass Phrase","Mot de passe SHA-IN"
-"SHA-OUT Pass Phrase","Mot de passe SHA-OUT"
-"Start Ogone Processing","Commencer traitement Ogone"
-"Table Background Color of the Ogone Template","Couleur d'arrière-plan tableau du modèle Ogone"
-"Table Text Color of the Ogone Template","Couleur du texte tableau du modèle Ogone"
-"Text Color of the Ogone Template","Couleur du texte du modèle Ogone"
-"The hash is not valid","Le hachage est invalide"
-"The order cannot be canceled for a system reason.","La commande ne peut être annulée pour une raison liée au système."
-"The order cannot be saved for a system reason.","La commande ne peut être sauvegardée pour une raison liée au système."
-"The order cannot be saved.","La commande ne peut être sauvegardée."
-"The order is not valid","La commande est invalide."
-"The order was canceled on ogone side.","La commande a été annulée par Ogone."
-"Title","Titre"
-"Title of the Ogone Template","Titre du modèle Ogone."
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","Pour hacher <strong>tous les paramètres</strong>, sélectionnez les options suivantes dans les « paramètres de sécurité globale» : <ul><li>Chaque paramètres suivi du mot de passe.</li><li>«Algorithme de hachage» identique à «Hacher algorithme» ci-dessous</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","URL / nom de fichier du logo.<br />L'URL doit être absolue et stockée sur un serveur sécurisé."
-"Unknown exception","Exception inconnue"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","Utilisation pour poster des données de Magento sur Ogone.<br/>Utilisation lors de la vérification des données par Ogone avant le paiement."
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","Utiliser pour poster des données de Ogone vers Magento.<br/>Utilisation lors de la vérification des feedbacks par Magento."
-"Verical list","Liste verticale"
+"Processed Ogone Payment","Paiement Ogone traité"
"Waiting Authorization","En attente d'autorisation"
-"You can arrange the layout/list of the payment methods on Ogone payment page.","Vous pouvez modifier la mise en page / liste des méthodes de paiement sur la page de paiement Ogone."
+"Payment ID: %1","Payment ID: %1"
"You will be redirected to Ogone website when you place an order.","Vous serez redirigé vers le site Internet d'Ogone lorsque vous aurez passé votre commande."
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
+"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
+"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
+"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
+"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
+"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
diff --git a/app/code/Magento/Ogone/i18n/nl_NL.csv b/app/code/Magento/Ogone/i18n/nl_NL.csv
index fbd4aac6763..8b0617cd73f 100644
--- a/app/code/Magento/Ogone/i18n/nl_NL.csv
+++ b/app/code/Magento/Ogone/i18n/nl_NL.csv
@@ -1,66 +1,122 @@
-"Authorization","Autorisatie"
-"Authorization Waiting from Ogone","Wacht op autorisatie van Ogone"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","Autorisatie onbekend: Een technisch probleem is opgetreden tijdens het autorisatie proces, met onbekende gevolgen."
-"Background Color of Ogone Template","Achtergrond kleur van het Ogone Sjabloon"
-"Button Background Color of the Ogone Template","Knop Achtergrond Kleur op het Ogone Sjabloon"
-"Button Text Color of the Ogone Template","Knop Tekst Kleur op het Ogone Sjabloon"
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing","Begin Ogone Verwerking"
"Can't detect Ogone payment action","Kan Ogone Betalingsactie niet vinden"
-"Cancelled Ogone","Ogone Geannuleerd"
-"Debug","Debug"
-"Declined Ogone","Ogone Afgewezen"
-"Declined Order on Ogone side.","Afgewezen bestellingen vanaf Ogone's kant."
-"Direct Sale","Rechtstreekse Verkoop"
-"E.g: ""Verdana"".","Bv.: ""Verdana""."
-"E.g: ""black"".","Bv.: ""Zwart""."
-"E.g: ""white"".","Bv.: ""Wit""."
-"Enabled","Aan"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","Wanneer u deze functie inschakelt moet u ""Technische informatie > Globale Veiligheidsparameters"" naar handelaars administratie aanpassen."
+"The order cannot be saved.","De bestelling kan niet worden opgeslagen."
+"Authorization Waiting from Ogone","Wacht op autorisatie van Ogone"
+"Processed by Ogone","Verwerkt door Ogone"
+"Order can't save","Bestelling kan niet opgeslagen worden"
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception","Onbekende uitzondering"
+"Something went wrong while saving this order.","Something went wrong while saving this order."
"Exception not defined","Uitzondering niet gedefinieerd"
-"Font Family of the Ogone Template","Lettertype in het Ogone Sjabloon"
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","Voor productie moet u ""test"" vervangen met ""prod"". Bijvoorbeeld: https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","Gateway URL"
-"Hash All Parameters","Deel Alle Parameters Op"
-"Hashing Algorithm","Deel het Algoritme Op"
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation","Ogone Standaard Operatie"
+Authorization,Autorisatie
+"Direct Sale","Rechtstreekse Verkoop"
"Horizontally grouped logo with group name on left","Horizontaal gegroepeerd logo met de groep naam links"
"Horizontally grouped logo with no group name","Horizontaal gegroepeerd logo zonder groepsnaam"
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","Wanneer uw ""Geen Operatie"" kiest, zal Ogone uw standaard betalingsprocedure vanuit de Ogone configuratie gebruiken."
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","Wanneer uw ""Ogone Sjabloon"" kiest; zult u de volgende velden moeten invullen."
-"Layout of Payment Methods","Lay-out van de Betalingsmethodes"
-"Logo of the Ogone Template","Logo van de Ogone Sjabloon"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Ogone Standaard Operatie"
-"Order can't save","Bestelling kan niet opgeslagen worden"
-"PSPID","PSP ID"
-"Payment Action","Betaling"
-"Payment Template","Betaling Sjabloon"
-"Payment transaction has been declined.","Betalingstransactie wordt niet geaccepteerd."
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","Betalingsonzekerheid: Een technisch probleem verscheen tijdens het betalingsprocess met onbekende resultaten"
+"Verical list","Vericale lijst"
+Ogone,Ogone
"Pending Ogone","In afwachting van Ogone"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","Even geduld a.u.b., deze pagina zal uw binnen enkele seconden naar de Ogone betalingspoort leiden."
-"Processed Ogone Payment","Verwerkte Ogone Betalingen"
-"Processed by Ogone","Verwerkt door Ogone"
+"Cancelled Ogone","Ogone Geannuleerd"
+"Declined Ogone","Ogone Afgewezen"
"Processing Ogone Payment","Verwerking van de Ogone Betaling"
-"SHA-IN Pass Phrase","SHA-IN Wachtwoord Zin"
-"SHA-OUT Pass Phrase","SHA-OUT Wachtwoord Zin"
-"Start Ogone Processing","Begin Ogone Verwerking"
-"Table Background Color of the Ogone Template","Tabel Achtergrond Kleur op het Ogone Sjabloon"
-"Table Text Color of the Ogone Template","Tabel Tekst Kleur op het Ogone Sjabloon"
-"Text Color of the Ogone Template","Tekst Kleur op het Ogone Sjabloon"
-"The hash is not valid","De hash is niet valide"
-"The order cannot be canceled for a system reason.","De bestelling kan vanwege een systeemreden niet worden geannuleerd."
-"The order cannot be saved for a system reason.","De bestelling kan vanwege een systeemreden niet worden opgeslagen."
-"The order cannot be saved.","De bestelling kan niet worden opgeslagen."
-"The order is not valid","De bestelling is niet geldig"
-"The order was canceled on ogone side.","De bestelling is geannuleerd."
-"Title","Titel"
-"Title of the Ogone Template","Titel van de Ogone Sjabloon"
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","Om alle <strong>parameters te hashen</strong>, selecteer de volgende opties in de ""Global security parameters"" fieldset: <ul><li>Elke parameter gevolgd door de volgende zin..</li><li>""Hash algoritme"" zoals ""Hashing Algoritme"" hieronder</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","URL/bestandsnaam van het logo.<br />De URL moet absoluut zijn en opgeslagen op een veilige server."
-"Unknown exception","Onbekende uitzondering"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","Gebruik in postbestanden van Magento naar Ogone..<br/>Gebruik in nakijken van bestanden door Ogone voor betaling."
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","Gebruik in postbestanden van Ogone naar Magento.<br/>Gebruik in nakijken van bestanden door Magento."
-"Verical list","Vericale lijst"
+"Processed Ogone Payment","Verwerkte Ogone Betalingen"
"Waiting Authorization","Wachten op Authorisatie"
-"You can arrange the layout/list of the payment methods on Ogone payment page.","U kunt de layout/lijst van de betaalmethoden op de Ogone betaalpagina rangschikken."
+"Payment ID: %1","Payment ID: %1"
"You will be redirected to Ogone website when you place an order.","U wordt teruggeleid naar de Ogone website als u een bestelling plaatst."
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
+"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
+"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
+"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
+"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
+"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
diff --git a/app/code/Magento/Ogone/i18n/pt_BR.csv b/app/code/Magento/Ogone/i18n/pt_BR.csv
index 6a7548de1b9..c2995256563 100644
--- a/app/code/Magento/Ogone/i18n/pt_BR.csv
+++ b/app/code/Magento/Ogone/i18n/pt_BR.csv
@@ -1,66 +1,122 @@
-"Authorization","Autorização"
-"Authorization Waiting from Ogone","Esperando Autorização de Ogone"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","Autorização não conhecida: Um problema técnico surgiu durante o processo de autorização, dando resultado imprevisÃvel"
-"Background Color of Ogone Template","Cor de Fundo de Modelo Ogone"
-"Button Background Color of the Ogone Template","Botão de Cor de Fundo do Modelo Ogone"
-"Button Text Color of the Ogone Template","Botão de Cor de Texto do Modelo Ogone"
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing","Iniciar Processamento Ogone"
"Can't detect Ogone payment action","Não é possÃvel detetar a ação de pagamento Ogone"
-"Cancelled Ogone","Ogone Cancelada"
-"Debug","Debug"
-"Declined Ogone","Ogone Recusada"
-"Declined Order on Ogone side.","Ordem Recusada do lado Ogone."
-"Direct Sale","Venda Direta"
-"E.g: ""Verdana"".","Exemplo: ""Verdana""."
-"E.g: ""black"".","Exemplo: ""preto""."
-"E.g: ""white"".","Exemplo: ""branco""."
-"Enabled","Ativado"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","A ativação deste recurso precisa de ajuste de ""Informações técnicas > Parâmetros de segurança globais"" na administração comerciante."
+"The order cannot be saved.","A ordem não pode ser salva."
+"Authorization Waiting from Ogone","Esperando Autorização de Ogone"
+"Processed by Ogone","Processado por Ogone"
+"Order can't save","Não pode salvar ordem"
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception","Exceção desconhecida"
+"Something went wrong while saving this order.","Something went wrong while saving this order."
"Exception not defined","Exceção não definida"
-"Font Family of the Ogone Template","FamÃlia de Fontes do Modelo Ogone"
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","Para a produção, substitua ""teste"" com ""prod"". Exemplo: https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","URL do Gateway"
-"Hash All Parameters","Misture Todos os Parâmetros"
-"Hashing Algorithm","Misturando Algoritmos"
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation","Operação Predifinida Ogone"
+Authorization,Autorização
+"Direct Sale","Venda Direta"
"Horizontally grouped logo with group name on left","Logotipo horizontalmente agrupado com nome do grupo à esquerda"
"Horizontally grouped logo with no group name","Logotipo horizontalmente agrupado com nenhum nome de grupo"
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","Se você escolher ""Sem Operação"", Ogone usará a configuração do procedimento de pagamento predifinida na configuração Ogone."
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","Se você escolher ""Modelo Ogone"", você precisará preencher todos os campos a seguir."
-"Layout of Payment Methods","Disposição dos Métodos de Pagamento"
-"Logo of the Ogone Template","Logo do Modelo Ogone"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Operação Predifinida Ogone"
-"Order can't save","Não pode salvar ordem"
-"PSPID","PSPID"
-"Payment Action","Ação de Pagamento"
-"Payment Template","Modelo de Pagamento"
-"Payment transaction has been declined.","Operação de pagamento foi recusada."
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","Pagamento incerto: Um problema técnico surgiu durante o processo de pagamento, dando um resultado imprevisÃvel"
+"Verical list","Lista verical"
+Ogone,Ogone
"Pending Ogone","Ogone Pendente"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","Por favor, aguarde um momento. Esta página vai transferir seus dados para o portal de pagamento Ogone em poucos segundos."
-"Processed Ogone Payment","Pagamento Ogone Processado"
-"Processed by Ogone","Processado por Ogone"
+"Cancelled Ogone","Ogone Cancelada"
+"Declined Ogone","Ogone Recusada"
"Processing Ogone Payment","Processando Pagamento Ogone"
-"SHA-IN Pass Phrase","Frase Senha SHA-IN"
-"SHA-OUT Pass Phrase","Frase Senha SHA-OUT"
-"Start Ogone Processing","Iniciar Processamento Ogone"
-"Table Background Color of the Ogone Template","Tabela de Cores de Fundo do Modelo Ogone"
-"Table Text Color of the Ogone Template","Tabela de Cores de Texto do Modelo Ogone"
-"Text Color of the Ogone Template","Cor de Texto do Modelo Ogone"
-"The hash is not valid","A mistura não é válida"
-"The order cannot be canceled for a system reason.","A ordem não pode ser cancelada por um motivo do sistema."
-"The order cannot be saved for a system reason.","A ordem não pode ser salva por um motivo do sistema."
-"The order cannot be saved.","A ordem não pode ser salva."
-"The order is not valid","A ordem não é válida"
-"The order was canceled on ogone side.","A ordem foi cancelada do lado ogone."
-"Title","TÃtulo"
-"Title of the Ogone Template","TÃtulo do Modelo Ogone"
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","Para misturar <strong>todos os parâmetros</strong>, selecione as seguintes opções no conjunto de campos ""Parâmetros de segurança global"": <ul><li>Cada parâmetro seguido pela frase passagem.</li><li>""Algoritmo de mistura"" mesmo que ""Algoritmo de mixagem"" abaixo</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","URL/nome do arquivo do logotipo.<br /> O URL deve ser absoluto e armazenado em um servidor seguro."
-"Unknown exception","Exceção desconhecida"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","Use ao postar dados de Magento para Ogone.<br/>Use em verificação de dados por Ogone antes do pagamento."
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","Uso ao postar dados de Ogone para Magento.<br/>Use no controlo de retroalimentação de dados por Magento."
-"Verical list","Lista verical"
+"Processed Ogone Payment","Pagamento Ogone Processado"
"Waiting Authorization","Esperando Autorização"
-"You can arrange the layout/list of the payment methods on Ogone payment page.","Você pode organizar o layout/lista dos métodos de pagamento na página de pagamento Ogone."
+"Payment ID: %1","Payment ID: %1"
"You will be redirected to Ogone website when you place an order.","Você será redirecionado para o site Ogone quando você colocar uma ordem."
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
+"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
+"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
+"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
+"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
+"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
diff --git a/app/code/Magento/Ogone/i18n/zh_CN.csv b/app/code/Magento/Ogone/i18n/zh_CN.csv
index 0ca9dbe20a0..6d4b7058152 100644
--- a/app/code/Magento/Ogone/i18n/zh_CN.csv
+++ b/app/code/Magento/Ogone/i18n/zh_CN.csv
@@ -1,66 +1,122 @@
-"Authorization","授æƒ"
-"Authorization Waiting from Ogone","æ£åœ¨ç‰å¾…从 Ogone 的授æƒ"
-"Authorization not known: A technical problem arose during authorization process, giving unpredictable result","未知授æƒï¼šæŽˆæƒè¿‡ç¨‹ä¸å‡ºçŽ°æŠ€æœ¯æ€§é—®é¢˜ï¼Œå¯¼è‡´ä¸å¯é¢„知的结果"
-"Background Color of Ogone Template","Ogone 模æ¿çš„背景颜色"
-"Button Background Color of the Ogone Template","Ogone 模æ¿çš„按钮背景颜色"
-"Button Text Color of the Ogone Template","Ogone 模æ¿çš„的按钮文本颜色"
+Enabled,Enabled
+Title,Title
+Magento,Magento
+"The hash is not valid.","The hash is not valid."
+"The order is not valid.","The order is not valid."
+"Start Ogone Processing",开始Ogone处ç†
"Can't detect Ogone payment action","æ— æ³•æ£€æµ‹ Ogone 支付æ“作"
+"The order cannot be saved.",订å•æ— 法ä¿å˜ã€‚
+"Authorization Waiting from Ogone","æ£åœ¨ç‰å¾…从 Ogone 的授æƒ"
+"Processed by Ogone",ç”±Ogone处ç†
+"Order can't save",订å•æ— 法ä¿å˜
+"Something went wrong during the payment process, and so the result is unpredictable.","Something went wrong during the payment process, and so the result is unpredictable."
+"Something went wrong during the authorization process, and so the result is unpredictable.","Something went wrong during the authorization process, and so the result is unpredictable."
+"Unknown exception",未知例外
+"Something went wrong while saving this order.","Something went wrong while saving this order."
+"Exception not defined",异常未定义
+"Declined Order on Ogone side","Declined Order on Ogone side"
+"The payment transaction has been declined.","The payment transaction has been declined."
+"The order was canceled on the Ogone side.","The order was canceled on the Ogone side."
+"Something went wrong while canceling this order.","Something went wrong while canceling this order."
+"Ogone Default Operation",Ogone默认æ“作
+Authorization,授æƒ
+"Direct Sale",直销
+"Horizontally grouped logo with group name on left",左侧带组åç§°çš„æ°´å¹³åˆ†ç»„æ ‡å¿—
+"Horizontally grouped logo with no group name",ä¸å¸¦ç»„åç§°çš„æ°´å¹³åˆ†ç»„æ ‡å¿—
+"Verical list",垂直列表
+Ogone,Ogone
+"Pending Ogone",挂起的Ogone
"Cancelled Ogone","å·²å–消 Ogone"
-"Debug","调试"
"Declined Ogone","å·²æ‹’ç» Ogone"
-"Declined Order on Ogone side.","Ogone 方已拒ç»è®¢å•ã€‚"
-"Direct Sale","直销"
-"E.g: ""Verdana"".","例如：""Verdana""。"
-"E.g: ""black"".","例如：""黑色""。"
-"E.g: ""white"".","例如：""白色""。"
-"Enabled","å·²å¯ç”¨"
-"Enabling this feature needs adjusting ""Technical information > Global security parameters"" on merchant administration.","è¦å¯ç”¨æ¤åŠŸèƒ½ï¼Œéœ€è¦åœ¨å•†å®¶ç®¡ç†é¡µé¢è°ƒèŠ‚â€œæŠ€æœ¯ä¿¡æ¯ > 全局安全å‚æ•°â€è®¾ç½®ã€‚"
-"Exception not defined","异常未定义"
-"Font Family of the Ogone Template","Ogone 模æ¿çš„å—体库"
-"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","对于产å“，将 ""test"" 替æ¢ä¸º ""prod""。例如：https://secure.ogone.com/ncol/prod/orderstandard.asp"
-"Gateway URL","网关 URL"
-"Hash All Parameters","哈希所有å‚æ•°"
-"Hashing Algorithm","哈希算法"
-"Horizontally grouped logo with group name on left","左侧带组åç§°çš„æ°´å¹³åˆ†ç»„æ ‡å¿—"
-"Horizontally grouped logo with no group name","ä¸å¸¦ç»„åç§°çš„æ°´å¹³åˆ†ç»„æ ‡å¿—"
-"If you choose ""No Operation"", Ogone will use default payment procedure setup in Ogone configuration.","å¦‚æžœæ‚¨é€‰æ‹©â€œæ— æ“作â€ï¼ŒOgone将使用Ogoneé…ç½®ä¸çš„默认支付æµç¨‹ã€‚"
-"If you choose ""Ogone Template"", you will need to fill in all the following fields.","如果选择“Ogone模æ¿â€ï¼Œåˆ™éœ€è¦å¡«å†™ä¸‹åˆ—全部å—段。"
-"Layout of Payment Methods","支付方法布局"
-"Logo of the Ogone Template","Ogone模æ¿çš„å¾½æ ‡"
-"Magento","Magento"
-"Ogone","Ogone"
-"Ogone Default Operation","Ogone默认æ“作"
-"Order can't save","订å•æ— 法ä¿å˜"
-"PSPID","PSPID"
-"Payment Action","支付æ“作"
-"Payment Template","支付模æ¿"
-"Payment transaction has been declined.","支付交易被拒ç»ã€‚"
-"Payment uncertain: A technical problem arose during payment process, giving unpredictable result","支付ä¸ç¡®å®šï¼šæ”¯ä»˜è¿‡ç¨‹ä¸é‡åˆ°äº†æŠ€æœ¯é—®é¢˜ï¼Œå› æ¤èŽ·å¾—了éžé¢„期结果"
-"Pending Ogone","挂起的Ogone"
-"Please, wait a moment. This page will transfer your data to Ogone payment gateway in a few seconds.","请ç¨ç‰ã€‚该页é¢ä¼šåœ¨å‡ 秒åŽå°†æ‚¨çš„æ•°æ®ä¼ 输到Ogone支付网站。"
-"Processed Ogone Payment","已处ç†çš„Ogone支付"
-"Processed by Ogone","ç”±Ogone处ç†"
-"Processing Ogone Payment","æ£åœ¨å¤„ç†Ogone支付"
-"SHA-IN Pass Phrase","SHA-IN通路"
-"SHA-OUT Pass Phrase","SHA-OUT 通路"
-"Start Ogone Processing","开始Ogone处ç†"
-"Table Background Color of the Ogone Template","Ogone模æ¿çš„è¡¨æ ¼èƒŒæ™¯è‰²"
-"Table Text Color of the Ogone Template","Ogoneè¡¨æ ¼çš„æ–‡å—颜色"
-"Text Color of the Ogone Template","Ogone模æ¿çš„æ–‡å—颜色"
-"The hash is not valid","å“ˆå¸Œæ— æ•ˆ"
-"The order cannot be canceled for a system reason.","ç”±äºŽç³»ç»ŸåŽŸå› ï¼Œè®¢å•æ— 法å–消。"
-"The order cannot be saved for a system reason.","ç”±äºŽç³»ç»ŸåŽŸå› ï¼Œè®¢å•æ— 法ä¿å˜ã€‚"
-"The order cannot be saved.","订å•æ— 法ä¿å˜ã€‚"
-"The order is not valid","订å•æ— 效。"
-"The order was canceled on ogone side.","订å•åœ¨Ogone端被å–消。"
-"Title","æ ‡é¢˜"
-"Title of the Ogone Template","Ogone模æ¿çš„å称"
-"To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>","è¦å¯¹ <strong>所有å‚æ•°</strong>创建哈希，请在“全局安全å‚æ•°â€ç±»åˆ«ä¸‹é€‰æ‹©ä¸‹åˆ—选项：<ul><li>通路åŽçš„æ¯ä¸ªå‚数。</li><li>""哈希算法""与 下é¢çš„""哈希算法""相åŒ</li><li>UTF-8</li></ul>"
-"URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.","å¾½æ ‡çš„URL/文件å。<br />URL必须是ç»å¯¹è·¯å¾„，并ä¿å˜åœ¨å®‰å…¨çš„æœåŠ¡å™¨ä¸Šã€‚"
-"Unknown exception","未知例外"
-"Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.","用于从Magentoå‘Ogoneå‘布数æ®ã€‚<br/>用于在支付å‰ç”±Ogone检查数æ®ã€‚"
-"Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.","用于从Ogoneå‘Magentoå‘布数æ®ã€‚<br/>被Magento用于检查å馈的数æ®ã€‚"
-"Verical list","垂直列表"
-"Waiting Authorization","ç‰å¾…身份验è¯"
-"You can arrange the layout/list of the payment methods on Ogone payment page.","您å¯ä»¥åœ¨Ogone支付页é¢ä¸Šå®‰æŽ’支付方法的布局/列表。"
-"You will be redirected to Ogone website when you place an order.","在下å•æ—¶ï¼Œæ‚¨ä¼šè¢«é‡å®šå‘到Ogone的网站。"
+"Processing Ogone Payment",æ£åœ¨å¤„ç†Ogone支付
+"Processed Ogone Payment",已处ç†çš„Ogone支付
+"Waiting Authorization",ç‰å¾…身份验è¯
+"Payment ID: %1","Payment ID: %1"
+"You will be redirected to Ogone website when you place an order.",在下å•æ—¶ï¼Œæ‚¨ä¼šè¢«é‡å®šå‘到Ogone的网站。
+"Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway."
+Debug,Debug
+"Payment Action","Payment Action"
+"Gateway URL","Gateway URL"
+"
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ ","
+ <br />
+ <div class=""custom-options"">
+ <div class=""box"">
+ <p class=""grand-total""><br /><b>Signing up with Ogone</b></p>
+ <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+ <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+ <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+ </div>
+ </div>
+
+ "
+PSPID,PSPID
+"SHA-IN Pass Phrase","SHA-IN Pass Phrase"
+"
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ ","
+ Use in posting data from Magento to Ogone.<br/>Use in data checking by Ogone before the payment.
+ "
+"SHA-OUT Pass Phrase","SHA-OUT Pass Phrase"
+"
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ ","
+ Use in posting data from Ogone to Magento.<br/>Use in feedback data checking by Magento.
+ "
+"Hash All Parameters","Hash All Parameters"
+"
+ To enable this feature, please edit your global security parameters.
+ ","
+ To enable this feature, please edit your global security parameters.
+ "
+"
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ ","
+ To hash <strong>all parameters</strong>, select the following options in the ""Global security parameters"" fieldset: <ul><li>Each parameter followed by the pass phrase.</li><li>""Hash algorithm"" same as ""Hashing Algorithm"" below</li><li>UTF-8</li></ul>
+ "
+"Hashing Algorithm","Hashing Algorithm"
+"For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp","For production, replace ""test"" with ""prod"". Example: https://secure.ogone.com/ncol/prod/orderstandard.asp"
+"If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup.","If you choose ""No Operation"", Ogone will use the default payment procedure in your Ogone setup."
+"Payment Template","Payment Template"
+"If you choose ""Ogone Template"", you will need to fill in all the following fields.","If you choose ""Ogone Template"", you will need to fill in all the following fields."
+"Title of the Ogone Template","Title of the Ogone Template"
+"Background Color of Ogone Template","Background Color of Ogone Template"
+"
+ E.g: ""white""
+ ","
+ E.g: ""white""
+ "
+"Text Color of the Ogone Template","Text Color of the Ogone Template"
+"
+ E.g: ""black""
+ ","
+ E.g: ""black""
+ "
+"Table Background Color of the Ogone Template","Table Background Color of the Ogone Template"
+"Table Text Color of the Ogone Template","Table Text Color of the Ogone Template"
+"Button Background Color of the Ogone Template","Button Background Color of the Ogone Template"
+"Button Text Color of the Ogone Template","Button Text Color of the Ogone Template"
+"Font Family of the Ogone Template","Font Family of the Ogone Template"
+"
+ E.g: ""Verdana""
+ ","
+ E.g: ""Verdana""
+ "
+"Logo of the Ogone Template","Logo of the Ogone Template"
+"
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ ","
+ URL/filename of the logo.<br />The URL must be absolute and stored on a secure server.
+ "
+"Layout of Payment Methods","Layout of Payment Methods"
+"You can arrange the layout/list of the payment methods on Ogone payment page.","You can arrange the layout/list of the payment methods on Ogone payment page."
diff --git a/app/code/Magento/Ogone/view/frontend/templates/form.phtml b/app/code/Magento/Ogone/view/frontend/templates/form.phtml
index 4035d817046..32cefbb6c14 100644
--- a/app/code/Magento/Ogone/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Ogone/view/frontend/templates/form.phtml
@@ -24,8 +24,6 @@
?>
<?php $_code=$this->getMethodCode() ?>
-<fieldset class="fieldset items" id="payment_form_<?php echo $_code ?>" style="display:none;">
- <div class="message notice">
- <div><?php echo __('You will be redirected to Ogone website when you place an order.') ?></div>
- </div>
+<fieldset class="fieldset items redirect" id="payment_form_<?php echo $_code ?>" style="display:none;">
+ <div><?php echo __('You will be redirected to Ogone website when you place an order.') ?></div>
</fieldset>
diff --git a/app/code/Magento/PageCache/i18n/de_DE.csv b/app/code/Magento/PageCache/i18n/de_DE.csv
index 3f4754bb08e..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/de_DE.csv
+++ b/app/code/Magento/PageCache/i18n/de_DE.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","Es ist ein Fehler beim Löschen der externen ganzseitigen Cache aufgetreten."
-"Cookie Lifetime (seconds)","Cookie Lifetime (Cookie-Laufzeit) (Sekunden)"
-"Enable External Cache","Externes Cache aktivieren"
-"External Cache Control","Externe Cache-Steuerung"
-"External Full Page Cache Settings","Externe ganzseitige Cache Einstellungen"
-"External full page cache.","Externes ganzseitiges Cache."
-"Failed to load external cache control","Fehler beim Laden des externen Cache-Steuerelements"
-"Flush External Page Cache","Externes Seiten Cache spülen (Flush externes Seiten Cache)"
-"If empty, default value will be used.","Wenn leer, wird der Standardwert verwendet."
-"The external full page cache has been cleaned.","Das externe ganzseitige Cache wurde gereinigt."
-"Zend Full Page Cache","Zend ganzseitiges Seiten Cache"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PageCache/i18n/en_US.csv b/app/code/Magento/PageCache/i18n/en_US.csv
index 79f380c0c6c..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/en_US.csv
+++ b/app/code/Magento/PageCache/i18n/en_US.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","An error occurred while clearing the external full page cache."
-"Cookie Lifetime (seconds)","Cookie Lifetime (seconds)"
-"Enable External Cache","Enable External Cache"
-"External Cache Control","External Cache Control"
-"External Full Page Cache Settings","External Full Page Cache Settings"
-"External full page cache.","External full page cache."
-"Failed to load external cache control","Failed to load external cache control"
-"Flush External Page Cache","Flush External Page Cache"
-"If empty, default value will be used.","If empty, default value will be used."
-"The external full page cache has been cleaned.","The external full page cache has been cleaned."
-"Zend Full Page Cache","Zend Full Page Cache"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PageCache/i18n/es_ES.csv b/app/code/Magento/PageCache/i18n/es_ES.csv
index 880552e098d..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/es_ES.csv
+++ b/app/code/Magento/PageCache/i18n/es_ES.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","Ocurrió un error mientras se limpiaba la caché de página completa externa"
-"Cookie Lifetime (seconds)","Duración de la Cookie (segundos)"
-"Enable External Cache","Habilitar Caché Externa"
-"External Cache Control","Control de Caché Externa"
-"External Full Page Cache Settings","Configuración de la Caché de Página Completa Externa"
-"External full page cache.","Caché de página completa externa."
-"Failed to load external cache control","Fallo al cargar el control de caché externa"
-"Flush External Page Cache","Borrar Caché de Página Externa"
-"If empty, default value will be used.","Si está vacÃo, se usará el valor por defecto."
-"The external full page cache has been cleaned.","La caché de página completa externa se ha limpiado."
-"Zend Full Page Cache","Caché de Página Completa Zend"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PageCache/i18n/fr_FR.csv b/app/code/Magento/PageCache/i18n/fr_FR.csv
index 1475a89551d..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/fr_FR.csv
+++ b/app/code/Magento/PageCache/i18n/fr_FR.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","Une erreur s'est produite pendant le vidage du cache externe de l'ensemble de la page."
-"Cookie Lifetime (seconds)","Durée de vie du cookie (secondes)"
-"Enable External Cache","Activer le cache externe"
-"External Cache Control","Contrôle du cache externe"
-"External Full Page Cache Settings","Paramètres du cache externe de l'ensemble de la page"
-"External full page cache.","Cache externe de l'ensemble de la page."
-"Failed to load external cache control","Impossible de lancer le contrôle du cache externe"
-"Flush External Page Cache","Vider le cache externe de la page"
-"If empty, default value will be used.","Si le champ est vide, la valeur par défaut sera utilisée."
-"The external full page cache has been cleaned.","Le cache externe de l'ensemble de la page a été vidé."
-"Zend Full Page Cache","Cache Avestan de l'ensemble de la page"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PageCache/i18n/nl_NL.csv b/app/code/Magento/PageCache/i18n/nl_NL.csv
index 4d33f088855..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/nl_NL.csv
+++ b/app/code/Magento/PageCache/i18n/nl_NL.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","Er is een fout opgetreden bij het opruimen van de externe volledige pagina cache."
-"Cookie Lifetime (seconds)","Cookie Levensduur (seconden)"
-"Enable External Cache","Schakel Externe Cache In"
-"External Cache Control","Externe Cache Besturing"
-"External Full Page Cache Settings","Externe Volledige Pagina Cache-instellingen"
-"External full page cache.","Externe volledige pagina cache."
-"Failed to load external cache control","Kan geen externe cache-control laden"
-"Flush External Page Cache","Flush Externe Pagina Cache"
-"If empty, default value will be used.","Indien leeg, wordt de standaard waarde aangehouden."
-"The external full page cache has been cleaned.","De externe volledige pagina cache is schoongemaakt."
-"Zend Full Page Cache","Zend Volledige Pagina Cache"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PageCache/i18n/pt_BR.csv b/app/code/Magento/PageCache/i18n/pt_BR.csv
index 29adbf60277..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/pt_BR.csv
+++ b/app/code/Magento/PageCache/i18n/pt_BR.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","Ocorreu um erro ao limpar o cache da página completa externa."
-"Cookie Lifetime (seconds)","Tempo de vida do Cookie (segundos)"
-"Enable External Cache","Permitir Cache Externo"
-"External Cache Control","Controle de Cache Externo"
-"External Full Page Cache Settings","Configurações do Cache Externo da Página Completa"
-"External full page cache.","Cache externo da página completa."
-"Failed to load external cache control","Falha no carregamento de controle de cache externo"
-"Flush External Page Cache","Libere Cache Externo de Página Completa."
-"If empty, default value will be used.","Se vazio, será usado valor padrão."
-"The external full page cache has been cleaned.","O cache externo da página completa foi limpo."
-"Zend Full Page Cache","Cache Página Completa Zend"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PageCache/i18n/zh_CN.csv b/app/code/Magento/PageCache/i18n/zh_CN.csv
index 0d30e499a96..6d515fd2809 100644
--- a/app/code/Magento/PageCache/i18n/zh_CN.csv
+++ b/app/code/Magento/PageCache/i18n/zh_CN.csv
@@ -1,11 +1,19 @@
-"An error occurred while clearing the external full page cache.","清ç†å¤–部全页é¢ç¼“å˜æ—¶å‡ºé”™ã€‚"
-"Cookie Lifetime (seconds)","Cookie 寿命（秒）"
-"Enable External Cache","å¯ç”¨å¤–部缓å˜"
-"External Cache Control","外部缓å˜æŽ§åˆ¶"
-"External Full Page Cache Settings","外部全页é¢ç¼“å˜è®¾ç½®"
-"External full page cache.","外部全页é¢ç¼“å˜ã€‚"
-"Failed to load external cache control","åŠ è½½å¤–éƒ¨ç¼“å˜æŽ§åˆ¶å‡ºé”™"
-"Flush External Page Cache","清除外部页é¢ç¼“å˜"
-"If empty, default value will be used.","如果为空，将使用默认值。"
-"The external full page cache has been cleaned.","外部全页é¢ç¼“å˜å·²è¢«æ¸…ç†ã€‚"
-"Zend Full Page Cache","Zend 全页é¢ç¼“å˜"
+"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"
+"Varnish Caching","Varnish Caching"
+"Full Page Cache","Full Page Cache"
+"Caching Application","Caching Application"
+"Varnish Configuration","Varnish Configuration"
+"Access list","Access list"
+"IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved.","IPs access list separated with ',' that can purge Varnish configuration for config file generation.
+ If field is empty default value localhost will be saved."
+"Backend host","Backend host"
+"Specify backend host for config file generation. If field is empty default value localhost will be saved.","Specify backend host for config file generation. If field is empty default value localhost will be saved."
+"Backend port","Backend port"
+"Specify backend port for config file generation. If field is empty default value 8080 will be saved.","Specify backend port for config file generation. If field is empty default value 8080 will be saved."
+"TTL for public content","TTL for public content"
+"Public content cache lifetime in seconds. If field is empty default value 120 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 120 will be saved. "
+"Page Cache","Page Cache"
+"Full page caching.","Full page caching."
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/de_DE.csv b/app/code/Magento/PayPalRecurringPayment/i18n/de_DE.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/de_DE.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/en_US.csv b/app/code/Magento/PayPalRecurringPayment/i18n/en_US.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/en_US.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/es_ES.csv b/app/code/Magento/PayPalRecurringPayment/i18n/es_ES.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/es_ES.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/fr_FR.csv b/app/code/Magento/PayPalRecurringPayment/i18n/fr_FR.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/fr_FR.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/nl_NL.csv b/app/code/Magento/PayPalRecurringPayment/i18n/nl_NL.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/nl_NL.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/pt_BR.csv b/app/code/Magento/PayPalRecurringPayment/i18n/pt_BR.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/pt_BR.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/PayPalRecurringPayment/i18n/zh_CN.csv b/app/code/Magento/PayPalRecurringPayment/i18n/zh_CN.csv
new file mode 100644
index 00000000000..958f0761057
--- /dev/null
+++ b/app/code/Magento/PayPalRecurringPayment/i18n/zh_CN.csv
@@ -0,0 +1,7 @@
+"We can't change the status because the current status doesn't match the real status.","We can't change the status because the current status doesn't match the real status."
+"The subscriber name is too long.","The subscriber name is too long."
+"The merchant's reference ID format is not supported.","The merchant's reference ID format is not supported."
+"The schedule description is too long.","The schedule description is too long."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
diff --git a/app/code/Magento/Payment/i18n/de_DE.csv b/app/code/Magento/Payment/i18n/de_DE.csv
index 2d11f3b30e8..2c9f2f64027 100644
--- a/app/code/Magento/Payment/i18n/de_DE.csv
+++ b/app/code/Magento/Payment/i18n/de_DE.csv
@@ -1,132 +1,41 @@
-"%s %s cycle.","%s %s Zyklus."
+No,No
+Discount,Discount
+"Credit Card Type",Kreditkartentyp
+"Credit Card Number",Kreditkartennummer
+"Expiration Date",Ablaufdatum
+"Card Verification Number",Kartenprüfnummer
"--Please Select--","--Bitte auswählen--"
-"3D Secure Card Validation","3D Secure Card Validierung"
-"3D Secure Credit Card Validation","3D Secure Kreditkartenvalidierung"
-"<label>Make Check payable to:</label> %s","<label>Scheck zahlbar machen für</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Ein Wert ist für live mode erforderlich. Siehe CardinalCommerce Vereinbarung."
-"Allow Initial Fee Failure","Erstzahlungsfehlschlag erlauben"
-"An internal reference ID is required to save the payment profile.","Eine interne ReferenzID ist erforderlich um das Zahlungsprofil zu speichern."
-"Authorize action is not available.","Autorisierungsaktion ist nicht verfügbar."
-"Auto Bill on Next Cycle","Automatische Abrechnung beim nächsten Zyklus"
-"Automatically Invoice All Items","Automatische Abrechnung aller Artikel"
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Den ausstehenden Betrag automatisch im nächsten Rechnungslauf verrechnen (wenn es fehlgeschlagene Zahlungen gab)."
-"Billing Amount","Rechnungsbetrag"
-"Billing Frequency","Abrechnungsfrequenz"
-"Billing Interval","Abrechnungsperiode"
-"Billing Interval Unit","Abrechnungsperiodeneinheit"
-"Billing period unit is not defined or wrong.","Abrechnungsperiodeneinheit ist nicht definiert oder falsch."
-"Cannot retrieve payment method instance.","Zahlungsartinstanz kann nicht abgefragt werden."
-"Cannot retrieve the payment info model object.","Zahlungsinfomodellobjekt kann nicht abgefragt werden."
-"Cannot retrieve the payment information object instance.","Zahlungsinformationen Objektinstanz können nicht abgerufen werden."
-"Cannot retrieve the payment method code.","Code der Zahlungsart kann nicht abgerufen werden."
-"Cannot retrieve the payment method model object.","Zahlungsartmodellobjekt kann nicht abgefragt werden."
-"Capture action is not available.","Auffang-Aktion ist nicht verfügbar."
-"Card Verification Number","Kartenprüfnummer"
-"Centinel API URL","Centinel API URL"
-"Check / Money Order","Scheck / Zahlungsansweisung"
-"Credit Card Number","Kreditkartennummer"
-"Credit Card Type","Kreditkartentyp"
-"Credit Card Types","Arten von Kreditkarten"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","Was ist das?"
+Shipping,Shipping
+Yes,Yes
+N/A,"Nicht verfügbar"
+Month,Monat
+Year,Jahr
+"Start Date",Startdatum
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
+"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro-Issue Number"
+"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro-Start Date"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
+"Void action is not available.","Leer-Aktion ist nicht verfügbar."
+"The payment review action is unavailable.","Die Zahlungsreviewaktion ist nicht verfügbar."
"Credit card number mismatch with credit card type.","Kreditkarten-Nummer passt nicht zum Kreditkarten-Typ"
-"Credit card type is not allowed for this payment method.","Der Kreditkarten-Typ ist für diese Zahlungsvariante nicht erlaubt."
-"Currency","Währung"
-"Currency code is undefined.","Währungscode ist nicht definiert."
-"Customer ID is not set.","KundenID ist nicht gesetzt."
-"Day","Tag"
-"Debug Mode","Debug Modus"
-"Enabled","Aktiviert"
-"Expiration Date","Ablaufdatum"
-"Full name of the person receiving the product or service paid for by the recurring payment.","Voller Name des Empfängers des Produkts oder Services, für das mit turnusmäßigen Zahlungen bezahlt wird."
-"Incorrect credit card expiration date.","Falsches Verfallsdatum der Kreditkarte"
-"Initial Fee","Erstzahlung"
-"Initial non-recurring payment amount due immediately upon profile creation.","Erster nicht turnusmäßiger Zahlungsbetrag ist sofort nach Profilerstellung fällig."
-"Internal Reference ID","Interne ReferenzID"
"Invalid Credit Card Number","Ungültige Kreditkarten-Nummer"
-"Issue Number","Ausgabenumer"
-"Make Check Payable to","Scheck zahlbar machen für"
-"Make Check payable to:","Scheck zahlbar machen für:"
-"Make Check payable to: %s","Scheck zahlbar machen für: %s"
-"Maximum Billing Cycles","Maximale Anzahl an Rechnungsläufen"
-"Maximum Order Total","Höchstsumme der Bestellung"
-"Maximum Payment Failures","Maximale Anzahl an fehlgeschlagenen Zahlungen"
-"Maximum Trial Billing Cycles","Maximale Anzahl an Proberechnungsläufen"
-"Merchant ID","Händler-ID"
-"Minimum Order Total","Mindestsumme der Bestellung"
-"Month","Monat"
-"N/A","Nicht verfügbar"
-"Name on Card","Name auf Karte"
-"Name on the Card","Name auf der Karte"
-"New Order Status","Stand der neuen Bestellung"
-"Number of billing periods that make up one billing cycle.","Anzahl von Abrechnungsperioden die einen Rechnungslauf ausmachen."
-"Order action is not available.","Befehlsaktion ist nicht verfügbar."
-"Overrides API URL that may be specified by a payment method.","Ãœberschreibt API URL die durch ein Zahlungsart spezifiziert ist."
-"Password","Passwort"
-"Payment ID: %s","ZahlungsID: %s"
-"Payment Method","Zahlungsart"
-"Payment Methods","Zahlungsarten"
-"Payment Methods Section","Zahlungsartenbereich"
-"Payment Reference ID","Zahlungsreferenz ID"
-"Payment Services","Zahlungsservices"
-"Payment from Applicable Countries","Bezahlung aus den entsprechenden Ländern"
-"Payment from Specific Countries","Bezahlung aus bestimmten Ländern"
-"Payment method code is not set.","Zahlungsartcode ist nicht gesetzt."
-"Payment method code is undefined.","Zahlungsartcode ist nicht definiert."
-"Payment is invalid:\n%s","Zahlungsprofil ist ungültig:\n%s"
-"Interval frequency is wrong.","Periodenfrequenz ist falsch."
+"Credit card type is not allowed for this payment method.","Der Kreditkarten-Typ ist für diese Zahlungsvariante nicht erlaubt."
"Please enter a valid credit card verification number.","Bitte geben Sie eine gültige Verifikationsnummer für Ihre Kreditkarte ein."
-"Processor ID","Prozessor ID"
-"Purchase Order","Auftrag"
-"Purchase Order Number","Auftragsnummer"
-"Purchase Order Number:","Auftragsnummer:"
-"Purchase Order Number: %s","Auftragsnummer: %s"
-"Recurring Payment Start Date","Wiederkehrendes Profilstartdatum"
-"Recurring payment start date has invalid format.","Wiederkehrendes Profilstartdatum hat ein ungültiges Format."
-"Reference ID is not set.","ReferenzID ist nicht gesetzt."
-"Refund action is not available.","Rückerstattung Aktion ist nicht verfügbar."
-"Repeats %s time(s).","Wiederholt %s mal(e)."
-"Repeats until suspended or canceled.","Wiederholt bis angehalten oder abgebrochen."
-"Request Card Security Code","Kartensicherheitscode anfordern"
-"Saved CC","Gespeichertes CC"
-"Schedule Description","Ablaufplanbeschreibung"
-"Schedule description must be not empty.","Ablaufplanbeschreibung darf nicht leer sein."
-"Selected payment type is not allowed for billing country.","Der ausgewählte Zahlungstyp ist für das in der Rechnungsadresse genannte Land nicht erlaubt."
-"Send Check to","Sende Scheck an"
-"Send Check to:","Sende Scheck an:"
-"Severe 3D Secure Card Validation","Severe 3D Secure Card Validierung"
-"Severe validation removes chargeback liability on merchant.","Severe Validierung entfernt Ausgleichhaftung des Händlers."
-"Shipping Amount","Versandbetrag"
-"Short description of the recurring payment. By default equals to the product name.","Kurze Beschreibung der turnusmäßigen Zahlung. Standardmäßig ist das der Produktname."
-"Sort Order","Sortierreihenfolge"
-"Start Date","Startdatum"
-"Start date has invalid format.","Startdatum hat ein ungültiges Format."
-"Start date is undefined.","Startdatum ist nicht definiert."
-"Subscriber Name","Abonnentenname"
-"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro-Issue Number"
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
"Switch/Solo/Maestro Only","Nur Switch/Solo/Maestro"
-"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro-Start Date"
-"Tax Amount","Steuerbetrag"
-"Test Mode","Testmodus"
-"The date when billing for the profile begins.","Das Datum an dem die Abrechnung für das Profil beginnt."
-"The number of billing cycles for payment period.","Die Anzahl der Abrechnungszeiträume für die Zahlungsart."
-"The number of scheduled payments that can fail before the profile is automatically suspended.","Die Anzahl der planmäßigen Zahlungen die fehlschlagen dürfen bis das Profil automatisch suspendiert wird."
-"The payment review action is unavailable.","Die Zahlungsreviewaktion ist nicht verfügbar."
-"Title","Titel"
-"Trial Billing Amount","Probeabrechnungsbetrag"
-"Trial Billing Frequency","Probeabrechnungsfrequenz"
-"Trial Billing Interval Unit","Probeabrechnungsperiodeneinheit"
-"Trial Interval","Probeperiode"
-"Trial billing amount is wrong.","Probeabrechnungsbetrag ist falsch."
-"Trial billing period unit is wrong.","Probeabrechnungsperiodeneinheit ist falsch."
-"Trial period frequency is wrong.","Probeperiodenfrequenz ist falsch."
-"Trial period max cycles is wrong.","Maximale Zyklen für Probeperiode ist falsch."
-"Two Weeks","Zwei Wochen"
-"Unit for billing during the subscription period.","Einheit für Abrechnung der Abonnementperiode."
-"Unsupported currency code: %s.","Nicht unterstützter Währungscode: %s."
-"Void action is not available.","Leer-Aktion ist nicht verfügbar."
-"Week","Woche"
-"What is this?","Was ist das?"
-"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Ob das Zahlungsprofil suspendiert werden soll, wenn die Erstzahlung fehlschlägt, oder ob der Betrag zur ausstehenden Bilanz hinzugefügt werden soll."
-"Wrong %s specified.","%s ist falsch spezifiziert."
-"Wrong or empty billing amount specified.","Falscher oder leerer Abrechnungsbetrag spezifiziert."
-"Year","Jahr"
-"Zero Subtotal Checkout","Leere Zwischensumme Checkout"
+"Issue Number",Ausgabenumer
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/i18n/en_US.csv b/app/code/Magento/Payment/i18n/en_US.csv
index 254108fa6f9..0519acbd15f 100644
--- a/app/code/Magento/Payment/i18n/en_US.csv
+++ b/app/code/Magento/Payment/i18n/en_US.csv
@@ -1,139 +1,41 @@
-"%s %s cycle.","%s %s cycle."
-"--Please Select--","--Please Select--"
-"3D Secure Card Validation","3D Secure Card Validation"
-"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
-"<label>Make Check payable to:</label> %s","<label>Make Check payable to:</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
-"Allow Initial Fee Failure","Allow Initial Fee Failure"
-"An internal reference ID is required to save the payment profile.","An internal reference ID is required to save the payment profile."
-"Authorize action is not available.","Authorize action is not available."
-"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
-"Automatically Invoice All Items","Automatically Invoice All Items"
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments)."
-"Bank Transfer Payment","Bank Transfer Payment"
-"Billing Amount","Billing Amount"
-"Billing Frequency","Billing Frequency"
-"Billing Interval","Billing Interval"
-"Billing Interval Unit","Billing Interval Unit"
-"Billing period unit is not defined or wrong.","Billing period unit is not defined or wrong."
-"Cannot retrieve the payment info model object.","Cannot retrieve the payment info model object."
-"Cannot retrieve the payment information object instance.","Cannot retrieve the payment information object instance."
-"Cannot retrieve the payment method code.","Cannot retrieve the payment method code."
-"Cannot retrieve the payment method model object.","Cannot retrieve the payment method model object."
-"Capture action is not available.","Capture action is not available."
-"Card Verification Number","Card Verification Number"
-"Cash On Delivery Payment","Cash On Delivery Payment"
-"Centinel API URL","Centinel API URL"
-"Check / Money Order","Check / Money Order"
-"Credit Card Number","Credit Card Number"
-"Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s"
+No,No
+Discount,Discount
"Credit Card Type","Credit Card Type"
-"Credit Card Type: %s","Credit Card Type: %s"
-"Credit Card Types","Credit Card Types"
-"Credit card number mismatch with credit card type.","Credit card number mismatch with credit card type."
-"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method."
-"Currency","Currency"
-"Currency code is undefined.","Currency code is undefined."
-"Customer ID is not set.","Customer ID is not set."
-"Day","Day"
-"Debug Mode","Debug Mode"
-"Enabled","Enabled"
+"Credit Card Number","Credit Card Number"
"Expiration Date","Expiration Date"
-"Expiration Date: %s/%s","Expiration Date: %s/%s"
-"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
-"Incorrect credit card expiration date.","Incorrect credit card expiration date."
-"Initial Fee","Initial Fee"
-"Initial non-recurring payment amount due immediately upon profile creation.","Initial non-recurring payment amount due immediately upon profile creation."
-"Instructions","Instructions"
-"Internal Reference ID","Internal Reference ID"
-"Invalid Credit Card Number","Invalid Credit Card Number"
-"Issue Number","Issue Number"
-"Make Check Payable to","Make Check Payable to"
-"Make Check payable to:","Make Check payable to:"
-"Make Check payable to: %s","Make Check payable to: %s"
-"Maximum Billing Cycles","Maximum Billing Cycles"
-"Maximum Order Total","Maximum Order Total"
-"Maximum Payment Failures","Maximum Payment Failures"
-"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
-"Merchant ID","Merchant ID"
-"Minimum Order Total","Minimum Order Total"
-"Month","Month"
-"N/A","N/A"
-"Name on Card","Name on Card"
-"Name on the Card","Name on the Card"
-"Name on the Card: %s","Name on the Card: %s"
-"New Order Status","New Order Status"
-"Number of billing periods that make up one billing cycle.","Number of billing periods that make up one billing cycle."
-"Order action is not available.","Order action is not available."
-"Overrides API URL that may be specified by a payment method.","Overrides API URL that may be specified by a payment method."
-"Password","Password"
-"Payment ID: %s","Payment ID: %s"
-"Payment Method","Payment Method"
-"Payment Methods","Payment Methods"
-"Payment Methods Section","Payment Methods Section"
-"Payment Reference ID","Payment Reference ID"
-"Payment Services","Payment Services"
-"Payment from Applicable Countries","Payment from Applicable Countries"
-"Payment from Specific Countries","Payment from Specific Countries"
-"Payment method code is not set.","Payment method code is not set."
-"Payment method code is undefined.","Payment method code is undefined."
-"Payment profile is invalid:\n%s","Payment profile is invalid:\n%s"
-"Interval frequency is wrong.","Interval frequency is wrong."
-"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
-"Processor ID","Processor ID"
-"Purchase Order","Purchase Order"
-"Purchase Order Number","Purchase Order Number"
-"Purchase Order Number:","Purchase Order Number:"
-"Purchase Order Number: %s","Purchase Order Number: %s"
-"Recurring Payment Start Date","Recurring Payment Start Date"
-"Recurring payment start date has invalid format.","Recurring payment start date has invalid format."
-"Reference ID is not set.","Reference ID is not set."
-"Refund action is not available.","Refund action is not available."
-"Repeats %s time(s).","Repeats %s time(s)."
-"Repeats until suspended or canceled.","Repeats until suspended or canceled."
-"Request Card Security Code","Request Card Security Code"
-"Saved CC","Saved CC"
-"Schedule Description","Schedule Description"
-"Schedule description must be not empty.","Schedule description must be not empty."
-"Selected payment type is not allowed for billing country.","Selected payment type is not allowed for billing country."
-"Send Check to","Send Check to"
-"Send Check to:","Send Check to:"
-"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
-"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
-"Shipping Amount","Shipping Amount"
-"Short description of the recurring payment. By default equals to the product name.","Short description of the recurring payment. By default equals to the product name."
-"Sort Order","Sort Order"
+"Card Verification Number","Card Verification Number"
+"--Please Select--","--Please Select--"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","What is this?"
+Shipping,Shipping
+Yes,Yes
+N/A,N/A
+Month,Month
+Year,Year
"Start Date","Start Date"
-"Start date has invalid format.","Start date has invalid format."
-"Start date is undefined.","Start date is undefined."
-"Subscriber Name","Subscriber Name"
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro Issue Number"
-"Switch/Solo/Maestro Only","Switch/Solo/Maestro Only"
"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro Start Date"
-"Tax Amount","Tax Amount"
-"Test Mode","Test Mode"
-"The date when billing for the profile begins.","The date when billing for the profile begins."
-"The number of billing cycles for payment period.","The number of billing cycles for payment period."
-"The number of scheduled payments that can fail before the profile is automatically suspended.","The number of scheduled payments that can fail before the profile is automatically suspended."
-"The payment review action is unavailable.","The payment review action is unavailable."
-"The requested Payment Method is not available.","The requested Payment Method is not available."
-"Title","Title"
-"Trial Billing Amount","Trial Billing Amount"
-"Trial Billing Frequency","Trial Billing Frequency"
-"Trial Billing Interval Unit","Trial Billing Interval Unit"
-"Trial Interval","Trial Interval"
-"Trial billing amount is wrong.","Trial billing amount is wrong."
-"Trial billing period unit is wrong.","Trial billing period unit is wrong."
-"Trial period frequency is wrong.","Trial period frequency is wrong."
-"Trial period max cycles is wrong.","Trial period max cycles is wrong."
-"Two Weeks","Two Weeks"
-"Unit for billing during the subscription period.","Unit for billing during the subscription period."
-"Unsupported currency code: %s.","Unsupported currency code: %s."
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
"Void action is not available.","Void action is not available."
-"Week","Week"
-"What is this?","What is this?"
-"Whether to suspend the payment if the initial fee fails or add it to the outstanding balance.","Whether to suspend the payment if the initial fee fails or add it to the outstanding balance."
-"Wrong %s specified.","Wrong %s specified."
-"Wrong or empty billing amount specified.","Wrong or empty billing amount specified."
-"Year","Year"
-"Zero Subtotal Checkout","Zero Subtotal Checkout"
+"The payment review action is unavailable.","The payment review action is unavailable."
+"Credit card number mismatch with credit card type.","Credit card number mismatch with credit card type."
+"Invalid Credit Card Number","Invalid Credit Card Number"
+"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method."
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
+"Switch/Solo/Maestro Only","Switch/Solo/Maestro Only"
+"Issue Number","Issue Number"
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/i18n/es_ES.csv b/app/code/Magento/Payment/i18n/es_ES.csv
index b4aadd6782e..a80e5bd794f 100644
--- a/app/code/Magento/Payment/i18n/es_ES.csv
+++ b/app/code/Magento/Payment/i18n/es_ES.csv
@@ -1,132 +1,41 @@
-"%s %s cycle.","Ciclo %s %s."
-"--Please Select--","--Seleccione--"
-"3D Secure Card Validation","Validación segura 3D de tarjeta"
-"3D Secure Credit Card Validation","Validación segura en 3D de la tarjeta de crédito"
-"<label>Make Check payable to:</label> %s","<label>Pagar el cheque a:</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Se necesita un valor para el modo en vivo. Consulte el acuerdo de comercio cardinal."
-"Allow Initial Fee Failure","Permitir fallo inicial en la suma"
-"An internal reference ID is required to save the payment profile.","Se necesita una Id. de referencia interna para guardar el perfil de pago."
-"Authorize action is not available.","La autorización no se encuentra disponible."
-"Auto Bill on Next Cycle","Pasar la factura automáticamente en el próximo ciclo"
-"Automatically Invoice All Items","Facturar automáticamente todos los artÃculos"
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Pasar automáticamente el saldo pendiente de la factura en el próximo ciclo de facturación (en caso de que se produzca un error en los pagos)."
-"Billing Amount","Cantidad de facturación"
-"Billing Frequency","Frecuencia de facturación"
-"Billing Interval","PerÃodo de facturación"
-"Billing Interval Unit","Unidad de perÃodo de facturación"
-"Billing period unit is not defined or wrong.","La unidad del perÃodo de facturación no ha sido definida o no es correcta."
-"Cannot retrieve payment method instance.","No se puede recuperar la instancia del método de pago."
-"Cannot retrieve the payment info model object.","No se puede recuperar el modelo con la información del pago."
-"Cannot retrieve the payment information object instance.","No se puede encontrar la instancia del objeto de la información de pago."
-"Cannot retrieve the payment method code.","No se puede encontrar el código del método de pago."
-"Cannot retrieve the payment method model object.","No se puede recuperar el modelo del método de pago."
-"Capture action is not available.","La captura no se encuentra disponible."
-"Card Verification Number","Número de comprobación de la tarjeta"
-"Centinel API URL","Dirección URL de Centinel API"
-"Check / Money Order","Cheque / Orden de pago internacional"
-"Credit Card Number","Número de la tarjeta de crédito"
+No,No
+Discount,Discount
"Credit Card Type","Tipo de tarjeta de crédito"
-"Credit Card Types","Tipos de tarjeta de crédito"
-"Credit card number mismatch with credit card type.","El número de la tarjeta de crédito no coincide con el tÃpo de tarjeta."
-"Credit card type is not allowed for this payment method.","Este tipo de tarjeta de crédito no está permitido para este método de pago."
-"Currency","Divisa"
-"Currency code is undefined.","El código de moneda no ha sido definido."
-"Customer ID is not set.","No se ha establecido la Id. del cliente."
-"Day","DÃa"
-"Debug Mode","Modo Depuración"
-"Enabled","Habilitado"
+"Credit Card Number","Número de la tarjeta de crédito"
"Expiration Date","Fecha de Caducidad"
-"Full name of the person receiving the product or service paid for by the recurring payment.","Nombre completo de la persona que recibirá el producto o servicio pagado a través de la opción de pago recurrente."
-"Incorrect credit card expiration date.","Fecha de caducidad de la tarjeta de crédito incorrecta"
-"Initial Fee","Tarifa inicial"
-"Initial non-recurring payment amount due immediately upon profile creation.","Pago no recurrente inicial debido inmediatamente después de la creación del perfil."
-"Internal Reference ID","Id. de referencia interna"
-"Invalid Credit Card Number","El número de tarjeta es inválido."
-"Issue Number","Número de emisión"
-"Make Check Payable to","Pagar el cheque a"
-"Make Check payable to:","Pagar el cheque a:"
-"Make Check payable to: %s","Pagar el cheque a: %s"
-"Maximum Billing Cycles","Ciclos máximos de facturación"
-"Maximum Order Total","Total máximo de pedido"
-"Maximum Payment Failures","Fallos máximos de pago"
-"Maximum Trial Billing Cycles","Ciclos de prueba máximos de facturación"
-"Merchant ID","Identificación de Comerciante"
-"Minimum Order Total","Total mÃnimo de pedido"
-"Month","Mes"
-"N/A","N/A"
-"Name on Card","Nombre que aparece en la tarjeta"
-"Name on the Card","Nombre de la tarjeta"
-"New Order Status","Nuevo estado de pedido"
-"Number of billing periods that make up one billing cycle.","Cantidad de perÃodos de facturación que componen un ciclo de facturación."
-"Order action is not available.","La acción solicitada no está disponible."
-"Overrides API URL that may be specified by a payment method.","Anula la dirección URL de API que puede especificarse en un método de pago."
-"Password","Contraseña"
-"Payment ID: %s","ID de pago: %s"
-"Payment Method","Método de pago"
-"Payment Methods","Métodos de pago"
-"Payment Methods Section","Sección de métodos de pago"
-"Payment Reference ID","ID de referencia de pago"
-"Payment Services","Servicios de pago"
-"Payment from Applicable Countries","Pago desde paÃses aceptados"
-"Payment from Specific Countries","Pago desde paÃses especÃficos"
-"Payment method code is not set.","No se estableció el código de método de pago."
-"Payment method code is undefined.","No se definió el código de método de pago."
-"Payment profile is invalid:\n%s","El perfil de pago no es válido:\n%s"
-"Interval frequency is wrong.","La frecuencia de perÃodo es incorrecta."
-"Please enter a valid credit card verification number.","Por favor, introduzca el número de verificación de tarjeta válido."
-"Processor ID","Nº identificación del procesador"
-"Purchase Order","Orden de compra"
-"Purchase Order Number","Número de la orden de compra"
-"Purchase Order Number:","Número de la orden de compra:"
-"Purchase Order Number: %s","Número de la orden de compra: %s"
-"Recurring Payment Start Date","Fecha de Inicio del Perfil Repetitivo"
-"Recurring payment start date has invalid format.","La fecha de inicio del perfil repetitivo tiene un formato no válido."
-"Reference ID is not set.","No se estableció el ID de referencia."
-"Refund action is not available.","Reembolso no disponible."
-"Repeats %s time(s).","Se repite %s vez(veces)."
-"Repeats until suspended or canceled.","Se repite hasta que se suspende o cancela"
-"Request Card Security Code","Solicitar código de seguridad de la tarjeta de crédito"
-"Saved CC","CC guardado"
-"Schedule Description","Descripción de Programación"
-"Schedule description must be not empty.","La descripción de programación no debe quedar vacÃa."
-"Selected payment type is not allowed for billing country.","El tipo de pago seleccionado no está permitido para el paÃs de facturación."
-"Send Check to","Enviar Cheque a"
-"Send Check to:","Enviar Cheque a:"
-"Severe 3D Secure Card Validation","Validación estricta de tarjeta segura en 3D"
-"Severe validation removes chargeback liability on merchant.","La validación estricta exime al comerciante de responsabilidad en caso de devoluciones de cargos"
-"Shipping Amount","Importe del EnvÃo"
-"Short description of the recurring payment. By default equals to the product name.","Descripción corta del pago repetitivo. De forma predeterminada equivale al nombre del producto."
-"Sort Order","Ordenar Pedido"
+"Card Verification Number","Número de comprobación de la tarjeta"
+"--Please Select--",--Seleccione--
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","¿Qué es esto?"
+Shipping,Shipping
+Yes,Yes
+N/A,N/A
+Month,Mes
+Year,Año
"Start Date","Fecha de Inicio"
-"Start date has invalid format.","La fecha de inicio tiene un formato no válido."
-"Start date is undefined.","La fecha de inicio no está definida."
-"Subscriber Name","Nombre de Suscriptor"
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
"Switch/Solo/Maestro Issue Number","Número de expedición de Switch/Solo/Maestro"
-"Switch/Solo/Maestro Only","Únicamente Switch/Solo/Maestro"
"Switch/Solo/Maestro Start Date","Fecha de Inicio de Switch/Solo/Maestro"
-"Tax Amount","Importe de Impuestos"
-"Test Mode","Modo de prueba"
-"The date when billing for the profile begins.","La fecha de inicio de la facturación para el perfil"
-"The number of billing cycles for payment period.","El número de ciclos de facturación por perÃodo de pago."
-"The number of scheduled payments that can fail before the profile is automatically suspended.","El número de pagos programados que pueden fallar antes de que se suspenda automáticamente el perfil."
-"The payment review action is unavailable.","La acción de revisión de pago no está disponible."
-"Title","TÃtulo"
-"Trial Billing Amount","Importe de Facturación de Prueba"
-"Trial Billing Frequency","Frecuencia de Facturación de Prueba"
-"Trial Billing Interval Unit","Unidad del PerÃodo de Facturación de Prueba"
-"Trial Interval","PerÃodo de Prueba"
-"Trial billing amount is wrong.","El importe de facturación de prueba es incorrecto."
-"Trial billing period unit is wrong.","La unidad del perÃodo de facturación de prueba es incorrecta."
-"Trial period frequency is wrong.","La frecuencia del perÃodo de prueba es incorrecta."
-"Trial period max cycles is wrong.","Los ciclos máximos del perÃodo de prueba son incorrectos."
-"Two Weeks","Dos Semanas"
-"Unit for billing during the subscription period.","Unidad de facturación durante el perÃodo de suscripción."
-"Unsupported currency code: %s.","Código de divisa no compatible: %s."
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
"Void action is not available.","La anulación no se encuentra disponible."
-"Week","Semana"
-"What is this?","¿Qué es esto?"
-"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Opción de suspender el perfil de pago si falla el pago inicial o de agregarlo al saldo pendiente."
-"Wrong %s specified.","Se especificó un/a %s incorrecto/a."
-"Wrong or empty billing amount specified.","Se especificó un importe de facturación incorrecto o vacÃo."
-"Year","Año"
-"Zero Subtotal Checkout","El Subtotal de la Caja es Cero"
+"The payment review action is unavailable.","La acción de revisión de pago no está disponible."
+"Credit card number mismatch with credit card type.","El número de la tarjeta de crédito no coincide con el tÃpo de tarjeta."
+"Invalid Credit Card Number","El número de tarjeta es inválido."
+"Credit card type is not allowed for this payment method.","Este tipo de tarjeta de crédito no está permitido para este método de pago."
+"Please enter a valid credit card verification number.","Por favor, introduzca el número de verificación de tarjeta válido."
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
+"Switch/Solo/Maestro Only","Únicamente Switch/Solo/Maestro"
+"Issue Number","Número de emisión"
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/i18n/fr_FR.csv b/app/code/Magento/Payment/i18n/fr_FR.csv
index 2a5cd3d4cef..76bf63d45f7 100644
--- a/app/code/Magento/Payment/i18n/fr_FR.csv
+++ b/app/code/Magento/Payment/i18n/fr_FR.csv
@@ -1,132 +1,41 @@
-"%s %s cycle.","Cycle %s %s."
-"--Please Select--","--Veuillez sélectionner--"
-"3D Secure Card Validation","Validation de la carte par 3D Secure"
-"3D Secure Credit Card Validation","Validation de la carte de crédit par 3D Secure"
-"<label>Make Check payable to:</label> %s","<label>Rendre le chèque payable à :</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Une valeur est requise pour le mode en direct. Référez-vous à votre contrat CardinalCommerce."
-"Allow Initial Fee Failure","Autoriser un échec des frais initiaux."
-"An internal reference ID is required to save the payment profile.","Un ID de référence interne est requis pour enregistrer le profil de paiement."
-"Authorize action is not available.","L'action autoriser n'est pas disponible."
-"Auto Bill on Next Cycle","Facturer automatiquement lors du prochain cycle."
-"Automatically Invoice All Items","Facturer automatiquement tous les objets."
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Facturer automatiquement le montant restant dans le cycle suivant (si des paiements ont échoué)"
-"Billing Amount","Montant de la facturation."
-"Billing Frequency","Fréquence de facturation."
-"Billing Interval","Période de facturation."
-"Billing Interval Unit","Unité de période de facturation."
-"Billing period unit is not defined or wrong.","L'unité de période de facturation n'est pas définie ou est fausse."
-"Cannot retrieve payment method instance.","Impossible de récupérer l'instance de méthode de paiement."
-"Cannot retrieve the payment info model object.","Impossible de récupérer l'objet modèle d'informations de paiement."
-"Cannot retrieve the payment information object instance.","Impossible de récupérer les informations de paiement."
-"Cannot retrieve the payment method code.","Impossible de récupérer le code de la méthode de paiement."
-"Cannot retrieve the payment method model object.","Impossible de récupérer l'objet modèle de méthode de paiement."
-"Capture action is not available.","L'action capturer n'est pas disponible."
-"Card Verification Number","Numéro de vérification de carte."
-"Centinel API URL","URL de l'API Centinel"
-"Check / Money Order","Chèque / Mandat"
-"Credit Card Number","Numéro de carte de crédit"
+No,No
+Discount,Discount
"Credit Card Type","Type de carte de crédit"
-"Credit Card Types","Types de cartes de crédit"
-"Credit card number mismatch with credit card type.","Le numéro de carte de crédit ne correspond pas au type de carte."
-"Credit card type is not allowed for this payment method.","Ce type de carte de crédit n'est pas autorisé pour cette méthode de paiement."
-"Currency","Monnaie"
-"Currency code is undefined.","Le code pays n'est pas défini."
-"Customer ID is not set.","L'ID client n'est pas réglé."
-"Day","Jour"
-"Debug Mode","Mode débug"
-"Enabled","Activé"
+"Credit Card Number","Numéro de carte de crédit"
"Expiration Date","Date d'expiration"
-"Full name of the person receiving the product or service paid for by the recurring payment.","Nom complet de la personne recevant le produit ou le service payé par le paiement récurrent."
-"Incorrect credit card expiration date.","Date d'expiration de la carte incorrecte."
-"Initial Fee","Frais initiaux."
-"Initial non-recurring payment amount due immediately upon profile creation.","Le montant du paiement initial non récurrent est dû à la création du profil."
-"Internal Reference ID","ID de référence interne."
-"Invalid Credit Card Number","Numéro de carte invalide"
-"Issue Number","Numéro du problème."
-"Make Check Payable to","Faire un chèque payable à "
-"Make Check payable to:","Faire un chèque payable à :"
-"Make Check payable to: %s","Faire un chèque payable à : %s"
-"Maximum Billing Cycles","Cycles de facturation maximum"
-"Maximum Order Total","Montant total maximum"
-"Maximum Payment Failures","Échecs de paiement maximum"
-"Maximum Trial Billing Cycles","Cycles de tentative de facturation maximum"
-"Merchant ID","ID commerçant"
-"Minimum Order Total","Montant total minimum"
-"Month","Mois"
-"N/A","non applicable"
-"Name on Card","Nom sur la carte"
-"Name on the Card","Nom sur la carte"
-"New Order Status","Nouveau statut de la commande"
-"Number of billing periods that make up one billing cycle.","Nombre de période de facturation qui font un cycle de facturation."
-"Order action is not available.","Action Commande non disponible."
-"Overrides API URL that may be specified by a payment method.","Ignorer l'URL de l'API qui pourrait être spécifiée par une méthode de paiement."
-"Password","Mot de passe"
-"Payment ID: %s","ID du paiement : %s"
-"Payment Method","Méthode de paiement"
-"Payment Methods","Méthodes de paiement"
-"Payment Methods Section","Section des méthodes de paiement"
-"Payment Reference ID","ID de référence du paiement"
-"Payment Services","Services de paiement"
-"Payment from Applicable Countries","Paiement depuis les pays disponibles."
-"Payment from Specific Countries","Paiement depuis les pays spécifiques"
-"Payment method code is not set.","Le code de la méthode de paiement n'est pas défini."
-"Payment method code is undefined.","Le code de la méthode de paiement est indéfini."
-"Payment profile is invalid:\n%s","Le profil de paiement est invalide : \n%s"
-"Interval frequency is wrong.","La période de fréquence est fausse."
-"Please enter a valid credit card verification number.","Veuillez entrer un numéro de vérification valide."
-"Processor ID","ID processeur "
-"Purchase Order","Bon de commande"
-"Purchase Order Number","Numéro du bon de commande"
-"Purchase Order Number:","Numéro du bon de commande :"
-"Purchase Order Number: %s","Numéro du bon de commande : %s"
-"Recurring Payment Start Date","Récurrent Profil Date de départ"
-"Recurring payment start date has invalid format.","La date de départ du profil récurrent n'est pas dans un format valide."
-"Reference ID is not set.","L'ID de la référence n'est pas défini."
-"Refund action is not available.","Le remboursement n'est pas disponible."
-"Repeats %s time(s).","Se répète %s fois."
-"Repeats until suspended or canceled.","Se répète jusqu'à suspension ou annulation."
-"Request Card Security Code","Demander un code de carte de sécurité"
-"Saved CC","CC enregistré"
-"Schedule Description","Description du programme"
-"Schedule description must be not empty.","La description du programme ne peut pas être vide."
-"Selected payment type is not allowed for billing country.","Le type de paiement sélectionné n'est pas autorisé pour le pays de facturation."
-"Send Check to","Envoyer le chèque à "
-"Send Check to:","Envoyer le chèque à :"
-"Severe 3D Secure Card Validation","Validation de carte 3D Secure rigoureuse"
-"Severe validation removes chargeback liability on merchant.","La validation rigoureuse supprime la responsabilité du vendeur sur les remboursements."
-"Shipping Amount","Montant de livraison"
-"Short description of the recurring payment. By default equals to the product name.","Courte description du paiement récurrent. Par défaut la même que le nom du produit."
-"Sort Order","Trier les widgets"
+"Card Verification Number","Numéro de vérification de carte."
+"--Please Select--","--Veuillez sélectionner--"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","Qu'est-ce que c'est ?"
+Shipping,Shipping
+Yes,Yes
+N/A,"non applicable"
+Month,Mois
+Year,Année
"Start Date","Date de début"
-"Start date has invalid format.","La date de départ a un format invalide."
-"Start date is undefined.","La date de départ n'est pas définie."
-"Subscriber Name","Nom de l'abonné"
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
"Switch/Solo/Maestro Issue Number","Numéro Switch/Solo/Maestro"
-"Switch/Solo/Maestro Only","Switch/Solo/Maestro seulement"
"Switch/Solo/Maestro Start Date","Date de début Switch/Solo/Maestro"
-"Tax Amount","Montant des taxes"
-"Test Mode","Mode test."
-"The date when billing for the profile begins.","La date où la facturation commence pour le profil."
-"The number of billing cycles for payment period.","Le nombre de cycles de facturation pour la période de paiement."
-"The number of scheduled payments that can fail before the profile is automatically suspended.","Le nombre de paiements qui peuvent échouer avant que le profil soit automatiquement suspendu."
-"The payment review action is unavailable.","La vérification du paiement n'est pas disponible."
-"Title","Titre"
-"Trial Billing Amount","Montant d'essai facturé"
-"Trial Billing Frequency","Fréquence des factures d'essai"
-"Trial Billing Interval Unit","Période d'unité des factures"
-"Trial Interval","Période d'essai"
-"Trial billing amount is wrong.","Le montant des factures d'essai est incorrect."
-"Trial billing period unit is wrong.","La période d'unité des factures d'essai est incorrecte."
-"Trial period frequency is wrong.","La fréquence des périodes d'essai est incorrecte."
-"Trial period max cycles is wrong.","Le période maximale des cycles d'essai est incorrecte."
-"Two Weeks","Deux semaines"
-"Unit for billing during the subscription period.","Unité de facturation pour la période de souscription."
-"Unsupported currency code: %s.","Code de devise non supporté : %s."
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
"Void action is not available.","L'action annuler n'est pas disponible."
-"Week","Semaine"
-"What is this?","Qu'est-ce que c'est ?"
-"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Faut-il annuler le paiement si les frais initiaux échouent ou les ajouter à la balance."
-"Wrong %s specified.","Mauvais %s spécifié."
-"Wrong or empty billing amount specified.","Le montant de facturation spécifié est vide ou erroné."
-"Year","Année"
-"Zero Subtotal Checkout","Vérification du sous-total"
+"The payment review action is unavailable.","La vérification du paiement n'est pas disponible."
+"Credit card number mismatch with credit card type.","Le numéro de carte de crédit ne correspond pas au type de carte."
+"Invalid Credit Card Number","Numéro de carte invalide"
+"Credit card type is not allowed for this payment method.","Ce type de carte de crédit n'est pas autorisé pour cette méthode de paiement."
+"Please enter a valid credit card verification number.","Veuillez entrer un numéro de vérification valide."
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
+"Switch/Solo/Maestro Only","Switch/Solo/Maestro seulement"
+"Issue Number","Numéro du problème."
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/i18n/nl_NL.csv b/app/code/Magento/Payment/i18n/nl_NL.csv
index 82d81e14c3c..d4a6fef21f1 100644
--- a/app/code/Magento/Payment/i18n/nl_NL.csv
+++ b/app/code/Magento/Payment/i18n/nl_NL.csv
@@ -1,132 +1,41 @@
-"%s %s cycle.","%s %s cyclus."
-"--Please Select--","--Selecteer alstublieft--"
-"3D Secure Card Validation","3D Secure Card Validation"
-"3D Secure Credit Card Validation","3D Secure Credit Card Validatie"
-"<label>Make Check payable to:</label> %s","<label>Maak Bon betaalbaar naar:</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Een waarde is gevraagd voor live modus. Verwijs naar uw CardinalCommerce overeenkomst."
-"Allow Initial Fee Failure","Sta Voorletter Vergoeding Fout toe"
-"An internal reference ID is required to save the payment profile.","Een interne referentie ID is noodzakelijk om betaalprofiel op te slaan."
-"Authorize action is not available.","Autorisatieactie is niet beschikbaar."
-"Auto Bill on Next Cycle","Auto Rekening in Volgende Cyclus"
-"Automatically Invoice All Items","Automatische Factuur Alle Items"
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Breng automatisch de uitstaande balanshoeveelheid in rekening in de volgende betaalcyclus (als er mislukte betalingen waren)."
-"Billing Amount","Grootte Rekening"
-"Billing Frequency","Frequentie Rekening"
-"Billing Interval","Periode Rekening"
-"Billing Interval Unit","Rekening Periode Eenheid"
-"Billing period unit is not defined or wrong.","Rekening periode eenheid is ongedifinieerd of verkeerd."
-"Cannot retrieve payment method instance.","Kan betaalmethode niet terugkrijgen."
-"Cannot retrieve the payment info model object.","Kan het betaal info model object niet terugkrijgen."
-"Cannot retrieve the payment information object instance.","Kan de betalingsinformatie niet ophalen van de objectinstantie."
-"Cannot retrieve the payment method code.","Kan de code voor de betalingsmethode niet ophalen."
-"Cannot retrieve the payment method model object.","Kan betaalmethode model object niet terugkrijgen"
-"Capture action is not available.","Opnameactie niet beschikbaar."
-"Card Verification Number","Kaartverificatienummer"
-"Centinel API URL","Centinel API URL"
-"Check / Money Order","Bekijk / Geld Bestelling"
-"Credit Card Number","Nummer creditcard"
+No,No
+Discount,Discount
"Credit Card Type","Type credit card"
-"Credit Card Types","Types credit card"
+"Credit Card Number","Nummer creditcard"
+"Expiration Date",Houdbaarheidsdatum
+"Card Verification Number",Kaartverificatienummer
+"--Please Select--","--Selecteer alstublieft--"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","Wat is dit?"
+Shipping,Shipping
+Yes,Yes
+N/A,Nvt
+Month,Maand
+Year,Jaar
+"Start Date",Begindatum
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
+"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro verstrekkingsnummer"
+"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro startdatum"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
+"Void action is not available.","Vernietigactie is niet beschikbaar."
+"The payment review action is unavailable.","De optie om de betaling te herzien is niet beschikbaar."
"Credit card number mismatch with credit card type.","Kredietkaartnummer komt niet overeen met type kredietkaart."
-"Credit card type is not allowed for this payment method.","Type kredietkaart is niet toegestaan voor deze betalingsmethode."
-"Currency","Munteenheid"
-"Currency code is undefined.","Valuta code not gekozen."
-"Customer ID is not set.","Klant ID is niet ingesteld."
-"Day","Dag"
-"Debug Mode","Debug Modus"
-"Enabled","Aan"
-"Expiration Date","Houdbaarheidsdatum"
-"Full name of the person receiving the product or service paid for by the recurring payment.","Volledige naam van de persoon die het product of de service ontvangt, betaald door de wederkerende betaling."
-"Incorrect credit card expiration date.","Onjuiste creditcard vervaldatum."
-"Initial Fee","Initiële Betaling"
-"Initial non-recurring payment amount due immediately upon profile creation.","Bij het aanmaken van uw profiel moet u gelijk een eenmalige betaling voldoen."
-"Internal Reference ID","Interne Referentie ID"
"Invalid Credit Card Number","Ongeldig Kredietkaartnummer"
-"Issue Number","Uitgave Nummer"
-"Make Check Payable to","Maak de Check betaalbaar aan"
-"Make Check payable to:","Maak de Check betaalbaar aan:"
-"Make Check payable to: %s","Maak de Check betaalbaar aan: %s"
-"Maximum Billing Cycles","Maximum hoeveelheid Betalingcycli"
-"Maximum Order Total","Maximale Bestelling"
-"Maximum Payment Failures","Maximum Betaling Storingen"
-"Maximum Trial Billing Cycles","Maximum Trial Betaling Cycli"
-"Merchant ID","Verkopers Identificatie"
-"Minimum Order Total","Minimale Bestelling"
-"Month","Maand"
-"N/A","Nvt"
-"Name on Card","Naam Op Kaart"
-"Name on the Card","Naam op de Kaart"
-"New Order Status","Nieuwe Status van de Bestelling"
-"Number of billing periods that make up one billing cycle.","Aantal rekeningperiodes waaruit 1 rekening cyclus bestaat."
-"Order action is not available.","Actie bestelling is niet beschikbaar"
-"Overrides API URL that may be specified by a payment method.","Neemt API URL over dat door een betaalmethode gespecificeerd kan zijn."
-"Password","Wachtwoord"
-"Payment ID: %s","Betaal ID: %s"
-"Payment Method","Betaalmethode"
-"Payment Methods","Betalingsmethoden"
-"Payment Methods Section","Betaalmethode Sectie"
-"Payment Reference ID","Betaalreferentie ID"
-"Payment Services","Betaaldiensten"
-"Payment from Applicable Countries","Betaling van Geëigende Landen"
-"Payment from Specific Countries","Betaling van Specifieke Landen"
-"Payment method code is not set.","Betaalmethode code is niet ingesteld."
-"Payment method code is undefined.","Betaalmethode code is niet gedefinieerd."
-"Payment profile is invalid:\n%s","Betaalprofiel is ongeldig:\n%s"
-"Interval frequency is wrong.","Periode frequentie is verkeerd."
+"Credit card type is not allowed for this payment method.","Type kredietkaart is niet toegestaan voor deze betalingsmethode."
"Please enter a valid credit card verification number.","Voer a.u.b. een geldig creditcard verificatienummer in."
-"Processor ID","Processor ID"
-"Purchase Order","Aankoop Bestelling"
-"Purchase Order Number","Aankoopnummer"
-"Purchase Order Number:","Aankoop Bestellingsnummer:"
-"Purchase Order Number: %s","Verkooporder Nummer: %s"
-"Recurring Payment Start Date","Periodiek Profiel Startdatum"
-"Recurring payment start date has invalid format.","Periodiek profiel startdatum heeft een ongeldig formaat."
-"Reference ID is not set.","Referentie ID is niet ingesteld."
-"Refund action is not available.","Actie voor teruggave is niet beschikbaar."
-"Repeats %s time(s).","Herhaalt zich %s keer."
-"Repeats until suspended or canceled.","Herhaalt zich tot opschorting of annulering."
-"Request Card Security Code","Verzoek Beveiligingscode van Kaart"
-"Saved CC","CC opgeslagen"
-"Schedule Description","Schema Beschrijving"
-"Schedule description must be not empty.","Schema beschrijving mag niet leeg zijn."
-"Selected payment type is not allowed for billing country.","De geselecteerde betalingsmethode is niet toegestaan voor het facturatieland."
-"Send Check to","Verzend Rekening naar"
-"Send Check to:","Verzend Rekening naar:"
-"Severe 3D Secure Card Validation","Strenge 3D Secure Card Validation"
-"Severe validation removes chargeback liability on merchant.","Ernstige bevestiging verwijdert de aansprakelijkheid voor terugboeking van de handelaar."
-"Shipping Amount","Verzendingskosten"
-"Short description of the recurring payment. By default equals to the product name.","Korte omschrijving van de periodieke betaling. Standaard is deze dezelfde als de productnaam."
-"Sort Order","Sorteer Bestelling"
-"Start Date","Begindatum"
-"Start date has invalid format.","Startdatum heeft een ongeldig formaat."
-"Start date is undefined.","Startdatum is ongedefinieerd."
-"Subscriber Name","Abonnee Naam"
-"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro verstrekkingsnummer"
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
"Switch/Solo/Maestro Only","Alleen Switch/Solo/Maestro"
-"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro startdatum"
-"Tax Amount","BTW Bedrag"
-"Test Mode","Test modus"
-"The date when billing for the profile begins.","Datum waarop facturering van het profiel begint."
-"The number of billing cycles for payment period.","Het aantal rekeningen per betalingsperiode."
-"The number of scheduled payments that can fail before the profile is automatically suspended.","Het aantal betalingen die mis mogen gaan voordat het profiel automatisch opgeschort wordt."
-"The payment review action is unavailable.","De optie om de betaling te herzien is niet beschikbaar."
-"Title","Titel"
-"Trial Billing Amount","Trial Betalingshoeveelheid"
-"Trial Billing Frequency","Trial Betalingsfrequentie"
-"Trial Billing Interval Unit","Trial Betaling-periode-eenheid"
-"Trial Interval","Trial Periode"
-"Trial billing amount is wrong.","Trial Factureringshoeveelheid is verkeerd."
-"Trial billing period unit is wrong.","Trial Facturering-periode-eenheid is verkeerd."
-"Trial period frequency is wrong.","Trial periode frequentie is verkeerd."
-"Trial period max cycles is wrong.","Trial periode maximum hoeveelheid cycli is verkeerd."
-"Two Weeks","Twee Weken"
-"Unit for billing during the subscription period.","Eenheid voor het factureren tijdens de subscriptie periode."
-"Unsupported currency code: %s.","Niet-ondersteunde valuta code: %s."
-"Void action is not available.","Vernietigactie is niet beschikbaar."
-"Week","Week"
-"What is this?","Wat is dit?"
-"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Of het profiel opgeschort moet worden wanneer de eerste betaling gefaald heeft, of moet het op het uitstaande balans worden gezet."
-"Wrong %s specified.","Verkeerde %s gespecificeerd."
-"Wrong or empty billing amount specified.","Verkeerde of geen betalingshoeveeldheid gekozen."
-"Year","Jaar"
-"Zero Subtotal Checkout","Subtotaal van Nul Afrekenen"
+"Issue Number","Uitgave Nummer"
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/i18n/pt_BR.csv b/app/code/Magento/Payment/i18n/pt_BR.csv
index ff9890db5f7..49e64903337 100644
--- a/app/code/Magento/Payment/i18n/pt_BR.csv
+++ b/app/code/Magento/Payment/i18n/pt_BR.csv
@@ -1,132 +1,41 @@
-"%s %s cycle.","Ciclo %s %s."
-"--Please Select--","--Por Favor, Escolha--"
-"3D Secure Card Validation","Validação de Cartão 3D Secure"
-"3D Secure Credit Card Validation","Validação de Cartão de Crédito 3D Secure"
-"<label>Make Check payable to:</label> %s","<label>Faça Cheque pagável a:</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Um valor é necessário para o modo ao vivo. Consulte o seu contrato CardinalCommerce."
-"Allow Initial Fee Failure","Permitir Falha de Taxa Inicial"
-"An internal reference ID is required to save the payment profile.","Um ID interno de referência é necessário para salvar o perfil de pagamento."
-"Authorize action is not available.","Ação de autorização não está disponÃvel."
-"Auto Bill on Next Cycle","Faturar Automaticamente no Próximo Ciclo"
-"Automatically Invoice All Items","Faturar Automaticamente Todos os Itens"
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Faturar automaticamente o valor do balanço em destaque no próximo ciclo de faturamento (se houve falha de pagamentos)."
-"Billing Amount","Valor de Faturamento"
-"Billing Frequency","Frequência de Faturamento"
-"Billing Interval","PerÃodo de Faturamento"
-"Billing Interval Unit","Unidade de PerÃodo de Faturamento"
-"Billing period unit is not defined or wrong.","Unidade de perÃodo de faturamento não está definida ou errada."
-"Cannot retrieve payment method instance.","Não é possÃvel recuperar instância do método de pagamento."
-"Cannot retrieve the payment info model object.","Não é possÃvel recuperar a informação objeto modelo do pagamento."
-"Cannot retrieve the payment information object instance.","Não foi possÃvel recuperar instância de objeto de informações de pagamento."
-"Cannot retrieve the payment method code.","Não foi possÃvel recuperar o código de forma de pagamento."
-"Cannot retrieve the payment method model object.","Não é possÃvel recuperar o método objeto modelo do pagamento."
-"Capture action is not available.","Ação de captura não está disponÃvel."
-"Card Verification Number","Número de Verificação do Cartão"
-"Centinel API URL","URL Centinel API"
-"Check / Money Order","Cheque/Ordem de Pagamento"
-"Credit Card Number","Número do Cartão de Crédito"
+No,No
+Discount,Discount
"Credit Card Type","Tipo de Cartão de Crédito"
-"Credit Card Types","Tipos de Cartão de Crédito"
-"Credit card number mismatch with credit card type.","O número de cartão de crédito não corresponde ao tipo de cartão de crédito."
-"Credit card type is not allowed for this payment method.","O tipo de cartão de crédito não é permitido para esta forma de pagamento."
-"Currency","Moeda"
-"Currency code is undefined.","Código de moeda indefinido"
-"Customer ID is not set.","A ID do cliente não está definida"
-"Day","Dia"
-"Debug Mode","Modo de Depuração"
-"Enabled","Ativado"
+"Credit Card Number","Número do Cartão de Crédito"
"Expiration Date","Data de Validade"
-"Full name of the person receiving the product or service paid for by the recurring payment.","Nome completo da pessoa que recebe o produto ou serviço pago pelo pagamento recorrente."
-"Incorrect credit card expiration date.","Data de validade do cartão de crédito incorreta."
-"Initial Fee","Taxa inicial"
-"Initial non-recurring payment amount due immediately upon profile creation.","Valor do pagamento inicial não-recorrentes imediatamente após a criação do perfil."
-"Internal Reference ID","Identificação de referência interna"
-"Invalid Credit Card Number","Número de cartão de crédito inválido"
-"Issue Number","Número de Emissão"
-"Make Check Payable to","Faça Cheque Nominal a"
-"Make Check payable to:","Faça Cheque nominal a:"
-"Make Check payable to: %s","Faça Cheque nominal a: %s"
-"Maximum Billing Cycles","Ciclos de faturamento máximo"
-"Maximum Order Total","Total Máximo do Pedido"
-"Maximum Payment Failures","Falhas de pagamento máximo"
-"Maximum Trial Billing Cycles","Ciclos de faturamento de avaliação máximo"
-"Merchant ID","Identificação do comerciante"
-"Minimum Order Total","Total MÃnimo do Pedido"
-"Month","Mês"
-"N/A","IndisponÃvel"
-"Name on Card","Nome no Cartão"
-"Name on the Card","Nome no Cartão"
-"New Order Status","Status do Novo Pedido"
-"Number of billing periods that make up one billing cycle.","Número de perÃodos de emissão de faturas que formam um ciclo de faturamento."
-"Order action is not available.","Ação de pedido não está disponÃvel."
-"Overrides API URL that may be specified by a payment method.","Substitui URL da API que pode ser especificada por um método de pagamento."
-"Password","Senha"
-"Payment ID: %s","Identificação de Pagamento: %s"
-"Payment Method","Método de Pagamento"
-"Payment Methods","Métodos de Pagamento"
-"Payment Methods Section","Seção de Métodos de Pagamento"
-"Payment Reference ID","Identificação de Referência para Pagamento"
-"Payment Services","Serviços de Pagamento"
-"Payment from Applicable Countries","Pagamento de PaÃses Aplicáveis"
-"Payment from Specific Countries","Pagamento de PaÃses EspecÃficos"
-"Payment method code is not set.","Código de método de pagamento não está configurado."
-"Payment method code is undefined.","Código de método de pagamento não está definido."
-"Payment profile is invalid:\n%s","Perfil de pagamento inválido: \n%s"
-"Interval frequency is wrong.","Frequência de perÃodo está errada."
-"Please enter a valid credit card verification number.","Por favor insira um número de verificação de cartão de crédito válido."
-"Processor ID","Identificação do Processador"
-"Purchase Order","Ordem de Compra"
-"Purchase Order Number","Número de Ordem de Compra"
-"Purchase Order Number:","Número de Ordem de Compra:"
-"Purchase Order Number: %s","Número do Pedido de Compra: %s"
-"Recurring Payment Start Date","Data Inicial de Perfil Recorrente"
-"Recurring payment start date has invalid format.","A data inicial de perfil recorrente tem formato inválido."
-"Reference ID is not set.","A identificação da referência não está configurada."
-"Refund action is not available.","Ação de reembolso não está disponÃvel."
-"Repeats %s time(s).","Repete %s vez(es)."
-"Repeats until suspended or canceled.","Repete até suspensão ou cancelamento."
-"Request Card Security Code","Solicitar Código de Segurança do Cartão"
-"Saved CC","CC Salvo"
-"Schedule Description","Descrição do Agendamento"
-"Schedule description must be not empty.","A descrição de agendamento não pode estar vazia."
-"Selected payment type is not allowed for billing country.","O tipo de pagamento selecionado não é permitido para o paÃs de cobrança."
-"Send Check to","Enviar Cheque para"
-"Send Check to:","Enviar Cheque para:"
-"Severe 3D Secure Card Validation","Validação de Cartão Severe 3D Secure"
-"Severe validation removes chargeback liability on merchant.","A validação rigorosa isenta o comerciante da responsabilidade de desconto."
-"Shipping Amount","Valor do Frete"
-"Short description of the recurring payment. By default equals to the product name.","Breve descrição do pagamento recorrente. Por padrão, é igual ao nome do produto."
-"Sort Order","Classificar pedido"
+"Card Verification Number","Número de Verificação do Cartão"
+"--Please Select--","--Por Favor, Escolha--"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?","O que é isso?"
+Shipping,Shipping
+Yes,Yes
+N/A,IndisponÃvel
+Month,Mês
+Year,Ano
"Start Date","Data de inÃcio"
-"Start date has invalid format.","A data inicial tem formato inválido."
-"Start date is undefined.","A data inicial está indefinida."
-"Subscriber Name","Nome do Assinante"
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
"Switch/Solo/Maestro Issue Number","Número de Emissão Switch/Solo/Maestro"
-"Switch/Solo/Maestro Only","Somente Swith/Solo/Maestro"
"Switch/Solo/Maestro Start Date","Data Inicial do Switch/Solo/Maestro"
-"Tax Amount","Valor do Imposto"
-"Test Mode","Modo de Teste"
-"The date when billing for the profile begins.","A data em que o faturamento para o perfil começa."
-"The number of billing cycles for payment period.","O número de ciclos de faturamento para o perÃodo de pagamento."
-"The number of scheduled payments that can fail before the profile is automatically suspended.","O número de pagamentos programados que podem falhar antes que o perfil seja automaticamente suspenso."
-"The payment review action is unavailable.","A ação de revisão de pagamento não está disponÃvel."
-"Title","TÃtulo"
-"Trial Billing Amount","Teste de Faturamento de Valor"
-"Trial Billing Frequency","Teste de Faturamento de Frequência"
-"Trial Billing Interval Unit","Teste de Faturamento de Unidade de PerÃodo"
-"Trial Interval","PerÃodo Experimental"
-"Trial billing amount is wrong.","Teste de faturamento de valor está errado."
-"Trial billing period unit is wrong.","Teste de faturamento de unidade de perÃodo está errado."
-"Trial period frequency is wrong.","Teste de faturamento de frequência está errado."
-"Trial period max cycles is wrong.","Ciclo máximo de perÃodo experimental está errado."
-"Two Weeks","Duas Semanas"
-"Unit for billing during the subscription period.","Unidade de faturamento durante o perÃodo de subscrição."
-"Unsupported currency code: %s.","Código de moeda não suportada: %s."
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
"Void action is not available.","Ação de cancelamento não está disponÃvel."
-"Week","Semana"
-"What is this?","O que é isso?"
-"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Quer se suspenda o perfil de pagamento se a taxa inicial falhar ou se adicione ao saldo devedor."
-"Wrong %s specified.","%s errado especificado."
-"Wrong or empty billing amount specified.","Montante de faturação especificado errado ou vazio."
-"Year","Ano"
-"Zero Subtotal Checkout","Subtotal Checkout Zero"
+"The payment review action is unavailable.","A ação de revisão de pagamento não está disponÃvel."
+"Credit card number mismatch with credit card type.","O número de cartão de crédito não corresponde ao tipo de cartão de crédito."
+"Invalid Credit Card Number","Número de cartão de crédito inválido"
+"Credit card type is not allowed for this payment method.","O tipo de cartão de crédito não é permitido para esta forma de pagamento."
+"Please enter a valid credit card verification number.","Por favor insira um número de verificação de cartão de crédito válido."
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
+"Switch/Solo/Maestro Only","Somente Swith/Solo/Maestro"
+"Issue Number","Número de Emissão"
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/i18n/zh_CN.csv b/app/code/Magento/Payment/i18n/zh_CN.csv
index e74b452c855..c430c9d97f2 100644
--- a/app/code/Magento/Payment/i18n/zh_CN.csv
+++ b/app/code/Magento/Payment/i18n/zh_CN.csv
@@ -1,132 +1,41 @@
-"%s %s cycle.","%s %s 周期。"
+No,No
+Discount,Discount
+"Credit Card Type",信用å¡ç±»åž‹
+"Credit Card Number",信用å¡å·ç
+"Expiration Date",过期日期
+"Card Verification Number",å¡ç‰‡éªŒè¯å·ç
"--Please Select--","-- 请选择 --"
-"3D Secure Card Validation","3D 安全信用å¡éªŒè¯"
-"3D Secure Credit Card Validation","3D安全信用å¡éªŒè¯"
-"<label>Make Check payable to:</label> %s","<label>用支票付款给：</label> %s"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","动æ€æ¨¡å¼éœ€è¦æ供值。请å‚考您的CardinalCommerce å议。"
-"Allow Initial Fee Failure","å…许åˆå§‹è´¹ç”¨å¤±è´¥"
-"An internal reference ID is required to save the payment profile.","ä¿å˜æ”¯ä»˜é…置文件时需è¦æ供内部å‚考ID。"
-"Authorize action is not available.","授æƒæ“作ä¸å¯ç”¨ã€‚"
-"Auto Bill on Next Cycle","下个周期自动记账"
-"Automatically Invoice All Items","对所有商å“自动创建å‘票"
-"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","下个记账周期对余款é¢åº¦è‡ªåŠ¨è®°è´¦ï¼ˆå¦‚果有失败的支付的è¯ï¼‰ã€‚"
-"Billing Amount","è®°è´¦é¢åº¦"
-"Billing Frequency","记账频率"
-"Billing Interval","记账周期"
-"Billing Interval Unit","记账周期å•ä½"
-"Billing period unit is not defined or wrong.","记账周期å•ä½æœªå®šä¹‰æˆ–有误。"
-"Cannot retrieve payment method instance.","æ— æ³•èŽ·å–支付方法实例。"
-"Cannot retrieve the payment info model object.","æ— æ³•èŽ·å–支付信æ¯æ¨¡å—对象。"
-"Cannot retrieve the payment information object instance.","æ— æ³•èŽ·å–支付信æ¯å¯¹è±¡å®žä¾‹ã€‚"
-"Cannot retrieve the payment method code.","æ— æ³•èŽ·å–支付方法代ç 。"
-"Cannot retrieve the payment method model object.","æ— æ³•èŽ·å–支付方法模å—对象。"
-"Capture action is not available.","æ•èŽ·æ“作ä¸å¯ç”¨ã€‚"
-"Card Verification Number","å¡ç‰‡éªŒè¯å·ç "
-"Centinel API URL","Centinel API URL"
-"Check / Money Order","支票/费用订å•"
-"Credit Card Number","信用å¡å·ç "
-"Credit Card Type","信用å¡ç±»åž‹"
-"Credit Card Types","信用å¡ç±»åž‹"
-"Credit card number mismatch with credit card type.","信用å¡å·ä¸Žä¿¡ç”¨å¡ç±»åž‹ä¸åŒ¹é…。"
-"Credit card type is not allowed for this payment method.","信用å¡ç±»åž‹æ— 法用于æ¤æ”¯ä»˜æ–¹æ³•ã€‚"
-"Currency","å¸ç§"
-"Currency code is undefined.","è´§å¸ä»£ç 未定义。"
-"Customer ID is not set.","客户ID未设置。"
-"Day","天"
-"Debug Mode","调试模å¼"
-"Enabled","å·²å¯ç”¨"
-"Expiration Date","过期日期"
-"Full name of the person receiving the product or service paid for by the recurring payment.","获å–通过周期性支付所æ供的产å“或æœåŠ¡çš„人的全å。"
-"Incorrect credit card expiration date.","错误的信用å¡åˆ°æœŸæ—¥ã€‚"
-"Initial Fee","åˆå§‹è´¹ç”¨"
-"Initial non-recurring payment amount due immediately upon profile creation.","创建é…置文件时立刻进行éžå‘¨æœŸæ€§åˆå§‹æ”¯ä»˜ã€‚"
-"Internal Reference ID","内部å‚考ID"
-"Invalid Credit Card Number","信用å¡å·æ— 效"
-"Issue Number","问题编å·"
-"Make Check Payable to","通过支票付款给"
-"Make Check payable to:","通过支票付款给："
-"Make Check payable to: %s","通过支票付款给：%s"
-"Maximum Billing Cycles","最长记账周期"
-"Maximum Order Total","最大订å•æ€»æ•°"
-"Maximum Payment Failures","最多付款失败次数"
-"Maximum Trial Billing Cycles","最长试用记账周期"
-"Merchant ID","分行ID"
-"Minimum Order Total","最å°è®¢å•æ€»æ•°"
-"Month","月"
-"N/A","N/A"
-"Name on Card","å¡ç‰‡ä¸Šçš„åå—"
-"Name on the Card","æŒå¡äººåå—"
-"New Order Status","新订å•çŠ¶æ€"
-"Number of billing periods that make up one billing cycle.","组æˆä¸€ä¸ªè´¦å•å¾ªçŽ¯çš„è´¦å•å‘¨æœŸæ•°é‡ã€‚"
-"Order action is not available.","订è´æ“作ä¸å¯ç”¨ã€‚"
-"Overrides API URL that may be specified by a payment method.","覆盖å¯èƒ½ç”±æ”¯ä»˜æ–¹å¼æŒ‡å®šçš„ API URL。"
-"Password","密ç "
-"Payment ID: %s","支付 ID：%s"
-"Payment Method","支付方å¼"
-"Payment Methods","支付方å¼"
-"Payment Methods Section","支付方å¼åŒºåŸŸ"
-"Payment Reference ID","支付å‚考 ID"
-"Payment Services","支付æœåŠ¡"
-"Payment from Applicable Countries","从å¯æŽ¥å—的国家支付"
-"Payment from Specific Countries","从指定的国家支付"
-"Payment method code is not set.","支付方å¼ä»£ç 未设置。"
-"Payment method code is undefined.","支付方å¼ä»£ç 未定义。"
-"Payment profile is invalid:\n%s","æ”¯ä»˜èµ„æ–™æ— æ•ˆï¼š\n%s"
-"Interval frequency is wrong.","周期频率错误。"
-"Please enter a valid credit card verification number.","请输入有效的信用å¡éªŒè¯ç 。"
-"Processor ID","处ç†å™¨ ID"
-"Purchase Order","采è´è®¢å•"
-"Purchase Order Number","采è´è®¢å•å·"
-"Purchase Order Number:","采è´è®¢å•å·"
-"Purchase Order Number: %s","付款的订å•å·ï¼š%s"
-"Recurring Payment Start Date","周期性é…置文件开始日期"
-"Recurring payment start date has invalid format.","周期性é…ç½®æ–‡ä»¶å¼€å§‹æ—¥æœŸæ ¼å¼æ— 效。"
-"Reference ID is not set.","å‚考ID未设置。"
-"Refund action is not available.","退款æ“作ä¸å¯ç”¨ã€‚"
-"Repeats %s time(s).","é‡å¤ %s 次。"
-"Repeats until suspended or canceled.","一直é‡å¤ï¼Œç›´åˆ°è¢«æŒ‚起或å–消。"
-"Request Card Security Code","请求å¡å®‰å…¨ç 。"
-"Saved CC","ä¿å˜çš„CC"
-"Schedule Description","计划æè¿°"
-"Schedule description must be not empty.","计划æè¿°ä¸èƒ½ä¸ºç©º"
-"Selected payment type is not allowed for billing country.","å‘å¡è¡Œæ‰€åœ¨å›½ä¸å…许使用所选支付类类型。"
-"Send Check to","å‘é€æ”¯ç¥¨ç»™"
-"Send Check to:","å‘é€æ”¯ç¥¨ç»™ï¼š"
-"Severe 3D Secure Card Validation","æä¾› 3D 安全信用å¡éªŒè¯"
-"Severe validation removes chargeback liability on merchant.","ä¸¥æ ¼çš„éªŒè¯å¯é¿å…分行的退款责任。"
-"Shipping Amount","è¿é€é‡"
-"Short description of the recurring payment. By default equals to the product name.","周期性付款的简çŸæ述。默认ç‰äºŽäº§å“å。"
-"Sort Order","排åºé¡ºåº"
-"Start Date","开始日期"
-"Start date has invalid format.","å¼€å§‹æ—¥æœŸæ ¼å¼æ— 效。"
-"Start date is undefined.","开始日期未定义。"
-"Subscriber Name","订阅者姓å"
-"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestroå¡å·"
+"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
+"What is this?",这是什么？
+Shipping,Shipping
+Yes,Yes
+N/A,N/A
+Month,月
+Year,å¹´
+"Start Date",开始日期
+"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object."
+"We cannot retrieve the payment info model object.","We cannot retrieve the payment info model object."
+"Switch/Solo/Maestro Issue Number",Switch/Solo/Maestroå¡å·
+"Switch/Solo/Maestro Start Date",Switch/Solo/Maestro开始日期
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+"The payment method you requested is not available.","The payment method you requested is not available."
+"The payment disallows storing objects.","The payment disallows storing objects."
+"We cannot retrieve the payment method code.","We cannot retrieve the payment method code."
+"We cannot retrieve the payment information object instance.","We cannot retrieve the payment information object instance."
+"You can't use the payment type you selected to make payments to the billing country.","You can't use the payment type you selected to make payments to the billing country."
+"The order action is not available.","The order action is not available."
+"The authorize action is not available.","The authorize action is not available."
+"The capture action is not available.","The capture action is not available."
+"The refund action is not available.","The refund action is not available."
+"Void action is not available.",空æ“作ä¸å¯ç”¨ã€‚
+"The payment review action is unavailable.",支付审查æ“作ä¸å¯ç”¨ã€‚
+"Credit card number mismatch with credit card type.",信用å¡å·ä¸Žä¿¡ç”¨å¡ç±»åž‹ä¸åŒ¹é…。
+"Invalid Credit Card Number",信用å¡å·æ— 效
+"Credit card type is not allowed for this payment method.",信用å¡ç±»åž‹æ— 法用于æ¤æ”¯ä»˜æ–¹æ³•ã€‚
+"Please enter a valid credit card verification number.",请输入有效的信用å¡éªŒè¯ç 。
+"We found an incorrect credit card expiration date.","We found an incorrect credit card expiration date."
"Switch/Solo/Maestro Only","ä»…é™ Switch/Solo/Maestro"
-"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro开始日期"
-"Tax Amount","税é¢"
-"Test Mode","测试模å¼"
-"The date when billing for the profile begins.","该é…置文件记账的开始日期。"
-"The number of billing cycles for payment period.","支付周期内记账循环的数é‡ã€‚"
-"The number of scheduled payments that can fail before the profile is automatically suspended.","é…置文件被自动挂起之å‰ï¼Œæ”¯ä»˜è®¡åˆ’的失败数é‡ã€‚"
-"The payment review action is unavailable.","支付审查æ“作ä¸å¯ç”¨ã€‚"
-"Title","æ ‡é¢˜"
-"Trial Billing Amount","å°è¯•è®°è´¦å¸æˆ·ã€‚"
-"Trial Billing Frequency","å°è¯•è®°è´¦é¢‘率"
-"Trial Billing Interval Unit","å°è¯•è®°è´¦å‘¨æœŸå•ä½"
-"Trial Interval","å°è¯•å‘¨æœŸ"
-"Trial billing amount is wrong.","å°è¯•è®°è´¦é¢åº¦æœ‰è¯¯ã€‚"
-"Trial billing period unit is wrong.","å°è¯•è®°è´¦å‘¨æœŸå•ä½æœ‰è¯¯ã€‚"
-"Trial period frequency is wrong.","å°è¯•å‘¨æœŸé¢‘率有误。"
-"Trial period max cycles is wrong.","å°è¯•å‘¨æœŸæœ€å¤§å‘¨æœŸæœ‰è¯¯ã€‚"
-"Two Weeks","两周"
-"Unit for billing during the subscription period.","订阅期é™å†…çš„è®°è´¦å•ä½ã€‚"
-"Unsupported currency code: %s.","ä¸æ”¯æŒçš„è´§å¸ä»£ç ：%s"
-"Void action is not available.","空æ“作ä¸å¯ç”¨ã€‚"
-"Week","周"
-"What is this?","这是什么？"
-"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","如果åˆå§‹è´¹ç”¨å¤±è´¥ï¼Œæˆ–æ·»åŠ åˆ°ä½™æ¬¾ä½™é¢ä¸ï¼Œæ˜¯å¦æŒ‚起支付é…置文件。"
-"Wrong %s specified.","指定的 %s 有误。"
-"Wrong or empty billing amount specified.","指定的记账é¢åº¦æœ‰è¯¯æˆ–为空。"
-"Year","å¹´"
-"Zero Subtotal Checkout","æ— å°è®¡ç»“è´¦"
+"Issue Number",问题编å·
+"%1 is not available. You still can process offline actions.","%1 is not available. You still can process offline actions."
+"Payment Methods","Payment Methods"
diff --git a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
index bef0428c86c..e106171209f 100644
--- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
@@ -78,7 +78,7 @@
<input type="number" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
<?php $_content = '<img src=\"'.$this->getViewFileUrl('Magento_Checkout::cvv.gif').'\" alt=\"'.__('Card Verification Number Visual Reference').'\" title=\"'.__('Card Verification Number Visual Reference').'\" />'; ?>
<div class="note">
- <a href="#" class="action cvv" title="Hello" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
+ <a href="#" class="action cvv" title="<?php echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
</div>
</div>
diff --git a/app/code/Magento/Paypal/i18n/de_DE.csv b/app/code/Magento/Paypal/i18n/de_DE.csv
index 635156ea4fb..7167fee8d54 100644
--- a/app/code/Magento/Paypal/i18n/de_DE.csv
+++ b/app/code/Magento/Paypal/i18n/de_DE.csv
@@ -1,505 +1,692 @@
-"-- Please Select Billing Agreement--","-- Bitte wählen Sie Rechnungsvereinbarung --"
-"-OR-","-oder-"
-"2-pixel perimeter around the header space.","2-pixel Umkreis um das Feld der Kopfzeile"
-"3D Secure","3D Secure Verfahren"
-"3D Secure Card Validation","3D Secure Card Validierung"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Für Maestro-Karten wird eine 3D Secure-Bestätigung benötigt. Die Verwendung von American Express-Karten setzt eine weitere Vereinbarung voraus. Mehr Informationen dazu auf <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Akzeptieren Sie jetzt auch PayPal-Zahlungen!</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Ein Wert ist für live mode erforderlich. Siehe CardinalCommerce Vereinbarung."
-"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Einlage (Für Dispute oder andere Untersuchungen zurückgehalten)"
-"ACH Deposit (Reversal)","ACH Einlage (Stornierung)"
-"ACH Funding for Funds Recovery from Account Balance","ACH Finanzierung der Zurückgewinnung des Kontostands"
-"ACH Withdrawal","ACH Abhebung"
-"API Authentication Methods","API-Authentifikationsmethoden"
-"API Certificate","API-Zertifikat"
-"API Password","API Passwort"
-"API Signature","API Signatur"
-"API Username","API Benutzername"
-"API Uses Proxy","API benutzt Proxy"
-"API/Integration","API/Integration"
-"API/Integration Settings","API/Integration Einstellungen"
-"Ability for buyer to purchase without PayPal account.","Möglichkeit für Käufer ohne PayPal Konto einzukaufen"
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","Akzeptieren Sie PayPal Zahlungen in Ihrem Warenkorb. Paypal wird Ihre Kreditkartenzahlungen mit dem Payflow Pro Gateway abwickeln"
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","Zahlungen über eine PCI-konforme Zahlungsmethode akzeptieren, wodurch Kunden auf Ihrer Seite bleiben. Einschließlich einem Händlerkonto bei Paypal."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","Zahlungen über eine PCI-konforme Zahlungsmethode akzeptieren, wodurch Kunden auf Ihrer Seite bleiben. Zur Verwendung mit Ihrem Händlerkonto."
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","Akzeptieren Sie Zahlungen, ohne dass die Kunden ihre Webseite verlassen. Viele beliebten Web-Hosting-Dienste und Warenkörbe sind mit eingebauten Payflow Zahlungs-Gatways ausgestattet und somit leicht einzurichten."
-"Acceptance Mark","Akzeptanz Kennzeichnung"
-"Acceptance Mark Image","Akzeptanz Kennzeichnungs-Logo"
-"Account-to-Account Payment, initiated by PayPal","Konto-zu-Konto Zahlung, von PayPal eingeleitet"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","Fügen Sie ihrem vorhandenen Warenkorb eine Express-Checkout-Taste hinzu, um schnell und einfach per Kreditkarte zu bezahlen. PayPal übernimmt alle Zahlungsabwicklungen."
-"Additional Options","Zusätzliche Optionen"
-"Address","Adresse"
-"Address Verification System Response","Adressen Prüfsystem Rückmeldung"
-"All the address information matched","Alle Adressdaten stimmen überein"
-"Allow in Billing Agreement Wizard","Assistent für die Rechnungsvereinbarung wird zugelassen"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Erlaubte Werte: ""paypal"", ""primary"" (Standard), ihr_eigener_wert (ein benutzerdefinierter Stil für Ihre Zahlungsseite, den Sie in Ihrem Händlerkonto-Profil festgelegt haben)."
-"Allowed Credit Card Types","Zulässige Kreditkarten"
-"Also affects mini-shopping cart.","Wirkt sich auch auf den Mini-Warenkorb aus."
-"Ask Customer","Beim Kunden anfragen"
-"Attempted Authentication, Bad Result","Versuchte Authentifizierung, falsches Ergebnis"
-"Attempted Authentication, Good Result","Versuchte Authentifizierung, richtiges Ergebnis"
-"Auction Payment other than through eBay","Eine andere Auktionszahlung als über eBay"
-"Authenticated, Bad Result","Authentifiziert, falsches Ergebnis"
-"Authenticated, Good Result","Authentifiziert, richtiges Ergebnis"
-"Authorization","Bewilligung"
-"Authorization Honor Interval (days)","Autorisation Ehrenzeitraum (Tage)"
-"Authorization expired.","Genehmigung abgelaufen"
-"Authorization transaction is required to void.","Genehmigungs-Transaktion zur Aufhebung erforderlich"
-"Authorization was voided by merchant.","Genehmigung wurde vom Händler für ungültig erklärt"
-"Authorized amount of %s.","Autorisierte Menge der %s"
-"Authorizing amount of %s is pending approval on gateway.","Autorisation der Anzahl der %s wartet auf die Zulassung."
-"Auto","Automatisch"
-"AutoSweep","Selbstdurchlauf"
-"Available Balance","Verfügbares Guthaben"
-"Back to Billing Agreements","Zurück zu Rechnungsvereinbarungen"
-"Balance Manager Account Bonus","Guthaben-Manager Kontobonus"
-"Billing Address","Rechnungsadresse"
-"Billing Agreement","Rechnungsvereinbarung"
-"Billing Agreement # %s","Rechnungsvereinbarung # %s"
-"Billing Agreement #%s","Rechnungsvereinbarung #%s"
-"Billing Agreement Signup ","Anmeldung zur Rechnungsvereinbarung"
+Custom,Kundenspezifisch
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,Preis
+ID,ID
+Configure,Configure
+No,Nein
+Qty,Qty
+Subtotal,Zwischensumme
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,Ja
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Bestellung
+View,Ansicht
+Active,Active
+Position,Position
+Dynamic,Dynamisch
+N/A,"Nicht zutreffend"
+Canceled,Canceled
+"General Information","General Information"
+Static,Statisch
+"Advanced Settings","Advanced Settings"
+"Learn More","Erfahren Sie mehr"
+"Start Date","Start Date"
+"Product Name","Product Name"
+"3D Secure Card Validation","3D Secure Card Validation"
+"Merchant Liability","Haftbarkeit des Händlers"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method",Lieferungsart
+"Please agree to all the terms and conditions before placing the order.","Bitte stimmen Sie den Allgemeinen Geschäftsbedingungen zu, bevor Sie die Bestellung aufgeben."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address",Lieferadresse
+"Payment Method","Payment Method"
+"Place Order","Erteilen Sie den Auftrag"
+"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung."
+Sales,Verkäufe
+Created,Created
+Display,Display
+User,User
+Daily,Täglich
+Date,Date
+"Order Total","Order Total"
+Never,Niemals
+Updated,Updated
+Reports,Berichte
+"Order Status","Order Status"
+"View Order","View Order"
+Event,Vorgang
+"Please Select","Please Select"
+"Submitting order information...","Bestellinformationen werden gesendet..."
+Authorization,Bewilligung
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
+"Billing Agreements",Rechnungsvereinbarungen
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
"Billing Agreement View","Rechnungsvereinbarung Ansicht"
-"Billing Agreements","Rechnungsvereinbarungen"
-"Billing Agreement status is not set.","Abrechnungsvereinbarungsstatus ist nicht gesetzt."
+"View Transaction Details","Ãœberweisungsdetails zeigen"
+"Reference Information",Referenz-Information
+"Transaction Information",Ãœberweisungs-Informationen
+"PayPal Fee Information","PayPal Gebühren-Information"
+"PayPal Settlement Reports","PayPal Abrechnungsberichte"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Aktualisierungen herunterladen"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Hilfe
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo","Demo anzeigen"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","Sie werden zur PayPal Webseite weitergeleitet."
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.","Sie werden zur PayPal-Website weitergeleitet, wenn Sie eine Bestellung aufgeben."
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.","Sie werden in wenigen Sekunden auf die PayPal Website weitergeleitet."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction","Transaktion anzeigen"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.","Express-Checkout und Bestellung wurden storniert."
+"Express Checkout has been canceled.","Express-Checkout storniert."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","PayPal Express-Checkout Token existiert nicht."
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.","Die erforderlichen Pflichtfelder für die PayPal Antwort wurden nicht ausgefüllt."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
"Unable to save Billing Agreement:","Abrechnungsvereinbarung kann nicht gespeichert werden:"
-"Your billing agreement # is: %s.","Die Nummer Ihrer Zustimmung zur Abrechnung lautet: %s."
-"Bonus for first ACH Use","Bonus für erste ACH-Benutzung"
-"Buyer Credit Payment","Käuferkredit Zahlung"
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","Wir bevorzugen PayPal (150 X 60)"
+"We prefer PayPal (150 X 40)","Wir bevorzugen PayPal (150 X 40)"
+"Now accepting PayPal (150 X 60)","Jetzt wird PayPal (150 X 60) angenommen"
+"Now accepting PayPal (150 X 40)","Wir nehmen jetzt PayPal an (150 X 40)"
+"Payments by PayPal (150 X 60)","Zahlungen durch PayPal (150 X 60)"
+"Payments by PayPal (150 X 40)","Zahlungen durch PayPal (150 X 40)"
+"Shop now using (150 X 60)","Kaufen Sie jetzt ein indem sie (150 X 60) nutzen"
+"Shop now using (150 X 40)","Kaufen Sie jetzt mit (150 X 40)"
+Shortcut,Shortcut
+"Acceptance Mark Image","Akzeptanz Kennzeichnungs-Logo"
+Sale,Verkauf
+"For Virtual Quotes Only","Nur für virtuelle Angebote"
+Auto,Automatisch
+"Ask Customer","Beim Kunden anfragen"
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","API Signatur"
+"API Certificate",API-Zertifikat
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","Die maximal mögliche Anzahl an Kinder-Autorisationen ist erreicht."
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.","Zahler ist nicht identifiziert"
+"Last Transaction ID","Letzte Ãœberweisungs-Kennnummer"
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.","Die Zahlung wurde autorisiert aber noch nicht ausgeführt."
+"The payment eCheck is not yet cleared.","Zahlung per eCheck ist noch nicht vereinbart."
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","Zahlung steht noch aus und wird von PayPal auf Risiken geprüft."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","Die Zahlung steht noch aus, da sie an eine Email-Adresse versandt wurde, die weder registriert noch bestätigt ist."
+"The merchant account is not yet verified.","Das Händlerkonto wurde noch nicht verifiziert."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","Die Zahlung wurde mit Kreditkarte getätigt. Damit der Händler Zahlungen erhalten kann, muss er sein Konto auf Business- oder Premiumstatus upgraden."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Storno einer Änderung"
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Rückerstattung für eine Rückbuchung"
+"Settlement of a chargeback.","Zahlung eine Rücklastschrift"
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Unbekannter Grund. Bitte kontaktieren Sie den PayPal Kundenservice."
+"Payer ID","Zahler Kennnummer"
+"Payer Email","Zahler Email"
+"Payer Status","Zahler Status"
+"Payer Address ID","Zahler Adressen Kennummer"
+"Payer Address Status","Adressenstatus des Zahlers"
+"Merchant Protection Eligibility","Händlerschutz Berechtigung"
+"Triggered Fraud Filters","Ausgelöste Betrugsfilter"
+"Last Correlation ID","Letzte Korrelations Identifizierung"
+"Address Verification System Response","Adressen Prüfsystem Rückmeldung"
+"CVV2 Check Result by PayPal","CVV2 Prüfergebnis durch PayPal"
"Buyer's Tax ID","Steuernummer des Käufers"
"Buyer's Tax ID Type","Art der Steuernummer des Käufers"
-"By default it is ""reports.paypal.com"".","Standardmäßige Einstellung ist ""reports.paypal.com""."
-"CNPJ","CNPJ"
-"CPF","CPF"
-"CVV2 Check Result by PayPal","CVV2 Prüfergebnis durch PayPal"
-"Can not send new order email.","Kann keine neue Bestellungs-E-Mail senden."
-"Cannot create target file for reading reports.","Zieldatei zum Lesen der Berichte kann nicht erstellt werden."
-"Centinel API URL","Centinel Api URL"
-"Centinel Custom API URL","Centinel Custom API-URL"
-"Charge-off","abbuchen"
-"Chargeback","Rücklastschrift"
-"Chargeback by customer.","Rücklastschrift durch Kunde"
-"Checkout with PayPal","Mit PayPal abmelden"
-"City","Stadt"
-"Click here if you are not redirected within 10 seconds...","Klicken Sie hier, wenn Sie nicht innerhalb von 10 Sekunden weitergeleitet werden..."
-"Company","Unternehmen"
-"Completion Date","Fertigstellungsdatum"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Verbindung zum PayPal SFTP Server um neue Berichte zu holen, wird erstellt. Sind Sie sicher, dass sie fortfahren wollen?"
-"Countries Payment Applicable From","Länder Zahlungen gültig ab"
-"Country","Land"
-"Coupon Redemption","Coupon-Einlösung"
-"Created billing agreement #%s.","Rechnungsvereinbahrung #%s erstellt."
-"Credit","Guthaben"
-"Credit Card Settings","Kreditkarten-Einstellung"
-"Currency Conversion required to cover negative balance","Währungsumrechnung erforderlich, um negatives Saldo zu decken"
-"Custom","Kundenspezifisch"
-"Custom Endpoint Hostname or IP-Address","Benutzerdefinierter Endpoint Hostname oder IP-Adresse"
-"Custom Path","Benutzerdefinierter Pfad"
-"Customer Information","Kundeninformation"
-"Customer complaint.","Kunden-Reklamation"
-"Customer did not include a confirmed address.","Kunde hat keine bestätigte Adresse angegeben"
-"Customer failed to pay.","Kunde hat nicht bezahlt."
-"Customer triggered a money-back guarantee.","Kunde rief eine Geld-zurück-Garantie ab."
-"Customer used non-confirmed address.","Kunde benutzte eine nicht bestätigte Adresse."
-"Daily","Täglich"
-"Debit","Soll"
-"Debit Card Cash Back","Debitkarte Cash Back"
-"Debit Card Transaction","Debitkarte Ãœberweisung"
-"Debit or Credit","Soll oder Haben"
-"Debug Mode","Debug Modus"
-"Direct Payment API","Direktzahlung API"
-"Discount","Rabatt"
-"Display Express Checkout in the Payment Information step","Anzeige der Express-Kaufabwicklung im Schritt Zahlungsinformationen"
-"Displays on catalog pages and homepage.","Anzeige auf Katalogseiten und auf der Homepage."
-"Don't have a PayPal account? Simply enter your email address.","Sie haben noch kein PayPal-Konto? Tragen Sie einfach Ihre Email-Adresse ein."
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","Sie haben noch kein PayPal Händler-Konto? Über Payflow Gateway können Sie doch Kreditkartenzahlungen annehmen."
-"Dynamic","Dynamisch"
-"EFT Funding (German banking)","EFT Finanzierung (Deutsches Banksystem)"
-"Edit Shopping Cart","Warenkorb bearbeiten"
-"Email Address","E-Mail-Adresse"
-"Email Associated with PayPal Merchant Account","Email ist mit PayPal Händler-Konto verknüpft"
-"Enable Automatic Fetching","Automatische Abholung aktivieren"
-"Enable PayPal Guest Checkout","PayPal Gast-Abmeldung aktivieren"
-"Enabled","Aktiviert"
-"Event","Vorgang"
-"Event Code","Vorgang-Schlüssel"
-"Every 10 days","alle 10 Tage"
-"Every 14 days","alle 14 Tage"
-"Every 3 days","alle 3 Tage"
-"Every 30 days","alle 30 Tage"
-"Every 40 days","alle 40 Tage"
-"Every 7 days","alle 7 Tage"
+"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Ergebnis"
+"PayPal/Centinel Electronic Commerce Indicator","PayPal/Cenitel Electronic Commerce Indikator"
+Chargeback,Rücklastschrift
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Nur übereinstimmende Adresse (keine Postleitzahl)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","Keine Details stimmen überein"
+"No Details matched. International","Keines der Details stimmt überein. International"
+"Exact Match. Address and nine-digit ZIP code","Genaue Ãœbereinstimmung. Adresse und neunstellige Postleitzahl"
"Exact Match. Address and Postal Code. International","Genaue Ãœbereinstimmung. Adresse und Postleitzahl. International"
"Exact Match. Address and Postal Code. UK-specific","Genaue Ãœbereinstimmung. Adresse und Postleitzahl. GB-spezifisch"
-"Exact Match. Address and nine-digit ZIP code","Genaue Ãœbereinstimmung. Adresse und neunstellige Postleitzahl"
-"Explanation: %s.","Erläuterung: %s"
-"Express Checkout","Express Kaufabwicklung"
-"Express Checkout (Payflow Edition) Settings","Express Kaufabwicklung (Payflow Edition) Einstellungen"
-"Express Checkout APIs","Express Kaufabwicklung APIs"
-"Express Checkout Settings","Express Kaufabwicklung Einstellungen"
-"Express Checkout and Order have been canceled.","Express-Checkout und Bestellung wurden storniert."
-"Express Checkout has been canceled.","Express-Checkout storniert."
-"Failed to cancel the billing agreement.","Aufhebung von Billing Agreement fehlgeschlagen."
-"Failed to create billing agreement for this order.","Erstellen von Billing Agreement für diese Bestellung fehlgeschlagen."
-"Failed to fetch reports from '%s@%s'.","Abholung der Berichte von '%s@%s' fehlgeschlagen."
-"Failed to finish billing agreement wizard.","Abschließen von Billing Agreement Assistent fehlgeschlagen."
-"Failed to start billing agreement wizard.","Start von Billing Agreement Assistent fehlgeschlagen."
-"Fax","Fax"
-"Fee Amount","Gebühr Betrag"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","Nicht zutreffend. MOTO (Internet/Telefon) Transaktionen nicht erlaubt"
+"N/A. Global Unavailable","N/A. Weltweit nicht verfügbar"
+"N/A. International Unavailable","N/A. International nicht verfügbar"
+"Matched five-digit ZIP only (no Address)","Nur die fünfstellige Postleitzahl stimmt überein (keine Adresse)"
+"Matched Postal Code only (no Address)","Nur die Postleitzahl stimmt überein (keine Adresse)"
+"N/A. Retry","N/A. wiederholen"
+"N/A. Service not Supported","Nicht zutreffend. Service nicht angeboten"
+"N/A. Unavailable","N/A. Nicht verfügbar"
+"Matched whole nine-didgit ZIP (no Address)","Die ganze neunstellige Postleitzahl stimmt überein (keine Adresse)"
+"Yes. Matched Address and five-didgit ZIP","Ja. Adresse und fünfstellige Postleitzahl stimmen überein."
+"All the address information matched","Alle Adressdaten stimmen überein"
+"None of the address information matched","Keine der Adress-Informationen stimmt überein"
+"Part of the address information matched","Die Adressen-Information stimmt teilweise überein"
+"N/A. The merchant did not provide AVS information","Nicht zutreffend. Der Händler hat keine AVS Informationen angegeben"
+"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Adresse nicht geprüft oder der Käufer bekam keine Antwort. Service nicht verfügbar."
+"Matched (CVV2CSC)","Ãœbereinstimmung (CVV2CSC)"
+"No match","Keine Ãœbereinstimmung"
+"N/A. Not processed","N/A. Nicht verarbeitet"
+"N/A. Service not supported","Nicht verfügbar. Service wird nicht unterstützt."
+"N/A. Service not available","N/A. Service ist nicht verfügbar"
+"N/A. No response","N/A. Keine Antwort"
+"Matched (CVV2)","abgeglichen (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","N/A. Der Händler benutzt keine CVV2 Code Verarbeitung"
+"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Händler hat angezeigt, dasssich CVV2 nicht auf der Karte befindet."
+"Authenticated, Good Result","Authentifiziert, richtiges Ergebnis"
+"Authenticated, Bad Result","Authentifiziert, falsches Ergebnis"
+"Attempted Authentication, Good Result","Versuchte Authentifizierung, richtiges Ergebnis"
+"Attempted Authentication, Bad Result","Versuchte Authentifizierung, falsches Ergebnis"
+"No Liability Shift","Keine Haftung Wechseln"
+"Issuer Liability","Haftung des Ausstellers"
+CNPJ,CNPJ
+CPF,CPF
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.","Zahlungen beinhalten nicht das Speichern der Objekte."
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.","Dieser Vorgang erfordert einen bestehenden Transaktionsgegenstand."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date",Berichtsdatum
+"Merchant Account","Händler Konto"
+"Transaction ID",TransaktionsID
+"Invoice ID",Rechnungsnummer
+"PayPal Reference ID","PayPal Referenz-Kennnummer"
+"PayPal Reference ID Type","PayPal Referenz.Kennnummerntyp"
+"Event Code",Vorgang-Schlüssel
+"Finish Date","Finish Date"
+"Debit or Credit","Soll oder Haben"
+"Gross Amount",Bruttobetrag
"Fee Debit or Credit","Gebühr Soll oder Haben"
-"Fee Reversal","Gebühr: ACH Auslands-Abhebung[caution! - this translation is for job#55147 and vice versa. sorry]"
-"Fee: Foreign ACH Withdrawal","Gebühr Storno"
-"Fee: Mass Pay Request","Gebühr: Anforderung Sammelzahlung"
+"Fee Amount","Gebühr Betrag"
+"Order ID",Bestellungsidentifizierung
+"Subscription ID",Bestellnummer
+"Preapproved Payment ID","Vorabgenehmigte Zahlung Kennnummer"
+Credit,Guthaben
+Debit,Soll
+"General: received payment of a type not belonging to the other T00xx categories","Allemein: Zahlung eines Typs erhalten, der nicht zu den anderen T00xx Kategorien gehört"
+"Mass Pay Payment","""Mass Pay"" Zahlungen"
+"Subscription Payment, either payment sent or payment received","Abonnementzahlung, entweder geschickte Zahlung oder Zahlung erhalten"
+"Preapproved Payment (BillUser API), either sent or received","Vorausgenehmigte Bezahlung (BillUser API), entweder geschickt oder erhalten"
+"eBay Auction Payment","eBay Auktion Zahlung"
+"Direct Payment API","Direktzahlung API"
+"Express Checkout APIs","Express Kaufabwicklung APIs"
+"Website Payments Standard Payment","Webseite Zahlungen Standard Zahlung"
+"Postage Payment to either USPS or UPS","Zahlung der Versandgebühr entweder an USPS oder UPS"
+"Gift Certificate Payment: purchase of Gift Certificate","Zahlung mit Geschenkgutschein: Kauf von Geschenkgutscheinen"
+"Auction Payment other than through eBay","Eine andere Auktionszahlung als über eBay"
+"Mobile Payment (made via a mobile phone)","Handy Zahlung (Zahlung erfolgt per Handy)"
+"Virtual Terminal Payment","Virtuelles Zahlungsterminal"
+"General: non-payment fee of a type not belonging to the other T01xx categories","Gebühr für Zahlungsverweigerung eines Typs, der nicht zu den anderen T01xx Kategorien gehört"
"Fee: Web Site Payments Pro Account Monthly","Gebühr: monatliche Zahlungen der Webseite für Konto"
+"Fee: Foreign ACH Withdrawal","Gebühr Storno"
"Fee: WorldLink Check Withdrawal","Gebühr: WorldLink Scheckauszahlung"
-"Fetch","Holen"
-"Fetch Updates","Aktualisierungen herunterladen"
-"Fetched %s report rows from '%s@%s'.","erfasste %s Berichtszeilen von ´%s@%s'."
-"For Virtual Quotes Only","Nur für virtuelle Angebote"
-"Frontend Experience Settings","Frontend Experience Einstellungen"
-"Funding","Finanzierung"
-"General (Authorization)","Allgemein (Berechtigung)"
-"General (Dividend)","Allgemein (Dividende)"
-"General (Funds Transfer from PayPal Account to Another)","Allgemein (Geldtransfer von einem PayPal Konto auf ein anderes)"
-"General (Purchase with a credit card)","Allgemein (Kauf mit einer Kreditkarte)"
-"General Adjustment without businessrelated event","Allgemeine Einstellung ohne geschäftsbezogenen Vorgang"
+"Fee: Mass Pay Request","Gebühr: Anforderung Sammelzahlung"
"General Currency Conversion","Allgemein Währungsumrechnung"
+"User-initiated Currency Conversion","Vom Benutzer ausgelöste Währungsumrechnung"
+"Currency Conversion required to cover negative balance","Währungsumrechnung erforderlich, um negatives Saldo zu decken"
"General Funding of PayPal Account ","Allgemein Finanzierung des PayPal Kontos"
-"General Redemption","Allgemein Rückzahlung"
+"PayPal Balance Manager function of PayPal account","PayPal Guthaben-Managerfunktion des PayPal Kontos"
+"ACH Funding for Funds Recovery from Account Balance","ACH Finanzierung der Zurückgewinnung des Kontostands"
+"EFT Funding (German banking)","EFT Finanzierung (Deutsches Banksystem)"
"General Withdrawal from PayPal Account","Allgemein Abhebung vom PayPal Konto"
-"General. Product no longer supported","Allgemein. Produkt wird nicht mehr untersützt"
+AutoSweep,Selbstdurchlauf
"General: Use of PayPal account for purchasing as well as receiving payments","Allgemein: Verwendung des PayPal Kontos für Einkauf und den Empfang von Zahlungen"
+"Virtual PayPal Debit Card Transaction","Virtuelle PayPal Ãœberweisung mit Debitkarte"
+"PayPal Debit Card Withdrawal from ATM","PayPal Debitkarte Abhebung von ATM"
+"Hidden Virtual PayPal Debit Card Transaction","Verborgene virtuelle PayPal Debitkarten Ãœberweisung"
+"PayPal Debit Card Cash Advance","PayPal Debitkarte Barvorschuss"
"General: Withdrawal from PayPal Account","Allgemein: Abhebung vom PayPal Konto"
-"General: Withdrawal to Non-Bank Entity","Allgemein: Abhebung von Nichtbank-Finanzintermediären"
-"General: adjustment of a type not belonging to the other T12xx categories","Allgemein: Einstellung eines Typs der nicht zu den anderen T12xx Kategorien gehört"
+"General (Purchase with a credit card)","Allgemein (Kauf mit einer Kreditkarte)"
+"Negative Balance","Negatives Guthaben"
"General: bonus of a type not belonging to the other T08xx categories","Allgemein: Bonus eines Typs der nicht zu den anderen T08xx Kategorien gehört"
-"General: event not yet categorized","Allgemein: noch nicht klassifiziert"
-"General: non-payment fee of a type not belonging to the other T01xx categories","Gebühr für Zahlungsverweigerung eines Typs, der nicht zu den anderen T01xx Kategorien gehört"
-"General: received payment of a type not belonging to the other T00xx categories","Allemein: Zahlung eines Typs erhalten, der nicht zu den anderen T00xx Kategorien gehört"
-"General: reversal of a type not belonging to the other T11xx categories","Allgemein: Storno eines Typs der nicht zu den anderen T11xx Kategorien gehört"
-"General: temporary hold of a type not belonging to the other T15xx categories","Allgemein: Vorübergehende Einbehaltung eines Typs, der nicht zu den anderen T15xx Kategorien gehört"
-"Get Credentials from PayPal","Fordern Sie von PayPal die Anmeldeinformationen an"
-"Gift Certificate Payment: purchase of Gift Certificate","Zahlung mit Geschenkgutschein: Kauf von Geschenkgutscheinen"
-"Gift Certificate Redemption","Einlösung von Geschenkgutscheinen"
-"Gross Amount","Bruttobetrag"
-"Header Background Color","Kopfzeile Hintergrundfarbe"
-"Header Border Color","Kopfzeile Farbe der Umrandung"
-"Header Image URL","Kopfzeile Bild URL"
-"Help","Hilfe"
-"Hidden Virtual PayPal Debit Card Transaction","Verborgene virtuelle PayPal Debitkarten Ãœberweisung"
-"Hold for Dispute Investigation","Zurückgehalten wegen Disput Überprüfung"
-"IPN ""%s"".","IPN ""%s""."
-"IPN verification ""%s"".","IPN-Verifizierung ""%s""."
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Wenn leer wird ein Standardwert verwendet. Individuelle URL kann durch CardinalCommerce Vereinbarung ausgegeben werden"
-"If not specified, Default Country from General Config will be used","Wenn nicht angegeben, wird das Land, welches in der General Config vorgegeben ist (Default), verwendet."
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Wenn diese Option aktiviert ist, kann der Kunde die Versandadresse und die Versandart auf der PayPal Webseite ändern. Im Live-Modus funktioniert dies nur über das HTTPS Protokoll."
-"Impossible to issue a refund transaction because the capture transaction does not exist.","Eine Rückerstattungsüberweisung kann nicht erfolgen, da die Überweisungerfassung nicht vorhanden ist"
-"Incentive","Anreiz"
-"Initiation Date","Aktivierungsdatum"
-"Integral Evolution","Integral Evolution"
-"Integral Evolution Settings","Einstellungen für Integral Evolution"
-"Invoice ID","Rechnungsnummer"
-"Issuer Liability","Haftung des Ausstellers"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Es wird empfohlen, diesen Wert auf ""Debit- oder Kreditkarte"" zu setzen."
-"It is recommended to set this value to ""PayPal"" per store views.","Es wird empfohlen, diesen Wert auf ""PayPal"" Ansicht pro Geschäft zu setzen."
-"Items in Your Shopping Cart","Artikel in Ihrem Warenkorb"
-"Last Correlation ID","Letzte Korrelations Identifizierung"
-"Last Transaction ID","Letzte Ãœberweisungs-Kennnummer"
-"Learn More","Erfahren Sie mehr"
-"Login","Einloggen"
-"Looking for PayPal? We have our own tab to the left under Sales.","Suche Sie PayPal? Wir haben unsere eigene Menuetaste auf der linken Seite unter Verkauf."
-"Mass Pay Payment","""Mass Pay"" Zahlungen"
-"Matched (CVV2)","abgeglichen (CVV2)"
-"Matched (CVV2CSC)","Ãœbereinstimmung (CVV2CSC)"
-"Matched Address only (no ZIP)","Nur übereinstimmende Adresse (keine Postleitzahl)"
-"Matched Address only (no ZIP). International","Nur die Adresse stimmt überein (keine Postleitzahl). International"
-"Matched Postal Code only (no Address)","Nur die Postleitzahl stimmt überein (keine Adresse)"
-"Matched five-digit ZIP only (no Address)","Nur die fünfstellige Postleitzahl stimmt überein (keine Adresse)"
-"Matched whole nine-didgit ZIP (no Address)","Die ganze neunstellige Postleitzahl stimmt überein (keine Adresse)"
-"Merchant Account","Händler Konto"
-"Merchant Country","Händler Land"
-"Merchant Liability","Haftbarkeit des Händlers"
-"Merchant Protection Eligibility","Händlerschutz Berechtigung"
+"Debit Card Cash Back","Debitkarte Cash Back"
"Merchant Referral Bonus","Händler Empfehlungsbonus"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Das Händlerkonto hat keine Abhebungsfunktion. Der Händler muss die Zahlung manuell annehmen oder ablehnen im ""Account Overview"" (Kontoübersicht)."
-"Merchant account is not verified.","Händlerkonto ist nicht verifiziert."
-"Merchant denied this pending payment.","Der Händler hat diese ausstehende Zahlung verweigert."
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Der Händler besitzt ein Nicht-US Konto und hat keinen Überweisungsautomatismus."
-"Merchant must upgrade account to Business or Premier status.","Händler muss Konto auf Business- oder Premierstatus upgraden."
-"Merchant reference ID format is not supported.","Das Format der Händler-Referenz-ID wird nicht unterstützt."
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Händler müssen bei PayPal anfragen, um die Funktion ""Rechnungsvereinbarungen"" zu aktivieren. Aktivieren Sie diese Option nicht bevor PayPal bestätigt hat, dass die Rechnungsvereinbarungen für Ihr Händlerkonto aktiviert sind."
-"Mobile Payment (made via a mobile phone)","Handy Zahlung (Zahlung erfolgt per Handy)"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Mehrfach-Währungs-Vorgang. Der Händler muss diese Zahlung manuell aus der PayPal Kontoübersicht annehmen oder ablehnen."
-"N/A","Nicht zutreffend"
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Adresse nicht geprüft oder der Käufer bekam keine Antwort. Service nicht verfügbar."
-"N/A. Global Unavailable","N/A. Weltweit nicht verfügbar"
-"N/A. International Unavailable","N/A. International nicht verfügbar"
-"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Händler hat angezeigt, dasssich CVV2 nicht auf der Karte befindet."
-"N/A. No response","N/A. Keine Antwort"
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","Nicht zutreffend. MOTO (Internet/Telefon) Transaktionen nicht erlaubt"
-"N/A. Not processed","N/A. Nicht verarbeitet"
-"N/A. Retry","N/A. wiederholen"
-"N/A. Service not Supported","Nicht zutreffend. Service nicht angeboten"
-"N/A. Service not available","N/A. Service ist nicht verfügbar"
-"N/A. Service not supported","Nicht verfügbar. Service wird nicht unterstützt."
-"N/A. The merchant did not provide AVS information","Nicht zutreffend. Der Händler hat keine AVS Informationen angegeben"
-"N/A. The merchant has not implemented CVV2 code handling","N/A. Der Händler benutzt keine CVV2 Code Verarbeitung"
-"N/A. Unavailable","N/A. Nicht verfügbar"
-"Negative Balance","Negatives Guthaben"
-"Never","Niemals"
-"New Billing Agreement","Neue Abrechnungsvereinbarung"
-"No","Nein"
-"No Details matched","Keine Details stimmen überein"
-"No Details matched. International","Keines der Details stimmt überein. International"
-"No Liability Shift","Keine Haftung Wechseln"
-"No Logo","Kein Logo"
-"No match","Keine Ãœbereinstimmung"
-"None of the address information matched","Keine der Adress-Informationen stimmt überein"
-"Note: %s","Hinweis: %s"
-"Nothing to fetch because of an empty configuration.","Nichts zu holen auf Grund von leerer Konfiguration"
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Beachten Sie, dass PayPal bis zu 10 Versandoptionen unterstützen kann. Magento wird daher nur die 10 günstigsten Versandoptionen übernehmen, falls es mehr als 10 Optionen gibt."
-"Notified customer about creditmemo #%s.","Benachrichteter Kunde über den Kreditvermerk #%s"
-"Notified customer about invoice #%s.","Benachrichteter Kunde über Rechnung #%s."
-"Now accepting PayPal (150 X 40)","Wir nehmen jetzt PayPal an (150 X 40)"
-"Now accepting PayPal (150 X 60)","Jetzt wird PayPal (150 X 60) angenommen"
-"Number of Child Authorizations","Anzahl der Kinder-Autorisationen"
-"Open Authorization","Autorisierung öffnen"
-"Order","Bestellung"
-"Order ID","Bestellungsidentifizierung"
-"Order Valid Interval (days)","Bestellung Geltungsdauer (Tage)"
-"Ordered amount of %s.","Bestellte Menge von %s."
-"Ordering amount of %s is pending approval on gateway.","Bestellte Menge von %s erwartet die Bestätigung vom Gateway."
-"Page Background Color","Seiten Hintergrundfarbe"
-"Page Style","Seitengestaltung"
-"Part of the address information matched","Die Adressen-Information stimmt teilweise überein"
-"Partner","Partner"
-"Pasarela integral","Pasarela integral"
-"Pasarela integral Settings","Pasarela integral Einstellungen"
-"Password","Passwort"
-"Pay Now","Jetzt bezahlen"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","PayPal Guthaben-Managerfunktion des PayPal Kontos"
+"Balance Manager Account Bonus","Guthaben-Manager Kontobonus"
"PayPal Buyer Warranty Bonus","PayPal Käufer Garantiebonus"
-"PayPal Debit Card Cash Advance","PayPal Debitkarte Barvorschuss"
-"PayPal Debit Card Withdrawal from ATM","PayPal Debitkarte Abhebung von ATM"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper"
-"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper"
-"PayPal Express Checkout Token does not exist.","PayPal Express-Checkout Token existiert nicht."
-"PayPal Express Order Review Form","PayPal Express Bestellübersichtsformular"
-"PayPal Express Order Review Form","PayPal Express Ansicht Bestellformular"
-"PayPal Fee Information","PayPal Gebühren-Information"
-"PayPal Merchant Pages Style","PayPal Händlerseiten Design"
-"PayPal Payments Advanced","Erweiterte Paypal-Zahlungen"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","PayPal Pro-Einstellungen"
-"PayPal Product Logo","PayPal Produktlogo"
"PayPal Protection Bonus","PayPal Schutz Bonus"
-"PayPal Reference ID","PayPal Referenz-Kennnummer"
-"PayPal Reference ID Type","PayPal Referenz.Kennnummerntyp"
-"PayPal Settlement Reports","PayPal Abrechnungsberichte"
-"PayPal certificate does not exist.","PayPal-Zertifikat existiert nicht."
-"PayPal certificate file is empty.","PayPal-Zertifikatdatei ist leer."
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal unterstützt keine Verarbeitung von Bestellungen mit einem Wert von Null. Um Ihren Einkauf abzuschließen, fahren Sie bitte mit dem Standard-Checkout fort."
-"PayPal gateway has rejected request. %s","PayPal gateway hat Ihre Anforderung abgewiesen. %s"
-"PayPal processes all of your orders, and you get paid.","PayPal verarbeitet all Ihre Aufträge und Sie werden bezahlt."
-"PayPal response hasn't required fields.","Die erforderlichen Pflichtfelder für die PayPal Antwort wurden nicht ausgefüllt."
-"PayPal retains reports for 45 days.","PayPal behält Aufzeichnungen für 45 Tage."
-"PayPal/Centinel Electronic Commerce Indicator","PayPal/Cenitel Electronic Commerce Indikator"
-"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Ergebnis"
-"Payer Address ID","Zahler Adressen Kennummer"
-"Payer Address Status","Adressenstatus des Zahlers"
-"Payer Email","Zahler Email"
-"Payer ID","Zahler Kennnummer"
-"Payer Status","Zahler Status"
-"Payer is not identified.","Zahler ist nicht identifiziert"
-"Payflow Link (for USA and Canada)","Payflow Link (für USA und Kanada)"
-"Payflow Link Settings","Payflow Link Einstellungen"
-"Payflow Pro Gateway","Payflow Pro Gateway"
-"Payflow Pro Settings","Payflow Pro Einstellungen"
-"Payment Action","Zahlungsaktion"
-"Payment Applicable From","Zahlung zutreffend von"
-"Payment Refund initiated by merchant","Rückerstattung der Zahlung durch den Händler initiiert"
-"Payment has been declined. Please try again.","Zahlung wurde verweigert. Bitte versuchen Sie es erneut."
-"Payment is being reviewed by PayPal for risk.","Zahlung wird durch PayPal auf Risiken überprüft"
-"Payment transactions disallow storing objects.","Zahlungen beinhalten nicht das Speichern der Objekte."
-"Payment was made to an email address that is not yet registered or confirmed.","Zahlung erging an eine Email-Adresse die noch nicht registriert oder bestätigt wurde."
-"Payments by PayPal (150 X 40)","Zahlungen durch PayPal (150 X 40)"
-"Payments by PayPal (150 X 60)","Zahlungen durch PayPal (150 X 60)"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","Kartenzahlungen + Verkäuferschutz - <strong style=""color:red"">Kontaktieren Sie PayPal vor der Aktivierung</strong>"
-"Paypal Billing Agreement Settings","PayPal Rechnungsvereinbarung Einstellungen"
-"Pending PayPal","PayPal ausstehend"
-"Phone","Telefon"
-"Place Order","Erteilen Sie den Auftrag"
-"Place Order Using Billing Agreements","Auftrag mithilfe von Rechnungsvereinbahrungen erteilen"
-"Please agree to all the terms and conditions before placing the order.","Bitte stimmen Sie den Allgemeinen Geschäftsbedingungen zu, bevor Sie die Bestellung aufgeben."
-"Please contact PayPal Customer Service.","Bitte benachrichtigen Sie den PayPal Kundenservice."
-"Please do not refresh the page until you complete payment.","Bitte die Seite nicht aktualisieren, bis Sie die Zahlung abgeschlossen haben."
-"Please select a shipping method...","Bitte wählen Sie eine Versandart aus..."
-"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen."
-"Please update order data to get shipping methods and rates","Aktualisieren Sie bitte die Auftragsdaten für Versandmethoden und -tarife"
+"Bonus for first ACH Use","Bonus für erste ACH-Benutzung"
+"General Redemption","Allgemein Rückzahlung"
+"Gift Certificate Redemption","Einlösung von Geschenkgutscheinen"
"Points Incentive Redemption","Einlösung von Loyalitätspunkten"
-"Postage Payment to either USPS or UPS","Zahlung der Versandgebühr entweder an USPS oder UPS"
-"Preapproved Payment (BillUser API), either sent or received","Vorausgenehmigte Bezahlung (BillUser API), entweder geschickt oder erhalten"
-"Preapproved Payment ID","Vorabgenehmigte Zahlung Kennnummer"
-"Price","Preis"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","Nutzen Sie Kreditkarten direkt auf Ihrer Webseite mit PayPal's alles-in-einer online Zahlungsprozess-Lösung."
-"Product","Produktname"
-"Proxy Host","Proxy Host"
-"Proxy Port","Proxy Port"
-"Quantity","Anzahl"
-"Reauthorization","Erneute Autorisierung"
-"Reference Information","Referenz-Information"
-"Refund issued by merchant.","Erstattung durch Händler erfolgt."
-"Reimbursement for a chargeback.","Rückerstattung für eine Rückbuchung"
-"Reimbursement of Chargeback","Rückerstattung einer Rücklastschrift"
-"Report Date","Berichtsdatum"
-"Reports","Berichte"
-"Requested %s and configured %s merchant emails do not match.","Angeforderte %s und konfigurierte %s Emails der Händler stimmen nicht überein."
-"Require CVV Entry","Kartenprüfnummer erfordern"
-"Require Customer's Billing Address","Kunden-Rechnungsadresse anfordern"
-"Reversal","Rückbelastung"
-"Reversal of General Account Hold","Storno des Hauptkontos durchführen"
+"Coupon Redemption",Coupon-Einlösung
+"Reward Voucher Redemption","Belohnungsgutschein Einlösung"
+"General. Product no longer supported","Allgemein. Produkt wird nicht mehr untersützt"
+"General: reversal of a type not belonging to the other T11xx categories","Allgemein: Storno eines Typs der nicht zu den anderen T11xx Kategorien gehört"
+"ACH Withdrawal","ACH Abhebung"
+"Debit Card Transaction","Debitkarte Ãœberweisung"
"Reversal of Points Usage","Points Rückbelastung"
-"Reversal of an adjustment.","Storno einer Änderung"
+"ACH Deposit (Reversal)","ACH Einlage (Stornierung)"
+"Reversal of General Account Hold","Storno des Hauptkontos durchführen"
+"Account-to-Account Payment, initiated by PayPal","Konto-zu-Konto Zahlung, von PayPal eingeleitet"
+"Payment Refund initiated by merchant","Rückerstattung der Zahlung durch den Händler initiiert"
+"Fee Reversal","Gebühr: ACH Auslands-Abhebung[caution! - this translation is for job#55147 and vice versa. sorry]"
+"Hold for Dispute Investigation","Zurückgehalten wegen Disput Überprüfung"
"Reversal of hold for Dispute Investigation","Stornierung einer Reservierung des Kontos wegen Disput Untersuchung"
-"Review Order","Auftrag überprüfen"
-"Reward Voucher Redemption","Belohnungsgutschein Einlösung"
-"SFTP Credentials","SFTP Anmeldedaten"
-"Sale","Verkauf"
-"Sales","Verkäufe"
-"Same as shipping","Identisch mit Versand"
-"Sandbox Credentials","Sandbox Anmeldeinformationen"
-"Sandbox Mode","Sandkasten-Modus"
-"Schedule","Planen"
-"Schedule description is too long.","Ablaufbeschreibung ist zu lang."
-"Scheduled Fetching","vorgesehenes Hochladen"
-"Select a PayPal Solution","Wählen Sie eine PayPal Lösung"
-"Server Error. Please try again.","Server-Fehler. Versuchen Sie es bitte erneut."
+"General: adjustment of a type not belonging to the other T12xx categories","Allgemein: Einstellung eines Typs der nicht zu den anderen T12xx Kategorien gehört"
+Reversal,Rückbelastung
+Charge-off,abbuchen
+Incentive,Anreiz
+"Reimbursement of Chargeback","Rückerstattung einer Rücklastschrift"
+"General (Authorization)","Allgemein (Berechtigung)"
+Reauthorization,"Erneute Autorisierung"
+Void,Leer
+"General (Dividend)","Allgemein (Dividende)"
+"General: temporary hold of a type not belonging to the other T15xx categories","Allgemein: Vorübergehende Einbehaltung eines Typs, der nicht zu den anderen T15xx Kategorien gehört"
+"Open Authorization","Autorisierung öffnen"
+"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Einlage (Für Dispute oder andere Untersuchungen zurückgehalten)"
+"Available Balance","Verfügbares Guthaben"
+Funding,Finanzierung
+"General: Withdrawal to Non-Bank Entity","Allgemein: Abhebung von Nichtbank-Finanzintermediären"
+"WorldLink Withdrawal","WorldLink Abhebung"
+"Buyer Credit Payment","Käuferkredit Zahlung"
+"General Adjustment without businessrelated event","Allgemeine Einstellung ohne geschäftsbezogenen Vorgang"
+"General (Funds Transfer from PayPal Account to Another)","Allgemein (Geldtransfer von einem PayPal Konto auf ein anderes)"
"Settlement Consolidation","Zahlung Zusammenführung"
-"Settlement Report Settings","Abrechnungsbericht Einstellungen"
-"Settlement of a chargeback.","Zahlung eine Rücklastschrift"
-"Severe 3D Secure Card Validation","Severe 3D Secure Card Validierung"
-"Severe Validation Removes Chargeback Liability on Merchant","Die bestehende strenge Absicherung entzieht den Verkäufer der Verbindlichkeit Ausgleichsbuchungen nachkommen zu müssen"
-"Severe validation removes chargeback liability on merchant.","Severe Validierung entfernt Ausgleichhaftung des Händlers."
-"Shipping","Lieferung"
-"Shipping Address","Lieferadresse"
-"Shipping Method","Lieferungsart"
-"Shop now using (150 X 40)","Kaufen Sie jetzt mit (150 X 40)"
-"Shop now using (150 X 60)","Kaufen Sie jetzt ein indem sie (150 X 60) nutzen"
-"Shortcut","Shortcut"
-"Shortcut Buttons Flavor","Kurzbefehl Schaltfläche Geschmack"
-"Shortcut on Product View","Kurzbefehl zur Artikelansicht"
-"Shortcut on Shopping Cart","Direktweg zum Einkaufswagen"
-"Sign a billing agreement to streamline further purchases with PayPal.","Unterzeichnen sie eine Rechnungsvereinbarung, um zukünftige Käufe mit PayPal zu rationalisieren."
-"Solo","Einzeln"
-"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung."
-"Sort Order","Sortierfolge"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Spezifizierung, was die Autorisation des Ehrenzeitraumes im PayPal-Konto des Händlers ist. Dies muss den Einstellungen in PayPal entsprechen."
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Spezifizierung, was die Bestellung der Geltungsdauer im PayPal-Konto des Händlers ist. Dies muss den Einstellungen in PayPal entsprechen."
-"State/Province","Staat/Bezirk"
-"Static","Statisch"
-"Street Address","Anschrift (Straße, Hausnummer, PLZ)"
-"Street Address %s","Hausanschrift %s"
-"Submitting order information...","Bestellinformationen werden gesendet..."
-"Subscriber name is too long.","Der Teilnehmername ist zu lang."
-"Subscription ID","Bestellnummer"
-"Subscription Payment, either payment sent or payment received","Abonnementzahlung, entweder geschickte Zahlung oder Zahlung erhalten"
-"Subtotal","Zwischensumme"
-"Summary Text for Aggregated Cart","Zusammenfassung des gesamten Korbs"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Für die Unterstützung von American Express Karten ist eine gesonderte Vereinbarung erforderlich. Erfahren Sie mehr unter at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"Switch/Maestro","Switch/ Maestro"
-"Test Mode","Testmodus"
-"The background color for the checkout page around the header and payment form.","Die Hintergrundfarbe für die Checkout-Seite, um die Überschrift und Zahlungsart herum."
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","Die Hintergrundfarbe für die Kopfzeile der Abmeldeseite. Groβ- und Kleinschreibung sechs Buchstaben HTML hexadezimal farbcode in ASII."
-"The billing agreement ""%s"" has been canceled.","Die Rechnungsvereinbarung ""%s"" wurde annuliert."
-"The billing agreement ""%s"" has been created.","Die Rechnungsvereinbarung ""%s"" wurde erstellt."
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","Die Standardeinstellung für Kinder-Autorisationen in Ihrem Paypal-Konto ist 1. Für mehrfache Autorisationen kontaktieren Sie bitte PayPal und bitten Sie um Erweiterung."
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","Das Bild oben links auf der Checkout-Seite. Max. Größe 750 x 90 Pixel. <strong style=""color:red"">https</strong> wird dringend empfohlen."
-"The maximum number of child authorizations is reached.","Die maximal mögliche Anzahl an Kinder-Autorisationen ist erreicht."
-"The merchant account is not yet verified.","Das Händlerkonto wurde noch nicht verifiziert."
-"The payment curency does not match any of the merchant's balances currency.","Die Währung der Zahlung stimmt mit keiner der Währungen des Kontos des Händlers überein."
-"The payment eCheck is not yet cleared.","Zahlung per eCheck ist noch nicht vereinbart."
-"The payment is authorized but not settled.","Die Zahlung wurde autorisiert aber noch nicht ausgeführt."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","Die Zahlung steht noch aus, da sie an eine Email-Adresse versandt wurde, die weder registriert noch bestätigt ist."
-"The payment is pending while it is being reviewed by PayPal for risk.","Zahlung steht noch aus und wird von PayPal auf Risiken geprüft."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","Die Zahlung wurde mit Kreditkarte getätigt. Damit der Händler Zahlungen erhalten kann, muss er sein Konto auf Business- oder Premiumstatus upgraden."
+"General: event not yet categorized","Allgemein: noch nicht klassifiziert"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days","alle 3 Tage"
+"Every 7 days","alle 7 Tage"
+"Every 10 days","alle 10 Tage"
+"Every 14 days","alle 14 Tage"
+"Every 30 days","alle 30 Tage"
+"Every 40 days","alle 40 Tage"
+"No Logo","Kein Logo"
+"Pending PayPal","PayPal ausstehend"
+"Billing Agreement",Rechnungsvereinbarung
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- Bitte wählen Sie Rechnungsvereinbarung --"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements","Zurück zu Rechnungsvereinbarungen"
"There are no billing agreements yet.","Es gibt noch keine Rechnungsvereinbahrungen."
-"There was an error processing your order. Please contact us or try again later.","Bei der Bearbeitung Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns oder versuchen Sie es später noch einmal."
-"This feature needs be enabled first for the merchant account through PayPal technical support.","Diese Funktion muss zunächst für das Händlerkonto vom Technischen Support von Paypal aktiviert werden."
-"This operation requires an existing transaction object.","Dieser Vorgang erfordert einen bestehenden Transaktionsgegenstand."
-"Time of Day","Tageszeit"
-"Title","Titel"
-"Transaction ID","TransaktionsID"
-"Transaction ID must not be empty.","ID der Transaktion darf nicht leer sein."
-"Transaction Information","Ãœberweisungs-Informationen"
-"Transfer Cart Line Items","Einkaufswagen-Rechnungsposten transferieren"
-"Transfer Shipping Options","Ãœberweisung Versand Optionen"
-"Triggered Fraud Filters","Ausgelöste Betrugsfilter"
-"Unable to cancel Express Checkout.","Express-Checkout kann nicht abgebrochen werden."
-"Unable to change status. Current status is not correspond to real status.","Status kann nicht geändert werden. Der aktuelle Status entspricht nicht dem tatsächlichen Status."
-"Unable to communicate with the PayPal gateway.","Es kann keine Verbindung zum PayPal Gatway aufgenommen werden."
-"Unable to initialize Express Checkout review.","Express-Checkout Überprüfung kann nicht initialisiert werden."
-"Unable to initialize Express Checkout.","Express Abmeldung kann nicht initialisiert werden."
-"Unable to place the order.","Bestellung konnte nicht aufgegeben werden."
-"Unable to process Express Checkout approval.","Express-Checkout Genehmigung konnte nicht bearbeitet werden."
-"Unable to start Express Checkout.","Express-Checkout konnte nicht gestartet werden."
-"Unable to update Order data.","Bestellinformation konnte nicht aktualisiert werden."
-"Unable to update shipping method.","Die Versandmethode konnte nicht aktualisiert werden."
-"Unknown Error. Please try again later.","Unbekannter Fehler. Versuchen Sie es später erneut."
-"Unknown reason. Please contact PayPal customer service.","Unbekannter Grund. Bitte kontaktieren Sie den PayPal Kundenservice."
-"Update Order Data","Bestellinformation aktualisieren"
-"Use Proxy","Proxy benutzen"
-"Use colon to specify port. For example: ""test.example.com:5224"".","Verwenden Sie einen Doppelpunkt, um den Port festzulegen. Zum Beispiel: ""test.example.com:5224""."
-"User","Benutzer"
-"User-initiated Currency Conversion","Vom Benutzer ausgelöste Währungsumrechnung"
-"Uses store frontend name by default.","Benutzt standardmässig store frontend name."
-"VAT Number","MwSt.-Nummer"
-"Vendor","Anbieter"
-"Vendor / Merchant Login","Verkäufer / Händler-Login"
-"View","Ansicht"
-"View Demo","Demo anzeigen"
-"View PayPal solutions.","PayPal Lösungen zeigen."
-"View Transaction","Transaktion anzeigen"
-"View Transaction Details","Ãœberweisungsdetails zeigen"
-"Virtual PayPal Debit Card Transaction","Virtuelle PayPal Ãœberweisung mit Debitkarte"
-"Virtual Terminal Payment","Virtuelles Zahlungsterminal"
-"Void","Leer"
-"Waiting until Customer's eCheck will be cleared.","Warten bis der eCheck des Kunden freigegeben ist."
-"We prefer PayPal (150 X 40)","Wir bevorzugen PayPal (150 X 40)"
-"We prefer PayPal (150 X 60)","Wir bevorzugen PayPal (150 X 60)"
-"Website Payments Plus","Webseite Zahlungen Plus"
-"Website Payments Plus Settings","Website Payments Plus Einstellungen"
-"Website Payments Pro","Webseite Zahlungen Pro"
-"Website Payments Pro (Payflow Edition) Settings","Webseite Zahlung Pro (Payflow Edition) Einstellungen"
-"Website Payments Pro Hosted Solution","Website Payments Pro Gehostete Lösung"
-"Website Payments Pro Hosted Solution Settings","Website Payments Pro Gehostete Lösung Einstellungen"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","Webseite Payments Pro ayflow Edition (mit Express Abmeldung)"
-"Website Payments Pro Settings","Webseite Zahlungen Pro Einstellungen"
-"Website Payments Standard","Webseite Zahlungen Standard"
-"Website Payments Standard Payment","Webseite Zahlungen Standard Zahlung"
-"Website Payments Standard Settings","Webseite Zahlungen Standard Einstellungen"
-"What is PayPal?","Was ist PayPal?"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Ob eine Rechnungsvereinbarung angelegt werden muss, wenn keine aktiven Rechnungsvereinbarungen zur Verfügung stehen."
-"Will appear as a payment option only for customers who have at least one active billing agreement.","Erscheint nur für die Kunden als Zahlungsoption, die mindestens eine aktive Rechnungsvereinbarung haben."
-"WorldLink Withdrawal","WorldLink Abhebung"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Würden Sie gerne eine Rechnungsvereinbarung abschliessen, um zukünftige Käufe mit PayPal zu rationalisieren?"
-"Wrong Order ID (%s) specified.","Falsche Bestellnummer (%s) angegeben."
-"Wrong PayPal Express Checkout Token specified.","Falscher PayPal Express-Checkout Token eingegeben."
-"Wrong billing agreement ID specified.","Falsche Zahlungsvereinbarungs-ID angegeben."
-"Yes","Ja"
-"Yes. Matched Address and five-didgit ZIP","Ja. Adresse und fünfstellige Postleitzahl stimmen überein."
-"You cannot void a verification transaction","Sie können eine Prüfung nicht für ungültig erklären"
-"You will be redirected to the PayPal website in a few seconds.","Sie werden in wenigen Sekunden auf die PayPal Website weitergeleitet."
-"You will be redirected to the PayPal website when you place an order.","Sie werden zur PayPal-Website weitergeleitet, wenn Sie eine Bestellung aufgeben."
-"You will be redirected to the PayPal website.","Sie werden zur PayPal Webseite weitergeleitet."
+"New Billing Agreement","Neue Abrechnungsvereinbarung"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order","Auftrag überprüfen"
+"Please select a shipping method...","Bitte wählen Sie eine Versandart aus..."
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","Artikel in Ihrem Warenkorb"
+"Edit Shopping Cart","Warenkorb bearbeiten"
+"Please update order data to get shipping methods and rates","Aktualisieren Sie bitte die Auftragsdaten für Versandmethoden und -tarife"
+"Checkout with PayPal","Mit PayPal abmelden"
+"Please do not refresh the page until you complete payment.","Bitte die Seite nicht aktualisieren, bis Sie die Zahlung abgeschlossen haben."
"You will be required to enter your payment details after you place an order.","Sie werden aufgefordert, Ihre Zahlungsdaten eingeben, nachdem Sie eine Bestellung aufgegeben haben."
-"Zip/Postal Code","Postleitzahl"
-"chargeback reimbursed","Rücklastschrift erstattet."
-"chargeback settled","Rücklastschrift beglichen"
-"customer complaint","Kundenreklamation"
-"customer triggered a chargeback","Kunde hat eine Rückbuchung veranlasst"
-"customer triggered money-back guarantee","Der Kunde leitete eine Geld-zurück-Garantie ein"
-"eBay Auction Payment","eBay Auktion Zahlung"
-"merchant refunded payment","Händler hat Zahlung erstattet"
-"no reason","kein Grund"
-"reversal of an adjustment","Storno einer Änderung"
-"unknown reason","unbekannter Grund"
+"Additional Options","Zusätzliche Optionen"
+"Acceptance Mark","Akzeptanz Kennzeichnung"
+"What is PayPal?","Was ist PayPal?"
+"Sign a billing agreement to streamline further purchases with PayPal.","Unterzeichnen sie eine Rechnungsvereinbarung, um zukünftige Käufe mit PayPal zu rationalisieren."
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
+"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 5d65fec9c84..7369fc04436 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -1,504 +1,692 @@
-"-- Please Select Billing Agreement--","-- Please Select Billing Agreement--"
-"-OR-","-OR-"
-"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
-"3D Secure","3D Secure"
+Custom,Custom
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,Price
+ID,ID
+Configure,Configure
+No,No
+Qty,Qty
+Subtotal,Subtotal
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+View,View
+Active,Active
+Position,Position
+Dynamic,Dynamic
+N/A,N/A
+Canceled,Canceled
+"General Information","General Information"
+Static,Static
+"Advanced Settings","Advanced Settings"
+"Learn More","Learn More"
+"Start Date","Start Date"
+"Product Name","Product Name"
"3D Secure Card Validation","3D Secure Card Validation"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
-"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Deposit (Hold for Dispute or Other Investigation)"
-"ACH Deposit (Reversal)","ACH Deposit (Reversal)"
-"ACH Funding for Funds Recovery from Account Balance","ACH Funding for Funds Recovery from Account Balance"
-"ACH Withdrawal","ACH Withdrawal"
-"API Authentication Methods","API Authentication Methods"
-"API Certificate","API Certificate"
-"API Password","API Password"
-"API Signature","API Signature"
-"API Username","API Username"
-"API Uses Proxy","API Uses Proxy"
-"API/Integration","API/Integration"
-"API/Integration Settings","API/Integration Settings"
-"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account."
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up."
-"Acceptance Mark","Acceptance Mark"
-"Acceptance Mark Image","Acceptance Mark Image"
-"Account-to-Account Payment, initiated by PayPal","Account-to-Account Payment, initiated by PayPal"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing."
-"Additional Options","Additional Options"
-"Address","Address"
-"Address Verification System Response","Address Verification System Response"
-"All the address information matched","All the address information matched"
-"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile)."
-"Allowed Credit Card Types","Allowed Credit Card Types"
-"Also affects mini-shopping cart.","Also affects mini-shopping cart."
-"Ask Customer","Ask Customer"
-"Attempted Authentication, Bad Result","Attempted Authentication, Bad Result"
-"Attempted Authentication, Good Result","Attempted Authentication, Good Result"
-"Auction Payment other than through eBay","Auction Payment other than through eBay"
-"Authenticated, Bad Result","Authenticated, Bad Result"
-"Authenticated, Good Result","Authenticated, Good Result"
-"Authorization","Authorization"
-"Authorization Honor Interval (days)","Authorization Honor Interval (days)"
-"Authorization expired.","Authorization expired."
-"Authorization transaction is required to void.","Authorization transaction is required to void."
-"Authorization was voided by merchant.","Authorization was voided by merchant."
-"Authorized amount of %s.","Authorized amount of %s."
-"Authorizing amount of %s is pending approval on gateway.","Authorizing amount of %s is pending approval on gateway."
-"Auto","Auto"
-"AutoSweep","AutoSweep"
-"Available Balance","Available Balance"
-"Back to Billing Agreements","Back to Billing Agreements"
-"Balance Manager Account Bonus","Balance Manager Account Bonus"
-"Billing Address","Billing Address"
-"Billing Agreement","Billing Agreement"
-"Billing Agreement # %s","Billing Agreement # %s"
-"Billing Agreement #%s","Billing Agreement #%s"
-"Billing Agreement Signup ","Billing Agreement Signup "
-"Billing Agreement View","Billing Agreement View"
+"Merchant Liability","Merchant Liability"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+"Place Order","Place Order"
+"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+Sales,Sales
+Created,Created
+Display,Display
+User,User
+Daily,Daily
+Date,Date
+"Order Total","Order Total"
+Never,Never
+Updated,Updated
+Reports,Reports
+"Order Status","Order Status"
+"View Order","View Order"
+Event,Event
+"Please Select","Please Select"
+"Submitting order information...","Submitting order information..."
+Authorization,Authorization
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
"Billing Agreements","Billing Agreements"
-"Billing Agreement status is not set.","Billing Agreement status is not set."
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
+"Billing Agreement View","Billing Agreement View"
+"View Transaction Details","View Transaction Details"
+"Reference Information","Reference Information"
+"Transaction Information","Transaction Information"
+"PayPal Fee Information","PayPal Fee Information"
+"PayPal Settlement Reports","PayPal Settlement Reports"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Fetch Updates"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Help
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo","View Demo"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.","You will be redirected to the PayPal website when you place an order."
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.","You will be redirected to the PayPal website in a few seconds."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction","View Transaction"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."
+"Express Checkout has been canceled.","Express Checkout has been canceled."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","PayPal Express Checkout Token does not exist."
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.","PayPal response hasn't required fields."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
"Unable to save Billing Agreement:","Unable to save Billing Agreement:"
-"Your billing agreement # is: %s.","Your billing agreement # is: %s."
-"Bonus for first ACH Use","Bonus for first ACH Use"
-"Buyer Credit Payment","Buyer Credit Payment"
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
+"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
+"Now accepting PayPal (150 X 60)","Now accepting PayPal (150 X 60)"
+"Now accepting PayPal (150 X 40)","Now accepting PayPal (150 X 40)"
+"Payments by PayPal (150 X 60)","Payments by PayPal (150 X 60)"
+"Payments by PayPal (150 X 40)","Payments by PayPal (150 X 40)"
+"Shop now using (150 X 60)","Shop now using (150 X 60)"
+"Shop now using (150 X 40)","Shop now using (150 X 40)"
+Shortcut,Shortcut
+"Acceptance Mark Image","Acceptance Mark Image"
+Sale,Sale
+"For Virtual Quotes Only","For Virtual Quotes Only"
+Auto,Auto
+"Ask Customer","Ask Customer"
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","API Signature"
+"API Certificate","API Certificate"
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","The maximum number of child authorizations is reached."
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can\'t process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.","Payer is not identified."
+"Last Transaction ID","Last Transaction ID"
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.","The payment is authorized but not settled."
+"The payment eCheck is not yet cleared.","The payment eCheck is not yet cleared."
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","The payment is pending while it is being reviewed by PayPal for risk."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","The payment is pending because it was made to an email address that is not yet registered or confirmed."
+"The merchant account is not yet verified.","The merchant account is not yet verified."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Reversal of an adjustment."
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Reimbursement for a chargeback."
+"Settlement of a chargeback.","Settlement of a chargeback."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Unknown reason. Please contact PayPal customer service."
+"Payer ID","Payer ID"
+"Payer Email","Payer Email"
+"Payer Status","Payer Status"
+"Payer Address ID","Payer Address ID"
+"Payer Address Status","Payer Address Status"
+"Merchant Protection Eligibility","Merchant Protection Eligibility"
+"Triggered Fraud Filters","Triggered Fraud Filters"
+"Last Correlation ID","Last Correlation ID"
+"Address Verification System Response","Address Verification System Response"
+"CVV2 Check Result by PayPal","CVV2 Check Result by PayPal"
"Buyer's Tax ID","Buyer's Tax ID"
"Buyer's Tax ID Type","Buyer's Tax ID Type"
-"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
-"CNPJ","CNPJ"
-"CPF","CPF"
-"CVV2 Check Result by PayPal","CVV2 Check Result by PayPal"
-"Can not send new order email.","Can not send new order email."
-"Cannot create target file for reading reports.","Cannot create target file for reading reports."
-"Centinel API URL","Centinel API URL"
-"Centinel Custom API URL","Centinel Custom API URL"
-"Charge-off","Charge-off"
-"Chargeback","Chargeback"
-"Chargeback by customer.","Chargeback by customer."
-"Checkout with PayPal","Checkout with PayPal"
-"City","City"
-"Click here if you are not redirected within 10 seconds...","Click here if you are not redirected within 10 seconds..."
-"Company","Company"
-"Completion Date","Completion Date"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?"
-"Countries Payment Applicable From","Countries Payment Applicable From"
-"Country","Country"
-"Coupon Redemption","Coupon Redemption"
-"Created billing agreement #%s.","Created billing agreement #%s."
-"Credit","Credit"
-"Credit Card Settings","Credit Card Settings"
-"Currency Conversion required to cover negative balance","Currency Conversion required to cover negative balance"
-"Custom","Custom"
-"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
-"Custom Path","Custom Path"
-"Customer Information","Customer Information"
-"Customer complaint.","Customer complaint."
-"Customer did not include a confirmed address.","Customer did not include a confirmed address."
-"Customer failed to pay.","Customer failed to pay."
-"Customer triggered a money-back guarantee.","Customer triggered a money-back guarantee."
-"Customer used non-confirmed address.","Customer used non-confirmed address."
-"Daily","Daily"
-"Debit","Debit"
-"Debit Card Cash Back","Debit Card Cash Back"
-"Debit Card Transaction","Debit Card Transaction"
-"Debit or Credit","Debit or Credit"
-"Debug Mode","Debug Mode"
-"Direct Payment API","Direct Payment API"
-"Discount","Discount"
-"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
-"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
-"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway."
-"Dynamic","Dynamic"
-"EFT Funding (German banking)","EFT Funding (German banking)"
-"Edit Shopping Cart","Edit Shopping Cart"
-"Email Address","Email Address"
-"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
-"Enable Automatic Fetching","Enable Automatic Fetching"
-"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
-"Enabled","Enabled"
-"Event","Event"
-"Event Code","Event Code"
-"Every 10 days","Every 10 days"
-"Every 14 days","Every 14 days"
-"Every 3 days","Every 3 days"
-"Every 30 days","Every 30 days"
-"Every 40 days","Every 40 days"
-"Every 7 days","Every 7 days"
+"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Result"
+"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Electronic Commerce Indicator"
+Chargeback,Chargeback
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Matched Address only (no ZIP)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","No Details matched"
+"No Details matched. International","No Details matched. International"
+"Exact Match. Address and nine-digit ZIP code","Exact Match. Address and nine-digit ZIP code"
"Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International"
"Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific"
-"Exact Match. Address and nine-digit ZIP code","Exact Match. Address and nine-digit ZIP code"
-"Explanation: %s.","Explanation: %s."
-"Express Checkout","Express Checkout"
-"Express Checkout (Payflow Edition) Settings","Express Checkout (Payflow Edition) Settings"
-"Express Checkout APIs","Express Checkout APIs"
-"Express Checkout Settings","Express Checkout Settings"
-"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."
-"Express Checkout has been canceled.","Express Checkout has been canceled."
-"Failed to cancel the billing agreement.","Failed to cancel the billing agreement."
-"Failed to create billing agreement for this order.","Failed to create billing agreement for this order."
-"Failed to fetch reports from '%s@%s'.","Failed to fetch reports from '%s@%s'."
-"Failed to finish billing agreement wizard.","Failed to finish billing agreement wizard."
-"Failed to start billing agreement wizard.","Failed to start billing agreement wizard."
-"Fax","Fax"
-"Fee Amount","Fee Amount"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Not allowed for MOTO (Internet/Phone) transactions"
+"N/A. Global Unavailable","N/A. Global Unavailable"
+"N/A. International Unavailable","N/A. International Unavailable"
+"Matched five-digit ZIP only (no Address)","Matched five-digit ZIP only (no Address)"
+"Matched Postal Code only (no Address)","Matched Postal Code only (no Address)"
+"N/A. Retry","N/A. Retry"
+"N/A. Service not Supported","N/A. Service not Supported"
+"N/A. Unavailable","N/A. Unavailable"
+"Matched whole nine-didgit ZIP (no Address)","Matched whole nine-didgit ZIP (no Address)"
+"Yes. Matched Address and five-didgit ZIP","Yes. Matched Address and five-didgit ZIP"
+"All the address information matched","All the address information matched"
+"None of the address information matched","None of the address information matched"
+"Part of the address information matched","Part of the address information matched"
+"N/A. The merchant did not provide AVS information","N/A. The merchant did not provide AVS information"
+"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
+"Matched (CVV2CSC)","Matched (CVV2CSC)"
+"No match","No match"
+"N/A. Not processed","N/A. Not processed"
+"N/A. Service not supported","N/A. Service not supported"
+"N/A. Service not available","N/A. Service not available"
+"N/A. No response","N/A. No response"
+"Matched (CVV2)","Matched (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","N/A. The merchant has not implemented CVV2 code handling"
+"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Merchant has indicated that CVV2 is not present on card"
+"Authenticated, Good Result","Authenticated, Good Result"
+"Authenticated, Bad Result","Authenticated, Bad Result"
+"Attempted Authentication, Good Result","Attempted Authentication, Good Result"
+"Attempted Authentication, Bad Result","Attempted Authentication, Bad Result"
+"No Liability Shift","No Liability Shift"
+"Issuer Liability","Issuer Liability"
+CNPJ,CNPJ
+CPF,CPF
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.","This operation requires an existing transaction object."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date","Report Date"
+"Merchant Account","Merchant Account"
+"Transaction ID","Transaction ID"
+"Invoice ID","Invoice ID"
+"PayPal Reference ID","PayPal Reference ID"
+"PayPal Reference ID Type","PayPal Reference ID Type"
+"Event Code","Event Code"
+"Finish Date","Finish Date"
+"Debit or Credit","Debit or Credit"
+"Gross Amount","Gross Amount"
"Fee Debit or Credit","Fee Debit or Credit"
-"Fee Reversal","Fee Reversal"
-"Fee: Foreign ACH Withdrawal","Fee: Foreign ACH Withdrawal"
-"Fee: Mass Pay Request","Fee: Mass Pay Request"
+"Fee Amount","Fee Amount"
+"Order ID","Order ID"
+"Subscription ID","Subscription ID"
+"Preapproved Payment ID","Preapproved Payment ID"
+Credit,Credit
+Debit,Debit
+"General: received payment of a type not belonging to the other T00xx categories","General: received payment of a type not belonging to the other T00xx categories"
+"Mass Pay Payment","Mass Pay Payment"
+"Subscription Payment, either payment sent or payment received","Subscription Payment, either payment sent or payment received"
+"Preapproved Payment (BillUser API), either sent or received","Preapproved Payment (BillUser API), either sent or received"
+"eBay Auction Payment","eBay Auction Payment"
+"Direct Payment API","Direct Payment API"
+"Express Checkout APIs","Express Checkout APIs"
+"Website Payments Standard Payment","Website Payments Standard Payment"
+"Postage Payment to either USPS or UPS","Postage Payment to either USPS or UPS"
+"Gift Certificate Payment: purchase of Gift Certificate","Gift Certificate Payment: purchase of Gift Certificate"
+"Auction Payment other than through eBay","Auction Payment other than through eBay"
+"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"
+"Virtual Terminal Payment","Virtual Terminal Payment"
+"General: non-payment fee of a type not belonging to the other T01xx categories","General: non-payment fee of a type not belonging to the other T01xx categories"
"Fee: Web Site Payments Pro Account Monthly","Fee: Web Site Payments Pro Account Monthly"
+"Fee: Foreign ACH Withdrawal","Fee: Foreign ACH Withdrawal"
"Fee: WorldLink Check Withdrawal","Fee: WorldLink Check Withdrawal"
-"Fetch","Fetch"
-"Fetch Updates","Fetch Updates"
-"Fetched %s report rows from '%s@%s'.","Fetched %s report rows from '%s@%s'."
-"For Virtual Quotes Only","For Virtual Quotes Only"
-"Frontend Experience Settings","Frontend Experience Settings"
-"Funding","Funding"
-"General (Authorization)","General (Authorization)"
-"General (Dividend)","General (Dividend)"
-"General (Funds Transfer from PayPal Account to Another)","General (Funds Transfer from PayPal Account to Another)"
-"General (Purchase with a credit card)","General (Purchase with a credit card)"
-"General Adjustment without businessrelated event","General Adjustment without businessrelated event"
+"Fee: Mass Pay Request","Fee: Mass Pay Request"
"General Currency Conversion","General Currency Conversion"
+"User-initiated Currency Conversion","User-initiated Currency Conversion"
+"Currency Conversion required to cover negative balance","Currency Conversion required to cover negative balance"
"General Funding of PayPal Account ","General Funding of PayPal Account "
-"General Redemption","General Redemption"
+"PayPal Balance Manager function of PayPal account","PayPal Balance Manager function of PayPal account"
+"ACH Funding for Funds Recovery from Account Balance","ACH Funding for Funds Recovery from Account Balance"
+"EFT Funding (German banking)","EFT Funding (German banking)"
"General Withdrawal from PayPal Account","General Withdrawal from PayPal Account"
-"General. Product no longer supported","General. Product no longer supported"
+AutoSweep,AutoSweep
"General: Use of PayPal account for purchasing as well as receiving payments","General: Use of PayPal account for purchasing as well as receiving payments"
+"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
+"PayPal Debit Card Withdrawal from ATM","PayPal Debit Card Withdrawal from ATM"
+"Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
+"PayPal Debit Card Cash Advance","PayPal Debit Card Cash Advance"
"General: Withdrawal from PayPal Account","General: Withdrawal from PayPal Account"
-"General: Withdrawal to Non-Bank Entity","General: Withdrawal to Non-Bank Entity"
-"General: adjustment of a type not belonging to the other T12xx categories","General: adjustment of a type not belonging to the other T12xx categories"
+"General (Purchase with a credit card)","General (Purchase with a credit card)"
+"Negative Balance","Negative Balance"
"General: bonus of a type not belonging to the other T08xx categories","General: bonus of a type not belonging to the other T08xx categories"
-"General: event not yet categorized","General: event not yet categorized"
-"General: non-payment fee of a type not belonging to the other T01xx categories","General: non-payment fee of a type not belonging to the other T01xx categories"
-"General: received payment of a type not belonging to the other T00xx categories","General: received payment of a type not belonging to the other T00xx categories"
-"General: reversal of a type not belonging to the other T11xx categories","General: reversal of a type not belonging to the other T11xx categories"
-"General: temporary hold of a type not belonging to the other T15xx categories","General: temporary hold of a type not belonging to the other T15xx categories"
-"Get Credentials from PayPal","Get Credentials from PayPal"
-"Gift Certificate Payment: purchase of Gift Certificate","Gift Certificate Payment: purchase of Gift Certificate"
+"Debit Card Cash Back","Debit Card Cash Back"
+"Merchant Referral Bonus","Merchant Referral Bonus"
+"Balance Manager Account Bonus","Balance Manager Account Bonus"
+"PayPal Buyer Warranty Bonus","PayPal Buyer Warranty Bonus"
+"PayPal Protection Bonus","PayPal Protection Bonus"
+"Bonus for first ACH Use","Bonus for first ACH Use"
+"General Redemption","General Redemption"
"Gift Certificate Redemption","Gift Certificate Redemption"
-"Gross Amount","Gross Amount"
-"Header Background Color","Header Background Color"
-"Header Border Color","Header Border Color"
-"Header Image URL","Header Image URL"
-"Help","Help"
-"Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
-"Hold for Dispute Investigation","Hold for Dispute Investigation"
-"IPN ""%s"".","IPN ""%s""."
-"IPN verification ""%s"".","IPN verification ""%s""."
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
-"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
-"Impossible to issue a refund transaction because the capture transaction does not exist.","Impossible to issue a refund transaction because the capture transaction does not exist."
-"Incentive","Incentive"
-"Initiation Date","Initiation Date"
-"Integral Evolution","Integral Evolution"
-"Integral Evolution Settings","Integral Evolution Settings"
-"Invoice ID","Invoice ID"
-"Issuer Liability","Issuer Liability"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
-"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
-"Items in Your Shopping Cart","Items in Your Shopping Cart"
-"Last Correlation ID","Last Correlation ID"
-"Last Transaction ID","Last Transaction ID"
-"Learn More","Learn More"
-"Login","Login"
-"Looking for PayPal? We have our own tab to the left under Sales.","Looking for PayPal? We have our own tab to the left under Sales."
-"Mass Pay Payment","Mass Pay Payment"
-"Matched (CVV2)","Matched (CVV2)"
-"Matched (CVV2CSC)","Matched (CVV2CSC)"
-"Matched Address only (no ZIP)","Matched Address only (no ZIP)"
-"Matched Address only (no ZIP). International","Matched Address only (no ZIP). International"
-"Matched Postal Code only (no Address)","Matched Postal Code only (no Address)"
-"Matched five-digit ZIP only (no Address)","Matched five-digit ZIP only (no Address)"
-"Matched whole nine-didgit ZIP (no Address)","Matched whole nine-didgit ZIP (no Address)"
-"Merchant Account","Merchant Account"
-"Merchant Country","Merchant Country"
-"Merchant Liability","Merchant Liability"
-"Merchant Protection Eligibility","Merchant Protection Eligibility"
-"Merchant Referral Bonus","Merchant Referral Bonus"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview."
-"Merchant account is not verified.","Merchant account is not verified."
-"Merchant denied this pending payment.","Merchant denied this pending payment."
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism."
-"Merchant must upgrade account to Business or Premier status.","Merchant must upgrade account to Business or Premier status."
-"Merchant reference ID format is not supported.","Merchant reference ID format is not supported."
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account."
-"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview."
-"N/A","N/A"
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
-"N/A. Global Unavailable","N/A. Global Unavailable"
-"N/A. International Unavailable","N/A. International Unavailable"
-"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Merchant has indicated that CVV2 is not present on card"
-"N/A. No response","N/A. No response"
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Not allowed for MOTO (Internet/Phone) transactions"
-"N/A. Not processed","N/A. Not processed"
-"N/A. Retry","N/A. Retry"
-"N/A. Service not Supported","N/A. Service not Supported"
-"N/A. Service not available","N/A. Service not available"
-"N/A. Service not supported","N/A. Service not supported"
-"N/A. The merchant did not provide AVS information","N/A. The merchant did not provide AVS information"
-"N/A. The merchant has not implemented CVV2 code handling","N/A. The merchant has not implemented CVV2 code handling"
-"N/A. Unavailable","N/A. Unavailable"
-"Negative Balance","Negative Balance"
-"Never","Never"
-"New Billing Agreement","New Billing Agreement"
-"No","No"
-"No Details matched","No Details matched"
-"No Details matched. International","No Details matched. International"
-"No Liability Shift","No Liability Shift"
-"No Logo","No Logo"
-"No match","No match"
-"None of the address information matched","None of the address information matched"
-"Note: %s","Note: %s"
-"Nothing to fetch because of an empty configuration.","Nothing to fetch because of an empty configuration."
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
-"Notified customer about creditmemo #%s.","Notified customer about creditmemo #%s."
-"Notified customer about invoice #%s.","Notified customer about invoice #%s."
-"Now accepting PayPal (150 X 40)","Now accepting PayPal (150 X 40)"
-"Now accepting PayPal (150 X 60)","Now accepting PayPal (150 X 60)"
-"Number of Child Authorizations","Number of Child Authorizations"
-"Open Authorization","Open Authorization"
-"Order","Order"
-"Order ID","Order ID"
-"Order Valid Interval (days)","Order Valid Interval (days)"
-"Ordered amount of %s.","Ordered amount of %s."
-"Ordering amount of %s is pending approval on gateway.","Ordering amount of %s is pending approval on gateway."
-"Page Background Color","Page Background Color"
-"Page Style","Page Style"
-"Part of the address information matched","Part of the address information matched"
-"Partner","Partner"
-"Pasarela integral","Pasarela integral"
-"Pasarela integral Settings","Pasarela integral Settings"
-"Password","Password"
-"Pay Now","Pay Now"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","PayPal Balance Manager function of PayPal account"
-"PayPal Buyer Warranty Bonus","PayPal Buyer Warranty Bonus"
-"PayPal Debit Card Cash Advance","PayPal Debit Card Cash Advance"
-"PayPal Debit Card Withdrawal from ATM","PayPal Debit Card Withdrawal from ATM"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper"
-"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper"
-"PayPal Express Checkout Token does not exist.","PayPal Express Checkout Token does not exist."
-"PayPal Express Order Review Form","PayPal Express Order Review Form"
-"PayPal Fee Information","PayPal Fee Information"
-"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
-"PayPal Payments Advanced","PayPal Payments Advanced"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","PayPal Pro Settings"
-"PayPal Product Logo","PayPal Product Logo"
-"PayPal Protection Bonus","PayPal Protection Bonus"
-"PayPal Reference ID","PayPal Reference ID"
-"PayPal Reference ID Type","PayPal Reference ID Type"
-"PayPal Settlement Reports","PayPal Settlement Reports"
-"PayPal certificate does not exist.","PayPal certificate does not exist."
-"PayPal certificate file is empty.","PayPal certificate file is empty."
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process."
-"PayPal gateway has rejected request. %s","PayPal gateway has rejected request. %s"
-"PayPal processes all of your orders, and you get paid.","PayPal processes all of your orders, and you get paid."
-"PayPal response hasn't required fields.","PayPal response hasn't required fields."
-"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
-"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Electronic Commerce Indicator"
-"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Result"
-"Payer Address ID","Payer Address ID"
-"Payer Address Status","Payer Address Status"
-"Payer Email","Payer Email"
-"Payer ID","Payer ID"
-"Payer Status","Payer Status"
-"Payer is not identified.","Payer is not identified."
-"Payflow Link (for USA and Canada)","Payflow Link (for USA and Canada)"
-"Payflow Link Settings","Payflow Link Settings"
-"Payflow Pro Gateway","Payflow Pro Gateway"
-"Payflow Pro Settings","Payflow Pro Settings"
-"Payment Action","Payment Action"
-"Payment Applicable From","Payment Applicable From"
-"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
-"Payment has been declined. Please try again.","Payment has been declined. Please try again."
-"Payment is being reviewed by PayPal for risk.","Payment is being reviewed by PayPal for risk."
-"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."
-"Payment was made to an email address that is not yet registered or confirmed.","Payment was made to an email address that is not yet registered or confirmed."
-"Payments by PayPal (150 X 40)","Payments by PayPal (150 X 40)"
-"Payments by PayPal (150 X 60)","Payments by PayPal (150 X 60)"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>"
-"Paypal Billing Agreement Settings","Paypal Billing Agreement Settings"
-"Pending PayPal","Pending PayPal"
-"Phone","Phone"
-"Place Order","Place Order"
-"Place Order Using Billing Agreements","Place Order Using Billing Agreements"
-"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
-"Please contact PayPal Customer Service.","Please contact PayPal Customer Service."
-"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
-"Please select a shipping method...","Please select a shipping method..."
-"Please select region, state or province","Please select region, state or province"
-"Please update order data to get shipping methods and rates","Please update order data to get shipping methods and rates"
"Points Incentive Redemption","Points Incentive Redemption"
-"Postage Payment to either USPS or UPS","Postage Payment to either USPS or UPS"
-"Preapproved Payment (BillUser API), either sent or received","Preapproved Payment (BillUser API), either sent or received"
-"Preapproved Payment ID","Preapproved Payment ID"
-"Price","Price"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution."
-"Product","Product"
-"Proxy Host","Proxy Host"
-"Proxy Port","Proxy Port"
-"Quantity","Quantity"
-"Reauthorization","Reauthorization"
-"Reference Information","Reference Information"
-"Refund issued by merchant.","Refund issued by merchant."
-"Reimbursement for a chargeback.","Reimbursement for a chargeback."
-"Reimbursement of Chargeback","Reimbursement of Chargeback"
-"Report Date","Report Date"
-"Reports","Reports"
-"Requested %s and configured %s merchant emails do not match.","Requested %s and configured %s merchant emails do not match."
-"Require CVV Entry","Require CVV Entry"
-"Require Customer's Billing Address","Require Customer's Billing Address"
-"Reversal","Reversal"
-"Reversal of General Account Hold","Reversal of General Account Hold"
+"Coupon Redemption","Coupon Redemption"
+"Reward Voucher Redemption","Reward Voucher Redemption"
+"General. Product no longer supported","General. Product no longer supported"
+"General: reversal of a type not belonging to the other T11xx categories","General: reversal of a type not belonging to the other T11xx categories"
+"ACH Withdrawal","ACH Withdrawal"
+"Debit Card Transaction","Debit Card Transaction"
"Reversal of Points Usage","Reversal of Points Usage"
-"Reversal of an adjustment.","Reversal of an adjustment."
+"ACH Deposit (Reversal)","ACH Deposit (Reversal)"
+"Reversal of General Account Hold","Reversal of General Account Hold"
+"Account-to-Account Payment, initiated by PayPal","Account-to-Account Payment, initiated by PayPal"
+"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
+"Fee Reversal","Fee Reversal"
+"Hold for Dispute Investigation","Hold for Dispute Investigation"
"Reversal of hold for Dispute Investigation","Reversal of hold for Dispute Investigation"
-"Review Order","Review Order"
-"Reward Voucher Redemption","Reward Voucher Redemption"
-"SFTP Credentials","SFTP Credentials"
-"Sale","Sale"
-"Sales","Sales"
-"Same as shipping","Same as shipping"
-"Sandbox Credentials","Sandbox Credentials"
-"Sandbox Mode","Sandbox Mode"
-"Schedule","Schedule"
-"Schedule description is too long.","Schedule description is too long."
-"Scheduled Fetching","Scheduled Fetching"
-"Select a PayPal Solution","Select a PayPal Solution"
-"Server Error. Please try again.","Server Error. Please try again."
+"General: adjustment of a type not belonging to the other T12xx categories","General: adjustment of a type not belonging to the other T12xx categories"
+Reversal,Reversal
+Charge-off,Charge-off
+Incentive,Incentive
+"Reimbursement of Chargeback","Reimbursement of Chargeback"
+"General (Authorization)","General (Authorization)"
+Reauthorization,Reauthorization
+Void,Void
+"General (Dividend)","General (Dividend)"
+"General: temporary hold of a type not belonging to the other T15xx categories","General: temporary hold of a type not belonging to the other T15xx categories"
+"Open Authorization","Open Authorization"
+"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Deposit (Hold for Dispute or Other Investigation)"
+"Available Balance","Available Balance"
+Funding,Funding
+"General: Withdrawal to Non-Bank Entity","General: Withdrawal to Non-Bank Entity"
+"WorldLink Withdrawal","WorldLink Withdrawal"
+"Buyer Credit Payment","Buyer Credit Payment"
+"General Adjustment without businessrelated event","General Adjustment without businessrelated event"
+"General (Funds Transfer from PayPal Account to Another)","General (Funds Transfer from PayPal Account to Another)"
"Settlement Consolidation","Settlement Consolidation"
-"Settlement Report Settings","Settlement Report Settings"
-"Settlement of a chargeback.","Settlement of a chargeback."
+"General: event not yet categorized","General: event not yet categorized"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days","Every 3 days"
+"Every 7 days","Every 7 days"
+"Every 10 days","Every 10 days"
+"Every 14 days","Every 14 days"
+"Every 30 days","Every 30 days"
+"Every 40 days","Every 40 days"
+"No Logo","No Logo"
+"Pending PayPal","Pending PayPal"
+"Billing Agreement","Billing Agreement"
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- Please Select Billing Agreement--"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements","Back to Billing Agreements"
+"There are no billing agreements yet.","There are no billing agreements yet."
+"New Billing Agreement","New Billing Agreement"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order","Review Order"
+"Please select a shipping method...","Please select a shipping method..."
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","Items in Your Shopping Cart"
+"Edit Shopping Cart","Edit Shopping Cart"
+"Please update order data to get shipping methods and rates","Please update order data to get shipping methods and rates"
+"Checkout with PayPal","Checkout with PayPal"
+"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
+"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
+"Additional Options","Additional Options"
+"Acceptance Mark","Acceptance Mark"
+"What is PayPal?","What is PayPal?"
+"Sign a billing agreement to streamline further purchases with PayPal.","Sign a billing agreement to streamline further purchases with PayPal."
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
-"Shipping","Shipping"
-"Shipping Address","Shipping Address"
-"Shipping Method","Shipping Method"
-"Shop now using (150 X 40)","Shop now using (150 X 40)"
-"Shop now using (150 X 60)","Shop now using (150 X 60)"
-"Shortcut","Shortcut"
-"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
-"Shortcut on Product View","Shortcut on Product View"
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
-"Sign a billing agreement to streamline further purchases with PayPal.","Sign a billing agreement to streamline further purchases with PayPal."
-"Solo","Solo"
-"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
-"Sort Order","Sort Order"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal."
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal."
-"State/Province","State/Province"
-"Static","Static"
-"Street Address","Street Address"
-"Street Address %s","Street Address %s"
-"Submitting order information...","Submitting order information..."
-"Subscriber name is too long.","Subscriber name is too long."
-"Subscription ID","Subscription ID"
-"Subscription Payment, either payment sent or payment received","Subscription Payment, either payment sent or payment received"
-"Subtotal","Subtotal"
-"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"Switch/Maestro","Switch/Maestro"
-"Test Mode","Test Mode"
-"The background color for the checkout page around the header and payment form.","The background color for the checkout page around the header and payment form."
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII."
-"The billing agreement ""%s"" has been canceled.","The billing agreement ""%s"" has been canceled."
-"The billing agreement ""%s"" has been created.","The billing agreement ""%s"" has been created."
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged."
-"The maximum number of child authorizations is reached.","The maximum number of child authorizations is reached."
-"The merchant account is not yet verified.","The merchant account is not yet verified."
-"The payment curency does not match any of the merchant's balances currency.","The payment curency does not match any of the merchant's balances currency."
-"The payment eCheck is not yet cleared.","The payment eCheck is not yet cleared."
-"The payment is authorized but not settled.","The payment is authorized but not settled."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","The payment is pending because it was made to an email address that is not yet registered or confirmed."
-"The payment is pending while it is being reviewed by PayPal for risk.","The payment is pending while it is being reviewed by PayPal for risk."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status."
-"There are no billing agreements yet.","There are no billing agreements yet."
-"There was an error processing your order. Please contact us or try again later.","There was an error processing your order. Please contact us or try again later."
-"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
-"This operation requires an existing transaction object.","This operation requires an existing transaction object."
-"Time of Day","Time of Day"
-"Title","Title"
-"Transaction ID","Transaction ID"
-"Transaction ID must not be empty.","Transaction ID must not be empty."
-"Transaction Information","Transaction Information"
-"Transfer Cart Line Items","Transfer Cart Line Items"
"Transfer Shipping Options","Transfer Shipping Options"
-"Triggered Fraud Filters","Triggered Fraud Filters"
-"Unable to cancel Express Checkout.","Unable to cancel Express Checkout."
-"Unable to change status. Current status is not correspond to real status.","Unable to change status. Current status is not correspond to real status."
-"Unable to communicate with the PayPal gateway.","Unable to communicate with the PayPal gateway."
-"Unable to initialize Express Checkout review.","Unable to initialize Express Checkout review."
-"Unable to initialize Express Checkout.","Unable to initialize Express Checkout."
-"Unable to place the order.","Unable to place the order."
-"Unable to process Express Checkout approval.","Unable to process Express Checkout approval."
-"Unable to start Express Checkout.","Unable to start Express Checkout."
-"Unable to update Order data.","Unable to update Order data."
-"Unable to update shipping method.","Unable to update shipping method."
-"Unknown Error. Please try again later.","Unknown Error. Please try again later."
-"Unknown reason. Please contact PayPal customer service.","Unknown reason. Please contact PayPal customer service."
-"Update Order Data","Update Order Data"
-"Use Proxy","Use Proxy"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
-"User","User"
-"User-initiated Currency Conversion","User-initiated Currency Conversion"
-"Uses store frontend name by default.","Uses store frontend name by default."
-"VAT Number","VAT Number"
-"Vendor","Vendor"
-"Vendor / Merchant Login","Vendor / Merchant Login"
-"View","View"
-"View Demo","View Demo"
-"View PayPal solutions.","View PayPal solutions."
-"View Transaction","View Transaction"
-"View Transaction Details","View Transaction Details"
-"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
-"Virtual Terminal Payment","Virtual Terminal Payment"
-"Void","Void"
-"Waiting until Customer's eCheck will be cleared.","Waiting until Customer's eCheck will be cleared."
-"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
-"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
-"Website Payments Plus","Website Payments Plus"
-"Website Payments Plus Settings","Website Payments Plus Settings"
-"Website Payments Pro","Website Payments Pro"
-"Website Payments Pro (Payflow Edition) Settings","Website Payments Pro (Payflow Edition) Settings"
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
-"Website Payments Pro Hosted Solution Settings","Website Payments Pro Hosted Solution Settings"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","Website Payments Pro Payflow Edition (includes Express Checkout)"
-"Website Payments Pro Settings","Website Payments Pro Settings"
-"Website Payments Standard","Website Payments Standard"
-"Website Payments Standard Payment","Website Payments Standard Payment"
-"Website Payments Standard Settings","Website Payments Standard Settings"
-"What is PayPal?","What is PayPal?"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
-"Will appear as a payment option only for customers who have at least one active billing agreement.","Will appear as a payment option only for customers who have at least one active billing agreement."
-"WorldLink Withdrawal","WorldLink Withdrawal"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?"
-"Wrong Order ID (%s) specified.","Wrong Order ID (%s) specified."
-"Wrong PayPal Express Checkout Token specified.","Wrong PayPal Express Checkout Token specified."
-"Wrong billing agreement ID specified.","Wrong billing agreement ID specified."
-"Yes","Yes"
-"Yes. Matched Address and five-didgit ZIP","Yes. Matched Address and five-didgit ZIP"
-"You cannot void a verification transaction","You cannot void a verification transaction"
-"You will be redirected to the PayPal website in a few seconds.","You will be redirected to the PayPal website in a few seconds."
-"You will be redirected to the PayPal website when you place an order.","You will be redirected to the PayPal website when you place an order."
-"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
-"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
-"Zip/Postal Code","Zip/Postal Code"
-"chargeback reimbursed","chargeback reimbursed"
-"chargeback settled","chargeback settled"
-"customer complaint","customer complaint"
-"customer triggered a chargeback","customer triggered a chargeback"
-"customer triggered money-back guarantee","customer triggered money-back guarantee"
-"eBay Auction Payment","eBay Auction Payment"
-"merchant refunded payment","merchant refunded payment"
-"no reason","no reason"
-"reversal of an adjustment","reversal of an adjustment"
-"unknown reason","unknown reason"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/i18n/es_ES.csv b/app/code/Magento/Paypal/i18n/es_ES.csv
index c4aeb894f33..ceb8b989d9c 100644
--- a/app/code/Magento/Paypal/i18n/es_ES.csv
+++ b/app/code/Magento/Paypal/i18n/es_ES.csv
@@ -1,505 +1,692 @@
-"-- Please Select Billing Agreement--","-- Por favor, Seleccione el Acuerdo de Facturación--"
-"-OR-","-O-"
-"2-pixel perimeter around the header space.","PerÃmetro de 2 pÃxeles alrededor del espacio de cabera."
-"3D Secure","3D Seguro"
-"3D Secure Card Validation","Validación segura 3D de tarjeta"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Para tarjetas Maestro se requiere validación 3D Secure. Para aceptar tarjetas American Express se requiere un acuerdo adicional. Obtenga más información en <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">¡Empiece a aceptar pagos a través de PayPal!</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Se necesita un valor para el modo en vivo. Consulte el acuerdo de comercio cardinal."
-"ACH Deposit (Hold for Dispute or Other Investigation)","Depósito ACH (En Espera por Conflicto u Otra Investigación)"
-"ACH Deposit (Reversal)","Depósito ACH (Revocación)"
-"ACH Funding for Funds Recovery from Account Balance","Financiación ACH para Recuperación de Fondos desde el Balance de Cuenta"
-"ACH Withdrawal","Retirada ACH"
-"API Authentication Methods","Métodos de autenticación API"
-"API Certificate","Certificdo API"
-"API Password","Contraseña API"
-"API Signature","Firma API"
-"API Username","Nombre de Usuario API"
-"API Uses Proxy","Proxy de Usos API"
-"API/Integration","Api/Integración"
-"API/Integration Settings","Api/Configuración de Integración"
-"Ability for buyer to purchase without PayPal account.","Capacidad del comprador para comprar sin cuenta PayPal."
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","Aceptar pagos PayPal en tu carro de la compra. PayPal procesará tus pagos de tarjeta de crédito a través del Gateway Payflow Pro"
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","Aceptar pagos conformes a la norma PCI de verificación que mantiene a los clientes en tu sitio web. Incluye una cuenta comercial de PayPal."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","Aceptar pagos conformes a la norma PCI de verificación que mantiene a los clientes en tu sitio web. Para usarlo con tu propia cuenta comercial."
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","Aceptar pagos sin que los clientes abandonen tu página web. Muchos servicios populares de web-hosting y carros de la compra vienen con los gateways de pago Payflow incluidos, de manera que sean fáciles de configurar."
-"Acceptance Mark","Señal de Aceptación"
-"Acceptance Mark Image","Imagen de Señal de Aceptación"
-"Account-to-Account Payment, initiated by PayPal","Pago Cuenta-a-Cuenta, iniciado por PayPal"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","Añadir un botón de Pago Express a tu carro de la compra ya existente para pagos con tarjeta de crédito rápidos y sencillos. PayPal gestiona todo el proceso de pago."
-"Additional Options","Opciones Adicionales"
-"Address","Dirección"
-"Address Verification System Response","Respuesta del Sistema de Verificación de Dirección"
-"All the address information matched","Coincide toda la información de dirección"
-"Allow in Billing Agreement Wizard","Permitir el Asistente de Acuerdo de Facturación"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Valores admitidos: ""paypal"", ""primary"" (por defecto), su_valor_customizado (estÃlo de página de pago customizado de su perfil de cuenta comercial)."
-"Allowed Credit Card Types","Tipos de Tarjetas de Crédito Permitidos"
-"Also affects mini-shopping cart.","También afecta al mini-carro de la compra."
-"Ask Customer","Preguntar al Cliente"
-"Attempted Authentication, Bad Result","Intento de Autenticación, Resultado Incorrecto"
-"Attempted Authentication, Good Result","Intento de Autenticación, Resultado Correcto"
-"Auction Payment other than through eBay","Pago por Subasta diferente de eBay"
-"Authenticated, Bad Result","Autenticación, Resultado Incorrecto"
-"Authenticated, Good Result","Autenticación, Resultado Correcto"
-"Authorization","Autorización"
-"Authorization Honor Interval (days)","PerÃodo de autorización (dÃas)"
-"Authorization expired.","Autorización caducada."
-"Authorization transaction is required to void.","Para anular se requiere la transacción de autorización."
-"Authorization was voided by merchant.","El vendedor ha anulado la autorización."
-"Authorized amount of %s.","Cantidad autorizada de %s."
-"Authorizing amount of %s is pending approval on gateway.","La cantidad autorizada de %s está a la espera de ser aprobada en la pasarela de pago."
-"Auto","Auto"
-"AutoSweep","AutoBarrido"
-"Available Balance","Balance Disponible"
-"Back to Billing Agreements","Volver a los contratos de facturación"
-"Balance Manager Account Bonus","Bono de Cuenta de Gestor de Balance"
-"Billing Address","Dirección de facturación"
-"Billing Agreement","Acuerdo de facturación"
-"Billing Agreement # %s","Contrato de facturación # %s"
-"Billing Agreement #%s","Contrato de facturación # %s"
-"Billing Agreement Signup ","Firma de Acuerdo de Facturación"
-"Billing Agreement View","Ver contrato de facturación"
+Custom,Personalizado
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,Precio
+ID,ID
+Configure,Configure
+No,No
+Qty,Qty
+Subtotal,Subtotal
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,SÃ
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Encargar
+View,Ver
+Active,Active
+Position,Position
+Dynamic,Dinámico
+N/A,N/A
+Canceled,Canceled
+"General Information","General Information"
+Static,Estático
+"Advanced Settings","Advanced Settings"
+"Learn More","Saber más"
+"Start Date","Start Date"
+"Product Name","Product Name"
+"3D Secure Card Validation","3D Secure Card Validation"
+"Merchant Liability","Responsabilidad del comerciante"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Método de envÃo"
+"Please agree to all the terms and conditions before placing the order.","Por favor, acepta todos los términos y condiciones antes de realizar el pedido."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address","Dirección de EnvÃo"
+"Payment Method","Payment Method"
+"Place Order","Hacer pedido"
+"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido."
+Sales,Ventas
+Created,Created
+Display,Display
+User,User
+Daily,Diario
+Date,Date
+"Order Total","Order Total"
+Never,Nunca
+Updated,Updated
+Reports,Informes
+"Order Status","Order Status"
+"View Order","View Order"
+Event,Evento
+"Please Select","Please Select"
+"Submitting order information...","Enviando la información del pedido..."
+Authorization,Autorización
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
"Billing Agreements","Contratos de facturación"
-"Billing Agreement status is not set.","No se ha establecido el estado del acuerdo de facturación."
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
+"Billing Agreement View","Ver contrato de facturación"
+"View Transaction Details","Ver Detalles de la Transacción"
+"Reference Information","Información de Referencia"
+"Transaction Information","Información de Transacción"
+"PayPal Fee Information","Información de tarifa de PayPal"
+"PayPal Settlement Reports","Informes de liquidación de PayPal"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Nuevos resultados obtenidos"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Ayuda
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo","Vea la demostración"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","Se le redirigirá al sitio web de PayPal."
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.","Cuando realice el pedido se le devolverá a la página PayPal."
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.","Volverá a la página web de Paypal en unos segundos."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction","Ver transacción"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.","El Pedido y la Salida Express se han cancelado."
+"Express Checkout has been canceled.","La Salida Express se ha cancelado."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","El sÃmbolo para la Salida Express con Paypal no existe."
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.","La respuesta de PayPal no tiene campos obligatorios."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
"Unable to save Billing Agreement:","No se puede guardar el Contrato de Facturación:"
-"Your billing agreement # is: %s.","Su número de acuerdo de facturación es: %s."
-"Bonus for first ACH Use","Bono por el primer Uso de ACH"
-"Buyer Credit Payment","Pago de Crédito de Comprador"
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","Preferimos PayPal (150 X 60)"
+"We prefer PayPal (150 X 40)","Preferimos PayPal (150 X 40)"
+"Now accepting PayPal (150 X 60)","Ahora se acepta Paypal (150 X 60)"
+"Now accepting PayPal (150 X 40)","Se acepta PayPal (150 X 40)"
+"Payments by PayPal (150 X 60)","Pagos por PayPal (150 X 60)"
+"Payments by PayPal (150 X 40)","Pagos por PayPal (150 X 40)"
+"Shop now using (150 X 60)","Compre ahora utilizando (150 X 60)"
+"Shop now using (150 X 40)","Compre ahora usando (150 X 40)"
+Shortcut,"Acceso directo"
+"Acceptance Mark Image","Imagen de Señal de Aceptación"
+Sale,Venta
+"For Virtual Quotes Only","Solo para presupuestos en lÃnea"
+Auto,Auto
+"Ask Customer","Preguntar al Cliente"
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","Firma API"
+"API Certificate","Certificdo API"
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","Se ha alcanzado el número máximo de autorizaciones infantiles."
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.","El pagador no se ha identificado."
+"Last Transaction ID","Última Identificación de Transacción"
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.","El pago se ha autorizado, pero no se ha realizado."
+"The payment eCheck is not yet cleared.","TodavÃa no se ha limpiado el eCheck de pago."
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","El pago está pendiente, PayPal lo está revisando para asegurarse."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","El pago está pendiente porque se ha realizado a una dirección de mail que todavÃa no se ha registrado o confirmado."
+"The merchant account is not yet verified.","TodavÃa no se ha verificado la cuenta de vendedor."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","El pago se ha realizado mediante tarjeta de crédito. Para recibir los fondos el vendedor tiene que actualizar la cuenta a estado Business o Premier."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Revocación de un ajuste."
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Devolución o reembolso."
+"Settlement of a chargeback.","Liquidación de una transacción devuelta."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Razones desconocidas. Por favor, contacte el servicio de atención al cliente de PayPal."
+"Payer ID","Id. del pagador"
+"Payer Email","Correo electrónico del pagador"
+"Payer Status","Situación del comprador"
+"Payer Address ID","Id. de dirección del pagador"
+"Payer Address Status","Estado de la dirección del comprador"
+"Merchant Protection Eligibility","Requisitos de protección de mercado"
+"Triggered Fraud Filters","Filtros de Fraude Desencadenados"
+"Last Correlation ID","Última Identificación de Correlación"
+"Address Verification System Response","Respuesta del Sistema de Verificación de Dirección"
+"CVV2 Check Result by PayPal","Resultado de Comprobación CVV2 por PayPal"
"Buyer's Tax ID","Número de identificación social del contribuyente del comprador\es"
"Buyer's Tax ID Type","Tipo de número de identificación social del contribuyente del comprador\es"
-"By default it is ""reports.paypal.com"".","Por defecto es ""reports.paypal.com""."
-"CNPJ","CNPJ"
-"CPF","CPF"
-"CVV2 Check Result by PayPal","Resultado de Comprobación CVV2 por PayPal"
-"Can not send new order email.","No se puede enviar correo-e de nuevo encargo."
-"Cannot create target file for reading reports.","No se puede crear el archivo destino para leer informes."
-"Centinel API URL","URL de Api Centinela"
-"Centinel Custom API URL","Centinel API URL customizado"
-"Charge-off","Cancelar"
-"Chargeback","Facturar"
-"Chargeback by customer.","Facturación por cliente."
-"Checkout with PayPal","Pago con PayPal"
-"City","Ciudad"
-"Click here if you are not redirected within 10 seconds...","Haz clic aquà si no se te redirige a la página web en 10 segundos..."
-"Company","Empresa"
-"Completion Date","Fecha de Finalización"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Conectándose al servidor SFTP de PayPal para recuperar nuevos informes.¿Estás seguro de querer continuar?"
-"Countries Payment Applicable From","Formulario Aplicable de Pago por PaÃses"
-"Country","PaÃs"
-"Coupon Redemption","Reembolso de Cupón"
-"Created billing agreement #%s.","Crear contrato de facturación #%s."
-"Credit","Crédito"
-"Credit Card Settings","Configuración de la Tarjeta de Crédito"
-"Currency Conversion required to cover negative balance","Se requiere una Conversión de Divisas para cubrir el saldo negativo"
-"Custom","Personalizado"
-"Custom Endpoint Hostname or IP-Address","Dirección IP o nombre de Host de destino personalizado"
-"Custom Path","Camino personalizado"
-"Customer Information","Información del cliente"
-"Customer complaint.","Queja del cliente:"
-"Customer did not include a confirmed address.","El cliente no incluyó una dirección confirmada."
-"Customer failed to pay.","El cliente no pagó."
-"Customer triggered a money-back guarantee.","El cliente hizo uso de una garantÃa de devolución."
-"Customer used non-confirmed address.","El cliente usó una dirección no confirmada."
-"Daily","Diario"
-"Debit","Débito"
-"Debit Card Cash Back","Retirada de efectivo de tarjeta de débito"
-"Debit Card Transaction","Transacción con tarjeta de débito"
-"Debit or Credit","Débito o Crédito"
-"Debug Mode","Modo Depuración"
-"Direct Payment API","API de pago directo"
-"Discount","Descuento"
-"Display Express Checkout in the Payment Information step","Mostrar Pago exprés en la pantalla de información del Pago"
-"Displays on catalog pages and homepage.","Impresiones en páginas de catálogo y sitio web."
-"Don't have a PayPal account? Simply enter your email address.","No dispone de una cuenta PayPal? Introduzca su dirección de email."
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","No dispone de una cuenta de comerciante de Paypal? Puede aceptar pagos mediante tarjeta de crédito a través del procesador de pagos Payflow Pro"
-"Dynamic","Dinámico"
-"EFT Funding (German banking)","Transacción EFT (Bancos alemanes)"
-"Edit Shopping Cart","Editar Carrito de la Compra"
-"Email Address","Dirección de correo electrónico"
-"Email Associated with PayPal Merchant Account","Email asociado con la cuenta de comerciante de Paypal"
-"Enable Automatic Fetching","Habilitar acceso automático"
-"Enable PayPal Guest Checkout","Habilitar Checkout de Invitado Paypal"
-"Enabled","Habilitado"
-"Event","Evento"
-"Event Code","Código de Evento"
-"Every 10 days","Cada 10 dÃas"
-"Every 14 days","Cada 14 dÃas"
-"Every 3 days","Cada 3 dÃas"
-"Every 30 days","Cada 30 dÃas"
-"Every 40 days","Cada 40 dÃas"
-"Every 7 days","Cada 7 dÃas"
+"PayPal/Centinel Visa Payer Authentication Service Result","Resultado del servicio de autenticación del pagador con Visa a través de PayPal/Centinel"
+"PayPal/Centinel Electronic Commerce Indicator","Indicador de comercio electrónico de PayPal/Centinel"
+Chargeback,Facturar
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Sólo dirección correspondiente (no CP)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","No ha habido coincidencias"
+"No Details matched. International","Los detalles no coinciden. Internacional"
+"Exact Match. Address and nine-digit ZIP code","Coincidencia exacta. Dirección y código ZIP de 9 dÃgitos"
"Exact Match. Address and Postal Code. International","Coincidencia exacta. Dirección y Código Postal. Internacional"
"Exact Match. Address and Postal Code. UK-specific","Coincidencia exacta. Dirección y Código Postal. EspecÃfico para Reino Unido"
-"Exact Match. Address and nine-digit ZIP code","Coincidencia exacta. Dirección y código ZIP de 9 dÃgitos"
-"Explanation: %s.","Explicación: %s."
-"Express Checkout","Paso por Caja Express"
-"Express Checkout (Payflow Edition) Settings","Ajustes de Paso por Caja Express (edición de Payflow)"
-"Express Checkout APIs","APIs de Paso por Caja Express"
-"Express Checkout Settings","Ajustes de Paso por Caja Express"
-"Express Checkout and Order have been canceled.","El Pedido y la Salida Express se han cancelado."
-"Express Checkout has been canceled.","La Salida Express se ha cancelado."
-"Failed to cancel the billing agreement.","No se ha podido cancelar el acuerdo de facturación"
-"Failed to create billing agreement for this order.","No se ha podido crear un acuerdo de facturación para este pedido."
-"Failed to fetch reports from '%s@%s'.","No se consiguió obtener los registros de '%s@%s'."
-"Failed to finish billing agreement wizard.","El asistente de acuerdos de facturación no ha podido finalizar."
-"Failed to start billing agreement wizard.","El asistente de acuerdos de facturación no ha podido iniciarse."
-"Fax","Fax"
-"Fee Amount","Importe de la Comisión"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. No disponible para transacciones MOTO (Internet/móvil)"
+"N/A. Global Unavailable","No disponible. Global no disponible."
+"N/A. International Unavailable","No disponible. Internacional no disponible."
+"Matched five-digit ZIP only (no Address)","Sólo Encaja el Código Postal de cinco dÃgitos (no la Dirección)"
+"Matched Postal Code only (no Address)","Sólo Encaja el Código Postal (no la Dirección)"
+"N/A. Retry","No disponible. Vuelva a intentar."
+"N/A. Service not Supported","N/A. Servicio no disponible."
+"N/A. Unavailable","No disponible. No disponible."
+"Matched whole nine-didgit ZIP (no Address)","Sólo Encaja el Código Postal de nueve dÃgitos (no la Dirección)"
+"Yes. Matched Address and five-didgit ZIP","SÃ. La Dirección y el Código Postal de cinco dÃgitos coinciden."
+"All the address information matched","Coincide toda la información de dirección"
+"None of the address information matched","Ninguna información de la dirección coincide"
+"Part of the address information matched","Parte de la información de la dirección coincidió"
+"N/A. The merchant did not provide AVS information","N/A. El comerciante no ha proporcionado la información AVS"
+"N/A. Address not checked, or acquirer had no response. Service not available","No disponible. No se ha comprobado la dirección o el usuario no obtuvo respuesta. Servicio no disponible."
+"Matched (CVV2CSC)","CVV2CSC coincidentes."
+"No match","No ha habido coincidencias"
+"N/A. Not processed","No disponible. No procesado."
+"N/A. Service not supported","N/A. Servicio no operativo"
+"N/A. Service not available","No disponible. Servicio no disponible."
+"N/A. No response","No disponible. Sin respuesta."
+"Matched (CVV2)","Emparejado (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","No disponible. El comerciante no ha implementado la gestión del código CVV2."
+"N/A. Merchant has indicated that CVV2 is not present on card","No disponible. El comerciante ha notificado que su tarjeta no tiene CVV2."
+"Authenticated, Good Result","Autenticación, Resultado Correcto"
+"Authenticated, Bad Result","Autenticación, Resultado Incorrecto"
+"Attempted Authentication, Good Result","Intento de Autenticación, Resultado Correcto"
+"Attempted Authentication, Bad Result","Intento de Autenticación, Resultado Incorrecto"
+"No Liability Shift","No hay cambios de responsabilidad"
+"Issuer Liability","Responsabilidad del Emisor"
+CNPJ,CNPJ
+CPF,CPF
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.","Las operaciones de pago no permiten almacenar objetos."
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.","Esta operación requiere de una transacción ya existente."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date","Fecha del informe"
+"Merchant Account","Cuenta del comerciante"
+"Transaction ID","Número de identificación de la transacción"
+"Invoice ID","Identificación de la Factura"
+"PayPal Reference ID","Id. de referencia de PayPal"
+"PayPal Reference ID Type","Tipo de Id. de referencia de PayPal"
+"Event Code","Código de Evento"
+"Finish Date","Finish Date"
+"Debit or Credit","Débito o Crédito"
+"Gross Amount","Total Bruto"
"Fee Debit or Credit","Comisión Débito o Crédito"
-"Fee Reversal","Retroceso de Comisiones"
-"Fee: Foreign ACH Withdrawal","Comisión: Retirada ACH en el extranjero"
-"Fee: Mass Pay Request","Comisión: Solicitud de Pago Masivo"
+"Fee Amount","Importe de la Comisión"
+"Order ID","ID de Pedido"
+"Subscription ID","ID de Suscripción."
+"Preapproved Payment ID","Identificación del Pago Pre-autorizado"
+Credit,Crédito
+Debit,Débito
+"General: received payment of a type not belonging to the other T00xx categories","General: pago recibido de una clase no perteneciente a las otras T00xx categorÃas"
+"Mass Pay Payment","Pago Agrupado"
+"Subscription Payment, either payment sent or payment received","Pago de suscripción, bien sea pago enviado o recibido."
+"Preapproved Payment (BillUser API), either sent or received","Pagos previamente aprobados (BillUser API) enviados o recibidos"
+"eBay Auction Payment","Pago de Subasta de eBay"
+"Direct Payment API","API de pago directo"
+"Express Checkout APIs","APIs de Paso por Caja Express"
+"Website Payments Standard Payment","Pago estándar de la página web"
+"Postage Payment to either USPS or UPS","Pago de los Gastos de EnvÃo bien a USPS o a UPS"
+"Gift Certificate Payment: purchase of Gift Certificate","Pago de Cheque Regalo: compra de Cheque Regalo"
+"Auction Payment other than through eBay","Pago por Subasta diferente de eBay"
+"Mobile Payment (made via a mobile phone)","Pago móvil (realizado vÃa teléfono móvil)"
+"Virtual Terminal Payment","Pago Terminal virtual"
+"General: non-payment fee of a type not belonging to the other T01xx categories","General: tarifa de impago de una clase no perteneciente a las otras T01xx categorÃas"
"Fee: Web Site Payments Pro Account Monthly","Comisión: cuenta Web Site Payments Pro mensual"
+"Fee: Foreign ACH Withdrawal","Comisión: Retirada ACH en el extranjero"
"Fee: WorldLink Check Withdrawal","Comisión: Retirada mediante cheque WorldLink"
-"Fetch","Capturar"
-"Fetch Updates","Nuevos resultados obtenidos"
-"Fetched %s report rows from '%s@%s'.","Se obtuvieron %s filas de informe de '%s@%s'."
-"For Virtual Quotes Only","Solo para presupuestos en lÃnea"
-"Frontend Experience Settings","Ajustes de la Experiencia con Fachada"
-"Funding","Fondos"
-"General (Authorization)","General (Autorización)"
-"General (Dividend)","General (Dividendo)"
-"General (Funds Transfer from PayPal Account to Another)","General (Transferencia de Fondos desde una Cuenta Paypal a Otra Cuenta)"
-"General (Purchase with a credit card)","General (Compra con una tarjeta de crédito)"
-"General Adjustment without businessrelated event","Ajuste General sin ningún acontecimiento relacionado con el negocio"
+"Fee: Mass Pay Request","Comisión: Solicitud de Pago Masivo"
"General Currency Conversion","Conversión de Divisa General"
+"User-initiated Currency Conversion","Conversión de moneda iniciada por el usuario"
+"Currency Conversion required to cover negative balance","Se requiere una Conversión de Divisas para cubrir el saldo negativo"
"General Funding of PayPal Account ","Fondos Generales de la Cuenta de PayPal"
-"General Redemption","Amortización General"
+"PayPal Balance Manager function of PayPal account","Función del Gestor de saldo de PayPal de la cuenta de PayPal"
+"ACH Funding for Funds Recovery from Account Balance","Financiación ACH para Recuperación de Fondos desde el Balance de Cuenta"
+"EFT Funding (German banking)","Transacción EFT (Bancos alemanes)"
"General Withdrawal from PayPal Account","Retirada de fondos General desde la Cuenta de PayPal"
-"General. Product no longer supported","General. Este producto ya no está admitido"
+AutoSweep,AutoBarrido
"General: Use of PayPal account for purchasing as well as receiving payments","General: Uso de la cuenta PayPal tanto para comprar como para recibir pagos"
+"Virtual PayPal Debit Card Transaction","Transacción de Tarjeta de Débito de PayPal Virtual"
+"PayPal Debit Card Withdrawal from ATM","Retiro de dinero de tarjeta de débido de PayPal desde un cajero automático"
+"Hidden Virtual PayPal Debit Card Transaction","Transacción Oculta de Tarjeta Virtual de Débito PayPal"
+"PayPal Debit Card Cash Advance","Adelanto de efectivo de una tarjeta de débito en PayPal"
"General: Withdrawal from PayPal Account","General: Retirada de fondos desde la Cuenta de PayPal"
-"General: Withdrawal to Non-Bank Entity","General: Retirada de fondos a una Entidad No Bancaria"
-"General: adjustment of a type not belonging to the other T12xx categories","General: ajuste de una clase no perteneciente a las otras T12xx categorÃas"
+"General (Purchase with a credit card)","General (Compra con una tarjeta de crédito)"
+"Negative Balance","No disponible. Saldo negativo"
"General: bonus of a type not belonging to the other T08xx categories","General: bonificación de una clase no perteneciente a las otras T08xx categorÃas"
-"General: event not yet categorized","General: suceso no catalogado aún"
-"General: non-payment fee of a type not belonging to the other T01xx categories","General: tarifa de impago de una clase no perteneciente a las otras T01xx categorÃas"
-"General: received payment of a type not belonging to the other T00xx categories","General: pago recibido de una clase no perteneciente a las otras T00xx categorÃas"
-"General: reversal of a type not belonging to the other T11xx categories","General: revocación de una clase no perteneciente a las otras T01xx categorÃas"
-"General: temporary hold of a type not belonging to the other T15xx categories","General: cargo temporal de una clase no perteneciente a las otras T15xx categorÃas"
-"Get Credentials from PayPal","Consiga sus Credenciales de PayPal"
-"Gift Certificate Payment: purchase of Gift Certificate","Pago de Cheque Regalo: compra de Cheque Regalo"
-"Gift Certificate Redemption","Canjear Cheque Regalo"
-"Gross Amount","Total Bruto"
-"Header Background Color","Color del Fondo de la Cabecera"
-"Header Border Color","Color del Borde de la Cabecera"
-"Header Image URL","URL de la Imagen de la Cabecera"
-"Help","Ayuda"
-"Hidden Virtual PayPal Debit Card Transaction","Transacción Oculta de Tarjeta Virtual de Débito PayPal"
-"Hold for Dispute Investigation","Manténgase a la Espera de la Investigación sobre la Disputa"
-"IPN ""%s"".","""%s"" IPN."
-"IPN verification ""%s"".","""%s"" de verificación de IPN."
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Se utilizará un valor por defecto si se deja en blanco. Podrá proporcionarse una URL por encargo según acuerdo con Cardinal Commerce."
-"If not specified, Default Country from General Config will be used","Si no se especifica, use el paÃs por defecto de la configuración general."
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Si se activa esta opción, el cliente podrá cambiar la dirección y el método de envÃo desde el sitio de Internet de PayPal. La modalidad en vivo funciona sólo a través de protocolo HTTPS."
-"Impossible to issue a refund transaction because the capture transaction does not exist.","No es posible facilitar una transacción de reembolso porque no existe la transacción de captura."
-"Incentive","Incentivo"
-"Initiation Date","Fecha de Inicio"
-"Integral Evolution","Evolución integral"
-"Integral Evolution Settings","Ajustes de evolución integral"
-"Invoice ID","Identificación de la Factura"
-"Issuer Liability","Responsabilidad del Emisor"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Se recomienda fijar este valor en ""Tarjeta de débito o crédito"" por vistas de tienda."
-"It is recommended to set this value to ""PayPal"" per store views.","Se recomienda fijar este valor en ""PayPal"" por vistas de tienda."
-"Items in Your Shopping Cart","ArtÃculos en Su Carro de la Compra"
-"Last Correlation ID","Última Identificación de Correlación"
-"Last Transaction ID","Última Identificación de Transacción"
-"Learn More","Saber más"
-"Login","Entrar"
-"Looking for PayPal? We have our own tab to the left under Sales.","¿Busca PayPal? Tenemos nuestra propia etiqueta a la izquierda, debajo de Ventas."
-"Mass Pay Payment","Pago Agrupado"
-"Matched (CVV2)","Emparejado (CVV2)"
-"Matched (CVV2CSC)","CVV2CSC coincidentes."
-"Matched Address only (no ZIP)","Sólo dirección correspondiente (no CP)"
-"Matched Address only (no ZIP). International","Sólo Encaja la Dirección (no el Código Postal). Internacional"
-"Matched Postal Code only (no Address)","Sólo Encaja el Código Postal (no la Dirección)"
-"Matched five-digit ZIP only (no Address)","Sólo Encaja el Código Postal de cinco dÃgitos (no la Dirección)"
-"Matched whole nine-didgit ZIP (no Address)","Sólo Encaja el Código Postal de nueve dÃgitos (no la Dirección)"
-"Merchant Account","Cuenta del comerciante"
-"Merchant Country","PaÃs de envÃo"
-"Merchant Liability","Responsabilidad del comerciante"
-"Merchant Protection Eligibility","Requisitos de protección de mercado"
+"Debit Card Cash Back","Retirada de efectivo de tarjeta de débito"
"Merchant Referral Bonus","Bonificación de referencia del comerciante"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","La cuenta del envÃo no tiene una opción de retirada de dinero. El recipiente debe aceptar o rechazar manualmente este pago de su resumen de cuentas."
-"Merchant account is not verified.","La cuenta del comerciante no ha sido verificada."
-"Merchant denied this pending payment.","El comerciante denegó este pago pendiente."
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","El comerciante no posee una cuenta de EEUU ni tampoco un mecanismo de retirada de dinero."
-"Merchant must upgrade account to Business or Premier status.","El comerciante debe actualizar su cuenta a la opción Business o Premier."
-"Merchant reference ID format is not supported.","El formato de la Id. de referencia del comerciante no es compatible."
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Los comerciantes necesitan registrarse en Paypal para activar la opción de acuerdos de facturación. No active esta opción hasta que Paypal confirme que los acuerdos de facturación han sido activados para su cuenta de comerciante."
-"Mobile Payment (made via a mobile phone)","Pago móvil (realizado vÃa teléfono móvil)"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Problema de monedas múltiples. El comerciante debe aceptar o denegar manualmente este pago a través de la opción Vista general de la cuenta de Paypal."
-"N/A","N/A"
-"N/A. Address not checked, or acquirer had no response. Service not available","No disponible. No se ha comprobado la dirección o el usuario no obtuvo respuesta. Servicio no disponible."
-"N/A. Global Unavailable","No disponible. Global no disponible."
-"N/A. International Unavailable","No disponible. Internacional no disponible."
-"N/A. Merchant has indicated that CVV2 is not present on card","No disponible. El comerciante ha notificado que su tarjeta no tiene CVV2."
-"N/A. No response","No disponible. Sin respuesta."
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. No disponible para transacciones MOTO (Internet/móvil)"
-"N/A. Not processed","No disponible. No procesado."
-"N/A. Retry","No disponible. Vuelva a intentar."
-"N/A. Service not Supported","N/A. Servicio no disponible."
-"N/A. Service not available","No disponible. Servicio no disponible."
-"N/A. Service not supported","N/A. Servicio no operativo"
-"N/A. The merchant did not provide AVS information","N/A. El comerciante no ha proporcionado la información AVS"
-"N/A. The merchant has not implemented CVV2 code handling","No disponible. El comerciante no ha implementado la gestión del código CVV2."
-"N/A. Unavailable","No disponible. No disponible."
-"Negative Balance","No disponible. Saldo negativo"
-"Never","Nunca"
-"New Billing Agreement","Nuevo Acuerdo de Facturación"
-"No","No"
-"No Details matched","No ha habido coincidencias"
-"No Details matched. International","Los detalles no coinciden. Internacional"
-"No Liability Shift","No hay cambios de responsabilidad"
-"No Logo","Sin logotipo"
-"No match","No ha habido coincidencias"
-"None of the address information matched","Ninguna información de la dirección coincide"
-"Note: %s","Nota: %s"
-"Nothing to fetch because of an empty configuration.","No hay resultados debido a un vacÃo en la configuración."
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Tenga en cuenta que PayPal puede gestionar hasta 10 opciones de envÃo. Por eso Magento solamente transferirá las primeras 10 opciones de envÃo más baratas si hay mas de 10 opciones disponibles."
-"Notified customer about creditmemo #%s.","Cliente informado de la nota de abono #%s."
-"Notified customer about invoice #%s.","Cliente informado de la factura #%s."
-"Now accepting PayPal (150 X 40)","Se acepta PayPal (150 X 40)"
-"Now accepting PayPal (150 X 60)","Ahora se acepta Paypal (150 X 60)"
-"Number of Child Authorizations","Número de autorizaciones infantiles"
-"Open Authorization","Abrir la autorización"
-"Order","Encargar"
-"Order ID","ID de Pedido"
-"Order Valid Interval (days)","PerÃodo válido del pedido (dÃas)"
-"Ordered amount of %s.","Cantidad pedida de %s."
-"Ordering amount of %s is pending approval on gateway.","El pedido de la cantidad de %s está pendiente de aprobación en el portal."
-"Page Background Color","Color del fondo de página"
-"Page Style","Estilo de página"
-"Part of the address information matched","Parte de la información de la dirección coincidió"
-"Partner","Socio"
-"Pasarela integral","Pasarela integral"
-"Pasarela integral Settings","Ajustes de Pasarela integral"
-"Password","Contraseña"
-"Pay Now","Pagar ahora"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","Función del Gestor de saldo de PayPal de la cuenta de PayPal"
+"Balance Manager Account Bonus","Bono de Cuenta de Gestor de Balance"
"PayPal Buyer Warranty Bonus","Bonificación de garantÃa del comprador en PayPal"
-"PayPal Debit Card Cash Advance","Adelanto de efectivo de una tarjeta de débito en PayPal"
-"PayPal Debit Card Withdrawal from ATM","Retiro de dinero de tarjeta de débido de PayPal desde un cajero automático"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Contenedor de acceso directo a Pago Express de PayPal (Edición de Flujo de Pago)"
-"PayPal Express Checkout Shortcut Wrapper","Acceso directo al check-out exprés de PayPal"
-"PayPal Express Checkout Token does not exist.","El sÃmbolo para la Salida Express con Paypal no existe."
-"PayPal Express Order Review Form","Formulario para revisar el pedido express de Paypal"
-"PayPal Express Order Review Form","Formulario de revisión de compra por PayPal Express"
-"PayPal Fee Information","Información de tarifa de PayPal"
-"PayPal Merchant Pages Style","Estilo de la página de la tienda en PayPal"
-"PayPal Payments Advanced","Pagos Avanzados de PayPal"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","Ajustes de PayPal Pro"
-"PayPal Product Logo","Logotipo del producto en PayPal"
"PayPal Protection Bonus","Bono de protección de PayPal"
-"PayPal Reference ID","Id. de referencia de PayPal"
-"PayPal Reference ID Type","Tipo de Id. de referencia de PayPal"
-"PayPal Settlement Reports","Informes de liquidación de PayPal"
-"PayPal certificate does not exist.","Certificado PayPal no existe."
-"PayPal certificate file is empty.","Archivo de certificado PayPal está vacÃo."
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal no admite el proceso de pedidos con importe cero. Para finalizar su compra, continúe con el proceso de caja estándar."
-"PayPal gateway has rejected request. %s","La puerta de enlace de PayPal ha rechazado la solicitud. %s"
-"PayPal processes all of your orders, and you get paid.","PayPal procesa todos sus pedidos y le paga a usted."
-"PayPal response hasn't required fields.","La respuesta de PayPal no tiene campos obligatorios."
-"PayPal retains reports for 45 days.","PayPal almacena los informes durante 45 dÃas."
-"PayPal/Centinel Electronic Commerce Indicator","Indicador de comercio electrónico de PayPal/Centinel"
-"PayPal/Centinel Visa Payer Authentication Service Result","Resultado del servicio de autenticación del pagador con Visa a través de PayPal/Centinel"
-"Payer Address ID","Id. de dirección del pagador"
-"Payer Address Status","Estado de la dirección del comprador"
-"Payer Email","Correo electrónico del pagador"
-"Payer ID","Id. del pagador"
-"Payer Status","Situación del comprador"
-"Payer is not identified.","El pagador no se ha identificado."
-"Payflow Link (for USA and Canada)","VÃnculo de Flujo de Pago (para EE. UU. y Canadá)"
-"Payflow Link Settings","Configuración del VÃnculo de Flujo de Pago"
-"Payflow Pro Gateway","Pasarela Payflow Pro"
-"Payflow Pro Settings","Ajustes de la Pasarela Payflow Pro"
-"Payment Action","Acción de Pago"
-"Payment Applicable From","Pago Aplicable Desde"
-"Payment Refund initiated by merchant","Reembolso de Pago iniciado por el comerciante"
-"Payment has been declined. Please try again.","El pago ha sido rechazado. Vuelva a intentarlo."
-"Payment is being reviewed by PayPal for risk.","El pago está siendo revisado por PayPal por si hubiera algún riesgo."
-"Payment transactions disallow storing objects.","Las operaciones de pago no permiten almacenar objetos."
-"Payment was made to an email address that is not yet registered or confirmed.","El pago se ha realizado a una dirección electrónica que todavÃa no ha sido registrada o confirmada."
-"Payments by PayPal (150 X 40)","Pagos por PayPal (150 X 40)"
-"Payments by PayPal (150 X 60)","Pagos por PayPal (150 X 60)"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","Pagos mediante tarjetas + protección de vendedor - <strong style=""color:red"">Contacte con PayPal antes de su activación</strong>"
-"Paypal Billing Agreement Settings","Ajustes del Acuerdo de Facturación de PayPal"
-"Pending PayPal","Pendiente de pago en PayPal"
-"Phone","Teléfono"
-"Place Order","Hacer pedido"
-"Place Order Using Billing Agreements","Hacer el Pedido Utilizando los Acuerdos de Facturación"
-"Please agree to all the terms and conditions before placing the order.","Por favor, acepta todos los términos y condiciones antes de realizar el pedido."
-"Please contact PayPal Customer Service.","Por favor, póngase en contacto con el Servicio de Atención al Cliente de PayPal."
-"Please do not refresh the page until you complete payment.","No actualice la página hasta que complete el pago."
-"Please select a shipping method...","Por favor, elija un método de envÃo..."
-"Please select region, state or province","Por favor seleccione región, estado o provincia"
-"Please update order data to get shipping methods and rates","Por favor, actualice los datos del pedido para obtener métodos de envÃo y tarifas"
+"Bonus for first ACH Use","Bono por el primer Uso de ACH"
+"General Redemption","Amortización General"
+"Gift Certificate Redemption","Canjear Cheque Regalo"
"Points Incentive Redemption","Puntos de incentivo por cancelación"
-"Postage Payment to either USPS or UPS","Pago de los Gastos de EnvÃo bien a USPS o a UPS"
-"Preapproved Payment (BillUser API), either sent or received","Pagos previamente aprobados (BillUser API) enviados o recibidos"
-"Preapproved Payment ID","Identificación del Pago Pre-autorizado"
-"Price","Precio"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","Tramite las tarjetas de crédito directamente en su sitio de Internet con la solución de tramitación de pago a distancia todo-en-uno de PayPal."
-"Product","Nombre de Producto"
-"Proxy Host","Servidor Proxy"
-"Proxy Port","Puerto proxy"
-"Quantity","Cantidad"
-"Reauthorization","Reautorización"
-"Reference Information","Información de Referencia"
-"Refund issued by merchant.","Reembolso emitido por el comerciante."
-"Reimbursement for a chargeback.","Devolución o reembolso."
-"Reimbursement of Chargeback","Reembolso de una transacción devuelta"
-"Report Date","Fecha del informe"
-"Reports","Informes"
-"Requested %s and configured %s merchant emails do not match.","Las direcciones del comerciante solicitada %s y configurada %s no se corresponden."
-"Require CVV Entry","Requiere el código de seguridad de la tarjeta"
-"Require Customer's Billing Address","Exija la dirección de facturación del cliente"
-"Reversal","Inversión"
-"Reversal of General Account Hold","Revocación de Cargo General en Cuenta"
+"Coupon Redemption","Reembolso de Cupón"
+"Reward Voucher Redemption","Realizar canje de vales"
+"General. Product no longer supported","General. Este producto ya no está admitido"
+"General: reversal of a type not belonging to the other T11xx categories","General: revocación de una clase no perteneciente a las otras T01xx categorÃas"
+"ACH Withdrawal","Retirada ACH"
+"Debit Card Transaction","Transacción con tarjeta de débito"
"Reversal of Points Usage","Inversión de los puntos de utilización"
-"Reversal of an adjustment.","Revocación de un ajuste."
+"ACH Deposit (Reversal)","Depósito ACH (Revocación)"
+"Reversal of General Account Hold","Revocación de Cargo General en Cuenta"
+"Account-to-Account Payment, initiated by PayPal","Pago Cuenta-a-Cuenta, iniciado por PayPal"
+"Payment Refund initiated by merchant","Reembolso de Pago iniciado por el comerciante"
+"Fee Reversal","Retroceso de Comisiones"
+"Hold for Dispute Investigation","Manténgase a la Espera de la Investigación sobre la Disputa"
"Reversal of hold for Dispute Investigation","Reposición por la investigación de la disputa"
-"Review Order","Revise su pedido"
-"Reward Voucher Redemption","Realizar canje de vales"
-"SFTP Credentials","Credenciales SFTP"
-"Sale","Venta"
-"Sales","Ventas"
-"Same as shipping","Igual que el envÃo"
-"Sandbox Credentials","Credenciales de Supervisión"
-"Sandbox Mode","Modo de prueba"
-"Schedule","Programa"
-"Schedule description is too long.","La descripción de designaciones es demasiado larga."
-"Scheduled Fetching","Compra programada"
-"Select a PayPal Solution","Selecciones una solución PayPal"
-"Server Error. Please try again.","Error del servidor. Por favor, inténtelo de nuevo."
+"General: adjustment of a type not belonging to the other T12xx categories","General: ajuste de una clase no perteneciente a las otras T12xx categorÃas"
+Reversal,Inversión
+Charge-off,Cancelar
+Incentive,Incentivo
+"Reimbursement of Chargeback","Reembolso de una transacción devuelta"
+"General (Authorization)","General (Autorización)"
+Reauthorization,Reautorización
+Void,Nulo
+"General (Dividend)","General (Dividendo)"
+"General: temporary hold of a type not belonging to the other T15xx categories","General: cargo temporal de una clase no perteneciente a las otras T15xx categorÃas"
+"Open Authorization","Abrir la autorización"
+"ACH Deposit (Hold for Dispute or Other Investigation)","Depósito ACH (En Espera por Conflicto u Otra Investigación)"
+"Available Balance","Balance Disponible"
+Funding,Fondos
+"General: Withdrawal to Non-Bank Entity","General: Retirada de fondos a una Entidad No Bancaria"
+"WorldLink Withdrawal","Retirada de Fondos WorldLink"
+"Buyer Credit Payment","Pago de Crédito de Comprador"
+"General Adjustment without businessrelated event","Ajuste General sin ningún acontecimiento relacionado con el negocio"
+"General (Funds Transfer from PayPal Account to Another)","General (Transferencia de Fondos desde una Cuenta Paypal a Otra Cuenta)"
"Settlement Consolidation","Consolidación del Acuerdo"
-"Settlement Report Settings","Ajustes del informe de liquidación"
-"Settlement of a chargeback.","Liquidación de una transacción devuelta."
-"Severe 3D Secure Card Validation","Validación estricta de tarjeta segura en 3D"
-"Severe Validation Removes Chargeback Liability on Merchant","La Validación Severe Suprime la Responsabilidad de Cancelación de Cargo del Comerciante"
-"Severe validation removes chargeback liability on merchant.","La validación estricta exime al comerciante de responsabilidad en caso de devoluciones de cargos"
-"Shipping","Transporte"
-"Shipping Address","Dirección de EnvÃo"
-"Shipping Method","Método de envÃo"
-"Shop now using (150 X 40)","Compre ahora usando (150 X 40)"
-"Shop now using (150 X 60)","Compre ahora utilizando (150 X 60)"
-"Shortcut","Acceso directo"
-"Shortcut Buttons Flavor","Tipo de Botones de Atajo"
-"Shortcut on Product View","Atajo para Vista de Producto"
-"Shortcut on Shopping Cart","Atajo en el carro de la compra"
-"Sign a billing agreement to streamline further purchases with PayPal.","Firma un acuerdo de facturación para agilizar futuras compras con PayPal."
-"Solo","Solo"
-"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido."
-"Sort Order","Orden de selección"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica cuál es el perÃodo de autorización de la cuenta de PayPal del comerciante. Tiene que ser igual a la configuración de PayPal."
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica cuál es el perÃodo de validez del pedido de la cuenta de PayPal del comerciante. Tiene que ser igual a la configuración de PayPal."
-"State/Province","Estado/Provincia"
-"Static","Estático"
-"Street Address","Dirección postal"
-"Street Address %s","Calle %s"
-"Submitting order information...","Enviando la información del pedido..."
-"Subscriber name is too long.","El nombre de suscriptor es demasiado largo."
-"Subscription ID","ID de Suscripción."
-"Subscription Payment, either payment sent or payment received","Pago de suscripción, bien sea pago enviado o recibido."
-"Subtotal","Subtotal"
-"Summary Text for Aggregated Cart","Texto de Resumen para el Carro Añadido"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","La admisión de tarjetas American Express requiere de un acuerdo adicional. Consulte los requisitios en <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"Switch/Maestro","Cambiar/Maestro"
-"Test Mode","Modo de prueba"
-"The background color for the checkout page around the header and payment form.","El color de fondo de la página de reembolso de la cabecera y formulario de pago."
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","Color de fondo para la cabecera de la página de pago. Código ASCII de color hexadecimal HTML de seis caracteres sin diferencias mayúsculas o minúsculas."
-"The billing agreement ""%s"" has been canceled.","El acuerdo de facturación ""%s"" se ha cancelado."
-"The billing agreement ""%s"" has been created.","El acuerdo de facturación ""%s"" se ha creado."
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","El número de autorizaciones infantiles por defecto de su cuenta de PayPal es 1. Para tener autorizaciones múltiples, póngase en contacto con PayPal para solicitar un aumento."
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","Imagen en la parte superior izquierda de la página de pago. El tamaño máximo es 750x90 pÃxeles. Se recomienda encarecidamente el uso de <strong style=""color:red"">https</strong>."
-"The maximum number of child authorizations is reached.","Se ha alcanzado el número máximo de autorizaciones infantiles."
-"The merchant account is not yet verified.","TodavÃa no se ha verificado la cuenta de vendedor."
-"The payment curency does not match any of the merchant's balances currency.","La moneda de pago no coincide con ninguna de las monedas de saldo del vendedor."
-"The payment eCheck is not yet cleared.","TodavÃa no se ha limpiado el eCheck de pago."
-"The payment is authorized but not settled.","El pago se ha autorizado, pero no se ha realizado."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","El pago está pendiente porque se ha realizado a una dirección de mail que todavÃa no se ha registrado o confirmado."
-"The payment is pending while it is being reviewed by PayPal for risk.","El pago está pendiente, PayPal lo está revisando para asegurarse."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","El pago se ha realizado mediante tarjeta de crédito. Para recibir los fondos el vendedor tiene que actualizar la cuenta a estado Business o Premier."
+"General: event not yet categorized","General: suceso no catalogado aún"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days","Cada 3 dÃas"
+"Every 7 days","Cada 7 dÃas"
+"Every 10 days","Cada 10 dÃas"
+"Every 14 days","Cada 14 dÃas"
+"Every 30 days","Cada 30 dÃas"
+"Every 40 days","Cada 40 dÃas"
+"No Logo","Sin logotipo"
+"Pending PayPal","Pendiente de pago en PayPal"
+"Billing Agreement","Acuerdo de facturación"
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- Por favor, Seleccione el Acuerdo de Facturación--"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements","Volver a los contratos de facturación"
"There are no billing agreements yet.","No hay acuerdos de facturación todavÃa."
-"There was an error processing your order. Please contact us or try again later.","Se produjo un error en el proceso de su pedido. Contacte con nosotros o inténtelo más tarde."
-"This feature needs be enabled first for the merchant account through PayPal technical support.","Esta caracterÃstica necesita primero ser activada para la cuenta comercial a través del soporte técnico de PayPal."
-"This operation requires an existing transaction object.","Esta operación requiere de una transacción ya existente."
-"Time of Day","Hora del DÃa"
-"Title","TÃtulo"
-"Transaction ID","Número de identificación de la transacción"
-"Transaction ID must not be empty.","El número identificativo de la transacción debe completarse."
-"Transaction Information","Información de Transacción"
-"Transfer Cart Line Items","Transferir la lÃnea de los artÃculos en el carrito"
-"Transfer Shipping Options","Transferir las opciones de envÃo"
-"Triggered Fraud Filters","Filtros de Fraude Desencadenados"
-"Unable to cancel Express Checkout.","No se ha podido cancelar la Salida Express."
-"Unable to change status. Current status is not correspond to real status.","No se puede cambiar el estado. El estado actual no se corresponde con el estado real."
-"Unable to communicate with the PayPal gateway.","No ha sido posible comunicarse con el gateway de PayPal."
-"Unable to initialize Express Checkout review.","No se ha podido iniciar la revisión de Salida Express."
-"Unable to initialize Express Checkout.","No ha sido posible inicializar el Pago Express."
-"Unable to place the order.","No se puede efectuar el pedido."
-"Unable to process Express Checkout approval.","No se ha podido procesar la aprobación de Salida Express."
-"Unable to start Express Checkout.","No se ha podido iniciar la Salida Express."
-"Unable to update Order data.","No es posible actualizar la información del pedido."
-"Unable to update shipping method.","No se ha podido actualizar el método de envÃo."
-"Unknown Error. Please try again later.","Error desconocido. Por favor inténtalo más tarde."
-"Unknown reason. Please contact PayPal customer service.","Razones desconocidas. Por favor, contacte el servicio de atención al cliente de PayPal."
-"Update Order Data","Actualizar información del pedido"
-"Use Proxy","Utilizar Proxy"
-"Use colon to specify port. For example: ""test.example.com:5224"".","Utilice dos puntos para especificar el puerto. Por ejemplo: ""prueba.ejemplo.com:5224""."
-"User","Usuario"
-"User-initiated Currency Conversion","Conversión de moneda iniciada por el usuario"
-"Uses store frontend name by default.","De forma predeterminada utiliza el nombre de la tienda de interfaz de usuario"
-"VAT Number","Número de IVA"
-"Vendor","Vendedor"
-"Vendor / Merchant Login","Inicio de sesión para proveedores / comerciantes"
-"View","Ver"
-"View Demo","Vea la demostración"
-"View PayPal solutions.","Ver soluciones de PayPal"
-"View Transaction","Ver transacción"
-"View Transaction Details","Ver Detalles de la Transacción"
-"Virtual PayPal Debit Card Transaction","Transacción de Tarjeta de Débito de PayPal Virtual"
-"Virtual Terminal Payment","Pago Terminal virtual"
-"Void","Nulo"
-"Waiting until Customer's eCheck will be cleared.","En espera hasta que se produzca la compensación del Cheque Electrónico del Cliente"
-"We prefer PayPal (150 X 40)","Preferimos PayPal (150 X 40)"
-"We prefer PayPal (150 X 60)","Preferimos PayPal (150 X 60)"
-"Website Payments Plus","Pagos Web Plus"
-"Website Payments Plus Settings","Configuración de Pagos Web Plus"
-"Website Payments Pro","Website Payments Pro"
-"Website Payments Pro (Payflow Edition) Settings","Configuración de Website Payments Pro (Payflow Edition)"
-"Website Payments Pro Hosted Solution","Solución Hospedada de Pagos Web Pro"
-"Website Payments Pro Hosted Solution Settings","Configuración de Solución Hospedada de Pagos Web Pro"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","Website Payments Pro Payflow Edition (incluye Pago Express)"
-"Website Payments Pro Settings","Configuración de Website Payments Pro"
-"Website Payments Standard","Pago Estándar en el Sitio Web"
-"Website Payments Standard Payment","Pago estándar de la página web"
-"Website Payments Standard Settings","Configuración de Pago Estándar en el Sitio Web"
-"What is PayPal?","¿Qué es PayPal?"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Opción de creación de un contrato de facturación, si no hay contratos de facturación activos disponibles."
-"Will appear as a payment option only for customers who have at least one active billing agreement.","Aparecerá como una opción de pago solamente para clientes que tengan al menos un contrato de facturación activo."
-"WorldLink Withdrawal","Retirada de Fondos WorldLink"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","¿Le gustarÃa firmar un contrato de facturación para agilizar sus futuras compras con PayPal?"
-"Wrong Order ID (%s) specified.","Se especificó un Identificador de Pedido Erróneo (%s)."
-"Wrong PayPal Express Checkout Token specified.","SÃmbolo especificado de Salida Express con Paypal incorrecto."
-"Wrong billing agreement ID specified.","La identificación del contrato de facturación es incorrecta."
-"Yes","SÃ"
-"Yes. Matched Address and five-didgit ZIP","SÃ. La Dirección y el Código Postal de cinco dÃgitos coinciden."
-"You cannot void a verification transaction","No se puede anular una operación de comprobación"
-"You will be redirected to the PayPal website in a few seconds.","Volverá a la página web de Paypal en unos segundos."
-"You will be redirected to the PayPal website when you place an order.","Cuando realice el pedido se le devolverá a la página PayPal."
-"You will be redirected to the PayPal website.","Se le redirigirá al sitio web de PayPal."
+"New Billing Agreement","Nuevo Acuerdo de Facturación"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order","Revise su pedido"
+"Please select a shipping method...","Por favor, elija un método de envÃo..."
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","ArtÃculos en Su Carro de la Compra"
+"Edit Shopping Cart","Editar Carrito de la Compra"
+"Please update order data to get shipping methods and rates","Por favor, actualice los datos del pedido para obtener métodos de envÃo y tarifas"
+"Checkout with PayPal","Pago con PayPal"
+"Please do not refresh the page until you complete payment.","No actualice la página hasta que complete el pago."
"You will be required to enter your payment details after you place an order.","Se le solicitará que introduzca los detalles del pago tras realizar el pedido."
-"Zip/Postal Code","Código postal"
-"chargeback reimbursed","Devolución del cargo reembolsada"
-"chargeback settled","Devolución del cargo liquidada"
-"customer complaint","reclamación de cliente"
-"customer triggered a chargeback","El cliente ha solicitado un reembolso"
-"customer triggered money-back guarantee","el cliente activó una garantÃa de devolución del dinero"
-"eBay Auction Payment","Pago de Subasta de eBay"
-"merchant refunded payment","el comerciante ha reembolsado el pago"
-"no reason","No existen razones"
-"reversal of an adjustment","revocación de un ajuste"
-"unknown reason","Razones desconocidas"
+"Additional Options","Opciones Adicionales"
+"Acceptance Mark","Señal de Aceptación"
+"What is PayPal?","¿Qué es PayPal?"
+"Sign a billing agreement to streamline further purchases with PayPal.","Firma un acuerdo de facturación para agilizar futuras compras con PayPal."
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
+"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/i18n/fr_FR.csv b/app/code/Magento/Paypal/i18n/fr_FR.csv
index ced16b1777a..4fa18266f99 100644
--- a/app/code/Magento/Paypal/i18n/fr_FR.csv
+++ b/app/code/Magento/Paypal/i18n/fr_FR.csv
@@ -1,505 +1,692 @@
-"-- Please Select Billing Agreement--","-- Veuillez sélectionner un accord de facturation--"
-"-OR-","-OU-"
-"2-pixel perimeter around the header space.","Un périmètre de deux pixels autour de l'espace du header."
-"3D Secure","3D Secure"
-"3D Secure Card Validation","Validation de la carte par 3D Secure"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Validation D sécurisée nécessaire pour les cartes Maestro. Le support des cartes American Express nécessite l'acceptation d'un accord supplémentaire. En savoir plus à <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>"
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Commencer à accepter les paiements via Paypal !</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Une valeur est requise pour le mode en direct. Référez-vous à votre contrat CardinalCommerce."
-"ACH Deposit (Hold for Dispute or Other Investigation)","Dépôt ACH (bloquer pour litige ou autre enquête)"
-"ACH Deposit (Reversal)","Dépôt ACH (annulation)"
-"ACH Funding for Funds Recovery from Account Balance","Fonds ACH pour récupération de fonds depuis la balance du compte"
-"ACH Withdrawal","Virement ACH"
-"API Authentication Methods","API Méthodes d'identification"
-"API Certificate","Certificat API"
-"API Password","Mot de passe API"
-"API Signature","Signature API"
-"API Username","Nom d'utilisateur API"
-"API Uses Proxy","L'API utilise un proxy"
-"API/Integration","API/Intégration"
-"API/Integration Settings","Réglages de l'API/Intégration"
-"Ability for buyer to purchase without PayPal account.","Possibilité pour l'acheteur de commander sans compte PayPal."
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","Accepter les paiements Paypal dans vote boutique. Paypal gérera les paiements via carte de crédit grâce à la passerelle Payflow Pro."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","Accepter les paiements avec un règlement conforme au PCI qui garde les clients sur le site. Comprend un compte commercial de PayPal."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","Accepter les paiements avec un règlement conforme au PCI qui garde les clients sur le site. Pour une utilisation avec votre propre compte commercial."
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","Acceptez les paiements sans que les clients ne quittent votre site. De nombreux services hébergés en ligne viennent avec la passerelle Payflow pré-installée, et sont donc faciles à mettre en place."
-"Acceptance Mark","Marque d'acceptance"
-"Acceptance Mark Image","Image de marque d'acceptance"
-"Account-to-Account Payment, initiated by PayPal","Paiement compte-à -compte, initié par PayPal"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","Ajouter un bouton d'achat express à votre panier existant pour des paiements rapides et simples. PayPal s'occupe de tout le traitement du paiement."
-"Additional Options","Options additionnelles"
-"Address","Adresse"
-"Address Verification System Response","Réponse du système à la vérification d'adresse"
-"All the address information matched","Toutes les informations de l'adresse correspondent"
-"Allow in Billing Agreement Wizard","Autoriser dans l'assistant d'accord de facturation"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Variables autorisées : ""paypal"", ""primary"" (default), your_custom_value (un style de page de paiement personnalisé de votre compte vendeur)"
-"Allowed Credit Card Types","Types de cartes autorisés"
-"Also affects mini-shopping cart.","Affecte aussi le panier mini-shopping."
-"Ask Customer","Demander au client"
-"Attempted Authentication, Bad Result","Essai d'authentification, mauvais résultat"
-"Attempted Authentication, Good Result","Essai d'authentification, bon résultat"
-"Auction Payment other than through eBay","Paiement des enchères autres que via eBay"
-"Authenticated, Bad Result","Authentifié, mauvais résultat"
-"Authenticated, Good Result","Authentifié, bon résultat"
-"Authorization","Autorisation"
-"Authorization Honor Interval (days)","Autorisation de la période de garantie (en jours)"
-"Authorization expired.","Autorisation expirée."
-"Authorization transaction is required to void.","L'autorisation de la transaction doit être annulée."
-"Authorization was voided by merchant.","L'autorisation a été annulée par le vendeur."
-"Authorized amount of %s.","La quantité autorisée s'élève à  : %s."
-"Authorizing amount of %s is pending approval on gateway.","La quantité autorisée de %s est en attente d'approbation sur la passerelle."
-"Auto","Automatique"
-"AutoSweep","Emporter automatiquement"
-"Available Balance","Solde disponible"
-"Back to Billing Agreements","Retour aux accords de facturation"
-"Balance Manager Account Bonus","Bonus de la balance du manager"
-"Billing Address","Adresse de facturation"
-"Billing Agreement","Accord de facturation"
-"Billing Agreement # %s","Accord de facturation # %s"
-"Billing Agreement #%s","Accord de facturation #%s"
-"Billing Agreement Signup ","Souscription aux accords de facturation"
-"Billing Agreement View","Voir l'accord de facturation"
+Custom,Personnalisé
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,Prix
+ID,ID
+Configure,Configure
+No,Non
+Qty,Qty
+Subtotal,Sous-total
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,Oui
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Commande
+View,Vue
+Active,Active
+Position,Position
+Dynamic,Dynamique
+N/A,N/A
+Canceled,Canceled
+"General Information","General Information"
+Static,Statique
+"Advanced Settings","Advanced Settings"
+"Learn More","En savoir plus"
+"Start Date","Start Date"
+"Product Name","Product Name"
+"3D Secure Card Validation","3D Secure Card Validation"
+"Merchant Liability","Responsabilité du vendeur"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Méthode d'expédition"
+"Please agree to all the terms and conditions before placing the order.","Veuillez accepter toutes les conditions générales avant de passer la commande."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address","Adresse d'expédition"
+"Payment Method","Payment Method"
+"Place Order","Placer une commande"
+"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande."
+Sales,Ventes
+Created,Created
+Display,Display
+User,User
+Daily,"Tous les jours"
+Date,Date
+"Order Total","Order Total"
+Never,Jamais
+Updated,Updated
+Reports,Rapports
+"Order Status","Order Status"
+"View Order","View Order"
+Event,Évènement
+"Please Select","Please Select"
+"Submitting order information...","Traitement de la commande..."
+Authorization,Autorisation
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
"Billing Agreements","Accords de facturation"
-"Billing Agreement status is not set.","Le statut du contrat de facturation n'est pas réglé."
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
+"Billing Agreement View","Voir l'accord de facturation"
+"View Transaction Details","Voir les détails de la transction"
+"Reference Information","Informations de référence"
+"Transaction Information","Information de la transaction"
+"PayPal Fee Information","Informations des frais Paypal"
+"PayPal Settlement Reports","Rapports sur le règlement PayPal"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Mises à jour de récupération"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Aide
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo","Voir démo"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","Vous serez redirigé vers le site de Paypal."
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.","Vous serez redirigé vers le site de PayPal quand vous effectuerez une commande."
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.","Vous serez redirigé vers le site web de Paypal dans quelques secondes."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction","Voir la transaction"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.","Le contrôle express et la commande ont été annulés."
+"Express Checkout has been canceled.","Le contrôle express a été annulé."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","Le mot de vérification du paiement express via Paypal n'existe pas."
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.","La réponse PayPal n'a pas les champs obligatoires."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
"Unable to save Billing Agreement:","Impossible d'enregistrer l'accord de facturation :"
-"Your billing agreement # is: %s.","Votre accord de facturation # est : %s."
-"Bonus for first ACH Use","Bonus pour première utilisation de l'ACH"
-"Buyer Credit Payment","Paiement acheteur"
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","Nous préférons PayPal (150 X 60)"
+"We prefer PayPal (150 X 40)","Nous préférons Paypal (150 X 40)"
+"Now accepting PayPal (150 X 60)","PayPal désormais accepté (150 X 60)"
+"Now accepting PayPal (150 X 40)","Accepte maintenant PayPal (150 X 40)"
+"Payments by PayPal (150 X 60)","Paiements par PayPal (150 X 60)"
+"Payments by PayPal (150 X 40)","Paiements par PayPal (150 X 40)"
+"Shop now using (150 X 60)","Boutique utilisant maintenant (150 X 60)"
+"Shop now using (150 X 40)","Faites vos achats en utilisant (150 X 40)"
+Shortcut,Raccourci
+"Acceptance Mark Image","Image de marque d'acceptance"
+Sale,Vente
+"For Virtual Quotes Only","Pour les devis virtuels uniquement"
+Auto,Automatique
+"Ask Customer","Demander au client"
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","Signature API"
+"API Certificate","Certificat API"
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","Le nombre maximum d'autorisations pour enfant est atteint."
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.","Le payeur n'est pas identifié."
+"Last Transaction ID","Dernier identifiant de transaction"
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.","Le paiement est autorisé mais pas encore réglé."
+"The payment eCheck is not yet cleared.","Le paiement eCheck n'est pas encore validé."
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","Le paiement est en attente alors qu'il est actuellement examiné par PayPal pour le risque."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","Le paiement est en attente car il a été fait vers une adresse qui n'est pas encore enregistrée ou confirmée."
+"The merchant account is not yet verified.","Le compte du vendeur n'est pas vérifié."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","Le paiement a été effectué via carte de crédit. Afin de recevoir les fonds, le vendeur doit obtenir un compte Business ou Premier."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Annulation d'un ajustement."
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Remboursement pour un rejet de débit."
+"Settlement of a chargeback.","Accord de remboursement."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Raison inconnue. Veuillez contacter le service client de PayPal."
+"Payer ID","ID du payeur"
+"Payer Email","E-mail du payeur"
+"Payer Status","Statut du payeur"
+"Payer Address ID","Identifiant de l'adresse de l'acheteur"
+"Payer Address Status","Statut d'adresse du payeur"
+"Merchant Protection Eligibility","Eligibilité de protection marchande"
+"Triggered Fraud Filters","A déclenché les détecteurs de fraude"
+"Last Correlation ID","Dernier identifiant en corrélation"
+"Address Verification System Response","Réponse du système à la vérification d'adresse"
+"CVV2 Check Result by PayPal","Résultats de chèque CVV2 via Paypal"
"Buyer's Tax ID","Identification fiscale de l'acheteur"
"Buyer's Tax ID Type","Type d'identification fiscale de l'acheteur"
-"By default it is ""reports.paypal.com"".","Par défaut ""reports.paypal.com"""
-"CNPJ","CNPJ"
-"CPF","CPF"
-"CVV2 Check Result by PayPal","Résultats de chèque CVV2 via Paypal"
-"Can not send new order email.","N'a pas pu envoyer le nouvel email de commande."
-"Cannot create target file for reading reports.","Ne peut pas créer de fichier source pour la lecture des rapports."
-"Centinel API URL","Centinel Api URL"
-"Centinel Custom API URL","Centinel Custom API URL"
-"Charge-off","Radiés"
-"Chargeback","Frais de retour"
-"Chargeback by customer.","Frais de retour à la charge du client."
-"Checkout with PayPal","Commander avec PayPal"
-"City","Ville"
-"Click here if you are not redirected within 10 seconds...","Cliquez ici si vous n'êtes pas redirigé après 10 secondes..."
-"Company","Compagnie"
-"Completion Date","Date de fin"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Se connecte au serveur SFTP de Paypal pour récupérer des nouveaux rapports. Etes-vous sûr de vouloir continuer ?"
-"Countries Payment Applicable From","Formulaire de pays disponibles"
-"Country","Pays"
-"Coupon Redemption","Annulations de coupons"
-"Created billing agreement #%s.","Créer un accord de paiement #%s"
-"Credit","Crédit"
-"Credit Card Settings","Réglages de la carte de crédit"
-"Currency Conversion required to cover negative balance","Conversion de monnaie nécessaire pour compenser balance négative"
-"Custom","Personnalisé"
-"Custom Endpoint Hostname or IP-Address","Nom d'hébergeur ou adresse IP personnalisé"
-"Custom Path","Chemin personnalisé"
-"Customer Information","Informations du client"
-"Customer complaint.","Plainte de client."
-"Customer did not include a confirmed address.","Le client n'a pas d'adresse confirmée."
-"Customer failed to pay.","Le paiement du client a échoué."
-"Customer triggered a money-back guarantee.","L'utilisateur a déclenché la garantie de remboursement."
-"Customer used non-confirmed address.","Le client a utilisé une adresse non confirmée."
-"Daily","Tous les jours"
-"Debit","Débit"
-"Debit Card Cash Back","Remboursement carte de débit."
-"Debit Card Transaction","Transaction via carte de débit."
-"Debit or Credit","Débit ou crédit"
-"Debug Mode","Mode débug"
-"Direct Payment API","Paiement direct via l'API"
-"Discount","Discount"
-"Display Express Checkout in the Payment Information step","Afficher la caisse expresse dans l'étape sur les informations de paiement"
-"Displays on catalog pages and homepage.","Affiche sur les pages du catalogue et la page d'accueil."
-"Don't have a PayPal account? Simply enter your email address.","Vous n'avez pas de compte PayPal ? Entrez simplement votre adresse e-mail."
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","Vous n'avez pas de compte Paypal vendeur ? Vous pouvez tout de même accepter les paiements par carte de crédit grâce à la passerelle Payflow Pro."
-"Dynamic","Dynamique"
-"EFT Funding (German banking)","Fonds EFT (banque allemande)"
-"Edit Shopping Cart","Modifier le panier"
-"Email Address","Adresse email"
-"Email Associated with PayPal Merchant Account","Email associée à un compte Paypal vendeur"
-"Enable Automatic Fetching","Activer la récupération automatique"
-"Enable PayPal Guest Checkout","Activer la paiement Paypal en tant qu'invité"
-"Enabled","Activé"
-"Event","Évènement"
-"Event Code","Code de l'évènement"
-"Every 10 days","Tous les 10 jours"
-"Every 14 days","Tous les 14 jours"
-"Every 3 days","Tous les 3 jours"
-"Every 30 days","Tous les 30 jours"
-"Every 40 days","Tous les 40 jours"
-"Every 7 days","Tous les 7 jours"
+"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Result"
+"PayPal/Centinel Electronic Commerce Indicator","Indicateur de commerce électronique de Paypal."
+Chargeback,"Frais de retour"
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Adresse correspondante uniquement (pas de ZIP)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","Pas de détails correspondants"
+"No Details matched. International","Pas de détail trouvé. International"
+"Exact Match. Address and nine-digit ZIP code","Correspondance exacte. Adresse et code postal ZIP Ã neuf chiffres"
"Exact Match. Address and Postal Code. International","Correspondance exacte. Adresse et code postal. International"
"Exact Match. Address and Postal Code. UK-specific","Correspondance exacte. Adresse et code postal. Spécifique à la Grande Bretagne"
-"Exact Match. Address and nine-digit ZIP code","Correspondance exacte. Adresse et code postal ZIP Ã neuf chiffres"
-"Explanation: %s.","Explication : %s."
-"Express Checkout","Commande express"
-"Express Checkout (Payflow Edition) Settings","Options de paiement Express (Payflow Edition)"
-"Express Checkout APIs","APIs de paiement Express"
-"Express Checkout Settings","Réglages de la commande express"
-"Express Checkout and Order have been canceled.","Le contrôle express et la commande ont été annulés."
-"Express Checkout has been canceled.","Le contrôle express a été annulé."
-"Failed to cancel the billing agreement.","Échec lors de l'annulation de l'accord de facturation."
-"Failed to create billing agreement for this order.","Échec de la création de l'accord de facturation pour cette commande."
-"Failed to fetch reports from '%s@%s'.","Échec de récupération des rapports depuis '%s@%s'."
-"Failed to finish billing agreement wizard.","Impossible de terminer l'assistant d'accord de facturation."
-"Failed to start billing agreement wizard.","Impossible de démarrer l'assistant d'accord de facturation"
-"Fax","Fax"
-"Fee Amount","Montant des frais"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Non autorisé pour des transactions MOTO (Internet / Téléphone)"
+"N/A. Global Unavailable","N/A. Indisponible"
+"N/A. International Unavailable","N/A. International indisponible."
+"Matched five-digit ZIP only (no Address)","ZIP Ã 5 chiffres correspondant uniquement (pas d'adresse)"
+"Matched Postal Code only (no Address)","Code postal correspondant uniquement (pas d'adresse)"
+"N/A. Retry","N/A. Réessayez"
+"N/A. Service not Supported","N/A. Le service n'est pas pris en charge"
+"N/A. Unavailable","N/A. Indisponible."
+"Matched whole nine-didgit ZIP (no Address)","ZIP complet à 9 chiffres correspondant uniquement (pas d'adresse)"
+"Yes. Matched Address and five-didgit ZIP","Oui. Adresse correspondante et ZIP Ã 5 chiffres"
+"All the address information matched","Toutes les informations de l'adresse correspondent"
+"None of the address information matched","Aucune des informations de l'adresse ne correspondait."
+"Part of the address information matched","Une partie des informations de l'adresse correspond"
+"N/A. The merchant did not provide AVS information","N/A. Le commerçant n'a pas fourni d'information AVS"
+"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Adresse non spécifiée, ou pas de réponse. Service non disponible."
+"Matched (CVV2CSC)","Assorti (CVV2CSC)"
+"No match","Aucune correspondance"
+"N/A. Not processed","N/A. Non effectué."
+"N/A. Service not supported","N/A. Appareil non supporté"
+"N/A. Service not available","N/A. Service non disponible."
+"N/A. No response","N/A Pas de réponse"
+"Matched (CVV2)","Correspondance (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","N/A. Le vendeur n'a pas implémenté la gestion du code CVV2"
+"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Le vendeur a indiqué que ce CVV2 n'est pas présent."
+"Authenticated, Good Result","Authentifié, bon résultat"
+"Authenticated, Bad Result","Authentifié, mauvais résultat"
+"Attempted Authentication, Good Result","Essai d'authentification, bon résultat"
+"Attempted Authentication, Bad Result","Essai d'authentification, mauvais résultat"
+"No Liability Shift","Pas de transfert de responsabilité"
+"Issuer Liability","Responsabilité de l'émetteur"
+CNPJ,CNPJ
+CPF,CPF
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.","Les transactions de paiement ne permettent pas le stockage d'objets."
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.","Cette opération nécessite un objet de transaction existant."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date","Date du rapport"
+"Merchant Account","Compte du vendeur"
+"Transaction ID","ID de la transaction"
+"Invoice ID","Identifiant de la facture"
+"PayPal Reference ID","Identifiant de référence Paypal"
+"PayPal Reference ID Type","Type d'identifiant de référence Paypal"
+"Event Code","Code de l'évènement"
+"Finish Date","Finish Date"
+"Debit or Credit","Débit ou crédit"
+"Gross Amount","Montant brut"
"Fee Debit or Credit","Frais de débit ou crédit"
-"Fee Reversal","Annulation des frais"
-"Fee: Foreign ACH Withdrawal","Frais : virement à l'étranger"
-"Fee: Mass Pay Request","Frais : requête de paiement de masse"
+"Fee Amount","Montant des frais"
+"Order ID","Identifiant commande"
+"Subscription ID","Identifiant de l'inscrit"
+"Preapproved Payment ID","Identifiant du paiement pré-approuvé"
+Credit,Crédit
+Debit,Débit
+"General: received payment of a type not belonging to the other T00xx categories","Général : paiement reçu ne correspondant pas aux autres catégories T01xx"
+"Mass Pay Payment","Paiement de masse"
+"Subscription Payment, either payment sent or payment received","Paiement de l'abonnement, paiement envoyé ou paiement reçu"
+"Preapproved Payment (BillUser API), either sent or received","Paiement préapprouvés (API facture utilisateur), envoyé ou reçu"
+"eBay Auction Payment","Paiement d'enchères eBay"
+"Direct Payment API","Paiement direct via l'API"
+"Express Checkout APIs","APIs de paiement Express"
+"Website Payments Standard Payment","Paiement site paiement standard"
+"Postage Payment to either USPS or UPS","Envoi d'un paiement à USPS ou UPS"
+"Gift Certificate Payment: purchase of Gift Certificate","Paiement du certificat de cadeau : acheter un certificat de cadeau"
+"Auction Payment other than through eBay","Paiement des enchères autres que via eBay"
+"Mobile Payment (made via a mobile phone)","Paiement mobile (effectué via un téléphone mobile)"
+"Virtual Terminal Payment","Terminal de paiement virtuel"
+"General: non-payment fee of a type not belonging to the other T01xx categories","Général : frais de non paiement ne correspondant pas aux catégories T01xx"
"Fee: Web Site Payments Pro Account Monthly","Frais : compte mensuelle de sites web pro"
+"Fee: Foreign ACH Withdrawal","Frais : virement à l'étranger"
"Fee: WorldLink Check Withdrawal","Frais : virement Worldlink"
-"Fetch","Chercher"
-"Fetch Updates","Mises à jour de récupération"
-"Fetched %s report rows from '%s@%s'.","Lignes de rapport %s récupérées depuis '%s@%s'."
-"For Virtual Quotes Only","Pour les devis virtuels uniquement"
-"Frontend Experience Settings","Options de l'interface utilisateur."
-"Funding","Fonds"
-"General (Authorization)","Général (autorisation)"
-"General (Dividend)","Générale (dividendes)"
-"General (Funds Transfer from PayPal Account to Another)","Général (transfert de fonds d'un compte Paypal à un autre)"
-"General (Purchase with a credit card)","Général (commande via carte de crédit)"
-"General Adjustment without businessrelated event","Ajustement général avec les évènements liés au commerce"
+"Fee: Mass Pay Request","Frais : requête de paiement de masse"
"General Currency Conversion","Conversion de monnaie"
+"User-initiated Currency Conversion","Conversion de devise initiée par l'utilisateur"
+"Currency Conversion required to cover negative balance","Conversion de monnaie nécessaire pour compenser balance négative"
"General Funding of PayPal Account ","Fonds du compte Paypal"
-"General Redemption","Remboursement général"
+"PayPal Balance Manager function of PayPal account","Fonction de gestion de la balance de votre compte Paypal"
+"ACH Funding for Funds Recovery from Account Balance","Fonds ACH pour récupération de fonds depuis la balance du compte"
+"EFT Funding (German banking)","Fonds EFT (banque allemande)"
"General Withdrawal from PayPal Account","Virement général depuis le compte Paypal"
-"General. Product no longer supported","Général. Produit plus supporté."
+AutoSweep,"Emporter automatiquement"
"General: Use of PayPal account for purchasing as well as receiving payments","Général : Utilisation du compte Paypal pour acheter et recevoir des paiements"
+"Virtual PayPal Debit Card Transaction","Transaction via carte de débit virtuelle Paypal"
+"PayPal Debit Card Withdrawal from ATM","Retrait depuis distributeur automatique à partir d'une carte de débit Paypal"
+"Hidden Virtual PayPal Debit Card Transaction","Transaction cachée via carte de débit Paypal"
+"PayPal Debit Card Cash Advance","Avance de fonds carte de débit PayPal"
"General: Withdrawal from PayPal Account","Général : virement depuis le compte Paypal."
-"General: Withdrawal to Non-Bank Entity","Général : virement vers une entité non-bancaire"
-"General: adjustment of a type not belonging to the other T12xx categories","Général : ajustement à un type ne correspondant pas aux autres catégories T12xx"
+"General (Purchase with a credit card)","Général (commande via carte de crédit)"
+"Negative Balance","Solde négatif"
"General: bonus of a type not belonging to the other T08xx categories","Général : bonus d'un type ne correspondant pas aux autres catégories T08xx"
-"General: event not yet categorized","Général : évènement n'appartenant à aucune catégorie"
-"General: non-payment fee of a type not belonging to the other T01xx categories","Général : frais de non paiement ne correspondant pas aux catégories T01xx"
-"General: received payment of a type not belonging to the other T00xx categories","Général : paiement reçu ne correspondant pas aux autres catégories T01xx"
-"General: reversal of a type not belonging to the other T11xx categories","Général : annulation d'un type ne correspondant pas aux autres catégories T11xx"
-"General: temporary hold of a type not belonging to the other T15xx categories","Général : blocage temporaire d'un type ne correspondant pas aux catégories T15xx"
-"Get Credentials from PayPal","Obtenir la pièce d'identité de Paypal"
-"Gift Certificate Payment: purchase of Gift Certificate","Paiement du certificat de cadeau : acheter un certificat de cadeau"
-"Gift Certificate Redemption","Obtenir annulation du certificat de cadeau"
-"Gross Amount","Montant brut"
-"Header Background Color","Couleur de fond de l'entête"
-"Header Border Color","Couleur du bord de l'entête"
-"Header Image URL","URL de l'image de l'entête"
-"Help","Aide"
-"Hidden Virtual PayPal Debit Card Transaction","Transaction cachée via carte de débit Paypal"
-"Hold for Dispute Investigation","Retenir pour enquête du litige"
-"IPN ""%s"".","IPN ""%s""."
-"IPN verification ""%s"".","Vérification IPN ""%s"""
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Si vide, une valeur par défaut sera utilisée. Une URL personnalisée pourrait être fournie par l'accord de CardinalCommerce."
-"If not specified, Default Country from General Config will be used","S'il n'est pas spécifié, le pays par défaut dans la configuration générale sera utilisé"
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Si cette option est activée, l'utilisateur peut changer l'adresse ainsi que la méthode d'expédition depuis le site de Paypal. Marche instantanément uniquement via le protocole HTTPS."
-"Impossible to issue a refund transaction because the capture transaction does not exist.","Échec du remboursement de la transaction car ladite transaction n'existe pas."
-"Incentive","Motivation"
-"Initiation Date","Date d'initiation"
-"Integral Evolution","Integral Evolution"
-"Integral Evolution Settings","Options Integral Evolution"
-"Invoice ID","Identifiant de la facture"
-"Issuer Liability","Responsabilité de l'émetteur"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Il est recommandé de fixer cette valeur sur ""Carte de crédit"""
-"It is recommended to set this value to ""PayPal"" per store views.","Il est recommandé de fixer cette valeur sur ""Paypal"""
-"Items in Your Shopping Cart","Objets dans votre panier"
-"Last Correlation ID","Dernier identifiant en corrélation"
-"Last Transaction ID","Dernier identifiant de transaction"
-"Learn More","En savoir plus"
-"Login","Identifiant"
-"Looking for PayPal? We have our own tab to the left under Sales.","Vous cherchez Paypal ? Nous avons notre propre onglet à gauche, sous Ventes."
-"Mass Pay Payment","Paiement de masse"
-"Matched (CVV2)","Correspondance (CVV2)"
-"Matched (CVV2CSC)","Assorti (CVV2CSC)"
-"Matched Address only (no ZIP)","Adresse correspondante uniquement (pas de ZIP)"
-"Matched Address only (no ZIP). International","Adresse correspondante uniquement (pas de ZIP). International"
-"Matched Postal Code only (no Address)","Code postal correspondant uniquement (pas d'adresse)"
-"Matched five-digit ZIP only (no Address)","ZIP Ã 5 chiffres correspondant uniquement (pas d'adresse)"
-"Matched whole nine-didgit ZIP (no Address)","ZIP complet à 9 chiffres correspondant uniquement (pas d'adresse)"
-"Merchant Account","Compte du vendeur"
-"Merchant Country","Pays commercial"
-"Merchant Liability","Responsabilité du vendeur"
-"Merchant Protection Eligibility","Eligibilité de protection marchande"
+"Debit Card Cash Back","Remboursement carte de débit."
"Merchant Referral Bonus","Bonus de parrainage d'un vendeur"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Le compte marchand n'a pas de mécanisme de retrait. Le marchand doit accepter ou refuser manuellement ce paiement à partir de l'aperçu du compte."
-"Merchant account is not verified.","Le compte du vendeur n'est pas vérifié."
-"Merchant denied this pending payment.","Le vendeur a refusé ce paiement en attente."
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Le vendeur utilise un compte en dehors des Etats Unis et ne dispose pas d'un mécanisme de virement de fonds."
-"Merchant must upgrade account to Business or Premier status.","Le marchand doit mettre à jour son compte pour un statut Business ou Premier."
-"Merchant reference ID format is not supported.","Le format de l'identifiant du vendeur n'est pas supporté."
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Le vendeur doit postuler via Paypal pour activer les accords de facture. N'activez pas cette option avant que Paypal ne confirme que ceux-ci sont activés pour le compte vendeur."
-"Mobile Payment (made via a mobile phone)","Paiement mobile (effectué via un téléphone mobile)"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Différentes monnaies. Le vendeur doit manuellement accepter ou refuser ce paiement depuis la vue générale de votre compte."
-"N/A","N/A"
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Adresse non spécifiée, ou pas de réponse. Service non disponible."
-"N/A. Global Unavailable","N/A. Indisponible"
-"N/A. International Unavailable","N/A. International indisponible."
-"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Le vendeur a indiqué que ce CVV2 n'est pas présent."
-"N/A. No response","N/A Pas de réponse"
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Non autorisé pour des transactions MOTO (Internet / Téléphone)"
-"N/A. Not processed","N/A. Non effectué."
-"N/A. Retry","N/A. Réessayez"
-"N/A. Service not Supported","N/A. Le service n'est pas pris en charge"
-"N/A. Service not available","N/A. Service non disponible."
-"N/A. Service not supported","N/A. Appareil non supporté"
-"N/A. The merchant did not provide AVS information","N/A. Le commerçant n'a pas fourni d'information AVS"
-"N/A. The merchant has not implemented CVV2 code handling","N/A. Le vendeur n'a pas implémenté la gestion du code CVV2"
-"N/A. Unavailable","N/A. Indisponible."
-"Negative Balance","Solde négatif"
-"Never","Jamais"
-"New Billing Agreement","Nouvel Accord de Facturation"
-"No","Non"
-"No Details matched","Pas de détails correspondants"
-"No Details matched. International","Pas de détail trouvé. International"
-"No Liability Shift","Pas de transfert de responsabilité"
-"No Logo","Pas de logo"
-"No match","Aucune correspondance"
-"None of the address information matched","Aucune des informations de l'adresse ne correspondait."
-"Note: %s","Note : %s"
-"Nothing to fetch because of an empty configuration.","Rien à extraire en raison d'une configuration vide."
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Sachez que Paypal peut gérer jusqu'à 10 options de livraisons. C'est pourquoi Magento transférera uniquement les 10 options les moins coûteuses s'il y en a plus de 10 disponibles."
-"Notified customer about creditmemo #%s.","Client notifié à propos de la note de crédit #%s."
-"Notified customer about invoice #%s.","Client notifié à propos de la note facture #%s."
-"Now accepting PayPal (150 X 40)","Accepte maintenant PayPal (150 X 40)"
-"Now accepting PayPal (150 X 60)","PayPal désormais accepté (150 X 60)"
-"Number of Child Authorizations","Quantité d'autorisations pour enfant"
-"Open Authorization","Autorisation ouverte"
-"Order","Commande"
-"Order ID","Identifiant commande"
-"Order Valid Interval (days)","Période valide de commande (en jours)"
-"Ordered amount of %s.","Montant commandé de %s"
-"Ordering amount of %s is pending approval on gateway.","Le montant commandé de %s est en cours d'approbation sur la passerelle."
-"Page Background Color","Couleur du fond de la page"
-"Page Style","Style de la page"
-"Part of the address information matched","Une partie des informations de l'adresse correspond"
-"Partner","Partenaire"
-"Pasarela integral","Pasarela integral"
-"Pasarela integral Settings","Options Pasarela integral"
-"Password","Mot de passe"
-"Pay Now","Payer maintenant"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","Fonction de gestion de la balance de votre compte Paypal"
+"Balance Manager Account Bonus","Bonus de la balance du manager"
"PayPal Buyer Warranty Bonus","Bonus Garantie Acheteur PayPal"
-"PayPal Debit Card Cash Advance","Avance de fonds carte de débit PayPal"
-"PayPal Debit Card Withdrawal from ATM","Retrait depuis distributeur automatique à partir d'une carte de débit Paypal"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Paiement express Paypal (Edition Payflow) Shortcut Wrapper"
-"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper"
-"PayPal Express Checkout Token does not exist.","Le mot de vérification du paiement express via Paypal n'existe pas."
-"PayPal Express Order Review Form","Formulaire de vérification du paiement express via Paypal."
-"PayPal Express Order Review Form","PayPal Express Order Review Form"
-"PayPal Fee Information","Informations des frais Paypal"
-"PayPal Merchant Pages Style","Style de pages marchants PayPal"
-"PayPal Payments Advanced","Paiements PayPal Avancés"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","Options PayPal Pro"
-"PayPal Product Logo","Logo produit PayPal"
"PayPal Protection Bonus","Bonus de protection Paypal"
-"PayPal Reference ID","Identifiant de référence Paypal"
-"PayPal Reference ID Type","Type d'identifiant de référence Paypal"
-"PayPal Settlement Reports","Rapports sur le règlement PayPal"
-"PayPal certificate does not exist.","Le certificat Paypal n'existe pas."
-"PayPal certificate file is empty.","Le fichier de certificat Paypal est vide."
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal ne traite pas les commandes d'un montant égal à zéro. Pour finaliser votre achat, procédez au paiement standard."
-"PayPal gateway has rejected request. %s","Le passerelle de Paypal a rejeté la requête. %s"
-"PayPal processes all of your orders, and you get paid.","Paypal gère toutes vos commandes, et vous recevez l'argent."
-"PayPal response hasn't required fields.","La réponse PayPal n'a pas les champs obligatoires."
-"PayPal retains reports for 45 days.","Paypal conserve les rapports pendant 45 jours."
-"PayPal/Centinel Electronic Commerce Indicator","Indicateur de commerce électronique de Paypal."
-"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Result"
-"Payer Address ID","Identifiant de l'adresse de l'acheteur"
-"Payer Address Status","Statut d'adresse du payeur"
-"Payer Email","E-mail du payeur"
-"Payer ID","ID du payeur"
-"Payer Status","Statut du payeur"
-"Payer is not identified.","Le payeur n'est pas identifié."
-"Payflow Link (for USA and Canada)","Lien Payflow (pour les USA et le Canada)"
-"Payflow Link Settings","Paramètres lien Payflow"
-"Payflow Pro Gateway","Passerelle Payflow Pro"
-"Payflow Pro Settings","Options de Payflow Pro"
-"Payment Action","Action de paiement"
-"Payment Applicable From","Paiement disponible depuis"
-"Payment Refund initiated by merchant","Remboursement de paiement initié par le marchand"
-"Payment has been declined. Please try again.","Le paiement a été refusé. Veuillez réessayer."
-"Payment is being reviewed by PayPal for risk.","Le paiement est vérifié par Paypal car présente des risques de sécurité."
-"Payment transactions disallow storing objects.","Les transactions de paiement ne permettent pas le stockage d'objets."
-"Payment was made to an email address that is not yet registered or confirmed.","Le paiement a été effectué à une adresse e-mail pas encore inscrite ou confirmée."
-"Payments by PayPal (150 X 40)","Paiements par PayPal (150 X 40)"
-"Payments by PayPal (150 X 60)","Paiements par PayPal (150 X 60)"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","Paiements par cartes + protection vendeur - <strong style=""color:red"">Contacter PayPal avant l'activation</strong>"
-"Paypal Billing Agreement Settings","Réglages de l'accord de facturation PayPal"
-"Pending PayPal","PayPal en attente"
-"Phone","Téléphone"
-"Place Order","Placer une commande"
-"Place Order Using Billing Agreements","Passer une commande en recourant aux accords de facturation"
-"Please agree to all the terms and conditions before placing the order.","Veuillez accepter toutes les conditions générales avant de passer la commande."
-"Please contact PayPal Customer Service.","Veuillez contacter le service clients de Paypal."
-"Please do not refresh the page until you complete payment.","Merci de ne pas actualiser cette page avant la finalisation du paiement."
-"Please select a shipping method...","Veuillez sélectionner un mode d'expédition..."
-"Please select region, state or province","Veuillez sélectionnez la région, l'état ou le pays"
-"Please update order data to get shipping methods and rates","Veuillez mettre à jour les données de la commande afin d'obtenir les modes et tarifs d'envoi"
+"Bonus for first ACH Use","Bonus pour première utilisation de l'ACH"
+"General Redemption","Remboursement général"
+"Gift Certificate Redemption","Obtenir annulation du certificat de cadeau"
"Points Incentive Redemption","Remboursement de prime de points"
-"Postage Payment to either USPS or UPS","Envoi d'un paiement à USPS ou UPS"
-"Preapproved Payment (BillUser API), either sent or received","Paiement préapprouvés (API facture utilisateur), envoyé ou reçu"
-"Preapproved Payment ID","Identifiant du paiement pré-approuvé"
-"Price","Prix"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","Accepter les cartes de crédit directement depuis votre site avec la solution tout-en-un de Paypal."
-"Product","Nom produit"
-"Proxy Host","Hébergeur du proxy"
-"Proxy Port","Port proxy"
-"Quantity","Qté"
-"Reauthorization","Réautorisation"
-"Reference Information","Informations de référence"
-"Refund issued by merchant.","Remboursement effectué par le vendeur."
-"Reimbursement for a chargeback.","Remboursement pour un rejet de débit."
-"Reimbursement of Chargeback","Remboursement."
-"Report Date","Date du rapport"
-"Reports","Rapports"
-"Requested %s and configured %s merchant emails do not match.","Les adresses email demandées %s et configurées %s ne correspondent pas."
-"Require CVV Entry","Données CVV requises"
-"Require Customer's Billing Address","Adresse de facturation du client requise"
-"Reversal","Reprise"
-"Reversal of General Account Hold","Annulation de l'attente du compte"
+"Coupon Redemption","Annulations de coupons"
+"Reward Voucher Redemption","Remboursement bon de récompense"
+"General. Product no longer supported","Général. Produit plus supporté."
+"General: reversal of a type not belonging to the other T11xx categories","Général : annulation d'un type ne correspondant pas aux autres catégories T11xx"
+"ACH Withdrawal","Virement ACH"
+"Debit Card Transaction","Transaction via carte de débit."
"Reversal of Points Usage","Reprise de l'utilisation des points"
-"Reversal of an adjustment.","Annulation d'un ajustement."
+"ACH Deposit (Reversal)","Dépôt ACH (annulation)"
+"Reversal of General Account Hold","Annulation de l'attente du compte"
+"Account-to-Account Payment, initiated by PayPal","Paiement compte-à -compte, initié par PayPal"
+"Payment Refund initiated by merchant","Remboursement de paiement initié par le marchand"
+"Fee Reversal","Annulation des frais"
+"Hold for Dispute Investigation","Retenir pour enquête du litige"
"Reversal of hold for Dispute Investigation","Reprise de l'immobilisation pour enquête sur la contestation"
-"Review Order","Vérification de la commande"
-"Reward Voucher Redemption","Remboursement bon de récompense"
-"SFTP Credentials","Titres de compétences SFTP"
-"Sale","Vente"
-"Sales","Ventes"
-"Same as shipping","Identique à l'adresse de livraison"
-"Sandbox Credentials","Pièces d'identité du bac à sable"
-"Sandbox Mode","Mode Sandbox"
-"Schedule","Programme"
-"Schedule description is too long.","La description du calendrier est trop longue."
-"Scheduled Fetching","Récupération prévue."
-"Select a PayPal Solution","Sélectionnez une solution PayPal"
-"Server Error. Please try again.","Erreur du serveur. Merci de bien vouloir réessayer."
+"General: adjustment of a type not belonging to the other T12xx categories","Général : ajustement à un type ne correspondant pas aux autres catégories T12xx"
+Reversal,Reprise
+Charge-off,Radiés
+Incentive,Motivation
+"Reimbursement of Chargeback",Remboursement.
+"General (Authorization)","Général (autorisation)"
+Reauthorization,Réautorisation
+Void,Annuler
+"General (Dividend)","Générale (dividendes)"
+"General: temporary hold of a type not belonging to the other T15xx categories","Général : blocage temporaire d'un type ne correspondant pas aux catégories T15xx"
+"Open Authorization","Autorisation ouverte"
+"ACH Deposit (Hold for Dispute or Other Investigation)","Dépôt ACH (bloquer pour litige ou autre enquête)"
+"Available Balance","Solde disponible"
+Funding,Fonds
+"General: Withdrawal to Non-Bank Entity","Général : virement vers une entité non-bancaire"
+"WorldLink Withdrawal","Virement WorldLink"
+"Buyer Credit Payment","Paiement acheteur"
+"General Adjustment without businessrelated event","Ajustement général avec les évènements liés au commerce"
+"General (Funds Transfer from PayPal Account to Another)","Général (transfert de fonds d'un compte Paypal à un autre)"
"Settlement Consolidation","Consolidation de l'accord."
-"Settlement Report Settings","Accord de règlement des rapports"
-"Settlement of a chargeback.","Accord de remboursement."
-"Severe 3D Secure Card Validation","Validation de carte 3D Secure rigoureuse"
-"Severe Validation Removes Chargeback Liability on Merchant","Validation sévère supprime le risque de remboursement pour le vendeur"
-"Severe validation removes chargeback liability on merchant.","La validation rigoureuse supprime la responsabilité du vendeur sur les remboursements."
-"Shipping","Envoi"
-"Shipping Address","Adresse d'expédition"
-"Shipping Method","Méthode d'expédition"
-"Shop now using (150 X 40)","Faites vos achats en utilisant (150 X 40)"
-"Shop now using (150 X 60)","Boutique utilisant maintenant (150 X 60)"
-"Shortcut","Raccourci"
-"Shortcut Buttons Flavor","Apparence des boutons de raccourci"
-"Shortcut on Product View","Raccourci vers la vue du produit"
-"Shortcut on Shopping Cart","Raccourci vers le panier d'achat"
-"Sign a billing agreement to streamline further purchases with PayPal.","Signez un accord de facture pour continuer vos achats via Paypal."
-"Solo","solo"
-"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande."
-"Sort Order","Trier la commande"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Indique ce qu'est la période de garantie sur le compte pour entreprises de Paypal. Elle doit correspondre aux paramètres de Paypal."
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Indique ce qu'est la période valide de commande sur le compte pour entreprises de Paypal. Elle doit correspondre aux paramètres de Paypal."
-"State/Province","Etat / région"
-"Static","Statique"
-"Street Address","Adresse de la rue"
-"Street Address %s","Adresse municipale %s"
-"Submitting order information...","Traitement de la commande..."
-"Subscriber name is too long.","Le nom de l'inscrit est trop long"
-"Subscription ID","Identifiant de l'inscrit"
-"Subscription Payment, either payment sent or payment received","Paiement de l'abonnement, paiement envoyé ou paiement reçu"
-"Subtotal","Sous-total"
-"Summary Text for Aggregated Cart","Texte résumant pour les paniers agrégés"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","La prise en charge des cartes American Express nécessite un accord supplémentaire. En savoir plus : <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"Switch/Maestro","Switch/Maestro"
-"Test Mode","Mode test."
-"The background color for the checkout page around the header and payment form.","Couleur de fond pour la page de paiement autour du haut de page et du formulaire de paiement."
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","La couleur de fond de l'entête de la page de paiement. Code HTML hexadécimal en ASCII de six caractères, non sensible à la case."
-"The billing agreement ""%s"" has been canceled.","L'accord de facturation ""%s"" a été annulé."
-"The billing agreement ""%s"" has been created.","L'accord de facturation ""%s"" a été créé."
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","Le nombre d'autorisations pour enfant sur votre compte Paypal est d'un enfant. Pour en autoriser davantage, veuillez contacter Paypal."
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","L'image en haut à gauche de la page de paiement. Taille maximum : 750 x 90 pixels. <strong style=""color:red"">https</strong> est fortement conseillé."
-"The maximum number of child authorizations is reached.","Le nombre maximum d'autorisations pour enfant est atteint."
-"The merchant account is not yet verified.","Le compte du vendeur n'est pas vérifié."
-"The payment curency does not match any of the merchant's balances currency.","La monnaie du paiement ne correspond pas aux monnaies acceptées par le vendeur."
-"The payment eCheck is not yet cleared.","Le paiement eCheck n'est pas encore validé."
-"The payment is authorized but not settled.","Le paiement est autorisé mais pas encore réglé."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","Le paiement est en attente car il a été fait vers une adresse qui n'est pas encore enregistrée ou confirmée."
-"The payment is pending while it is being reviewed by PayPal for risk.","Le paiement est en attente alors qu'il est actuellement examiné par PayPal pour le risque."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","Le paiement a été effectué via carte de crédit. Afin de recevoir les fonds, le vendeur doit obtenir un compte Business ou Premier."
+"General: event not yet categorized","Général : évènement n'appartenant à aucune catégorie"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days","Tous les 3 jours"
+"Every 7 days","Tous les 7 jours"
+"Every 10 days","Tous les 10 jours"
+"Every 14 days","Tous les 14 jours"
+"Every 30 days","Tous les 30 jours"
+"Every 40 days","Tous les 40 jours"
+"No Logo","Pas de logo"
+"Pending PayPal","PayPal en attente"
+"Billing Agreement","Accord de facturation"
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- Veuillez sélectionner un accord de facturation--"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements","Retour aux accords de facturation"
"There are no billing agreements yet.","Il n'y a pas encore d'accord de facturation"
-"There was an error processing your order. Please contact us or try again later.","Il y a eu une erreur dans le traitement de votre commande. Veuillez nous contacter ou réessayez plus tard."
-"This feature needs be enabled first for the merchant account through PayPal technical support.","Cette fonctionnalité doit d'abord être activée pour le compte commercial via le support technique PayPal."
-"This operation requires an existing transaction object.","Cette opération nécessite un objet de transaction existant."
-"Time of Day","Heure"
-"Title","Titre"
-"Transaction ID","ID de la transaction"
-"Transaction ID must not be empty.","L'identification de transaction ne peut pas rester vide."
-"Transaction Information","Information de la transaction"
-"Transfer Cart Line Items","Transférer les articles du panier"
-"Transfer Shipping Options","Options d'expédition du transfert"
-"Triggered Fraud Filters","A déclenché les détecteurs de fraude"
-"Unable to cancel Express Checkout.","N'a pas pu annuler le paiement express."
-"Unable to change status. Current status is not correspond to real status.","Impossible de modifier le statut. Le statut actuel ne correspond pas au statut réel."
-"Unable to communicate with the PayPal gateway.","Impossible de communiquer avec la passerelle de Paypal."
-"Unable to initialize Express Checkout review.","N'a pas pu initialiser la revue du paiement express."
-"Unable to initialize Express Checkout.","Impossible de lancer le Checkout Express."
-"Unable to place the order.","Impossible d'effectuer la commande."
-"Unable to process Express Checkout approval.","N'a pas pu obtenir l'accord pour le paiement express."
-"Unable to start Express Checkout.","N'a pas pu lancer le paiement express."
-"Unable to update Order data.","Impossible de mettre à jour les données de la commande."
-"Unable to update shipping method.","Impossible de mettre à jour la méthode d'expédition."
-"Unknown Error. Please try again later.","Erreur inconnue. Veuillez réessayer ultérieurement."
-"Unknown reason. Please contact PayPal customer service.","Raison inconnue. Veuillez contacter le service client de PayPal."
-"Update Order Data","Mettre à jour les données de la commande"
-"Use Proxy","Utiliser un proxy"
-"Use colon to specify port. For example: ""test.example.com:5224"".","Utilisez deux points pour spécifier le port. Exemple : ""test.exemple.com : 5224""."
-"User","Utilisateur"
-"User-initiated Currency Conversion","Conversion de devise initiée par l'utilisateur"
-"Uses store frontend name by default.","Utilise le nom d'interface de la boutique par défaut."
-"VAT Number","Numéro TVA"
-"Vendor","Vendeur"
-"Vendor / Merchant Login","Identifiant marchand"
-"View","Vue"
-"View Demo","Voir démo"
-"View PayPal solutions.","Voir les solutions Paypal"
-"View Transaction","Voir la transaction"
-"View Transaction Details","Voir les détails de la transction"
-"Virtual PayPal Debit Card Transaction","Transaction via carte de débit virtuelle Paypal"
-"Virtual Terminal Payment","Terminal de paiement virtuel"
-"Void","Annuler"
-"Waiting until Customer's eCheck will be cleared.","En attente de la vérification de l'eCheck du client."
-"We prefer PayPal (150 X 40)","Nous préférons Paypal (150 X 40)"
-"We prefer PayPal (150 X 60)","Nous préférons PayPal (150 X 60)"
-"Website Payments Plus","Paiements site Internet Plus"
-"Website Payments Plus Settings","Paiements site Internet Plus Paramètres"
-"Website Payments Pro","Paiements professionnels pour sites"
-"Website Payments Pro (Payflow Edition) Settings","Options de paiements professionnels pour sites"
-"Website Payments Pro Hosted Solution","Paiements site Internet Pro Solution hébergée"
-"Website Payments Pro Hosted Solution Settings","Paiements site Internet Pro Solution hébergée Paramètres"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","Edition de paiement professionnels pour sites"
-"Website Payments Pro Settings","Options de paiement professionnels pour sites"
-"Website Payments Standard","Paiements sites web standards"
-"Website Payments Standard Payment","Paiement site paiement standard"
-"Website Payments Standard Settings","Options des paiements sites web standards"
-"What is PayPal?","Qu'est-ce que Paypal?"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Ou de créer un accord de facturation, si aucun n'est disponible."
-"Will appear as a payment option only for customers who have at least one active billing agreement.","Apparaîtra comme une option de paiement uniquement aux utilisateurs disposant d'au moins un accord de facturation actif."
-"WorldLink Withdrawal","Virement WorldLink"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Voulez-vous signer un accord de facturation afin de pouvoir continuer les paiements via Paypal ?"
-"Wrong Order ID (%s) specified.","Mauvais identifiant de la commande (%s)."
-"Wrong PayPal Express Checkout Token specified.","Mauvais code de vérification du paiement express via Paypal."
-"Wrong billing agreement ID specified.","Mauvais identifiant des accords de facturation spécifié."
-"Yes","Oui"
-"Yes. Matched Address and five-didgit ZIP","Oui. Adresse correspondante et ZIP Ã 5 chiffres"
-"You cannot void a verification transaction","Une transaction de vérification ne peut être refusée"
-"You will be redirected to the PayPal website in a few seconds.","Vous serez redirigé vers le site web de Paypal dans quelques secondes."
-"You will be redirected to the PayPal website when you place an order.","Vous serez redirigé vers le site de PayPal quand vous effectuerez une commande."
-"You will be redirected to the PayPal website.","Vous serez redirigé vers le site de Paypal."
+"New Billing Agreement","Nouvel Accord de Facturation"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order","Vérification de la commande"
+"Please select a shipping method...","Veuillez sélectionner un mode d'expédition..."
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","Objets dans votre panier"
+"Edit Shopping Cart","Modifier le panier"
+"Please update order data to get shipping methods and rates","Veuillez mettre à jour les données de la commande afin d'obtenir les modes et tarifs d'envoi"
+"Checkout with PayPal","Commander avec PayPal"
+"Please do not refresh the page until you complete payment.","Merci de ne pas actualiser cette page avant la finalisation du paiement."
"You will be required to enter your payment details after you place an order.","Vous devrez saisir vos informations de paiement après avoir passé une commande."
-"Zip/Postal Code","Code postal"
-"chargeback reimbursed","Remboursement effectué."
-"chargeback settled","Remboursement effectué."
-"customer complaint","Plainte d'un utilisateur."
-"customer triggered a chargeback","le client a déclenché un rejet de débit"
-"customer triggered money-back guarantee","L'utilisateur a déclenché la garantie de remboursement."
-"eBay Auction Payment","Paiement d'enchères eBay"
-"merchant refunded payment","Le vendeur a remboursé le paiement."
-"no reason","pas de raison"
-"reversal of an adjustment","Annulation d'un ajustement."
-"unknown reason","raison inconnue"
+"Additional Options","Options additionnelles"
+"Acceptance Mark","Marque d'acceptance"
+"What is PayPal?","Qu'est-ce que Paypal?"
+"Sign a billing agreement to streamline further purchases with PayPal.","Signez un accord de facture pour continuer vos achats via Paypal."
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
+"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/i18n/nl_NL.csv b/app/code/Magento/Paypal/i18n/nl_NL.csv
index ce55d5c76b9..415dc929332 100644
--- a/app/code/Magento/Paypal/i18n/nl_NL.csv
+++ b/app/code/Magento/Paypal/i18n/nl_NL.csv
@@ -1,504 +1,692 @@
-"-- Please Select Billing Agreement--","-- Selecteer a.u.b. rekeningovereenkomst --"
-"-OR-","-OF-"
-"2-pixel perimeter around the header space.","2-pixel omtrek om de top ruimte."
-"3D Secure","3D Secure"
+Custom,Zelfgekozen
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,Prijs
+ID,ID
+Configure,Configure
+No,Nee
+Qty,Qty
+Subtotal,Subtotaal
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,Ja
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Bestelling
+View,Bekijk
+Active,Active
+Position,Position
+Dynamic,Dynamisch
+N/A,Nvt
+Canceled,Canceled
+"General Information","General Information"
+Static,Statisch
+"Advanced Settings","Advanced Settings"
+"Learn More","Meer Informatie"
+"Start Date","Start Date"
+"Product Name","Product Name"
"3D Secure Card Validation","3D Secure Card Validation"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","3D Secure validatie is vereist voor Maestro kaarten. Ondersteuning van American Express kaarten vereisen extra overeenkomst. Kijk ook op <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Accepteer betalingen via PayPal!</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Een waarde is gevraagd voor live modus. Verwijs naar uw CardinalCommerce overeenkomst."
-"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Storting (Wordt gehouden ingeval van dispuut of een ander onderzoek)"
-"ACH Deposit (Reversal)","ACH Storting (Herroeping)"
-"ACH Funding for Funds Recovery from Account Balance","ACH Financiering voor fondsen herstel op het account balans"
-"ACH Withdrawal","ACH Opname"
-"API Authentication Methods","API Verificatie Methoden"
-"API Certificate","API Certificaat"
-"API Password","API Wachtwoord"
-"API Signature","API Handtekening"
-"API Username","API Gebruikersnaam"
-"API Uses Proxy","API Gebruikt Proxy"
-"API/Integration","API/Integratie"
-"API/Integration Settings","API/Integratie Instellingen"
-"Ability for buyer to purchase without PayPal account.","Mogelijkheid voor de koper om te kopen zonder PayPal account."
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","Accepteer PayPal betalingen in uw winkelwagen. PayPal zal uw creditkaart betalingen behandelen door de Payflow Pro Poort."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","Accepteer betalingen met een PCI-compatibele kassa zodat de klanten op uw site blijven. Inclusief een merchant account van PayPal."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","Accepteer betalingen met een PCI-compatibele kassa zodat de klanen op uw site blijven. Voor gebruik met uw eigen merchant account."
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","Accepteer betalingen zonder dat uw klanten uw website verlaten. Veel populaire web-hosting diesnten en winkelwagens komen met het Payflow betaling systeem ingebouwd, zodat het makkelijk te gebruiken is."
-"Acceptance Mark","Acceptatie Stempel"
-"Acceptance Mark Image","Acceptatie Stempel Afbeelding"
-"Account-to-Account Payment, initiated by PayPal","Account-naar-Account Betaling, gestart door PayPal"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","Voeg een Express Checkout knop toe aan uw bestaande winkelwagen voor snelle en gemakkelijke creditcardbetalingen. PayPal zorgt voor de verwerking van alle betalingen. "
-"Additional Options","Meer Opties"
-"Address","Adres"
-"Address Verification System Response","Adres Verificatie Systeem Antwoord"
-"All the address information matched","Al de adres komt overeen"
-"Allow in Billing Agreement Wizard","Sta dit toe in de Facturatie-overeenkomst Wizard"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Toegestane waarden: ""paypal"", ""primary"" (systeemgekozen waarde), uw_gebruikelijke_waarde ( een gebruikelijke betalingspaginastijl van uw verkoop account profiel)."
-"Allowed Credit Card Types","Toegestane Kredietkaarten Types"
-"Also affects mini-shopping cart.","Heeft ook een effect op de mini-winkelwagen."
-"Ask Customer","Vraag een Klant"
-"Attempted Authentication, Bad Result","Poging tot Autorisatie, Slecht Resultaat"
-"Attempted Authentication, Good Result","Poging tot Autorisatie, Goed Resultaat"
-"Auction Payment other than through eBay","Veiling Betaling anders dan via eBay"
-"Authenticated, Bad Result","Geverifieerd, Slecht Resultaat"
-"Authenticated, Good Result","Geverifieerd, Goed Resultaat"
-"Authorization","Autorisatie"
-"Authorization Honor Interval (days)","Autorisatie Eer Periode (dagen)"
-"Authorization expired.","Autorisatie verlopen."
-"Authorization transaction is required to void.","Autorisatie transactie moet vernietigd worden."
-"Authorization was voided by merchant.","Autorisatie was vernietigd door de handelaar."
-"Authorized amount of %s.","Geautoriseerde hoeveelheid van %s"
-"Authorizing amount of %s is pending approval on gateway.","Geautoriseerde hoeveelheid van %s wacht op goedkeuring van de poort."
-"Auto","Auto"
-"AutoSweep","AutomatischOpschonen"
-"Available Balance","Beschikbaar Balans"
-"Back to Billing Agreements","Terug naar Factureringsovereenkomsten"
-"Balance Manager Account Bonus","Balans Beheerder Account Bonus"
-"Billing Address","Facturatieadres"
-"Billing Agreement","Factuurovereenkomst"
-"Billing Agreement # %s","Factureringsovereenkomst # %s"
-"Billing Agreement #%s","Factureringsovereenkomst #%s"
-"Billing Agreement Signup ","Betalingsovereenkomst aanmelding"
-"Billing Agreement View","Factureringsovereenkomst Beeld"
+"Merchant Liability","Winkelier Aansprakelijkheid"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method",Verzendingsmethode
+"Please agree to all the terms and conditions before placing the order.","Ga alstublieft akkoord met alle voorwaarden voor het plaatsen van de bestelling."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address",Verzendingsadres
+"Payment Method","Payment Method"
+"Place Order","Bestelling plaatsen"
+"Sorry, no quotes are available for this order at this time.","Sorry, geen prijsopgaven zijn beschikbaar voor deze bestelling op dit moment."
+Sales,Verkoop
+Created,Created
+Display,Display
+User,User
+Daily,Dagelijks
+Date,Date
+"Order Total","Order Total"
+Never,Nooit
+Updated,Updated
+Reports,Verslagen
+"Order Status","Order Status"
+"View Order","View Order"
+Event,Gebeurtenis
+"Please Select","Please Select"
+"Submitting order information...","Bestellingsinformatie aan het overbrengen..."
+Authorization,Autorisatie
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
"Billing Agreements","Facturering Overeenkomsten"
-"Billing Agreement status is not set.","Betaalovereenkomst status is niet opgesteld."
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
+"Billing Agreement View","Factureringsovereenkomst Beeld"
+"View Transaction Details","Bekijk Transactie Details"
+"Reference Information",Verwijsinformatie
+"Transaction Information","Transactie Informatie"
+"PayPal Fee Information","PayPal kosten informatie"
+"PayPal Settlement Reports","PayPal Overeenstemming Rapporten"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Updates halen"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Help
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo","Bekijk Demo"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","U zult doorverwezen worden naar de PayPal website."
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.","U wordt door verwezen naar de PayPal website wanneer u een bestelling plaatst."
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.","U zult binnen enkele seconden naar de PayPal website worden geleid."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction","Transactie bekijken"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.","Express Checkout en bestelling zijn geannuleerd."
+"Express Checkout has been canceled.","Express Checkout is geannuleerd."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","PayPal Express Afrekenen Teken bestaan niet."
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.","Antwoord van PayPal bevat de vereiste velden niet."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
"Unable to save Billing Agreement:","Niet mogelijk om Betalingsovereenkomst op te slaan:"
-"Your billing agreement # is: %s.","Uw factureringsovereenkomst # is: %s."
-"Bonus for first ACH Use","Bonus voor eerste ACH gebruik"
-"Buyer Credit Payment","Koper krediet betaling"
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","Paypal heeft onze voorkeur (150 X 60)"
+"We prefer PayPal (150 X 40)","PayPal heeft onze voorkeur (150 X 40)"
+"Now accepting PayPal (150 X 60)","Accepteert nu PayPal (150 X 60)"
+"Now accepting PayPal (150 X 40)","Accepteert nu PayPal (150 X 40)"
+"Payments by PayPal (150 X 60)","Betalingen door PayPal (150 X 60)"
+"Payments by PayPal (150 X 40)","Betalingen door PayPal (150 X 40)"
+"Shop now using (150 X 60)","Winkel nu met (150 X 60)"
+"Shop now using (150 X 40)","Winkel nu met (150 X 40)"
+Shortcut,Snelkoppeling
+"Acceptance Mark Image","Acceptatie Stempel Afbeelding"
+Sale,Verkoop
+"For Virtual Quotes Only","Alleen Voor Virtuele Prijsopgaves"
+Auto,Auto
+"Ask Customer","Vraag een Klant"
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","API Handtekening"
+"API Certificate","API Certificaat"
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","Het maximale aantal kindmachtigingen is bereikt."
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.","Betaler is niet geïdentificeerd."
+"Last Transaction ID","Laatste Transactie ID"
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.","De betaling is gemachtigd, maar niet afgehandeld."
+"The payment eCheck is not yet cleared.","De betalings eCheck is nog niet vrijgegeven."
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","De betaling staat in de wacht, terwijl deze beoordeeld wordt op risico door PayPal."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","De betaling staat in de wacht omdat deze aangemaakt is met een emailadres dat nog niet geregistreerd of bevestigd is."
+"The merchant account is not yet verified.","De handelsaccount is nog niet geverifieerd."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","De betaling werd gemaakt via creditcard. Om de gelden te ontvangen, moet de handelaar de account upgraden naar Business of Premier status."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Omzetting van een aanpassing"
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Vergoeding voor een terugboeking"
+"Settlement of a chargeback.","Regeling van een terugboeking."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Onbekende oorzaak. Neem alstublieft contact op met de klantendienst van PayPal."
+"Payer ID","Betaler ID"
+"Payer Email","Betaler Email"
+"Payer Status","Betaler Status"
+"Payer Address ID","Betaler Adres ID"
+"Payer Address Status","Betaler Adres Status"
+"Merchant Protection Eligibility","In aanmerking komen voor handelaar bescherming"
+"Triggered Fraud Filters","Fraudeur Filters Getriggerd"
+"Last Correlation ID","Laatste Correlatie ID"
+"Address Verification System Response","Adres Verificatie Systeem Antwoord"
+"CVV2 Check Result by PayPal","CVV2 Controle Resultaat van PayPal"
"Buyer's Tax ID","Kopers Belastings ID"
"Buyer's Tax ID Type","Koper 's Belastings ID Type"
-"By default it is ""reports.paypal.com"".","Ingesteld op ""reports.paypal.com""."
-"CNPJ","CNPJ"
-"CPF","CPF"
-"CVV2 Check Result by PayPal","CVV2 Controle Resultaat van PayPal"
-"Can not send new order email.","Kan geen nieuwe ordermail verzenden."
-"Cannot create target file for reading reports.","Kan geen doelbestand aanmaken voor het lezen van rapporten."
-"Centinel API URL","Centinel API URL"
-"Centinel Custom API URL","Centinel Custom API URL"
-"Charge-off","Afschrijving"
-"Chargeback","Terugboeking"
-"Chargeback by customer.","Terugboeking door een klant."
-"Checkout with PayPal","Checkout met PayPal"
-"City","Stad"
-"Click here if you are not redirected within 10 seconds...","Klik hier als je niet wordt doorverwezen binnen 10 seconden ..."
-"Company","Bedrijf"
-"Completion Date","Voltooiingsdatum"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Maakt contact met de PayPal SFTP server om nieuwe rapporten op te halen. Weet u zeker dat u door wilt gaan?"
-"Countries Payment Applicable From","Landen Waaruit Betaling van Toepassing"
-"Country","Land"
-"Coupon Redemption","Waardebon Inleveren"
-"Created billing agreement #%s.","Factuurovereenkomst #%s aangemaakt."
-"Credit","Krediet"
-"Credit Card Settings","Creditkaart Instellingen"
-"Currency Conversion required to cover negative balance","Valuta Conversie nodig om het negatieve balans te dekken"
-"Custom","Zelfgekozen"
-"Custom Endpoint Hostname or IP-Address","Aangepast Eindpunt Hostnaam of IP-Adres"
-"Custom Path","Aangepast Pad"
-"Customer Information","Klantinformatie"
-"Customer complaint.","Klacht van klant"
-"Customer did not include a confirmed address.","Klant heeft geen bevestigd adres toegevoegd."
-"Customer failed to pay.","Klant heeft niet betaald."
-"Customer triggered a money-back guarantee.","Klant heeft gebruik gemaakt van een geld-terug-garantie"
-"Customer used non-confirmed address.","Klant gebruikte niet-bevestigd adres."
-"Daily","Dagelijks"
-"Debit","Debet"
-"Debit Card Cash Back","Debetkaart Geld Terug"
-"Debit Card Transaction","Debetkaart Transactie"
-"Debit or Credit","Debet of Credit"
-"Debug Mode","Debug Modus"
-"Direct Payment API","Directe Betaling API"
-"Discount","Korting"
-"Display Express Checkout in the Payment Information step","Weergave Snel uitchecken in de Betalingsinformatie stap"
-"Displays on catalog pages and homepage.","Wordt weergegeven op cataloguspagina's en startpagina."
-"Don't have a PayPal account? Simply enter your email address.","Heeft u nog geen PayPal account? Vul simpelweg uw email adres in."
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","Heeft u nog geen PayPal handelaarsaccount? U kunt nog steeds creditcard betalingen accepteren door de Payflow Pro Gateway."
-"Dynamic","Dynamisch"
-"EFT Funding (German banking)","EFT fondsen (Duits bankieren)"
-"Edit Shopping Cart","Bewerken winkelmandje"
-"Email Address","e-mailadres"
-"Email Associated with PayPal Merchant Account","Email adres gerelateerd aan PayPal Winkelier Rekening"
-"Enable Automatic Fetching","Inschakelen van automatisch ophalen"
-"Enable PayPal Guest Checkout","Inschakelen van PayPal gast afrekening"
-"Enabled","Aan"
-"Event","Gebeurtenis"
-"Event Code","Gebeurtenis code"
-"Every 10 days","Iedere 10 dagen"
-"Every 14 days","Iedere 14 dagen"
-"Every 3 days","Iedere 3 dagen"
-"Every 30 days","Iedere 30 dagen"
-"Every 40 days","Iedere 40 dagen"
-"Every 7 days","Iedere 7 dagen"
+"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Betaler Machtigingsservice Resultaat"
+"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Elektronische Handelsindicator"
+Chargeback,Terugboeking
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Alleen Adres komt overeen (geen ZIP)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","Geen Details kwamen overeen"
+"No Details matched. International","Geen Details kwamen overeen. Internationaal"
+"Exact Match. Address and nine-digit ZIP code","Exacte overeenkomst. Adres en negencijferige ZIP code"
"Exact Match. Address and Postal Code. International","Exacte overeenkomst. Adres en postcode. Internationaal"
"Exact Match. Address and Postal Code. UK-specific","Exacte overeenkomst. Adres en postcode. Specifiek voor Verenigd Koninkrijk"
-"Exact Match. Address and nine-digit ZIP code","Exacte overeenkomst. Adres en negencijferige ZIP code"
-"Explanation: %s.","Uitleg: %s."
-"Express Checkout","Versneld afrekenen"
-"Express Checkout (Payflow Edition) Settings","Versneld afrekenen (Payflow Edition) instellingen"
-"Express Checkout APIs","Versneld afrekenen APIs"
-"Express Checkout Settings","Versneld afrekenen instellingen"
-"Express Checkout and Order have been canceled.","Express Checkout en bestelling zijn geannuleerd."
-"Express Checkout has been canceled.","Express Checkout is geannuleerd."
-"Failed to cancel the billing agreement.","Is er niet in geslaagd de facturering overeenkomst te ontbinden."
-"Failed to create billing agreement for this order.","Niet in staat om een factuurovereenkomst voor deze bestelling te maken."
-"Failed to fetch reports from '%s@%s'.","Kon verslagen niet ophalen van '%s@%s'."
-"Failed to finish billing agreement wizard.","Niet in staat om de factuur-wizard overeenkomst af te maken"
-"Failed to start billing agreement wizard.","Niet in staat om de factuur-wizard overeenkomst te starten"
-"Fax","Fax"
-"Fee Amount","Kosten bedrag"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","n.v.t. Niet toegestaan voor MOTO (Internet/Telefoon) overboekingen"
+"N/A. Global Unavailable","n.v.t. Globaal Onbeschikbaar"
+"N/A. International Unavailable","n.v.t. Internationaal Onbeschikbaar"
+"Matched five-digit ZIP only (no Address)","Alleen 5-getal ZIP code komt overeen (geen Adres)"
+"Matched Postal Code only (no Address)","Alleen Post Code komt overeen (geen Adres)"
+"N/A. Retry","n.v.t. Probeer opnieuw"
+"N/A. Service not Supported","n.v.t. Service niet ondersteund"
+"N/A. Unavailable","n.v.t. Niet beschikbaar"
+"Matched whole nine-didgit ZIP (no Address)","Gehele 9-cijferige ZIP code komt overeen (geen Adres)"
+"Yes. Matched Address and five-didgit ZIP","Ja. Het adres en de 5-cijferige ZIP code komen overeen"
+"All the address information matched","Al de adres komt overeen"
+"None of the address information matched","Geen van de adres informatie kwam overeen"
+"Part of the address information matched","Deel van de adresinformatie komt overeen"
+"N/A. The merchant did not provide AVS information","n.v.t. De handelaar heeft geen AVS informatie overhandigd"
+"N/A. Address not checked, or acquirer had no response. Service not available","n.v.t. Adres niet gecontroleerd of verkrijger had geen reactie. Service niet beschikbaar"
+"Matched (CVV2CSC)","Komt over een (CVV2CSC)"
+"No match","Geen overeenkomst"
+"N/A. Not processed","n.v.t. Niet verwerkt"
+"N/A. Service not supported","N/A. Dienst niet ondersteund."
+"N/A. Service not available","n.v.t. Service niet beschikbaar"
+"N/A. No response","n.v.t. Geen reactie"
+"Matched (CVV2)","Komt over een (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","n.v.t. De handelaar heeft geen CVV2 code verwerking ingevoerd"
+"N/A. Merchant has indicated that CVV2 is not present on card","n.v.t. Handelaar heeft aangegeven dat CVV2 niet aanwezig is op de kaart"
+"Authenticated, Good Result","Geverifieerd, Goed Resultaat"
+"Authenticated, Bad Result","Geverifieerd, Slecht Resultaat"
+"Attempted Authentication, Good Result","Poging tot Autorisatie, Goed Resultaat"
+"Attempted Authentication, Bad Result","Poging tot Autorisatie, Slecht Resultaat"
+"No Liability Shift","Geen Aansprakelijkheid Verschuiving"
+"Issuer Liability","Uitgever Verantwoordelijkheid"
+CNPJ,CNPJ
+CPF,CPF
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.","Betalingstransacties staan het opslaan van objecten niet toe."
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.","Deze operatie vereist een bestaand transactie object."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date","Datum bericht"
+"Merchant Account","Handelaar Account"
+"Transaction ID","Transactie ID"
+"Invoice ID","Factuur ID"
+"PayPal Reference ID","PayPal referentie ID"
+"PayPal Reference ID Type","PayPal referentie ID type"
+"Event Code","Gebeurtenis code"
+"Finish Date","Finish Date"
+"Debit or Credit","Debet of Credit"
+"Gross Amount",Brutobedrag
"Fee Debit or Credit","Kosten betaalrekening of creditcard"
-"Fee Reversal","Omkeren kosten"
-"Fee: Foreign ACH Withdrawal","Kosten: buitenlandse ACH opname"
-"Fee: Mass Pay Request","Kosten: massaal betalingsverzoek"
+"Fee Amount","Kosten bedrag"
+"Order ID","ID Bestelling"
+"Subscription ID","Abonnement ID"
+"Preapproved Payment ID","Vooraf goedgekeurde Betaling ID"
+Credit,Krediet
+Debit,Debet
+"General: received payment of a type not belonging to the other T00xx categories","Algemeen: betaling ontvangen van een type dat niet behoort tot de andere T00xx categorieën"
+"Mass Pay Payment",Bulkbetaling
+"Subscription Payment, either payment sent or payment received","Abonnementsbetaling, betaling verzonden of betaling ontvangen"
+"Preapproved Payment (BillUser API), either sent or received","Vooraf goedgekeurde Betaling (RekeningGebruiker API), verzonden of ontvangen"
+"eBay Auction Payment","eBay veiling betaling"
+"Direct Payment API","Directe Betaling API"
+"Express Checkout APIs","Versneld afrekenen APIs"
+"Website Payments Standard Payment","Website Betalingen Standaard Betaling"
+"Postage Payment to either USPS or UPS","Porto betaling aan USPS dan wel UPS"
+"Gift Certificate Payment: purchase of Gift Certificate","Geschenkcertificaat Betaling: aankoop van Geschenkcertificaat"
+"Auction Payment other than through eBay","Veiling Betaling anders dan via eBay"
+"Mobile Payment (made via a mobile phone)","Mobiele Betaling (betaling via een mobiele telefoon)"
+"Virtual Terminal Payment","Virtuele Laatste Betaling"
+"General: non-payment fee of a type not belonging to the other T01xx categories","Algemeen: niet-betalingsvergoeding van een type dat niet behoort tot de andere T01xx categorieën"
"Fee: Web Site Payments Pro Account Monthly","Kosten: betalingen website pro account per maand"
+"Fee: Foreign ACH Withdrawal","Kosten: buitenlandse ACH opname"
"Fee: WorldLink Check Withdrawal","Kosten: WereldLink check opname"
-"Fetch","Haal op"
-"Fetch Updates","Updates halen"
-"Fetched %s report rows from '%s@%s'.","%s verslagrijen op gehaald van '%s@%s'."
-"For Virtual Quotes Only","Alleen Voor Virtuele Prijsopgaves"
-"Frontend Experience Settings","Frontend ervaring instellingen"
-"Funding","Financiering"
-"General (Authorization)","Algemeen (Machtiging)"
-"General (Dividend)","Algemeen (Dividend)"
-"General (Funds Transfer from PayPal Account to Another)","Algemeen (Geldmiddelen Overplaatsen van een PayPal Account naar een Andere)"
-"General (Purchase with a credit card)","Algemeen (Aankoop met een creditcard)"
-"General Adjustment without businessrelated event","Algemene Aanpassing zonder zakengerelateerde gebeurtenis"
+"Fee: Mass Pay Request","Kosten: massaal betalingsverzoek"
"General Currency Conversion","Algemene Valuta Omzetting"
+"User-initiated Currency Conversion","Gebruiker-geïnitieerde munteenheid conversie"
+"Currency Conversion required to cover negative balance","Valuta Conversie nodig om het negatieve balans te dekken"
"General Funding of PayPal Account ","Algemene Financiering van PayPal Account"
-"General Redemption","Algemene Afschrijving"
+"PayPal Balance Manager function of PayPal account","PayPal Balansbeheerder functie van PayPal account"
+"ACH Funding for Funds Recovery from Account Balance","ACH Financiering voor fondsen herstel op het account balans"
+"EFT Funding (German banking)","EFT fondsen (Duits bankieren)"
"General Withdrawal from PayPal Account","Algemene Opname van PayPal Account"
-"General. Product no longer supported","Algemeen. Product niet langer ondersteund"
+AutoSweep,AutomatischOpschonen
"General: Use of PayPal account for purchasing as well as receiving payments","Algemeen: Gebruik van PayPal account voor zowel aankopen als ontvangen van betalingen"
+"Virtual PayPal Debit Card Transaction","Virtuele Paypal Debitcard Transactie"
+"PayPal Debit Card Withdrawal from ATM","PayPal betaalkaart geld pinnen"
+"Hidden Virtual PayPal Debit Card Transaction","Verborgen Virtuele PayPal Debitcard Transactie"
+"PayPal Debit Card Cash Advance","PayPal betaalkaart kas voorschot"
"General: Withdrawal from PayPal Account","Algemeen: Opname van PayPal Account"
-"General: Withdrawal to Non-Bank Entity","Algemeen: Opname naar Niet-Bancaire Entiteit"
-"General: adjustment of a type not belonging to the other T12xx categories","Algemeen: aanpassing van een type dat niet behoort tot de andere T12xx categorieën"
+"General (Purchase with a credit card)","Algemeen (Aankoop met een creditcard)"
+"Negative Balance","Negatief Balans"
"General: bonus of a type not belonging to the other T08xx categories","Algemeen: bonus van een type dat niet behoort tot de andere T08xx categorieën"
-"General: event not yet categorized","Algemeen: gebeurtenis nog niet gecategoriseerd"
-"General: non-payment fee of a type not belonging to the other T01xx categories","Algemeen: niet-betalingsvergoeding van een type dat niet behoort tot de andere T01xx categorieën"
-"General: received payment of a type not belonging to the other T00xx categories","Algemeen: betaling ontvangen van een type dat niet behoort tot de andere T00xx categorieën"
-"General: reversal of a type not belonging to the other T11xx categories","Algemeen: omkering van een type dat niet behoort tot de andere T11xx categorieën"
-"General: temporary hold of a type not belonging to the other T15xx categories","Algemeen: tijdelijke blokkering van een type dat niet behoort tot de andere T15xx categorieën"
-"Get Credentials from PayPal","Verkrijg Waarmerkingskenmerken van PayPal"
-"Gift Certificate Payment: purchase of Gift Certificate","Geschenkcertificaat Betaling: aankoop van Geschenkcertificaat"
-"Gift Certificate Redemption","Geschenkcertificaat Inlossen"
-"Gross Amount","Brutobedrag"
-"Header Background Color","Aanhef Achtergrond Kleur"
-"Header Border Color","Kop Kantlijn Kleur"
-"Header Image URL","Kop Afbeelding URL"
-"Help","Help"
-"Hidden Virtual PayPal Debit Card Transaction","Verborgen Virtuele PayPal Debitcard Transactie"
-"Hold for Dispute Investigation","Wacht op Onderzoek naar Geschil"
-"IPN ""%s"".","IPN ""%s""."
-"IPN verification ""%s"".","IPN verificatie ""%s""."
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Indien leeg, een standaard waarde kan worden gebruikt. Een aangepaste URL kan worden geleverd volgens de CardinalCommerce overeenkomst"
-"If not specified, Default Country from General Config will be used","Indien niet opgegeven, wordt het Standaard Land vanuit de algemene instellingen gebruikt."
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Als deze optie is ingeschakeld; kan de klant het afleveradres en bezorgingsmethode aanpassen op de PayPal website. Werkt live alleen via het HTTPS protocol."
-"Impossible to issue a refund transaction because the capture transaction does not exist.","Het is niet mogelijk om een geld-terug-gave op te vragen aangezien de transactie niet bestaat."
-"Incentive","Prikkel"
-"Initiation Date","Begin Datum"
-"Integral Evolution","Integrale Evolutie"
-"Integral Evolution Settings","Integrale Evolutie Instellingen"
-"Invoice ID","Factuur ID"
-"Issuer Liability","Uitgever Verantwoordelijkheid"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Het is aanbevolen deze waarde naar ""betaalkaart of creditcard"" per winkel view in te stellen."
-"It is recommended to set this value to ""PayPal"" per store views.","Het is aanbevolen deze waarde naar ""PayPal"" per winkel view in te stellen."
-"Items in Your Shopping Cart","Artikelen in Uw Winkelwagen"
-"Last Correlation ID","Laatste Correlatie ID"
-"Last Transaction ID","Laatste Transactie ID"
-"Learn More","Meer Informatie"
-"Login","Log in"
-"Looking for PayPal? We have our own tab to the left under Sales.","Zoekt u PayPal? We hebben onze eigen blad; links onder verkopen"
-"Mass Pay Payment","Bulkbetaling"
-"Matched (CVV2)","Komt over een (CVV2)"
-"Matched (CVV2CSC)","Komt over een (CVV2CSC)"
-"Matched Address only (no ZIP)","Alleen Adres komt overeen (geen ZIP)"
-"Matched Address only (no ZIP). International","Alleen Adres komt overeen (geen ZIP). Internationaal"
-"Matched Postal Code only (no Address)","Alleen Post Code komt overeen (geen Adres)"
-"Matched five-digit ZIP only (no Address)","Alleen 5-getal ZIP code komt overeen (geen Adres)"
-"Matched whole nine-didgit ZIP (no Address)","Gehele 9-cijferige ZIP code komt overeen (geen Adres)"
-"Merchant Account","Handelaar Account"
-"Merchant Country","Handelaar Land"
-"Merchant Liability","Winkelier Aansprakelijkheid"
-"Merchant Protection Eligibility","In aanmerking komen voor handelaar bescherming"
+"Debit Card Cash Back","Debetkaart Geld Terug"
"Merchant Referral Bonus","Handelaar Doorverwijzing Bonus"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Handelaar account heeft geen opname mechanisme. Handelaar moet handmatig betalingen accepteren of weigeren via zijn Account Overzicht."
-"Merchant account is not verified.","Handelaar account niet geverifieerd."
-"Merchant denied this pending payment.","Handelaar heeft deze betaling afgewezen."
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Handelaar bezit een niet-Amerikaans account en heeft geen opname mechanisme."
-"Merchant must upgrade account to Business or Premier status.","Handelaar moet zijn account opwaarderen tot een Business of Premier status."
-"Merchant reference ID format is not supported.","Handelaar doorverwijzing ID formaat is niet ondersteund."
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Handelaar moet zich bij PayPal aanmelden voor het inschakelen van facturatieovereenkomsten. Schakel deze optie pas in wanneer PayPal bevestigd dat facturatieovereenkomsten zijn ingeschakeld voor uw handelaarsaccount."
-"Mobile Payment (made via a mobile phone)","Mobiele Betaling (betaling via een mobiele telefoon)"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Meerdere valuta probleem. Handelaar moet handmatig deze betaling accepteren of weigeren via het PayPal Account Overzicht."
-"N/A","Nvt"
-"N/A. Address not checked, or acquirer had no response. Service not available","n.v.t. Adres niet gecontroleerd of verkrijger had geen reactie. Service niet beschikbaar"
-"N/A. Global Unavailable","n.v.t. Globaal Onbeschikbaar"
-"N/A. International Unavailable","n.v.t. Internationaal Onbeschikbaar"
-"N/A. Merchant has indicated that CVV2 is not present on card","n.v.t. Handelaar heeft aangegeven dat CVV2 niet aanwezig is op de kaart"
-"N/A. No response","n.v.t. Geen reactie"
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","n.v.t. Niet toegestaan voor MOTO (Internet/Telefoon) overboekingen"
-"N/A. Not processed","n.v.t. Niet verwerkt"
-"N/A. Retry","n.v.t. Probeer opnieuw"
-"N/A. Service not Supported","n.v.t. Service niet ondersteund"
-"N/A. Service not available","n.v.t. Service niet beschikbaar"
-"N/A. Service not supported","N/A. Dienst niet ondersteund."
-"N/A. The merchant did not provide AVS information","n.v.t. De handelaar heeft geen AVS informatie overhandigd"
-"N/A. The merchant has not implemented CVV2 code handling","n.v.t. De handelaar heeft geen CVV2 code verwerking ingevoerd"
-"N/A. Unavailable","n.v.t. Niet beschikbaar"
-"Negative Balance","Negatief Balans"
-"Never","Nooit"
-"New Billing Agreement","Nieuwe factuurovereenkomst"
-"No","Nee"
-"No Details matched","Geen Details kwamen overeen"
-"No Details matched. International","Geen Details kwamen overeen. Internationaal"
-"No Liability Shift","Geen Aansprakelijkheid Verschuiving"
-"No Logo","Geen Logo"
-"No match","Geen overeenkomst"
-"None of the address information matched","Geen van de adres informatie kwam overeen"
-"Note: %s","Notitie: %s"
-"Nothing to fetch because of an empty configuration.","Niets op te halen door lege configuratie."
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Merk op dat PayPal tot 10 verzendopties kan hanteren. Daarom plaatst Magento alleen de 10 goedkoopste verzendopties als er meer dan 10 beschikbaar zijn."
-"Notified customer about creditmemo #%s.","Klant verwittigd over kredietmemo #%s."
-"Notified customer about invoice #%s.","Klant verwittigd over factuur #%s."
-"Now accepting PayPal (150 X 40)","Accepteert nu PayPal (150 X 40)"
-"Now accepting PayPal (150 X 60)","Accepteert nu PayPal (150 X 60)"
-"Number of Child Authorizations","Aantal kindauthorisaties"
-"Open Authorization","Open authorisatie"
-"Order","Bestelling"
-"Order ID","ID Bestelling"
-"Order Valid Interval (days)","Periode bestelling geldig (dagen)"
-"Ordered amount of %s.","Bestelde hoeveelheid van %s."
-"Ordering amount of %s is pending approval on gateway.","In afwachting van goedkeuring bestelde hoeveelheid van %s."
-"Page Background Color","Achtergrondkleur pagina"
-"Page Style","Stijl pagina"
-"Part of the address information matched","Deel van de adresinformatie komt overeen"
-"Partner","Partner"
-"Pasarela integral","Pasarela integraal"
-"Pasarela integral Settings","Pasarela integraal Instellingen"
-"Password","Wachtwoord"
-"Pay Now","Betaal Nu"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","PayPal Balansbeheerder functie van PayPal account"
+"Balance Manager Account Bonus","Balans Beheerder Account Bonus"
"PayPal Buyer Warranty Bonus","PayPal koper garantie bonus"
-"PayPal Debit Card Cash Advance","PayPal betaalkaart kas voorschot"
-"PayPal Debit Card Withdrawal from ATM","PayPal betaalkaart geld pinnen"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper"
-"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper"
-"PayPal Express Checkout Token does not exist.","PayPal Express Afrekenen Teken bestaan niet."
-"PayPal Express Order Review Form","PayPal Express Bestelling Terugzien Formulier"
-"PayPal Fee Information","PayPal kosten informatie"
-"PayPal Merchant Pages Style","PayPal handelaar pagina stijl"
-"PayPal Payments Advanced","PayPal-betalingen Geavanceerd"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","PayPal Pro Instellingen"
-"PayPal Product Logo","PayPal productlogo"
"PayPal Protection Bonus","PayPal beschermingsbonus"
-"PayPal Reference ID","PayPal referentie ID"
-"PayPal Reference ID Type","PayPal referentie ID type"
-"PayPal Settlement Reports","PayPal Overeenstemming Rapporten"
-"PayPal certificate does not exist.","PayPal certificaat bestaat niet."
-"PayPal certificate file is empty.","PayPal certificaat bestand is leeg."
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal ondersteunt de verwerking van bestellingen met een bedrag van nul niet. Ga door met het normale betalingsproces om uw aankoop te voltooien."
-"PayPal gateway has rejected request. %s","PayPal gateway heeft het verzoek afgekeurd. %s"
-"PayPal processes all of your orders, and you get paid.","PayPal verwerkt al uw bestellingen en u krijgt betaald."
-"PayPal response hasn't required fields.","Antwoord van PayPal bevat de vereiste velden niet."
-"PayPal retains reports for 45 days.","PayPal behoudt meldingen voor 45 dagen."
-"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Elektronische Handelsindicator"
-"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Betaler Machtigingsservice Resultaat"
-"Payer Address ID","Betaler Adres ID"
-"Payer Address Status","Betaler Adres Status"
-"Payer Email","Betaler Email"
-"Payer ID","Betaler ID"
-"Payer Status","Betaler Status"
-"Payer is not identified.","Betaler is niet geïdentificeerd."
-"Payflow Link (for USA and Canada)","Payflow link (voor de VS en Canda)"
-"Payflow Link Settings","Payflow link instellingen"
-"Payflow Pro Gateway","Payflow Pro Gateway"
-"Payflow Pro Settings","Payflow Pro Instellingen"
-"Payment Action","Betaling"
-"Payment Applicable From","Betaling van Toepassing Van"
-"Payment Refund initiated by merchant","Betalingsterugstorting gestart door handelaar"
-"Payment has been declined. Please try again.","Betaling is afgewezen. Probeer het alstublieft opnieuw."
-"Payment is being reviewed by PayPal for risk.","Betaling wordt beoordeeld door Paypal op risico."
-"Payment transactions disallow storing objects.","Betalingstransacties staan het opslaan van objecten niet toe."
-"Payment was made to an email address that is not yet registered or confirmed.","Betaling werd gedaan naar een emailadres dat nog niet geregistreerd of bevestigd is."
-"Payments by PayPal (150 X 40)","Betalingen door PayPal (150 X 40)"
-"Payments by PayPal (150 X 60)","Betalingen door PayPal (150 X 60)"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","Betaling met kaarten + bescherming van verkoper - <strong style=""color:red"">neem contact op met PayPal alvorens dit te activeren</strong>"
-"Paypal Billing Agreement Settings","Paypal Facturering Overeenkomst Instellingen"
-"Pending PayPal","In afwachting van PayPal"
-"Phone","Telefoon"
-"Place Order","Bestelling plaatsen"
-"Place Order Using Billing Agreements","Plaats uw bestelling met behulp van Facturering overeenkomsten"
-"Please agree to all the terms and conditions before placing the order.","Ga alstublieft akkoord met alle voorwaarden voor het plaatsen van de bestelling."
-"Please contact PayPal Customer Service.","Neem alstublieft contact op met Paypal Klantenservice."
-"Please do not refresh the page until you complete payment.","Ververs alstublieft niet de pagina totdat de betaling is voltooid."
-"Please select a shipping method...","Selecteer een methode van verzending..."
-"Please select region, state or province","Selecteer a.u.b. uw provincie"
-"Please update order data to get shipping methods and rates","Update alstublieft de bestellings gegevens om verzendings methodes en tarieven te krijgen"
+"Bonus for first ACH Use","Bonus voor eerste ACH gebruik"
+"General Redemption","Algemene Afschrijving"
+"Gift Certificate Redemption","Geschenkcertificaat Inlossen"
"Points Incentive Redemption","Punten Incentive Aflossing"
-"Postage Payment to either USPS or UPS","Porto betaling aan USPS dan wel UPS"
-"Preapproved Payment (BillUser API), either sent or received","Vooraf goedgekeurde Betaling (RekeningGebruiker API), verzonden of ontvangen"
-"Preapproved Payment ID","Vooraf goedgekeurde Betaling ID"
-"Price","Prijs"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","Verwerk creditcards direct op uw website met PayPal's alles-in-één online oplossing voor het verwerken van betalingen"
-"Product","Productnaam"
-"Proxy Host","Proxy Host"
-"Proxy Port","Proxy Poort"
-"Quantity","Hoeveelheid"
-"Reauthorization","Nieuwe autorisatie"
-"Reference Information","Verwijsinformatie"
-"Refund issued by merchant.","Terugbetaling uitgegeven door verkoper"
-"Reimbursement for a chargeback.","Vergoeding voor een terugboeking"
-"Reimbursement of Chargeback","Vergoeding van een terugboeking"
-"Report Date","Datum bericht"
-"Reports","Verslagen"
-"Requested %s and configured %s merchant emails do not match.","Gevraagde %s en ingestelde %s verkoper e-mails komen niet overeen."
-"Require CVV Entry","Vereist invoer CVV"
-"Require Customer's Billing Address","Factuuradres van de klant vereist"
-"Reversal","Omzetting"
-"Reversal of General Account Hold","Omzetting van Algemene Rekening Houder"
+"Coupon Redemption","Waardebon Inleveren"
+"Reward Voucher Redemption","Beloning Voucher Aflossing"
+"General. Product no longer supported","Algemeen. Product niet langer ondersteund"
+"General: reversal of a type not belonging to the other T11xx categories","Algemeen: omkering van een type dat niet behoort tot de andere T11xx categorieën"
+"ACH Withdrawal","ACH Opname"
+"Debit Card Transaction","Debetkaart Transactie"
"Reversal of Points Usage","Omzetting van Puntengebruik"
-"Reversal of an adjustment.","Omzetting van een aanpassing"
+"ACH Deposit (Reversal)","ACH Storting (Herroeping)"
+"Reversal of General Account Hold","Omzetting van Algemene Rekening Houder"
+"Account-to-Account Payment, initiated by PayPal","Account-naar-Account Betaling, gestart door PayPal"
+"Payment Refund initiated by merchant","Betalingsterugstorting gestart door handelaar"
+"Fee Reversal","Omkeren kosten"
+"Hold for Dispute Investigation","Wacht op Onderzoek naar Geschil"
"Reversal of hold for Dispute Investigation","Aanpassing van houder voor onderzoek naar dispuut"
-"Review Order","Overzicht van de bestelling"
-"Reward Voucher Redemption","Beloning Voucher Aflossing"
-"SFTP Credentials","SFTP inloggegevens"
-"Sale","Verkoop"
-"Sales","Verkoop"
-"Same as shipping","Zelfde als verzenden"
-"Sandbox Credentials","Sandbox inloggegevens"
-"Sandbox Mode","Sandbox modus"
-"Schedule","Schema"
-"Schedule description is too long.","Schemabeschrijving is te lang."
-"Scheduled Fetching","Ophalen ingeroosterd"
-"Select a PayPal Solution","Kies een PayPal oplossing"
-"Server Error. Please try again.","Serverfout. Probeer het opnieuw."
+"General: adjustment of a type not belonging to the other T12xx categories","Algemeen: aanpassing van een type dat niet behoort tot de andere T12xx categorieën"
+Reversal,Omzetting
+Charge-off,Afschrijving
+Incentive,Prikkel
+"Reimbursement of Chargeback","Vergoeding van een terugboeking"
+"General (Authorization)","Algemeen (Machtiging)"
+Reauthorization,"Nieuwe autorisatie"
+Void,Geldig
+"General (Dividend)","Algemeen (Dividend)"
+"General: temporary hold of a type not belonging to the other T15xx categories","Algemeen: tijdelijke blokkering van een type dat niet behoort tot de andere T15xx categorieën"
+"Open Authorization","Open authorisatie"
+"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Storting (Wordt gehouden ingeval van dispuut of een ander onderzoek)"
+"Available Balance","Beschikbaar Balans"
+Funding,Financiering
+"General: Withdrawal to Non-Bank Entity","Algemeen: Opname naar Niet-Bancaire Entiteit"
+"WorldLink Withdrawal","WorldLink Opname"
+"Buyer Credit Payment","Koper krediet betaling"
+"General Adjustment without businessrelated event","Algemene Aanpassing zonder zakengerelateerde gebeurtenis"
+"General (Funds Transfer from PayPal Account to Another)","Algemeen (Geldmiddelen Overplaatsen van een PayPal Account naar een Andere)"
"Settlement Consolidation","Overeenkomst consolidatie"
-"Settlement Report Settings","Overeenkomst verslag instellingen"
-"Settlement of a chargeback.","Regeling van een terugboeking."
-"Severe 3D Secure Card Validation","Strenge 3D Secure Card Validation"
-"Severe Validation Removes Chargeback Liability on Merchant","Strenge validatie verwijdert terugboekingsaansprakelijkheid voor de handelaar"
-"Severe validation removes chargeback liability on merchant.","Ernstige bevestiging verwijdert de aansprakelijkheid voor terugboeking van de handelaar."
-"Shipping","Verzending"
-"Shipping Address","Verzendingsadres"
-"Shipping Method","Verzendingsmethode"
-"Shop now using (150 X 40)","Winkel nu met (150 X 40)"
-"Shop now using (150 X 60)","Winkel nu met (150 X 60)"
-"Shortcut","Snelkoppeling"
-"Shortcut Buttons Flavor","Snelkoppeling knoppen flavor"
-"Shortcut on Product View","Snelkoppeling op product bekijken"
-"Shortcut on Shopping Cart","Snelkoppeling op winkelmandje"
-"Sign a billing agreement to streamline further purchases with PayPal.","Teken een betaalovereenkomst om toekomstige aankopen met PayPal te stroomlijnen."
-"Solo","Alleen"
-"Sorry, no quotes are available for this order at this time.","Sorry, geen prijsopgaven zijn beschikbaar voor deze bestelling op dit moment."
-"Sort Order","Sorteer Bestelling"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specificeert wat de Authorization Honor Interval is op de PayPal rekening van de winkelier. Dit dient gelijk te zijn aan de instelling in PayPal zelf."
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specificeert wat de Order Valid Interval is op de PayPal rekening van de winkelier. Dit dient gelijk te zijn aan de instelling in PayPal zelf."
-"State/Province","Staat/Provincie"
-"Static","Statisch"
-"Street Address","Adres straat"
-"Street Address %s","Straatnaam en huisnummer %s"
-"Submitting order information...","Bestellingsinformatie aan het overbrengen..."
-"Subscriber name is too long.","Naam van abonnee is te lang"
-"Subscription ID","Abonnement ID"
-"Subscription Payment, either payment sent or payment received","Abonnementsbetaling, betaling verzonden of betaling ontvangen"
-"Subtotal","Subtotaal"
-"Summary Text for Aggregated Cart","Samenvatting tekst voor samengesteld winkelmandje"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Ondersteuning van American Express kaarten vereist een additionele overeenkomst. Leer meer op <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>"
-"Switch/Maestro","Switch/Maestro"
-"Test Mode","Test modus"
-"The background color for the checkout page around the header and payment form.","De achtergrondkleur voor de afrekenpagina rond de header en het betalingsformulier."
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","De achtergrondkleur voor de header van de afrekenpagina. Niet hoofdlettergevoelige zes-letterteken HTML hexadecimale kleurcode in ASCII."
-"The billing agreement ""%s"" has been canceled.","De afrekeningsovereenkomst ""%s"" is geannuleerd."
-"The billing agreement ""%s"" has been created.","De afrekeningsovereenkomst ""%s"" is aangemaakt."
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","Het standaard aantal kindmachtigingen in uw PayPal account is 1. Om meerdere machtigingen te doen, neem alstublieft contact op met PayPal om een verhoging aan te vragen."
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","De afbeelding linksboven op de afrekeningspagina. Maximale grootte is 750x90 pixels. <strong style=""color:red"">Https</strong> is ten sterkte aangeraden."
-"The maximum number of child authorizations is reached.","Het maximale aantal kindmachtigingen is bereikt."
-"The merchant account is not yet verified.","De handelsaccount is nog niet geverifieerd."
-"The payment curency does not match any of the merchant's balances currency.","De betalingsvaluta komt met geen enkele valuta van de saldi van de handelaar overeen."
-"The payment eCheck is not yet cleared.","De betalings eCheck is nog niet vrijgegeven."
-"The payment is authorized but not settled.","De betaling is gemachtigd, maar niet afgehandeld."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","De betaling staat in de wacht omdat deze aangemaakt is met een emailadres dat nog niet geregistreerd of bevestigd is."
-"The payment is pending while it is being reviewed by PayPal for risk.","De betaling staat in de wacht, terwijl deze beoordeeld wordt op risico door PayPal."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","De betaling werd gemaakt via creditcard. Om de gelden te ontvangen, moet de handelaar de account upgraden naar Business of Premier status."
+"General: event not yet categorized","Algemeen: gebeurtenis nog niet gecategoriseerd"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days","Iedere 3 dagen"
+"Every 7 days","Iedere 7 dagen"
+"Every 10 days","Iedere 10 dagen"
+"Every 14 days","Iedere 14 dagen"
+"Every 30 days","Iedere 30 dagen"
+"Every 40 days","Iedere 40 dagen"
+"No Logo","Geen Logo"
+"Pending PayPal","In afwachting van PayPal"
+"Billing Agreement",Factuurovereenkomst
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- Selecteer a.u.b. rekeningovereenkomst --"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements","Terug naar Factureringsovereenkomsten"
"There are no billing agreements yet.","Er zijn nog geen facturatieovereenkomsten."
-"There was an error processing your order. Please contact us or try again later.","Er heeft zich een fout voorgedaan bij het verwerken van uw bestelling. Neem alstublieft contact met ons op of probeer het later opnieuw."
-"This feature needs be enabled first for the merchant account through PayPal technical support.","Deze functie moet eerst worden ingeschakeld voor de merchant account via PayPal technische ondersteuning."
-"This operation requires an existing transaction object.","Deze operatie vereist een bestaand transactie object."
-"Time of Day","Tijd van de Dag"
-"Title","Titel"
-"Transaction ID","Transactie ID"
-"Transaction ID must not be empty.","Transactie-ID mag niet leeg zijn."
-"Transaction Information","Transactie Informatie"
-"Transfer Cart Line Items","Plaats Winkelwagentje Posten Over"
-"Transfer Shipping Options","Plaats Verzendingsopties Over"
-"Triggered Fraud Filters","Fraudeur Filters Getriggerd"
-"Unable to cancel Express Checkout.","Onmogelijk om Express Checkout te annuleren."
-"Unable to change status. Current status is not correspond to real status.","Kon status niet veranderen. Huidige status correspondeert niet met werkelijke status."
-"Unable to communicate with the PayPal gateway.","Kan niet communiceren met de PayPal gateway."
-"Unable to initialize Express Checkout review.","Onmogelijk om Express Checkout terug te zien."
-"Unable to initialize Express Checkout.","Kan Expres Afrekenen niet initialiseren."
-"Unable to place the order.","Kan bestelling niet plaatsen."
-"Unable to process Express Checkout approval.","Niet mogelijk om Express Checkout door het validatie te halen."
-"Unable to start Express Checkout.","Onmogelijk om Express Checkout te beginnen"
-"Unable to update Order data.","Kan Bestel gegevens niet bijwerken."
-"Unable to update shipping method.","Niet in staat om de versturingsmethode de updaten."
-"Unknown Error. Please try again later.","Onbekende fout. Probeer het later opnieuw."
-"Unknown reason. Please contact PayPal customer service.","Onbekende oorzaak. Neem alstublieft contact op met de klantendienst van PayPal."
-"Update Order Data","Update Bestel Gegevens"
-"Use Proxy","Proxy gebruiken"
-"Use colon to specify port. For example: ""test.example.com:5224"".","Gebruik een dubbelepunt om de poort te specificeren. Bijvoorbeeld: ""test.voorbeeld.com:5224""."
-"User","Gebruiker"
-"User-initiated Currency Conversion","Gebruiker-geïnitieerde munteenheid conversie"
-"Uses store frontend name by default.","Gebruikt standaard de frontend naam van de winkel"
-"VAT Number","BTW nummer"
-"Vendor","Verkoper"
-"Vendor / Merchant Login","Verkoper / Handelaar Login"
-"View","Bekijk"
-"View Demo","Bekijk Demo"
-"View PayPal solutions.","Bekijk PayPal oplossingen"
-"View Transaction","Transactie bekijken"
-"View Transaction Details","Bekijk Transactie Details"
-"Virtual PayPal Debit Card Transaction","Virtuele Paypal Debitcard Transactie"
-"Virtual Terminal Payment","Virtuele Laatste Betaling"
-"Void","Geldig"
-"Waiting until Customer's eCheck will be cleared.","Wachten tot Klant's eCheck wordt vrijgegeven."
-"We prefer PayPal (150 X 40)","PayPal heeft onze voorkeur (150 X 40)"
-"We prefer PayPal (150 X 60)","Paypal heeft onze voorkeur (150 X 60)"
-"Website Payments Plus","Website betalingen plus"
-"Website Payments Plus Settings","Website betalingen plus instellingen"
-"Website Payments Pro","Website Betalingen Pro"
-"Website Payments Pro (Payflow Edition) Settings","Website Betalingen Pro (Betaalstroom Editie) Instellingen"
-"Website Payments Pro Hosted Solution","Website betalingen professioneel gehoste oplossing"
-"Website Payments Pro Hosted Solution Settings","Website betalingen professioneel gehoste oplossing instellingen"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","Website Betalingen Pro Payflow Editie (Inclusief Express Checkout)"
-"Website Payments Pro Settings","Website Betalingen Pro Instellingen"
-"Website Payments Standard","Website Betalingen Standaard"
-"Website Payments Standard Payment","Website Betalingen Standaard Betaling"
-"Website Payments Standard Settings","Website Betalingen Standaard Instellingen"
-"What is PayPal?","Wat is PayPal?"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Of er een facturatieovereenkomst aangemaakt moet worden als er geen actieve facturatieovereenkomsten beschikbaar zijn."
-"Will appear as a payment option only for customers who have at least one active billing agreement.","Zal verschijnen als betaling optie voor klanten die tenminste een actieve facturatieovereenkomst hebben."
-"WorldLink Withdrawal","WorldLink Opname"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Zou u graag een facturatieovereenkomst willen ondertekenen voor een betere integratie met PayPal?"
-"Wrong Order ID (%s) specified.","Verkeerde Bestelling ID (%s) gespecificeerd."
-"Wrong PayPal Express Checkout Token specified.","Verkeerde PayPal Express Checkout Token gekozen."
-"Wrong billing agreement ID specified.","Verkeerde factuur overeenkomst ID opgegeven."
-"Yes","Ja"
-"Yes. Matched Address and five-didgit ZIP","Ja. Het adres en de 5-cijferige ZIP code komen overeen"
-"You cannot void a verification transaction","U kunt een verificatie-transactie niet nietig verklaren"
-"You will be redirected to the PayPal website in a few seconds.","U zult binnen enkele seconden naar de PayPal website worden geleid."
-"You will be redirected to the PayPal website when you place an order.","U wordt door verwezen naar de PayPal website wanneer u een bestelling plaatst."
-"You will be redirected to the PayPal website.","U zult doorverwezen worden naar de PayPal website."
+"New Billing Agreement","Nieuwe factuurovereenkomst"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order","Overzicht van de bestelling"
+"Please select a shipping method...","Selecteer een methode van verzending..."
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","Artikelen in Uw Winkelwagen"
+"Edit Shopping Cart","Bewerken winkelmandje"
+"Please update order data to get shipping methods and rates","Update alstublieft de bestellings gegevens om verzendings methodes en tarieven te krijgen"
+"Checkout with PayPal","Checkout met PayPal"
+"Please do not refresh the page until you complete payment.","Ververs alstublieft niet de pagina totdat de betaling is voltooid."
"You will be required to enter your payment details after you place an order.","U zult uw betalingsdetails moeten invoeren na het plaatsen van een bestelling."
-"Zip/Postal Code","Zip/Postcode"
-"chargeback reimbursed","terugbetaling uitgekeerd"
-"chargeback settled","Terugboeking geregeld"
-"customer complaint","klacht van klant"
-"customer triggered a chargeback","klant heeft een terugbetaling aangevraagd"
-"customer triggered money-back guarantee","klant heeft geld-terug garantie aangevraagd"
-"eBay Auction Payment","eBay veiling betaling"
-"merchant refunded payment","handelaar heeft de betaling teruggeboekt"
-"no reason","geen reden"
-"reversal of an adjustment","omkering van aanpassing"
-"unknown reason","onbekende reden"
+"Additional Options","Meer Opties"
+"Acceptance Mark","Acceptatie Stempel"
+"What is PayPal?","Wat is PayPal?"
+"Sign a billing agreement to streamline further purchases with PayPal.","Teken een betaalovereenkomst om toekomstige aankopen met PayPal te stroomlijnen."
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
+"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/i18n/pt_BR.csv b/app/code/Magento/Paypal/i18n/pt_BR.csv
index 7a972a9003c..c106ca0dd45 100644
--- a/app/code/Magento/Paypal/i18n/pt_BR.csv
+++ b/app/code/Magento/Paypal/i18n/pt_BR.csv
@@ -1,504 +1,692 @@
-"-- Please Select Billing Agreement--","-- Por Favor, Escolha o Acordo de Cobrança--"
-"-OR-","-OU-"
-"2-pixel perimeter around the header space.","PerÃmetro de 2 pixeis em torno do espaço do cabeçalho."
-"3D Secure","3D Secure"
-"3D Secure Card Validation","Validação de Cartão 3D Secure"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Validação Segura 3D é necessária para cartões Maestro. Suporte de cartões American Express exige um acordo adicional. Saiba mais em <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Comece a aceitar pagamentos via PayPal!</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","Um valor é necessário para o modo ao vivo. Consulte o seu contrato CardinalCommerce."
-"ACH Deposit (Hold for Dispute or Other Investigation)","Depósito ACH (Apoio para Disputa ou Outra Investigação)"
-"ACH Deposit (Reversal)","Depósito ACH (Reverso)"
-"ACH Funding for Funds Recovery from Account Balance","Financiamento ACH para Recuperação de Fundos de Saldo da Conta"
-"ACH Withdrawal","Levantamento ACH"
-"API Authentication Methods","Métodos de Autenticação API"
-"API Certificate","Certificado API"
-"API Password","Senha API"
-"API Signature","Assinatura API"
-"API Username","Nome de usuário API"
-"API Uses Proxy","API Usa Proxy"
-"API/Integration","API/Integração"
-"API/Integration Settings","API/Configurações de Integração"
-"Ability for buyer to purchase without PayPal account.","Capacidade para o comprador comprar sem conta PayPal."
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","Aceitar pagamentos PayPal no seu carrinho de compras. PayPal vai processar seus pagamentos de cartão de crédito através do portal Payflow Pro."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","Aceite pagamentos com um checkout que respeita as polÃticas do PCI que mantém o cliente no seu site. Inclua uma conta que aceita cartões de crédito do PayPal."
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","Aceite pagamentos com um checkout que respeita as polÃticas do PCI que mantém os clientes no seu site. Para uso com a sua própria conta que aceita cartões de crédito."
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","Aceitar pagamentos sem que os clientes deixem seu site. Muitos serviços populares de alojamento web e carrinhos de compras vêm com os portais de pagamento Payflow embutidos, para que sejam fáceis de configurar."
-"Acceptance Mark","Marca de Aceitação"
-"Acceptance Mark Image","Imagem de Marca de Aceitação"
-"Account-to-Account Payment, initiated by PayPal","Pagamento Conta para Conta, iniciado por PayPal"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","Adicione um botão Checkout expresso ao seu carrinho de compras existente para pagamentos rápidos e fáceis com cartão de crédito. PayPal lida com todo o processamento de pagamento."
-"Additional Options","Opções Adicionais"
-"Address","Endereço"
-"Address Verification System Response","Resposta de Sistema de Verificação de Endereço"
-"All the address information matched","Todas as informações do endereço correspondem"
-"Allow in Billing Agreement Wizard","Permitir no Assistente de Acordo de Faturamento"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Valores permitidos: ""paypal"", ""primário"" (padrão), your_custom_value (um estilo de página de pagamento personalizada do seu perfil conta de comerciante)."
-"Allowed Credit Card Types","Tipos de Cartão de Crédito Permitido"
-"Also affects mini-shopping cart.","Também afeta o mini carrinho de compras."
-"Ask Customer","Pergunte ao cliente"
-"Attempted Authentication, Bad Result","Autenticação Tentada, Mau Resultado"
-"Attempted Authentication, Good Result","Autenticação Tentada, Bom Resultado"
-"Auction Payment other than through eBay","Pagamento de Leilão que não seja através de eBay"
-"Authenticated, Bad Result","Autenticado, Mau Resultado"
-"Authenticated, Good Result","Autenticado, Bom Resultado"
-"Authorization","Autorização"
-"Authorization Honor Interval (days)","PerÃodo de Honra da Autorização (dias)"
-"Authorization expired.","Autorização expirou."
-"Authorization transaction is required to void.","Autorização da transação é necessária para anular."
-"Authorization was voided by merchant.","Autorização foi anulada pelo comerciante."
-"Authorized amount of %s.","Valor autorizado de %s."
-"Authorizing amount of %s is pending approval on gateway.","Autorização de valor %s está pendente de aprovação no portal."
-"Auto","Auto"
-"AutoSweep","AutoVarredura"
-"Available Balance","Saldo DisponÃvel"
-"Back to Billing Agreements","Voltar para Contratos de Faturamento"
-"Balance Manager Account Bonus","Conta de Gerente Bônus de Balanço"
-"Billing Address","Endereço de faturamento"
-"Billing Agreement","Contrato de faturamento"
-"Billing Agreement # %s","Contrato de Faturamento # %s"
-"Billing Agreement #%s","Contrato de Faturamento # %s"
-"Billing Agreement Signup ","Aceitação do Contrato de Faturamento"
-"Billing Agreement View","Visualização de Contrato de Faturamento"
+Custom,Personalizado
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,Preço
+ID,ID
+Configure,Configure
+No,Não
+Qty,Qty
+Subtotal,Subtotal
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,Sim
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Pedido
+View,Ver
+Active,Active
+Position,Position
+Dynamic,Dinâmico
+N/A,IndisponÃvel
+Canceled,Canceled
+"General Information","General Information"
+Static,Estático
+"Advanced Settings","Advanced Settings"
+"Learn More","Saiba Mais"
+"Start Date","Start Date"
+"Product Name","Product Name"
+"3D Secure Card Validation","3D Secure Card Validation"
+"Merchant Liability","Responsabilidade do Comerciante"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Tipo de Frete"
+"Please agree to all the terms and conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem."
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address","Endereço de Envio"
+"Payment Method","Payment Method"
+"Place Order","Colocar Ordem"
+"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponÃveis neste momento para esta ordem."
+Sales,Vendas
+Created,Created
+Display,Display
+User,User
+Daily,Diário
+Date,Date
+"Order Total","Order Total"
+Never,Nunca
+Updated,Updated
+Reports,Relatórios
+"Order Status","Order Status"
+"View Order","View Order"
+Event,Evento
+"Please Select","Please Select"
+"Submitting order information...","Enviando informações da ordem..."
+Authorization,Autorização
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
"Billing Agreements","Contratos de faturamento"
-"Billing Agreement status is not set.","Acordo de estado de Faturamento não está definido."
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
+"Billing Agreement View","Visualização de Contrato de Faturamento"
+"View Transaction Details","Visualizar Detalhes da Transação."
+"Reference Information","Informação de Referência"
+"Transaction Information","Informação da Transação"
+"PayPal Fee Information","Informação de Taxa PayPal"
+"PayPal Settlement Reports","Relatórios de Pagamento PayPal"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Buscar Atualizações"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Ajuda
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo","Visualizar Demonstração"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","Você será redirecionado para o site PayPal."
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.","Você será redirecionado para o site PayPal quando você colocar uma ordem."
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.","Você será redirecionado para a página do PayPal em alguns segundos."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction","Visualizar Transação"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.","Caixa Expresso e Ordem foram canceladas."
+"Express Checkout has been canceled.","Caixa Expresso foi cancelada."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","Fechar Pedido com PayPal Express: Token não existe"
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.","Resposta PayPal não tem os campos obrigatórios."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
"Unable to save Billing Agreement:","Não foi possÃvel salvar Acordo de Cobrança:"
-"Your billing agreement # is: %s.","Seu acordo de faturamento # está: %s."
-"Bonus for first ACH Use","Bônus pelo primeiro uso do ACH"
-"Buyer Credit Payment","Pagamento de Crédito do Comprador"
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","Preferimos PayPal (150 x 60)"
+"We prefer PayPal (150 X 40)","Preferimos PayPal (150 x 40)"
+"Now accepting PayPal (150 X 60)","Aceitando agora PayPal (150 X 60)"
+"Now accepting PayPal (150 X 40)","Aceitando agora PayPal (150 X 40)"
+"Payments by PayPal (150 X 60)","Pagamentos por PayPal (150 x 60)"
+"Payments by PayPal (150 X 40)","Pagamentos por PayPal (150 x 40)"
+"Shop now using (150 X 60)","Compre agora usando (150 X 60)"
+"Shop now using (150 X 40)","Compre agora usando (150 X 40)"
+Shortcut,Atalho
+"Acceptance Mark Image","Imagem de Marca de Aceitação"
+Sale,Venda
+"For Virtual Quotes Only","Somente para Orçamentos Virtuais"
+Auto,Auto
+"Ask Customer","Pergunte ao cliente"
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","Assinatura API"
+"API Certificate","Certificado API"
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","O número máximo de autorizações de criança foi atingido."
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.","O pagante não está identificado."
+"Last Transaction ID","ID da Última Transação"
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.","O pagamento está autorizado, mas não liquidado."
+"The payment eCheck is not yet cleared.","O pagamento eCheck ainda não está clarificado."
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","O pagamento está pendente enquanto ele está sendo revisado para o risco por PayPal."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","O pagamento está pendente porque foi feito para um endereço de e-mail que ainda não está registrado ou confirmado."
+"The merchant account is not yet verified.","A conta de comerciante ainda não foi confirmada."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","O pagamento foi feito via cartão de crédito. A fim de receber fundos o comerciante deve atualizar sua conta para status Business ou Premier."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Reversão de um ajustamento."
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Reembolso de uma cobrança retroativa."
+"Settlement of a chargeback.","Liquidação de um estorno."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Motivo desconhecido. Favor contactar o atendimento a clientes do PayPal."
+"Payer ID","Identificação do Pagante"
+"Payer Email","E-mail do Pagante"
+"Payer Status","Estado Atual do Pagante"
+"Payer Address ID","Identificação do Endereço do Pagante"
+"Payer Address Status","Estado Atual do Endereço do Pagante"
+"Merchant Protection Eligibility","Elegibilidade de Proteção do Comerciante"
+"Triggered Fraud Filters","Desencadeados Filtros de Fraude"
+"Last Correlation ID","ID da Última Correlação"
+"Address Verification System Response","Resposta de Sistema de Verificação de Endereço"
+"CVV2 Check Result by PayPal","CVV2: Verificar Resultado pelo PayPal"
"Buyer's Tax ID","CPF do Comprador"
"Buyer's Tax ID Type","Tipo de CPF/CNPJ do Comprador"
-"By default it is ""reports.paypal.com"".","Por padrão, é ""reports.paypal.com""."
-"CNPJ","CNPJ (Cadastro Nacional de Pessoas JurÃdicas)"
-"CPF","CPF (Cadastro de Contribuintes Pessoas FÃsicas)"
-"CVV2 Check Result by PayPal","CVV2: Verificar Resultado pelo PayPal"
-"Can not send new order email.","Não pode enviar e-mail com novo pedido."
-"Cannot create target file for reading reports.","Não pode criar arquivo-alvo para relatórios de leitura."
-"Centinel API URL","URL Centinel API"
-"Centinel Custom API URL","URL para API Personalizado da Centinel"
-"Charge-off","Baixa contábil"
-"Chargeback","Estorno"
-"Chargeback by customer.","Estorno para cliente."
-"Checkout with PayPal","Fechar Pedido com o PayPal"
-"City","Cidade"
-"Click here if you are not redirected within 10 seconds...","Clique aqui se você não for redirecionado dentro de 10 segundos..."
-"Company","Companhia"
-"Completion Date","Data da Conclusão"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Conectando-se ao servidor SFTP do PayPal em busca de novos relatórios. Tem certeza de que deseja prosseguir?"
-"Countries Payment Applicable From","Pagamento a PaÃses Aplicável Desde"
-"Country","PaÃs"
-"Coupon Redemption","Resgate de Cupom"
-"Created billing agreement #%s.","Criado o contrato de faturamento nº %s."
-"Credit","Crédito"
-"Credit Card Settings","Configurações do Cartão de Crédito"
-"Currency Conversion required to cover negative balance","Necessária a Conversão de Moeda para cobrir saldo negativo"
-"Custom","Personalizado"
-"Custom Endpoint Hostname or IP-Address","Nome de Terminal Servidor ou Endereço IP Personalizados"
-"Custom Path","Caminho Personalizado"
-"Customer Information","Dados do Cliente"
-"Customer complaint.","Reclamação de cliente."
-"Customer did not include a confirmed address.","O cliente não incluiu um endereço confirmado."
-"Customer failed to pay.","Cliente não conseguiu pagar."
-"Customer triggered a money-back guarantee.","O cliente acionou uma garantia de dinheiro devolvido."
-"Customer used non-confirmed address.","O cliente usou um endereço não confirmado."
-"Daily","Diário"
-"Debit","Débito"
-"Debit Card Cash Back","Desconto em Uso de Cartão de Débito"
-"Debit Card Transaction","Transação em Cartão de Débito"
-"Debit or Credit","Débito ou Crédito"
-"Debug Mode","Modo de Depuração"
-"Direct Payment API","API de Pagamento Direto"
-"Discount","Desconto"
-"Display Express Checkout in the Payment Information step","Exibe Checkout Expresso na etapa Informações de Pagamento"
-"Displays on catalog pages and homepage.","Exibições em páginas de catálogo e na página inicial."
-"Don't have a PayPal account? Simply enter your email address.","Não tem uma conta no PayPal? Basta digitar seu endereço de e-mail."
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","Não tem uma conta de comerciante no PayPal? Você pode aceitar pagamentos com cartão de crédito através do Payflow Pro."
-"Dynamic","Dinâmico"
-"EFT Funding (German banking)","Financiamento com transação eletrônica (banco alemão)"
-"Edit Shopping Cart","Editar Carrinho de Compras"
-"Email Address","Endereço de e-mail"
-"Email Associated with PayPal Merchant Account","E-mail Associado à Conta de Comerciante no PayPal"
-"Enable Automatic Fetching","Habilitar Execução Automática"
-"Enable PayPal Guest Checkout","Habilitar Conclusão de Pagamento pelo PayPal Sem Conta"
-"Enabled","Ativado"
-"Event","Evento"
-"Event Code","Código de Evento"
-"Every 10 days","A cada 10 dias"
-"Every 14 days","A cada 14 dias"
-"Every 3 days","A cada 3 dias"
-"Every 30 days","A cada 30 dias"
-"Every 40 days","A cada 40 dias"
-"Every 7 days","A cada 7 dias"
+"PayPal/Centinel Visa Payer Authentication Service Result","Resultado do Serviço de Autenticação Pagador Visa PayPal/Centinel"
+"PayPal/Centinel Electronic Commerce Indicator","Indicador de Comércio Eletrônico PayPal/Centinel"
+Chargeback,Estorno
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Apenas Endereço Correspondido (sem ZIP)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","Nenhuns Detalhes correspondem"
+"No Details matched. International","Nenhuns Detalhes correspondem. Internacional"
+"Exact Match. Address and nine-digit ZIP code","Correspondência exata. Endereço e código postal CEP de nove dÃgitos"
"Exact Match. Address and Postal Code. International","Correspondência exata. Endereço e CEP. Internacional"
"Exact Match. Address and Postal Code. UK-specific","Correspondência exata. Endereço e CEP. EspecÃficas do Reino Unido"
-"Exact Match. Address and nine-digit ZIP code","Correspondência exata. Endereço e código postal CEP de nove dÃgitos"
-"Explanation: %s.","Explicação: %s."
-"Express Checkout","Caixa Expresso"
-"Express Checkout (Payflow Edition) Settings","Configurações de Caixa Expresso (Edição Payflow)"
-"Express Checkout APIs","APIs Caixa Expresso"
-"Express Checkout Settings","Configurações de Caixa Expresso"
-"Express Checkout and Order have been canceled.","Caixa Expresso e Ordem foram canceladas."
-"Express Checkout has been canceled.","Caixa Expresso foi cancelada."
-"Failed to cancel the billing agreement.","Falha ao cancelar o contrato de faturamento."
-"Failed to create billing agreement for this order.","Falha ao criar contrato de faturamento para este pedido."
-"Failed to fetch reports from '%s@%s'.","Falha ao buscar relatórios de ""%s@%s""."
-"Failed to finish billing agreement wizard.","Falha ao concluir wizard do contrato de faturamento."
-"Failed to start billing agreement wizard.","Falha ao iniciar wizard do contrato de faturamento."
-"Fax","Fax"
-"Fee Amount","Valor da Taxa"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Não permitido para transações MOTO (Internet/Telefone)"
+"N/A. Global Unavailable","N/A. Global Não DisponÃvel"
+"N/A. International Unavailable","N/A. Internacional Não DisponÃvel"
+"Matched five-digit ZIP only (no Address)","Apenas ZIP de cinco dÃgitos correspondido (sem Endereço)"
+"Matched Postal Code only (no Address)","Apenas Código Postal Correspondido (sem Endereço)"
+"N/A. Retry","N/A. Tentar novamente"
+"N/A. Service not Supported","N/A. Serviço não Suportado"
+"N/A. Unavailable","N/A. IndisponÃvel"
+"Matched whole nine-didgit ZIP (no Address)","ZIP total de nove dÃgitos correspondido (sem Endereço)"
+"Yes. Matched Address and five-didgit ZIP","Sim. Endereço Correspondente e ZIP de cinco dÃgitos"
+"All the address information matched","Todas as informações do endereço correspondem"
+"None of the address information matched","Nenhuma das informações de endereço corresponderam"
+"Part of the address information matched","Parte das informações de endereço correspondeu"
+"N/A. The merchant did not provide AVS information","N/A. O comerciante não forneceu informação AVS"
+"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Endereço não verificado, ou comprador sem resposta. Serviço não disponÃvel"
+"Matched (CVV2CSC)","Correspondido (CVV2CSC)"
+"No match","Nenhuma correspondência"
+"N/A. Not processed","N/A. Não processado"
+"N/A. Service not supported","N/A. Serviço não suportado"
+"N/A. Service not available","N/A. Serviço não disponÃvel"
+"N/A. No response","N/A. Sem resposta"
+"Matched (CVV2)","Correspondido (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","N/A. O comerciante não implementou manipulação de código CVV2"
+"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Comerciante indicou que CVV2 não está presente no cartão"
+"Authenticated, Good Result","Autenticado, Bom Resultado"
+"Authenticated, Bad Result","Autenticado, Mau Resultado"
+"Attempted Authentication, Good Result","Autenticação Tentada, Bom Resultado"
+"Attempted Authentication, Bad Result","Autenticação Tentada, Mau Resultado"
+"No Liability Shift","Nenhuma Mudança de Responsabilidade"
+"Issuer Liability","Responsabilidade do Emissor"
+CNPJ,"CNPJ (Cadastro Nacional de Pessoas JurÃdicas)"
+CPF,"CPF (Cadastro de Contribuintes Pessoas FÃsicas)"
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.","Transações de pagamento não permitem armazenar objetos."
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.","Esta operação requer um objeto existente de transação."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date","Data do Relatório"
+"Merchant Account","Conta do Comerciante"
+"Transaction ID","ID da Transação"
+"Invoice ID","ID da fatura"
+"PayPal Reference ID","ID de Referência PayPal"
+"PayPal Reference ID Type","Tipo de ID de Referência PayPal"
+"Event Code","Código de Evento"
+"Finish Date","Finish Date"
+"Debit or Credit","Débito ou Crédito"
+"Gross Amount","Valor Bruto"
"Fee Debit or Credit","Taxa de Débito ou de Crédito"
-"Fee Reversal","Reversão de Taxa"
-"Fee: Foreign ACH Withdrawal","Taxa: Retirada ACH Exterior"
-"Fee: Mass Pay Request","Taxa: Pedido de Pagamento em Massa"
+"Fee Amount","Valor da Taxa"
+"Order ID","ID da Ordem"
+"Subscription ID","ID de Subscrição"
+"Preapproved Payment ID","ID do Pagamento Pré-aprovado"
+Credit,Crédito
+Debit,Débito
+"General: received payment of a type not belonging to the other T00xx categories","Geral: pagamento recebido de um tipo que não pertence às outras categorias T00xx"
+"Mass Pay Payment","Pagamento de Pagamento em Massa"
+"Subscription Payment, either payment sent or payment received","Pagamento de Subscrição, ou de pagamento enviado ou pagamento recebido"
+"Preapproved Payment (BillUser API), either sent or received","Pagamento Pré-aprovado (BillUser API), quer enviado ou recebido"
+"eBay Auction Payment","Pagamento do Leilão eBay"
+"Direct Payment API","API de Pagamento Direto"
+"Express Checkout APIs","APIs Caixa Expresso"
+"Website Payments Standard Payment","Pagamento de Pagamentos de Site Padrão"
+"Postage Payment to either USPS or UPS","Pagamento de Porte quer para USPS ou UPS"
+"Gift Certificate Payment: purchase of Gift Certificate","Pagamento de Vale Oferta: compra de Vale Oferta"
+"Auction Payment other than through eBay","Pagamento de Leilão que não seja através de eBay"
+"Mobile Payment (made via a mobile phone)","Pagamento Móvel (feito através de um celular)"
+"Virtual Terminal Payment","Pagamento via Terminal Virtual"
+"General: non-payment fee of a type not belonging to the other T01xx categories","Geral: taxa de não-pagamento de um tipo que não pertence às outras categorias T01xx"
"Fee: Web Site Payments Pro Account Monthly","Taxa: Conta Pro de Pagamentos de Web Site Mensal"
+"Fee: Foreign ACH Withdrawal","Taxa: Retirada ACH Exterior"
"Fee: WorldLink Check Withdrawal","Taxa: Levantamento Verificado WorldLink"
-"Fetch","Buscar"
-"Fetch Updates","Buscar Atualizações"
-"Fetched %s report rows from '%s@%s'.","%s Linhas de relatório buscadas de '%s@%s'."
-"For Virtual Quotes Only","Somente para Orçamentos Virtuais"
-"Frontend Experience Settings","Configurações de Experiência Frontend"
-"Funding","Financiamento"
-"General (Authorization)","Geral (Autorização)"
-"General (Dividend)","Geral (Dividendo)"
-"General (Funds Transfer from PayPal Account to Another)","Geral (Transferência de Fundos da Conta PayPal para Outra)"
-"General (Purchase with a credit card)","Geral (Compra com Cartão de Crédito)"
-"General Adjustment without businessrelated event","Ajuste Geral sem evento de negócios relacionado"
+"Fee: Mass Pay Request","Taxa: Pedido de Pagamento em Massa"
"General Currency Conversion","Conversão de Moeda em Geral"
+"User-initiated Currency Conversion","Conversão de Moeda por Iniciativa do Usuário"
+"Currency Conversion required to cover negative balance","Necessária a Conversão de Moeda para cobrir saldo negativo"
"General Funding of PayPal Account ","Financiamento Geral de Conta PayPal"
-"General Redemption","Redenção Geral"
+"PayPal Balance Manager function of PayPal account","Função PayPal de Gerente de Saldo da conta PayPal"
+"ACH Funding for Funds Recovery from Account Balance","Financiamento ACH para Recuperação de Fundos de Saldo da Conta"
+"EFT Funding (German banking)","Financiamento com transação eletrônica (banco alemão)"
"General Withdrawal from PayPal Account","Levantamento Geral a partir da Conta PayPal"
-"General. Product no longer supported","Geral. Produto não é mais suportado"
+AutoSweep,AutoVarredura
"General: Use of PayPal account for purchasing as well as receiving payments","Geral: Uso de conta PayPal para a compra bem como para receber pagamentos"
+"Virtual PayPal Debit Card Transaction","Transação via Cartão de Débito Virtual PayPal"
+"PayPal Debit Card Withdrawal from ATM","Levantamento de ATM com Cartão de Débito PayPal"
+"Hidden Virtual PayPal Debit Card Transaction","Transação Virtual Escondida com Cartão de Débito PayPal"
+"PayPal Debit Card Cash Advance","Adiantamento de Dinheiro com Cartão de Débito PayPal"
"General: Withdrawal from PayPal Account","Geral: Levantamento a partir da Conta PayPal"
-"General: Withdrawal to Non-Bank Entity","Geral: Levantamento de Entidade Não-Bancária"
-"General: adjustment of a type not belonging to the other T12xx categories","Geral: ajuste de um tipo que não pertence às outras categorias T12xx"
+"General (Purchase with a credit card)","Geral (Compra com Cartão de Crédito)"
+"Negative Balance","Balanço Negativo"
"General: bonus of a type not belonging to the other T08xx categories","Geral: bônus de um tipo que não pertence às outras categorias T08xx"
-"General: event not yet categorized","Geral: evento ainda não classificado"
-"General: non-payment fee of a type not belonging to the other T01xx categories","Geral: taxa de não-pagamento de um tipo que não pertence às outras categorias T01xx"
-"General: received payment of a type not belonging to the other T00xx categories","Geral: pagamento recebido de um tipo que não pertence às outras categorias T00xx"
-"General: reversal of a type not belonging to the other T11xx categories","Geral: reversão de um tipo que não pertence às outras categorias T11xx"
-"General: temporary hold of a type not belonging to the other T15xx categories","Geral: retenção temporária de um tipo que não pertence às outras categorias T15xx"
-"Get Credentials from PayPal","Obter Credenciais do PayPal"
-"Gift Certificate Payment: purchase of Gift Certificate","Pagamento de Vale Oferta: compra de Vale Oferta"
-"Gift Certificate Redemption","Redenção de Vale Oferta"
-"Gross Amount","Valor Bruto"
-"Header Background Color","Cor de Fundo do Cabeçalho"
-"Header Border Color","Cor da Margem do Cabeçalho"
-"Header Image URL","URL da Imagem de Cabeçalho"
-"Help","Ajuda"
-"Hidden Virtual PayPal Debit Card Transaction","Transação Virtual Escondida com Cartão de Débito PayPal"
-"Hold for Dispute Investigation","Espere por Investigação de Disputa"
-"IPN ""%s"".","IPN ""%s""."
-"IPN verification ""%s"".","Verificação de IPN ""%s""."
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Se vazio, um valor definido será usado. URL personalizado pode ser fornecido por acordo CardinalCommerce."
-"If not specified, Default Country from General Config will be used","Se não especificado, PaÃs Predefinido da Configuração Geral será usado"
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Se esta opção estiver ativada, o cliente pode mudar o endereço de entrega e a forma de envio no site PayPal. No modo ao vivo funciona via protocolo único HTTPS."
-"Impossible to issue a refund transaction because the capture transaction does not exist.","ImpossÃvel emitir uma transação de reembolso porque a transação de captura não existe."
-"Incentive","Incentivo"
-"Initiation Date","Data de InÃcio"
-"Integral Evolution","Evolução Integral"
-"Integral Evolution Settings","Configurações de Evolução Integral"
-"Invoice ID","ID da fatura"
-"Issuer Liability","Responsabilidade do Emissor"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Recomenda-se definir este valor como ""Cartão de Débito ou de Crédito"" por visualizações de loja."
-"It is recommended to set this value to ""PayPal"" per store views.","Recomenda-se definir este valor como ""PayPal"" por visualizações de loja."
-"Items in Your Shopping Cart","Itens em seu carrinho de compras"
-"Last Correlation ID","ID da Última Correlação"
-"Last Transaction ID","ID da Última Transação"
-"Learn More","Saiba Mais"
-"Login","Conectar-se"
-"Looking for PayPal? We have our own tab to the left under Sales.","Procurando por PayPal? Nós temos nossa própria guia para a esquerda em Vendas."
-"Mass Pay Payment","Pagamento de Pagamento em Massa"
-"Matched (CVV2)","Correspondido (CVV2)"
-"Matched (CVV2CSC)","Correspondido (CVV2CSC)"
-"Matched Address only (no ZIP)","Apenas Endereço Correspondido (sem ZIP)"
-"Matched Address only (no ZIP). International","Apenas Enedereço Correspondido (sem ZIP). Internacional"
-"Matched Postal Code only (no Address)","Apenas Código Postal Correspondido (sem Endereço)"
-"Matched five-digit ZIP only (no Address)","Apenas ZIP de cinco dÃgitos correspondido (sem Endereço)"
-"Matched whole nine-didgit ZIP (no Address)","ZIP total de nove dÃgitos correspondido (sem Endereço)"
-"Merchant Account","Conta do Comerciante"
-"Merchant Country","PaÃs do Comerciante"
-"Merchant Liability","Responsabilidade do Comerciante"
-"Merchant Protection Eligibility","Elegibilidade de Proteção do Comerciante"
+"Debit Card Cash Back","Desconto em Uso de Cartão de Débito"
"Merchant Referral Bonus","Bónus de Comerciante"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Conta do comerciante não tem um mecanismo de levantamento. O comerciante deve aceitar ou recusar manualmente esse pagamento a partir de sua Visão Geral da conta."
-"Merchant account is not verified.","Conta do comerciante não verificada."
-"Merchant denied this pending payment.","Comerciante recusou o pagamento pendente."
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","O comerciante é titular de uma conta fora dos EUA e não tem um mecanismo de levantamento."
-"Merchant must upgrade account to Business or Premier status.","Comerciante deve atualizar a conta para status Business ou Premier."
-"Merchant reference ID format is not supported.","Referência do formato ID do comerciante não é suportado."
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Comerciantes necessitam se aplicar no PayPal para permitir a funcionalidade de acordos de faturamento. Não ative essa opção até que PayPal confirme que os acordos de faturamento estão ativados para a sua conta de comerciante."
-"Mobile Payment (made via a mobile phone)","Pagamento Móvel (feito através de um celular)"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Questão multi-moeda. O comerciante deve manualmente aceitar ou recusar esse pagamento a partir da Visão Geral da Conta PayPal."
-"N/A","IndisponÃvel"
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Endereço não verificado, ou comprador sem resposta. Serviço não disponÃvel"
-"N/A. Global Unavailable","N/A. Global Não DisponÃvel"
-"N/A. International Unavailable","N/A. Internacional Não DisponÃvel"
-"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Comerciante indicou que CVV2 não está presente no cartão"
-"N/A. No response","N/A. Sem resposta"
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Não permitido para transações MOTO (Internet/Telefone)"
-"N/A. Not processed","N/A. Não processado"
-"N/A. Retry","N/A. Tentar novamente"
-"N/A. Service not Supported","N/A. Serviço não Suportado"
-"N/A. Service not available","N/A. Serviço não disponÃvel"
-"N/A. Service not supported","N/A. Serviço não suportado"
-"N/A. The merchant did not provide AVS information","N/A. O comerciante não forneceu informação AVS"
-"N/A. The merchant has not implemented CVV2 code handling","N/A. O comerciante não implementou manipulação de código CVV2"
-"N/A. Unavailable","N/A. IndisponÃvel"
-"Negative Balance","Balanço Negativo"
-"Never","Nunca"
-"New Billing Agreement","Novo Contrato de Faturamento"
-"No","Não"
-"No Details matched","Nenhuns Detalhes correspondem"
-"No Details matched. International","Nenhuns Detalhes correspondem. Internacional"
-"No Liability Shift","Nenhuma Mudança de Responsabilidade"
-"No Logo","Nenhum Logo"
-"No match","Nenhuma correspondência"
-"None of the address information matched","Nenhuma das informações de endereço corresponderam"
-"Note: %s","Nota: %s"
-"Nothing to fetch because of an empty configuration.","Nada para buscar por causa de uma configuração vazia."
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Observe que o PayPal pode lidar com até 10 opções de envio. É por isso que Magento irá transferir apenas as 10 primeiras opções mais baratas de envio se houver mais de 10 disponÃveis."
-"Notified customer about creditmemo #%s.","Cliente notificado sobre nota de crédito #%s."
-"Notified customer about invoice #%s.","Cliente notificado sobre fatura #%s."
-"Now accepting PayPal (150 X 40)","Aceitando agora PayPal (150 X 40)"
-"Now accepting PayPal (150 X 60)","Aceitando agora PayPal (150 X 60)"
-"Number of Child Authorizations","Número de Autorizações para Crianças"
-"Open Authorization","Autorização Aberta"
-"Order","Pedido"
-"Order ID","ID da Ordem"
-"Order Valid Interval (days)","PerÃodo de Ordem Válida (dias)"
-"Ordered amount of %s.","Valor ordenado de %s."
-"Ordering amount of %s is pending approval on gateway.","Valor ordenado de %s está pendente de aprovação no gateway."
-"Page Background Color","Cor de Fundo da Página"
-"Page Style","Estilo da Página"
-"Part of the address information matched","Parte das informações de endereço correspondeu"
-"Partner","Parceiro"
-"Pasarela integral","Pasarela integral"
-"Pasarela integral Settings","Configurações Pasarela integral"
-"Password","Senha"
-"Pay Now","Pagar Agora"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","Função PayPal de Gerente de Saldo da conta PayPal"
+"Balance Manager Account Bonus","Conta de Gerente Bônus de Balanço"
"PayPal Buyer Warranty Bonus","Garantia Bonus de Comprador PayPal"
-"PayPal Debit Card Cash Advance","Adiantamento de Dinheiro com Cartão de Débito PayPal"
-"PayPal Debit Card Withdrawal from ATM","Levantamento de ATM com Cartão de Débito PayPal"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Fechar Pedido com PayPal Express (Edição Payflow): Wrapper Simplificado"
-"PayPal Express Checkout Shortcut Wrapper","Atalho Envoltório PayPal de Checkout Expresso"
-"PayPal Express Checkout Token does not exist.","Fechar Pedido com PayPal Express: Token não existe"
-"PayPal Express Order Review Form","PayPal Express: Revisar Pedido"
-"PayPal Fee Information","Informação de Taxa PayPal"
-"PayPal Merchant Pages Style","Páginas Estilo Comerciante PayPal"
-"PayPal Payments Advanced","Pagamentos PayPal Advanced"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","Configurações PayPal Pro"
-"PayPal Product Logo","Logo de Produto PayPal"
"PayPal Protection Bonus","Bônus de Proteção PayPal"
-"PayPal Reference ID","ID de Referência PayPal"
-"PayPal Reference ID Type","Tipo de ID de Referência PayPal"
-"PayPal Settlement Reports","Relatórios de Pagamento PayPal"
-"PayPal certificate does not exist.","Certificado PayPal não existe."
-"PayPal certificate file is empty.","Arquivo de certificado PayPal está vazio."
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal não oferece suporte a processamento de ordens com montante zero. Para concluir a sua compra, vá para o processo de compra standard."
-"PayPal gateway has rejected request. %s","Portal PayPal rejeitou pedido. %s"
-"PayPal processes all of your orders, and you get paid.","PayPal processa todas as suas ordens, e você é pago."
-"PayPal response hasn't required fields.","Resposta PayPal não tem os campos obrigatórios."
-"PayPal retains reports for 45 days.","PayPal retém relatórios por 45 dias."
-"PayPal/Centinel Electronic Commerce Indicator","Indicador de Comércio Eletrônico PayPal/Centinel"
-"PayPal/Centinel Visa Payer Authentication Service Result","Resultado do Serviço de Autenticação Pagador Visa PayPal/Centinel"
-"Payer Address ID","Identificação do Endereço do Pagante"
-"Payer Address Status","Estado Atual do Endereço do Pagante"
-"Payer Email","E-mail do Pagante"
-"Payer ID","Identificação do Pagante"
-"Payer Status","Estado Atual do Pagante"
-"Payer is not identified.","O pagante não está identificado."
-"Payflow Link (for USA and Canada)","Payflow Link (para EUA e Canadá)"
-"Payflow Link Settings","Configurações do Payflow Link"
-"Payflow Pro Gateway","Gateway do Payflow Pro"
-"Payflow Pro Settings","Configurações do Payflow Pro"
-"Payment Action","Ação de Pagamento"
-"Payment Applicable From","Pagamento Aplicável Desde"
-"Payment Refund initiated by merchant","Reembolso de Pagamento por iniciativa do Comerciante"
-"Payment has been declined. Please try again.","O pagamento não foi realizado. Tente outra vez."
-"Payment is being reviewed by PayPal for risk.","O pagamento está sendo revisado pelo PayPal quanto ao risco."
-"Payment transactions disallow storing objects.","Transações de pagamento não permitem armazenar objetos."
-"Payment was made to an email address that is not yet registered or confirmed.","O pagamento foi feito para um endereço de e-mail ainda não registrado ou confirmado."
-"Payments by PayPal (150 X 40)","Pagamentos por PayPal (150 x 40)"
-"Payments by PayPal (150 X 60)","Pagamentos por PayPal (150 x 60)"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","Pagamentos com cartões + proteção do vendedor - <strong style=""color:red"">Contactar o PayPal antes de ativar</strong>"
-"Paypal Billing Agreement Settings","Configurações do Contrato de Faturamento do PayPal"
-"Pending PayPal","Pendência com PayPal"
-"Phone","Telefone"
-"Place Order","Colocar Ordem"
-"Place Order Using Billing Agreements","Faça o Pedido Usando Acordos de Faturamento"
-"Please agree to all the terms and conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem."
-"Please contact PayPal Customer Service.","Entre em contato com o Atendimento ao Cliente PayPal."
-"Please do not refresh the page until you complete payment.","Por favor não atualize a página até concluir o pagamento."
-"Please select a shipping method...","Por favor selecione um método de envio..."
-"Please select region, state or province","Selecione a região, estado ou provÃncia"
-"Please update order data to get shipping methods and rates","Por favor atualize os dados do pedido para ver as formas de envio e tarifas"
+"Bonus for first ACH Use","Bônus pelo primeiro uso do ACH"
+"General Redemption","Redenção Geral"
+"Gift Certificate Redemption","Redenção de Vale Oferta"
"Points Incentive Redemption","Redenção de Pontos de Incentivo"
-"Postage Payment to either USPS or UPS","Pagamento de Porte quer para USPS ou UPS"
-"Preapproved Payment (BillUser API), either sent or received","Pagamento Pré-aprovado (BillUser API), quer enviado ou recebido"
-"Preapproved Payment ID","ID do Pagamento Pré-aprovado"
-"Price","Preço"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","Processe cartões de crédito diretamente em seu site com a solução de processamento de pagamento tudo-em-um on-line PayPal."
-"Product","Nome do produto"
-"Proxy Host","Anfitrião Proxy"
-"Proxy Port","Porta Proxy"
-"Quantity","Quant."
-"Reauthorization","Reautorização"
-"Reference Information","Informação de Referência"
-"Refund issued by merchant.","Restituição emitida pelo comerciante."
-"Reimbursement for a chargeback.","Reembolso de uma cobrança retroativa."
-"Reimbursement of Chargeback","Reembolso de Cobrança Retroativa."
-"Report Date","Data do Relatório"
-"Reports","Relatórios"
-"Requested %s and configured %s merchant emails do not match.","%s solicitado e %s emails configurados do comerciante não coincidem."
-"Require CVV Entry","Requer Entrada CVV"
-"Require Customer's Billing Address","Solicitar endereço de cobrança do cliente"
-"Reversal","Reversão"
-"Reversal of General Account Hold","Reversão do DomÃnio da Conta Geral"
+"Coupon Redemption","Resgate de Cupom"
+"Reward Voucher Redemption","Resgate de Voucher de Recompensa"
+"General. Product no longer supported","Geral. Produto não é mais suportado"
+"General: reversal of a type not belonging to the other T11xx categories","Geral: reversão de um tipo que não pertence às outras categorias T11xx"
+"ACH Withdrawal","Levantamento ACH"
+"Debit Card Transaction","Transação em Cartão de Débito"
"Reversal of Points Usage","Reversão de Pontos de Uso"
-"Reversal of an adjustment.","Reversão de um ajustamento."
+"ACH Deposit (Reversal)","Depósito ACH (Reverso)"
+"Reversal of General Account Hold","Reversão do DomÃnio da Conta Geral"
+"Account-to-Account Payment, initiated by PayPal","Pagamento Conta para Conta, iniciado por PayPal"
+"Payment Refund initiated by merchant","Reembolso de Pagamento por iniciativa do Comerciante"
+"Fee Reversal","Reversão de Taxa"
+"Hold for Dispute Investigation","Espere por Investigação de Disputa"
"Reversal of hold for Dispute Investigation","Reversão de espera por Disputa de Investigação"
-"Review Order","Analisar o pedido"
-"Reward Voucher Redemption","Resgate de Voucher de Recompensa"
-"SFTP Credentials","Credenciais SFTP"
-"Sale","Venda"
-"Sales","Vendas"
-"Same as shipping","Mesmo de envio"
-"Sandbox Credentials","Credenciais Sandbox"
-"Sandbox Mode","Modo Sandbox"
-"Schedule","Programa"
-"Schedule description is too long.","A descrição do programa é muito longa"
-"Scheduled Fetching","Buscando Programa"
-"Select a PayPal Solution","Selecione a Solução PayPal"
-"Server Error. Please try again.","Erro do servidor. Por favor tente novamente."
+"General: adjustment of a type not belonging to the other T12xx categories","Geral: ajuste de um tipo que não pertence às outras categorias T12xx"
+Reversal,Reversão
+Charge-off,"Baixa contábil"
+Incentive,Incentivo
+"Reimbursement of Chargeback","Reembolso de Cobrança Retroativa."
+"General (Authorization)","Geral (Autorização)"
+Reauthorization,Reautorização
+Void,Anular
+"General (Dividend)","Geral (Dividendo)"
+"General: temporary hold of a type not belonging to the other T15xx categories","Geral: retenção temporária de um tipo que não pertence às outras categorias T15xx"
+"Open Authorization","Autorização Aberta"
+"ACH Deposit (Hold for Dispute or Other Investigation)","Depósito ACH (Apoio para Disputa ou Outra Investigação)"
+"Available Balance","Saldo DisponÃvel"
+Funding,Financiamento
+"General: Withdrawal to Non-Bank Entity","Geral: Levantamento de Entidade Não-Bancária"
+"WorldLink Withdrawal","Levantamento WorldLink"
+"Buyer Credit Payment","Pagamento de Crédito do Comprador"
+"General Adjustment without businessrelated event","Ajuste Geral sem evento de negócios relacionado"
+"General (Funds Transfer from PayPal Account to Another)","Geral (Transferência de Fundos da Conta PayPal para Outra)"
"Settlement Consolidation","Consolidação de liquidação"
-"Settlement Report Settings","Configurações de relatório de liquidação"
-"Settlement of a chargeback.","Liquidação de um estorno."
-"Severe 3D Secure Card Validation","Validação de Cartão Severe 3D Secure"
-"Severe Validation Removes Chargeback Liability on Merchant","Validação Severe Remove a Responsabilidade de Cobrança Retroativa no Comerciante"
-"Severe validation removes chargeback liability on merchant.","A validação rigorosa isenta o comerciante da responsabilidade de desconto."
-"Shipping","Remessa"
-"Shipping Address","Endereço de Envio"
-"Shipping Method","Tipo de Frete"
-"Shop now using (150 X 40)","Compre agora usando (150 X 40)"
-"Shop now using (150 X 60)","Compre agora usando (150 X 60)"
-"Shortcut","Atalho"
-"Shortcut Buttons Flavor","Sabor botões de atalho"
-"Shortcut on Product View","Atalho na Visão do Produto"
-"Shortcut on Shopping Cart","Atalho no Carrinho de Compras"
-"Sign a billing agreement to streamline further purchases with PayPal.","Assine um acordo de faturamento para agilizar ainda mais as compras com o PayPal."
-"Solo","Solo"
-"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponÃveis neste momento para esta ordem."
-"Sort Order","Classificar pedido"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica o que o PerÃodo de Honra de Autorização é na conta PayPal do comerciante. Deve espelhar a configuração no PayPal."
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica o que o PerÃodo de Ordem Válido é na conta PayPal do comerciante. Deve espelhar a configuração no PayPal."
-"State/Province","Estado/ProvÃncia"
-"Static","Estático"
-"Street Address","Endereço da Rua"
-"Street Address %s","Endereço da Rua %s"
-"Submitting order information...","Enviando informações da ordem..."
-"Subscriber name is too long.","Nome do assinante é muito longo."
-"Subscription ID","ID de Subscrição"
-"Subscription Payment, either payment sent or payment received","Pagamento de Subscrição, ou de pagamento enviado ou pagamento recebido"
-"Subtotal","Subtotal"
-"Summary Text for Aggregated Cart","Texto Resumo para Carrinho Agregado"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Apoio de cartões American Express exige um acordo adicional. Saiba mais em <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
-"Switch/Maestro","Switch/Maestro"
-"Test Mode","Modo de Teste"
-"The background color for the checkout page around the header and payment form.","A cor de fundo para a página de compra à volta do cabeçalho e formulário de pagamento."
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","A cor de fundo para o cabeçalho da página de compra. Código de seis caracteres, sem diferença de minúsculas e maiúsculas, de cor hexadecimal HTML em ASCII."
-"The billing agreement ""%s"" has been canceled.","O contrato de faturamento ""%s"" foi cancelado."
-"The billing agreement ""%s"" has been created.","O contrato de faturamento ""%s"" foi criado."
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","O número padrão de autorizações de criança em sua conta PayPal é 1. Para fazer autorizações múltiplas entre em contato com PayPal para pedir um aumento."
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","A imagem no canto superior esquerdo da página de compra. Tamanho máximo é 750x90 pixels. <strong style=""color:red"">https</strong> é altamente recomendado."
-"The maximum number of child authorizations is reached.","O número máximo de autorizações de criança foi atingido."
-"The merchant account is not yet verified.","A conta de comerciante ainda não foi confirmada."
-"The payment curency does not match any of the merchant's balances currency.","A moeda de pagamento não corresponde a nenhuma das moedas dos balanços do comerciante."
-"The payment eCheck is not yet cleared.","O pagamento eCheck ainda não está clarificado."
-"The payment is authorized but not settled.","O pagamento está autorizado, mas não liquidado."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","O pagamento está pendente porque foi feito para um endereço de e-mail que ainda não está registrado ou confirmado."
-"The payment is pending while it is being reviewed by PayPal for risk.","O pagamento está pendente enquanto ele está sendo revisado para o risco por PayPal."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","O pagamento foi feito via cartão de crédito. A fim de receber fundos o comerciante deve atualizar sua conta para status Business ou Premier."
+"General: event not yet categorized","Geral: evento ainda não classificado"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days","A cada 3 dias"
+"Every 7 days","A cada 7 dias"
+"Every 10 days","A cada 10 dias"
+"Every 14 days","A cada 14 dias"
+"Every 30 days","A cada 30 dias"
+"Every 40 days","A cada 40 dias"
+"No Logo","Nenhum Logo"
+"Pending PayPal","Pendência com PayPal"
+"Billing Agreement","Contrato de faturamento"
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- Por Favor, Escolha o Acordo de Cobrança--"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements","Voltar para Contratos de Faturamento"
"There are no billing agreements yet.","Ainda não existem acordos de faturamento."
-"There was an error processing your order. Please contact us or try again later.","Ocorreu um erro ao processar sua ordem. Entre em contato conosco ou tente novamente mais tarde."
-"This feature needs be enabled first for the merchant account through PayPal technical support.","Este recurso primeiro precisa ser ativado para a conta que aceita cartões de crédito através do suporte técnico PayPal ."
-"This operation requires an existing transaction object.","Esta operação requer um objeto existente de transação."
-"Time of Day","Hora do Dia"
-"Title","TÃtulo"
-"Transaction ID","ID da Transação"
-"Transaction ID must not be empty.","A ID da transação não pode estar vazia."
-"Transaction Information","Informação da Transação"
-"Transfer Cart Line Items","Itens de Linha de Carrinho de Transferência"
-"Transfer Shipping Options","Opções de Envio de Transferência"
-"Triggered Fraud Filters","Desencadeados Filtros de Fraude"
-"Unable to cancel Express Checkout.","ImpossÃvel cancelar Fechamento de Pedido Expresso."
-"Unable to change status. Current status is not correspond to real status.","Incapaz de mudar de status. Situação atual não corresponde ao estado real."
-"Unable to communicate with the PayPal gateway.","Incapaz de se comunicar com o portal PayPal."
-"Unable to initialize Express Checkout review.","ImpossÃvel iniciar revisão do Fechamento de Pedido Expresso."
-"Unable to initialize Express Checkout.","Não é possÃvel inicializar o Checkout Expresso."
-"Unable to place the order.","ImpossÃvel realizar o pedido."
-"Unable to process Express Checkout approval.","ImpossÃvel processar aprovação para Fechamento Expresso de Pedido."
-"Unable to start Express Checkout.","ImpossÃvel iniciar Fechamento Expresso de Pedido."
-"Unable to update Order data.","Incapaz de atualizar dados do Pedido."
-"Unable to update shipping method.","ImpossÃvel atualizar tipo de frete."
-"Unknown Error. Please try again later.","Erro Desconhecido. Por favor tente novamente mais tarde."
-"Unknown reason. Please contact PayPal customer service.","Motivo desconhecido. Favor contactar o atendimento a clientes do PayPal."
-"Update Order Data","Atualizar Dados do Pedido"
-"Use Proxy","Usar Proxy"
-"Use colon to specify port. For example: ""test.example.com:5224"".","Usar dois-pontos para especificar porta. Por ex.: ""teste.exemplo.com:5224""."
-"User","Usuário"
-"User-initiated Currency Conversion","Conversão de Moeda por Iniciativa do Usuário"
-"Uses store frontend name by default.","Usa por padrão o nome do servidor front-end da loja."
-"VAT Number","Número VAT"
-"Vendor","Vendedor"
-"Vendor / Merchant Login","Login de vendedor / comerciante"
-"View","Ver"
-"View Demo","Visualizar Demonstração"
-"View PayPal solutions.","Visualizar soluções PayPal."
-"View Transaction","Visualizar Transação"
-"View Transaction Details","Visualizar Detalhes da Transação."
-"Virtual PayPal Debit Card Transaction","Transação via Cartão de Débito Virtual PayPal"
-"Virtual Terminal Payment","Pagamento via Terminal Virtual"
-"Void","Anular"
-"Waiting until Customer's eCheck will be cleared.","Aguardando eCheck do Cliente ser liberado."
-"We prefer PayPal (150 X 40)","Preferimos PayPal (150 x 40)"
-"We prefer PayPal (150 X 60)","Preferimos PayPal (150 x 60)"
-"Website Payments Plus","Website Payments Plus"
-"Website Payments Plus Settings","Configurações do Website Payments Plus"
-"Website Payments Pro","Website Payments Pro"
-"Website Payments Pro (Payflow Edition) Settings","Configurações do Website Payments Pro (Edição Payflow)"
-"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
-"Website Payments Pro Hosted Solution Settings","Configurações do Website Payments Pro Hosted Solution"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","Edição Payflow de Pagamentos de Site Pro (inclui o Checkout Expresso)"
-"Website Payments Pro Settings","Configurações de Pagamentos de Site Pro"
-"Website Payments Standard","Pagamentos de Site Padrão"
-"Website Payments Standard Payment","Pagamento de Pagamentos de Site Padrão"
-"Website Payments Standard Settings","Configurações de Pagamentos de Site Padrão"
-"What is PayPal?","O que é o PayPal?"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Se deseja criar um acordo de faturamento, se não houver acordos de faturamento ativos disponÃveis."
-"Will appear as a payment option only for customers who have at least one active billing agreement.","Aparecerá como uma opção de pagamento apenas para os clientes que têm pelo menos um acordo de faturamento ativo."
-"WorldLink Withdrawal","Levantamento WorldLink"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Gostaria de assinar um acordo de faturamento para agilizar ainda mais compras posteriores com o PayPal?"
-"Wrong Order ID (%s) specified.","ID (%s) especificado da Ordem Errado ."
-"Wrong PayPal Express Checkout Token specified.","Token errado p/ Fechamento Expresso de Pedido pelo PayPal."
-"Wrong billing agreement ID specified.","ID de acordo de faturamento especificado errado."
-"Yes","Sim"
-"Yes. Matched Address and five-didgit ZIP","Sim. Endereço Correspondente e ZIP de cinco dÃgitos"
-"You cannot void a verification transaction","Não é possÃvel anular uma transação de verificação"
-"You will be redirected to the PayPal website in a few seconds.","Você será redirecionado para a página do PayPal em alguns segundos."
-"You will be redirected to the PayPal website when you place an order.","Você será redirecionado para o site PayPal quando você colocar uma ordem."
-"You will be redirected to the PayPal website.","Você será redirecionado para o site PayPal."
+"New Billing Agreement","Novo Contrato de Faturamento"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order","Analisar o pedido"
+"Please select a shipping method...","Por favor selecione um método de envio..."
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","Itens em seu carrinho de compras"
+"Edit Shopping Cart","Editar Carrinho de Compras"
+"Please update order data to get shipping methods and rates","Por favor atualize os dados do pedido para ver as formas de envio e tarifas"
+"Checkout with PayPal","Fechar Pedido com o PayPal"
+"Please do not refresh the page until you complete payment.","Por favor não atualize a página até concluir o pagamento."
"You will be required to enter your payment details after you place an order.","Você será obrigado a inserir seus detalhes de pagamento depois de colocar uma ordem."
-"Zip/Postal Code","Zip/Código Postal"
-"chargeback reimbursed","cobrança retroativa reembolsada"
-"chargeback settled","cobrança retroativa resolvida"
-"customer complaint","reclamação do cliente"
-"customer triggered a chargeback","cliente provocou um cobrança retroativa"
-"customer triggered money-back guarantee","cliente desencadeou garantia de reembolso"
-"eBay Auction Payment","Pagamento do Leilão eBay"
-"merchant refunded payment","pagamento do comerciante reembolsado"
-"no reason","nenhuma razão"
-"reversal of an adjustment","reversão de um ajuste"
-"unknown reason","razão desconhecida"
+"Additional Options","Opções Adicionais"
+"Acceptance Mark","Marca de Aceitação"
+"What is PayPal?","O que é o PayPal?"
+"Sign a billing agreement to streamline further purchases with PayPal.","Assine um acordo de faturamento para agilizar ainda mais as compras com o PayPal."
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
+"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/i18n/zh_CN.csv b/app/code/Magento/Paypal/i18n/zh_CN.csv
index 8b5bada8460..b7589a8ab15 100644
--- a/app/code/Magento/Paypal/i18n/zh_CN.csv
+++ b/app/code/Magento/Paypal/i18n/zh_CN.csv
@@ -1,504 +1,692 @@
-"-- Please Select Billing Agreement--","-- 请选择记账åè®® --"
-"-OR-","-或-"
-"2-pixel perimeter around the header space.","头部空间周围2åƒç´ 的边界"
-"3D Secure","3D 安全"
-"3D Secure Card Validation","3D 安全信用å¡éªŒè¯"
-"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","Maestroå¡éœ€è¦ 3D 安全验è¯ã€‚对美国è¿é€šå¡çš„支æŒéœ€è¦é¢å¤–çš„å议。详情请访问 <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>。"
-"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">开始通过PayPal接å—付款ï¼</a>"
-"A value is required for live mode. Refer to your CardinalCommerce agreement.","动æ€æ¨¡å¼éœ€è¦æ供值。请å‚考您的CardinalCommerce å议。"
-"ACH Deposit (Hold for Dispute or Other Investigation)","ACHä¿è¯é‡‘（用作ä¿è¯æˆ–其他调查用途）"
-"ACH Deposit (Reversal)","ACHä¿è¯é‡‘（撤销）"
-"ACH Funding for Funds Recovery from Account Balance","æ¥è‡ªå¸æˆ·ä½™é¢çš„返款æ¢å¤ACH返款"
-"ACH Withdrawal","ACH撤销"
-"API Authentication Methods","API身份验è¯æ–¹æ³•"
-"API Certificate","APIè¯ä¹¦"
-"API Password","API密ç "
-"API Signature","APIç¾å"
-"API Username","API用户å"
-"API Uses Proxy","API使用代ç†"
-"API/Integration","API/集æˆ"
-"API/Integration Settings","API/集æˆè®¾ç½®"
-"Ability for buyer to purchase without PayPal account.","买家在ä¸ä½¿ç”¨PayPalå¸æˆ·ä¸‹è´ä¹°çš„能力。"
-"Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.","在您的è´ç‰©è½¦ä¸æŽ¥å—PayPal付款。PayPal将通过 Payflow Pro Gateway 处ç†æ‚¨çš„付款。"
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. Includes a merchant account from PayPal.","接å—兼容 PCI æ ‡å‡†çš„æ”¯ä»˜æ–¹æ³•å¯ä»¥å¸®ä½ ç•™ä½é¡¾å®¢ã€‚ä½ ä¹Ÿå¯ä»¥ä½¿ç”¨ PayPal 的商家账户。"
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. For use with your own merchant account.","接å—兼容 PCI æ ‡å‡†çš„æ”¯ä»˜æ–¹æ³•å¯ä»¥å¸®ä½ ç•™ä½é¡¾å®¢ã€‚ä½ ä¹Ÿå¯ä»¥ä½¿ç”¨è‡ªå·±çš„商家账户。"
-"Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.","在ä¸è¦æ±‚客户离开您网站的情况下接å—付款。很多æµè¡Œçš„网络æœåŠ¡åŠè´ç‰©è½¦éƒ½å†…建有Payflowæ”¯ä»˜ç½‘å…³ï¼Œå› æ¤å®‰è£…更简便。"
-"Acceptance Mark","接å—æ ‡å¿—"
-"Acceptance Mark Image","接å—æ ‡å¿—å›¾ç‰‡"
-"Account-to-Account Payment, initiated by PayPal","å¸æˆ·åˆ°å¸æˆ·æ”¯ä»˜ï¼Œç”±PayPal开创"
-"Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.","为您现有的è´ç‰©è½¦æ·»åŠ 快速结账按钮，实现快速简å•çš„信用å¡æ”¯ä»˜ã€‚所有支付请求将由PayPal处ç†ã€‚"
-"Additional Options","其他选项"
-"Address","地å€"
-"Address Verification System Response","地å€éªŒè¯ç³»ç»Ÿå“应"
-"All the address information matched","所有地å€ä¿¡æ¯éƒ½åŒ¹é…"
-"Allow in Billing Agreement Wizard","å…许使用记账åè®®å‘导"
-"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","å¯ç”¨çš„值： ""paypal""ã€""primary"" （默认值）ã€your_custom_value（您的å¸æˆ·é…置文件ä¸åŒ…å«çš„一ç§è‡ªå®šä¹‰æ”¯ä»˜é¡µé¢æ ·å¼ï¼‰ã€‚"
-"Allowed Credit Card Types","å…许的信用å¡ç±»åž‹"
-"Also affects mini-shopping cart.","åŒæ—¶ä¼šå½±å“è¿·ä½ è´ç‰©è½¦ã€‚"
-"Ask Customer","询问顾客"
-"Attempted Authentication, Bad Result","å°è¯•èº«ä»½éªŒè¯ï¼Œç»“果有误"
-"Attempted Authentication, Good Result","å°è¯•èº«ä»½éªŒè¯ï¼Œç»“æžœæ£å¸¸"
-"Auction Payment other than through eBay","eBay之外的其他æ‹å–支付"
-"Authenticated, Bad Result","已身份验è¯ï¼Œç»“果有误"
-"Authenticated, Good Result","已身份验è¯ï¼Œç»“æžœæ£å¸¸"
-"Authorization","授æƒ"
-"Authorization Honor Interval (days)","授æƒæœ‰æ•ˆæœŸé™ï¼ˆå¤©ï¼‰"
-"Authorization expired.","授æƒå·²è¿‡æœŸã€‚"
-"Authorization transaction is required to void.","授æƒçš„äº¤æ˜“å¿…é¡»æ— æ•ˆã€‚"
-"Authorization was voided by merchant.","授æƒè¢«é“¶è¡Œæ’¤é”€ã€‚"
-"Authorized amount of %s.","授æƒé¢åº¦ %s"
-"Authorizing amount of %s is pending approval on gateway.","授æƒé¢åº¦ %s æ£ç‰å¾…网关的审批。"
-"Auto","自动"
-"AutoSweep","自动清ç†"
-"Available Balance","å¯ç”¨ä½™é¢"
-"Back to Billing Agreements","返回记账åè®®"
-"Balance Manager Account Bonus","ä½™é¢ç®¡ç†å™¨å¸æˆ·ç‚¹æ•°"
-"Billing Address","è´¦å•åœ°å€"
-"Billing Agreement","è®°è´¦åè®®"
-"Billing Agreement # %s","è®°è´¦åè®® # %s"
-"Billing Agreement #%s","è®°è´¦åè®®#%s"
-"Billing Agreement Signup ","ç¾ç½²è®°è´¦åè®®"
-"Billing Agreement View","è®°è´¦å议视图"
-"Billing Agreements","è®°è´¦åè®®"
-"Billing Agreement status is not set.","è®°è´¦å议状æ€æœªè®¾ç½®ã€‚"
-"Unable to save Billing Agreement:","æ— æ³•ä¿å˜è®°è´¦å议："
-"Your billing agreement # is: %s.","您的账å•ç¼–å·ä¸ºï¼š %s"
-"Bonus for first ACH Use","首次使用ACH奖励"
-"Buyer Credit Payment","买家信用支付"
+Custom,自定义
+Close,Close
+Cancel,Cancel
+Back,Back
+Price,ä»·æ ¼
+ID,ID
+Configure,Configure
+No,å¦
+Qty,Qty
+Subtotal,å°è®¡
+"Incl. Tax","Incl. Tax"
+Edit,Edit
+"--Please Select--","--Please Select--"
+Customer,Customer
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"-- Please Select --","-- Please Select --"
+Yes,是
+Status,Status
+Enabled,Enabled
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,订å•
+View,查看
+Active,Active
+Position,Position
+Dynamic,动æ€
+N/A,N/A
+Canceled,Canceled
+"General Information","General Information"
+Static,é™æ€
+"Advanced Settings","Advanced Settings"
+"Learn More",了解更多
+"Start Date","Start Date"
+"Product Name","Product Name"
+"3D Secure Card Validation","3D Secure Card Validation"
+"Merchant Liability",商家责任
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Shipping Method",è¿é€æ–¹å¼
+"Please agree to all the terms and conditions before placing the order.",请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚
+"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>."
+Password,Password
+Continue,Continue
+"Order #","Order #"
+Login,Login
+"Shipping Address",é€è´§åœ°å€
+"Payment Method","Payment Method"
+"Place Order",下订å•
+"Sorry, no quotes are available for this order at this time.",抱æ‰ï¼Œå½“å‰è¯¥è®¢å•ä¸æ²¡æœ‰æŠ¥ä»·å¯ç”¨ã€‚
+Sales,销售
+Created,Created
+Display,Display
+User,User
+Daily,æ¯å¤©
+Date,Date
+"Order Total","Order Total"
+Never,æ°¸ä¸
+Updated,Updated
+Reports,报告
+"Order Status","Order Status"
+"View Order","View Order"
+Event,事件
+"Please Select","Please Select"
+"Submitting order information...",æ£åœ¨æ交订å•ä¿¡æ¯...
+Authorization,授æƒ
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"Note: %1","Note: %1"
+"IPN ""%1""","IPN ""%1"""
+"Billing Agreements",è®°è´¦åè®®
+"Reference ID","Reference ID"
+"Billing Agreement #%1","Billing Agreement #%1"
+"Related Orders","Related Orders"
+"Billing Agreement View",è®°è´¦å议视图
+"View Transaction Details",查看交易详情
+"Reference Information",å‚考信æ¯
+"Transaction Information",交易信æ¯
+"PayPal Fee Information",PayPal费用信æ¯
+"PayPal Settlement Reports",PayPal处ç†æŠ¥å‘Š
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates",获å–æ›´æ–°
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,帮助
+"There is already another PayPal solution enabled. Enable this solution instead?","There is already another PayPal solution enabled. Enable this solution instead?"
+"The following error(s) occured:","The following error(s) occured:"
+"Some PayPal solutions conflict.","Some PayPal solutions conflict."
+"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
+"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
+"View Demo",查看演示
+"See terms","See terms"
+"You will be redirected to the PayPal website.",您将被é‡å®šå‘到PayPal网站。
+"Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?","Would you like to sign a billing agreement ' 'to streamline further purchases with PayPal?"
+"You will be redirected to the PayPal website when you place an order.",在您下å•æ—¶ï¼Œæ‚¨ä¼šè¢«é‡å®šå‘到PayPal网站。
+"Click here if you are not redirected within 10 seconds.","Click here if you are not redirected within 10 seconds."
+"You will be redirected to the PayPal website in a few seconds.",å‡ ç§’é’ŸåŽï¼Œæ‚¨å°†è¢«é‡å®šå‘到PayPal网站。
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We could not cancel the billing agreement.","We could not cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We could not delete the billing agreement.","We could not delete the billing agreement."
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"View Transaction",查看交易
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
+"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"We couldn't cancel the billing agreement.","We couldn't cancel the billing agreement."
+"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"Express Checkout and Order have been canceled.",快速结账且订å•å·²å–消。
+"Express Checkout has been canceled.",快速结账已被å–消。
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't place the order.","We can't place the order."
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.",PayPal快速结账令牌ä¸å˜åœ¨ã€‚
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"We can't contact the PayPal gateway.","We can't contact the PayPal gateway."
+"PayPal response hasn't required fields.",PayPalçš„å“应缺少必须å—段。
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"PayPal gateway rejected the request. %1","PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
+"Unable to save Billing Agreement:",æ— æ³•ä¿å˜è®°è´¦å议：
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)",我们喜欢PayPal（150X60）
+"We prefer PayPal (150 X 40)",我们喜欢PayPal（150X40）
+"Now accepting PayPal (150 X 60)",现在接å—PayPal（150X60）
+"Now accepting PayPal (150 X 40)",现在接å—PayPal（150X40）
+"Payments by PayPal (150 X 60)",用PayPal付款（150X60）
+"Payments by PayPal (150 X 40)",用PayPal付款（150X40）
+"Shop now using (150 X 60)",立刻è´ç‰©å¹¶ä½¿ç”¨ï¼ˆ150X60）
+"Shop now using (150 X 40)",立刻è´ç‰©å¹¶ä½¿ç”¨ï¼ˆ150X40）
+Shortcut,å¿«æ·æ–¹å¼
+"Acceptance Mark Image",接å—æ ‡å¿—å›¾ç‰‡
+Sale,销售
+"For Virtual Quotes Only",仅用于虚拟产å“
+Auto,自动
+"Ask Customer",询问顾客
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature",APIç¾å
+"API Certificate",APIè¯ä¹¦
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.",授æƒåå¸æˆ·çš„最大数é‡å·²è¾¾åˆ°ã€‚
+"PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. ' 'To finish your purchase, please go through the standard checkout process."
+"Payer is not identified.",付款者未ç»æ£€å®šã€‚
+"Last Transaction ID",最新交易ID
+"This customer did not include a confirmed address.","This customer did not include a confirmed address."
+"The payment is authorized but not settled.",支付已获授æƒä½†å°šæœªç¡®å®šã€‚
+"The payment eCheck is not yet cleared.",支付的电å支票尚未兑现。
+"The merchant holds a non-U.S. account and does not have a withdrawal mechanism.","The merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"The payment currency does not match any of the merchant's balances currency.","The payment currency does not match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.",æ”¯ä»˜è¢«æŒ‚èµ·ï¼Œå› ä¸ºæ£åœ¨ç”±PayPal进行风险评估。
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.",æ”¯ä»˜è¢«æŒ‚èµ·ï¼Œå› ä¸ºæ”¯ä»˜ä½¿ç”¨äº†ä¸€ä¸ªæœªç»ç¡®è®¤çš„电å邮件地å€ã€‚
+"The merchant account is not yet verified.",银行å¸æˆ·å°šæœªéªŒè¯ã€‚
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.",支付是通过信用å¡è¿›è¡Œçš„。为了收到资金，银行必须将å¸æˆ·å‡çº§ä¸ºå•†ä¸šæˆ–白金状æ€ã€‚
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.",调整撤销
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.",å¿è¿˜é€€æ¬¾ã€‚
+"Settlement of a chargeback.",处ç†è¿”款。
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.",æœªçŸ¥åŽŸå› ã€‚è¯·è”ç³»PayPal客户æœåŠ¡ã€‚
+"Payer ID",付款者ID
+"Payer Email",付款者邮件地å€
+"Payer Status",付款者状æ€
+"Payer Address ID",付款者地å€ID
+"Payer Address Status",付款者地å€çŠ¶æ€
+"Merchant Protection Eligibility",银行ä¿æŠ¤çš„èµ„æ ¼
+"Triggered Fraud Filters",触å‘的欺诈ç›é€‰å™¨
+"Last Correlation ID",最新关è”ID
+"Address Verification System Response",地å€éªŒè¯ç³»ç»Ÿå“应
+"CVV2 Check Result by PayPal",PayPal的CVV2检查结果
"Buyer's Tax ID","买家的纳税人 ID"
"Buyer's Tax ID Type","买家的纳税人 ID 类型"
-"By default it is ""reports.paypal.com"".","默认为“reports.paypal.comâ€ã€‚"
-"CNPJ","CNPJ"
-"CPF","CPF"
-"CVV2 Check Result by PayPal","PayPal的CVV2检查结果"
-"Can not send new order email.","æ— æ³•å‘é€æ–°çš„订å•é‚®ä»¶ã€‚"
-"Cannot create target file for reading reports.","æ— æ³•ä¸ºé˜…è¯»çš„æŠ¥å‘Šåˆ›å»ºç›®æ ‡æ–‡ä»¶ã€‚"
-"Centinel API URL","Centinel API URL"
-"Centinel Custom API URL","Centinel 自定义 API URL"
-"Charge-off","收å–"
-"Chargeback","退款"
-"Chargeback by customer.","由客户退款。"
-"Checkout with PayPal","使用PayPal结账"
-"City","城市"
-"Click here if you are not redirected within 10 seconds...","å¦‚æžœä½ åœ¨10秒内没有é‡å®šå‘，请点击这里..."
-"Company","å…¬å¸"
-"Completion Date","完æˆæ—¥æœŸ"
-"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","æ£åœ¨è¿žæŽ¥åˆ°PayPal SFTPæœåŠ¡å™¨èŽ·å–新报告。您是å¦ç¡®å®šè¦å¤„ç†ï¼Ÿ"
-"Countries Payment Applicable From","å„国支付å¯ç”¨æƒ…况表å•"
-"Country","国家"
-"Coupon Redemption","代金券兑æ¢"
-"Created billing agreement #%s.","创建记账åè®® #%s。"
-"Credit","信用"
-"Credit Card Settings","信用å¡è®¾ç½®"
-"Currency Conversion required to cover negative balance","è´§å¸è½¬æ¢éœ€è¦è€ƒè™‘ä½™é¢è´Ÿå€¼"
-"Custom","自定义"
-"Custom Endpoint Hostname or IP-Address","自定义端点主机å或IP地å€"
-"Custom Path","自定义路径"
-"Customer Information","客户信æ¯"
-"Customer complaint.","客户投诉。"
-"Customer did not include a confirmed address.","客户并未æ供确认的地å€ã€‚"
-"Customer failed to pay.","客户付款失败。"
-"Customer triggered a money-back guarantee.","客户触å‘了返款ä¿è¯ã€‚"
-"Customer used non-confirmed address.","客户使用了未ç»ç¡®è®¤çš„地å€/"
-"Daily","æ¯å¤©"
-"Debit","借记"
-"Debit Card Cash Back","借记å¡è¿”现"
-"Debit Card Transaction","借记å¡äº¤æ˜“"
-"Debit or Credit","借记å¡æˆ–信用å¡"
-"Debug Mode","调试模å¼"
-"Direct Payment API","直接支付API"
-"Discount","折扣"
-"Display Express Checkout in the Payment Information step","在支付信æ¯é¡µé¢æ˜¾ç¤ºå¿«é€Ÿç»“è´¦"
-"Displays on catalog pages and homepage.","显示在分类页和首页"
-"Don't have a PayPal account? Simply enter your email address.","还没有PayPalå¸æˆ·ï¼Ÿç›´æŽ¥è¾“入您的电å邮件地å€ã€‚"
-"Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.","还没有PayPal银行账户？您ä¾ç„¶å¯ä»¥é€šè¿‡Payflow Pro Gateway接å—信用å¡ä»˜æ¬¾ã€‚"
-"Dynamic","动æ€"
-"EFT Funding (German banking)","EFT返款（德国银行）"
-"Edit Shopping Cart","编辑è´ç‰©è½¦"
-"Email Address","编辑电å邮件地å€"
-"Email Associated with PayPal Merchant Account","å…³è”ç»™PayPal银行å¸æˆ·çš„电å邮件地å€"
-"Enable Automatic Fetching","å¯ç”¨è‡ªåŠ¨èŽ·å–"
-"Enable PayPal Guest Checkout","å¯ç”¨PayPalæ¥å®¾ç»“è´¦"
-"Enabled","å·²å¯ç”¨"
-"Event","事件"
-"Event Code","事件代ç "
-"Every 10 days","æ¯10天"
-"Every 14 days","æ¯14天"
-"Every 3 days","æ¯3天"
-"Every 30 days","æ¯30天"
-"Every 40 days","æ¯40天"
-"Every 7 days","æ¯7天"
-"Exact Match. Address and Postal Code. International","完全匹é…。地å€å’Œé‚®ç¼–。国际"
-"Exact Match. Address and Postal Code. UK-specific","完全匹é…。地å€å’Œé‚®ç¼–。仅é™è‹±å›½"
-"Exact Match. Address and nine-digit ZIP code","完全匹é…，地å€å’Œä¹ä½é‚®ç¼–"
-"Explanation: %s.","说明：%s"
-"Express Checkout","快速结账"
-"Express Checkout (Payflow Edition) Settings","快速结账（PayFlow版）设置"
-"Express Checkout APIs","快速结账API"
-"Express Checkout Settings","快速结账设置"
-"Express Checkout and Order have been canceled.","快速结账且订å•å·²å–消。"
-"Express Checkout has been canceled.","快速结账已被å–消。"
-"Failed to cancel the billing agreement.","å–消记账å议时出错。"
-"Failed to create billing agreement for this order.","为该订å•åˆ›å»ºè®°è´¦å议时出错。"
-"Failed to fetch reports from '%s@%s'.","从 '%s@%s'获å–报告失败。"
-"Failed to finish billing agreement wizard.","完æˆåœ°è®°è´¦åè®®å‘导时出错。"
-"Failed to start billing agreement wizard.","开始记账åè®®å‘导时出错。"
-"Fax","ä¼ çœŸ"
-"Fee Amount","费率"
-"Fee Debit or Credit","借记å¡æˆ–信用å¡è´¹ç”¨"
-"Fee Reversal","撤销手ç»è´¹"
-"Fee: Foreign ACH Withdrawal","费用：外国ACH撤销"
-"Fee: Mass Pay Request","费用：批é‡ä»˜æ¬¾è¯·æ±‚"
-"Fee: Web Site Payments Pro Account Monthly","费用：专业å¸æˆ·æœˆåº¦ç½‘站支付"
-"Fee: WorldLink Check Withdrawal","费用：WorldLink支票撤销"
-"Fetch","获å–"
-"Fetch Updates","获å–æ›´æ–°"
-"Fetched %s report rows from '%s@%s'.","从'%s@%s'èŽ·å– %s 报告。"
-"For Virtual Quotes Only","仅用于虚拟产å“"
-"Frontend Experience Settings","å‰ç«¯ä½“验设置"
-"Funding","退款"
-"General (Authorization)","常规（身份验è¯ï¼‰"
-"General (Dividend)","常规（利æ¯ï¼‰"
-"General (Funds Transfer from PayPal Account to Another)","常规（从一个PayPalå¸æˆ·å‘å¦ä¸€ä¸ªè½¬ç§»èµ„金）"
-"General (Purchase with a credit card)","常规（使用信用å¡è´ä¹°ï¼‰"
-"General Adjustment without businessrelated event","ä¸Žä¸šåŠ¡æ— å…³çš„å¸¸è§„è°ƒæ•´"
-"General Currency Conversion","常规货å¸è½¬æ¢"
-"General Funding of PayPal Account ","PayPalå¸æˆ·çš„常规退款"
-"General Redemption","常规兑æ¢"
-"General Withdrawal from PayPal Account","æ¥è‡ªPayPalå¸æˆ·çš„常规撤销"
-"General. Product no longer supported","常规。产å“ä¸åœ¨è¢«æ”¯æŒ"
-"General: Use of PayPal account for purchasing as well as receiving payments","常规：使用PayPalå¸æˆ·è¿›è¡Œä»˜æ¬¾ä»¥åŠæ”¶æ¬¾"
-"General: Withdrawal from PayPal Account","常规：通过PayPalå¸æˆ·æ’¤é”€"
-"General: Withdrawal to Non-Bank Entity","常规：通过éžé“¶è¡Œå®žä½“撤销"
-"General: adjustment of a type not belonging to the other T12xx categories","常规：调整为一ç§ä¸å†å±žäºŽå…¶ä»–T12xx分类的类型"
-"General: bonus of a type not belonging to the other T08xx categories","常规：通过一ç§ä¸å†å±žäºŽå…¶ä»–T08xx类型的奖励"
-"General: event not yet categorized","常规：事件尚未分类"
-"General: non-payment fee of a type not belonging to the other T01xx categories","常规：一ç§ä¸å±žäºŽå…¶ä»–T01xx分类的éžæ”¯ä»˜è´¹ç”¨"
-"General: received payment of a type not belonging to the other T00xx categories","常规：一ç§ä¸å±žäºŽå…¶ä»–T00xx分类的支付收款"
-"General: reversal of a type not belonging to the other T11xx categories","常规：ä¸å±žäºŽå…¶ä»–T11xx分类的ä¿ç•™ç±»åž‹"
-"General: temporary hold of a type not belonging to the other T15xx categories","常规：ä¸å±žäºŽå…¶ä»–T15xx分类的暂时ä¿ç•™ç±»åž‹"
-"Get Credentials from PayPal","从PayPal获得å‡è¯"
-"Gift Certificate Payment: purchase of Gift Certificate","礼å“券支付：è´ä¹°ç¤¼å“券"
-"Gift Certificate Redemption","礼å“券兑æ¢"
-"Gross Amount","总é¢"
-"Header Background Color","头部背景色"
-"Header Border Color","头部边框颜色"
-"Header Image URL","头部图åƒURL"
-"Help","帮助"
-"Hidden Virtual PayPal Debit Card Transaction","éšè—虚拟PayPal借记å¡äº¤æ˜“"
-"Hold for Dispute Investigation","ä¿ç•™åšäº‰è®®è°ƒæŸ¥"
-"IPN ""%s"".","IPN ""%s""。"
-"IPN verification ""%s"".","IPN éªŒè¯ ""%s""。"
-"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","如果为空，则会使用默认值。自定义URLå¯é€šè¿‡ CardinalCommerce åè®®æ供。"
-"If not specified, Default Country from General Config will be used","如果ä¸æŒ‡å®šï¼Œåˆ™ä½¿ç”¨å¸¸è§„é…ç½®ä¸çš„默认国家"
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","如果å¯ç”¨è¯¥é€‰é¡¹ï¼Œå®¢æˆ·å³å¯åœ¨PayPal网站更改自己的å‘货地å€å’Œå‘货方法。动æ€æ¨¡å¼ä¸‹åªèƒ½ä½¿ç”¨HTTPSå议。"
-"Impossible to issue a refund transaction because the capture transaction does not exist.","æ— æ³•å‘å¸ƒé€€æ¬¾äº¤æ˜“ï¼Œå› ä¸ºèŽ·å¾—çš„äº¤æ˜“ä¸å˜åœ¨ã€‚"
-"Incentive","奖励"
-"Initiation Date","å‘起日期"
-"Integral Evolution","整体演化"
-"Integral Evolution Settings","整体演化设置"
-"Invoice ID","å‘票ID"
-"Issuer Liability","å‘å¡äººè´£ä»»"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","建议对店铺的æ¯ä¸ªè§†å›¾ï¼Œå°†è¯¥å€¼è®¾ç½®ä¸ºâ€œå‚¨è“„å¡æˆ–信用å¡â€ã€‚"
-"It is recommended to set this value to ""PayPal"" per store views.","建议对店铺的æ¯ä¸ªè§†å›¾ï¼Œå°†è¯¥å€¼è®¾ç½®ä¸ºâ€œPayPalâ€ã€‚"
-"Items in Your Shopping Cart","您è´ç‰©è½¦ä¸çš„商å“"
-"Last Correlation ID","最新关è”ID"
-"Last Transaction ID","最新交易ID"
-"Learn More","了解更多"
-"Login","登录"
-"Looking for PayPal? We have our own tab to the left under Sales.","想使用PayPal？我们在销售页é¢çš„左侧æ供了专用选项å¡ã€‚"
-"Mass Pay Payment","大é‡ä»˜æ¬¾æ”¯ä»˜ã€‚"
-"Matched (CVV2)","匹é…（CVV2）"
-"Matched (CVV2CSC)","匹é…（CVV2CSC）"
-"Matched Address only (no ZIP)","åªåŒ¹é…地å€ï¼ˆæ— 邮编）"
-"Matched Address only (no ZIP). International","åªåŒ¹é…地å€ï¼ˆæ— 邮编）。国际"
-"Matched Postal Code only (no Address)","åªåŒ¹é…é‚®ç¼–ï¼ˆæ— åœ°å€ï¼‰"
-"Matched five-digit ZIP only (no Address)","åªåŒ¹é…五ä½é‚®ç¼–ï¼ˆæ— åœ°å€ï¼‰"
-"Matched whole nine-didgit ZIP (no Address)","åªåŒ¹é…ä¹ä½é‚®ç¼–ï¼ˆæ— åœ°å€ï¼‰"
-"Merchant Account","银行å¸æˆ·"
-"Merchant Country","银行所在国"
-"Merchant Liability","商家责任"
-"Merchant Protection Eligibility","银行ä¿æŠ¤çš„èµ„æ ¼"
-"Merchant Referral Bonus","银行推è奖励"
-"Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","银行å¸æˆ·æ²¡æœ‰æ’¤é”€æœºåˆ¶ã€‚银行必须从您的å¸æˆ·æ¦‚è¿°ä¸æ‰‹å·¥æŽ¥å—或拒ç»æœ¬æ”¯ä»˜ã€‚"
-"Merchant account is not verified.","银行å¸æˆ·æœªéªŒè¯ã€‚"
-"Merchant denied this pending payment.","银行拒ç»äº†è¿™ä¸€æŒ‚起的支付。"
-"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","银行æ供了éžç¾Žå›½å¸æˆ·ï¼Œå¹¶ä¸”没有撤销机制。"
-"Merchant must upgrade account to Business or Premier status.","银行必须将å¸æˆ·å‡çº§ä¸ºå•†ä¸šæˆ–白金状æ€ã€‚"
-"Merchant reference ID format is not supported.","ä¸æ”¯æŒçš„银行推èIDæ ¼å¼ã€‚"
-"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","银行需è¦é€šè¿‡PayPalå¯ç”¨è®°è´¦å议功能。在PayPal确认您的银行å¸æˆ·å·²ç»å¯ç”¨è®°è´¦å议之å‰ï¼Œä¸è¦å¯ç”¨è¯¥åŠŸèƒ½ã€‚"
-"Mobile Payment (made via a mobile phone)","移动支付（通过手机进行）"
-"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","多å¸ç§é—®é¢˜ã€‚银行必须通过PayPalå¸æˆ·æ¦‚述手工接å—或拒ç»è¯¥æ”¯ä»˜ã€‚"
-"N/A","N/A"
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A。地å€æœªæ£€æŸ¥ï¼Œæˆ–对方行未å“应。æœåŠ¡ä¸å¯ç”¨"
-"N/A. Global Unavailable","N/A.å…¨çƒä¸å¯ç”¨"
-"N/A. International Unavailable","N/A. 国际ä¸å¯ç”¨"
-"N/A. Merchant has indicated that CVV2 is not present on card","N/A. 商家指出信用å¡ç¼ºå°‘CVV2ç "
-"N/A. No response","N/A. 没有å“应"
+"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa付款者验è¯æœåŠ¡ç»“æžœ"
+"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Electronic Commerce指示器"
+Chargeback,退款
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)",åªåŒ¹é…地å€ï¼ˆæ— 邮编）
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched",æ— åŒ¹é…资料
+"No Details matched. International",æ— åŒ¹é…资料。国际化
+"Exact Match. Address and nine-digit ZIP code",完全匹é…，地å€å’Œä¹ä½é‚®ç¼–
+"Exact Match. Address and Postal Code. International",完全匹é…。地å€å’Œé‚®ç¼–。国际
+"Exact Match. Address and Postal Code. UK-specific",完全匹é…。地å€å’Œé‚®ç¼–。仅é™è‹±å›½
"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. ä¸å…许MOTO（网络，手机厂商）交易"
-"N/A. Not processed","N/A. 未处ç†"
+"N/A. Global Unavailable",N/A.å…¨çƒä¸å¯ç”¨
+"N/A. International Unavailable","N/A. 国际ä¸å¯ç”¨"
+"Matched five-digit ZIP only (no Address)",åªåŒ¹é…五ä½é‚®ç¼–ï¼ˆæ— åœ°å€ï¼‰
+"Matched Postal Code only (no Address)",åªåŒ¹é…é‚®ç¼–ï¼ˆæ— åœ°å€ï¼‰
"N/A. Retry","N/A. é‡è¯•"
"N/A. Service not Supported","N/A. ä¸æ”¯æŒçš„æœåŠ¡"
-"N/A. Service not available","N/A. æœåŠ¡ä¸å¯ç”¨"
-"N/A. Service not supported","N/A。æœåŠ¡ä¸æ”¯æŒ"
+"N/A. Unavailable","N/A. ä¸å¯ç”¨"
+"Matched whole nine-didgit ZIP (no Address)",åªåŒ¹é…ä¹ä½é‚®ç¼–ï¼ˆæ— åœ°å€ï¼‰
+"Yes. Matched Address and five-didgit ZIP",是的，匹é…地å€ä¸Žäº”ä½é‚®ç¼–
+"All the address information matched",所有地å€ä¿¡æ¯éƒ½åŒ¹é…
+"None of the address information matched",æ— åŒ¹é…地å€ä¿¡æ¯
+"Part of the address information matched",地å€ä¿¡æ¯ä¸éƒ¨åˆ†åŒ¹é…
"N/A. The merchant did not provide AVS information","N/A. 商家未æä¾›AVSä¿¡æ¯ã€‚"
+"N/A. Address not checked, or acquirer had no response. Service not available",N/A。地å€æœªæ£€æŸ¥ï¼Œæˆ–对方行未å“应。æœåŠ¡ä¸å¯ç”¨
+"Matched (CVV2CSC)",匹é…（CVV2CSC）
+"No match",æ— åŒ¹é…结果
+"N/A. Not processed","N/A. 未处ç†"
+"N/A. Service not supported",N/A。æœåŠ¡ä¸æ”¯æŒ
+"N/A. Service not available","N/A. æœåŠ¡ä¸å¯ç”¨"
+"N/A. No response","N/A. 没有å“应"
+"Matched (CVV2)",匹é…（CVV2）
"N/A. The merchant has not implemented CVV2 code handling","N/A. 商家未完æˆCVV2ç 的处ç†"
-"N/A. Unavailable","N/A. ä¸å¯ç”¨"
-"Negative Balance","逆差"
-"Never","æ°¸ä¸"
-"New Billing Agreement","新建记账åè®®"
-"No","å¦"
-"No Details matched","æ— åŒ¹é…资料"
-"No Details matched. International","æ— åŒ¹é…资料。国际化"
-"No Liability Shift","æ— è´£ä»»è½¬ç§»"
-"No Logo","æ²¡æœ‰æ ‡ç¤º"
-"No match","æ— åŒ¹é…结果"
-"None of the address information matched","æ— åŒ¹é…地å€ä¿¡æ¯"
-"Note: %s","注æ„：%s"
-"Nothing to fetch because of an empty configuration.","由于é…置为空，未获å–任何信æ¯"
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","请注æ„，PayPal 最多å¯å¤„ç†10个è¿é€é€‰é¡¹ã€‚å› æ¤å¦‚æžœå¯ç”¨æ•°è¶…过10个，Magentoå°†åªä¼ 输è¿è´¹æœ€ä¾¿å®œçš„å‰å个。"
-"Notified customer about creditmemo #%s.","通知客户有关信用æ醒 #%s。"
-"Notified customer about invoice #%s.","通知客户有关å‘票 #%s。"
-"Now accepting PayPal (150 X 40)","现在接å—PayPal（150X40）"
-"Now accepting PayPal (150 X 60)","现在接å—PayPal（150X60）"
-"Number of Child Authorizations","授æƒåå¸æˆ·çš„æ•°é‡"
-"Open Authorization","开放授æƒ"
-"Order","订å•"
+"N/A. Merchant has indicated that CVV2 is not present on card","N/A. 商家指出信用å¡ç¼ºå°‘CVV2ç "
+"Authenticated, Good Result",已身份验è¯ï¼Œç»“æžœæ£å¸¸
+"Authenticated, Bad Result",已身份验è¯ï¼Œç»“果有误
+"Attempted Authentication, Good Result",å°è¯•èº«ä»½éªŒè¯ï¼Œç»“æžœæ£å¸¸
+"Attempted Authentication, Bad Result",å°è¯•èº«ä»½éªŒè¯ï¼Œç»“果有误
+"No Liability Shift",æ— è´£ä»»è½¬ç§»
+"Issuer Liability",å‘å¡äººè´£ä»»
+CNPJ,CNPJ
+CPF,CPF
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We couldn't create a billing agreement for this order.","We couldn't create a billing agreement for this order."
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Fetch transaction details method does not exists in Payflow","Fetch transaction details method does not exists in Payflow"
+"We cannot send the new order email.","We cannot send the new order email."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"Payment transactions disallow storing objects.",支付交易ä¸å…许的店铺对象。
+"You need to enter a transaction ID.","You need to enter a transaction ID."
+"This operation requires an existing transaction object.",该æ“作需è¦ä¸€ä¸ªçŽ°æœ‰çš„äº¤æ˜“ç›®æ ‡ã€‚
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date",报告日期
+"Merchant Account",银行å¸æˆ·
+"Transaction ID",交易ID
+"Invoice ID",å‘票ID
+"PayPal Reference ID",PayPal推èID
+"PayPal Reference ID Type",PayPal推èID类型
+"Event Code",事件代ç
+"Finish Date","Finish Date"
+"Debit or Credit",借记å¡æˆ–信用å¡
+"Gross Amount",总é¢
+"Fee Debit or Credit",借记å¡æˆ–信用å¡è´¹ç”¨
+"Fee Amount",费率
"Order ID","è®¢å• ID"
-"Order Valid Interval (days)","订å•æœ‰æ•ˆæœŸï¼ˆå¤©ï¼‰"
-"Ordered amount of %s.","%s 的已下å•æ•°é‡ã€‚"
-"Ordering amount of %s is pending approval on gateway.","%s的订å•æ•°é‡æ£åœ¨ç½‘站上挂起供审批。"
-"Page Background Color","页é¢èƒŒæ™¯è‰²"
-"Page Style","页é¢æ ·å¼"
-"Part of the address information matched","地å€ä¿¡æ¯ä¸éƒ¨åˆ†åŒ¹é…"
-"Partner","åˆä½œä¼™ä¼´"
-"Pasarela integral","Pasarela integral"
-"Pasarela integral Settings","Pasarela integral 设置"
-"Password","密ç "
-"Pay Now","立刻支付"
-"PayPal","PayPal"
-"PayPal Balance Manager function of PayPal account","PayPalå¸æˆ·çš„PayPalä½™é¢ç®¡ç†å™¨åŠŸèƒ½"
-"PayPal Buyer Warranty Bonus","PayPal买家担ä¿æ´¥è´´"
-"PayPal Debit Card Cash Advance","PayPal借记å¡é¢„付现金"
-"PayPal Debit Card Withdrawal from ATM","从ATM进行PayPal借记å¡æ’¤é”€"
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal快速结账（Payflow版）快æ·æ–¹å¼åŒ…装"
-"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout å¿«æ·æ–¹å¼ä¿æŠ¤"
-"PayPal Express Checkout Token does not exist.","PayPal快速结账令牌ä¸å˜åœ¨ã€‚"
-"PayPal Express Order Review Form","PayPal快速订å•å®¡æŸ¥è¡¨å•"
-"PayPal Fee Information","PayPal费用信æ¯"
-"PayPal Merchant Pages Style","PayPal商业页é¢æ ·å¼"
-"PayPal Payments Advanced","PayPal Payments Advanced"
-"PayPal Pro","PayPal Pro"
-"PayPal Pro Settings","PayPal Pro设置"
-"PayPal Product Logo","PayPal产å“å¾½æ ‡"
-"PayPal Protection Bonus","PayPalä¿æŠ¤æ´¥è´´"
-"PayPal Reference ID","PayPal推èID"
-"PayPal Reference ID Type","PayPal推èID类型"
-"PayPal Settlement Reports","PayPal处ç†æŠ¥å‘Š"
-"PayPal certificate does not exist.","PayPal è¯ä¹¦ä¸å˜åœ¨ã€‚"
-"PayPal certificate file is empty.","PayPal è¯ä¹¦æ–‡ä»¶ä¸ºç©ºã€‚"
-"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPalä¸æ”¯æŒå¤„ç†é›¶é‡‘é¢çš„订å•ã€‚为完æˆæ‚¨çš„订è´ï¼Œè¯·ä½¿ç”¨æ ‡å‡†ç»“è´¦æµç¨‹ã€‚"
-"PayPal gateway has rejected request. %s","PayPal网关拒ç»äº†è¯¥è¯·æ±‚。%s"
-"PayPal processes all of your orders, and you get paid.","PayPal处ç†äº†æ‚¨çš„所有订å•ï¼Œæ‚¨å°†èŽ·å¾—付款。"
-"PayPal response hasn't required fields.","PayPalçš„å“应缺少必须å—段。"
-"PayPal retains reports for 45 days.","PayPal会将报告ä¿å˜45天。"
-"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Electronic Commerce指示器"
-"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa付款者验è¯æœåŠ¡ç»“æžœ"
-"Payer Address ID","付款者地å€ID"
-"Payer Address Status","付款者地å€çŠ¶æ€"
-"Payer Email","付款者邮件地å€"
-"Payer ID","付款者ID"
-"Payer Status","付款者状æ€"
-"Payer is not identified.","付款者未ç»æ£€å®šã€‚"
-"Payflow Link (for USA and Canada)","Payflow链接（仅é™ç¾Žå›½å’ŒåŠ 拿大）"
-"Payflow Link Settings","Payflow链接设置"
-"Payflow Pro Gateway","Payflow Pro Gateway"
-"Payflow Pro Settings","Payflow Pro设置"
-"Payment Action","支付æ“作"
-"Payment Applicable From","支付适用性表å•"
-"Payment Refund initiated by merchant","由商户å‘起的支付退款"
-"Payment has been declined. Please try again.","支付被拒ç»ã€‚请é‡è¯•ã€‚"
-"Payment is being reviewed by PayPal for risk.","支付æ£åœ¨è¢«PayPalåšé£Žé™©è¯„估。"
-"Payment transactions disallow storing objects.","支付交易ä¸å…许的店铺对象。"
-"Payment was made to an email address that is not yet registered or confirmed.","支付时通过尚未注册或确认的电å邮件进行的。"
-"Payments by PayPal (150 X 40)","用PayPal付款（150X40）"
-"Payments by PayPal (150 X 60)","用PayPal付款（150X60）"
-"Payments by cards + seller protection - <strong style=""color:red"">Contact PayPal before activating</strong>","通过å¡ç‰‡æ”¯ä»˜ + å–家ä¿æŠ¤ - <strong style=""color:red"">激活å‰è”ç³»PayPal</strong>"
-"Paypal Billing Agreement Settings","PayPalè®°è´¦å议设置"
-"Pending PayPal","挂起的PayPal"
-"Phone","电è¯"
-"Place Order","下订å•"
-"Place Order Using Billing Agreements","使用记账å议下å•"
-"Please agree to all the terms and conditions before placing the order.","请在下订å•å‰åŒæ„所有的æ¡æ¬¾å’Œæ¡ä»¶ã€‚"
-"Please contact PayPal Customer Service.","请è”ç³»PayPal客æœã€‚"
-"Please do not refresh the page until you complete payment.","请ä¸è¦åˆ·æ–°è¯¥é¡µé¢ï¼Œç›´åˆ°ä»˜æ¬¾å®Œæˆã€‚"
-"Please select a shipping method...","请选择é€è´§æ–¹æ³•..."
-"Please select region, state or province","请选择地区ã€å·žï¼Œæˆ–çœ"
-"Please update order data to get shipping methods and rates","请更新订å•æ•°æ®ï¼ŒèŽ·å–é…é€æ–¹å¼å’Œä»·æ ¼"
-"Points Incentive Redemption","å…‘æ¢å¥–励点"
-"Postage Payment to either USPS or UPS","USPS或UPSçš„è¿è´¹"
+"Subscription ID",订阅ID
+"Preapproved Payment ID",é¢„å®¡æ ¸çš„æ”¯ä»˜ID
+Credit,信用
+Debit,借记
+"General: received payment of a type not belonging to the other T00xx categories",常规：一ç§ä¸å±žäºŽå…¶ä»–T00xx分类的支付收款
+"Mass Pay Payment",大é‡ä»˜æ¬¾æ”¯ä»˜ã€‚
+"Subscription Payment, either payment sent or payment received",订阅支付，å¯é€šè¿‡å‘出或收到的付款进行
"Preapproved Payment (BillUser API), either sent or received","é¢„å®¡æ ¸æŽ¥æ”¶æˆ–å‘é€çš„支付（BillUser API）"
-"Preapproved Payment ID","é¢„å®¡æ ¸çš„æ”¯ä»˜ID"
-"Price","ä»·æ ¼"
-"Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.","通过PayPal的一体å¼åœ¨çº¿æ”¯ä»˜å¤„ç†è§£å†³æ–¹æ¡ˆï¼Œç›´æŽ¥åœ¨æ‚¨çš„网站处ç†ä¿¡ç”¨å¡äº¤æ˜“/"
-"Product","产å“å"
-"Proxy Host","代ç†ä¸»æœº"
-"Proxy Port","代ç†ç«¯å£"
-"Quantity","æ•°é‡"
-"Reauthorization","撤销授æƒ"
-"Reference Information","å‚考信æ¯"
-"Refund issued by merchant.","商家å‘起的退款。"
-"Reimbursement for a chargeback.","å¿è¿˜é€€æ¬¾ã€‚"
-"Reimbursement of Chargeback","退款的å¿è¿˜"
-"Report Date","报告日期"
-"Reports","报告"
-"Requested %s and configured %s merchant emails do not match.","所请求的 %s 与é…置的 %s 商家邮件ä¸åŒ¹é…。"
-"Require CVV Entry","需è¦CVV项"
-"Require Customer's Billing Address","è¦æ±‚客户å¸å•åœ°å€"
-"Reversal","撤销"
-"Reversal of General Account Hold","常规å¸æˆ·ä¿æŒçš„撤销"
-"Reversal of Points Usage","点数使用情况撤销"
-"Reversal of an adjustment.","调整撤销"
-"Reversal of hold for Dispute Investigation","撤销ä¿ç•™çš„争议调查"
-"Review Order","查看订å•"
-"Reward Voucher Redemption","奖励兑æ¢"
-"SFTP Credentials","SFTPå‡æ®"
-"Sale","销售"
-"Sales","销售"
-"Same as shipping","与é…é€åœ°å€ç›¸åŒ"
-"Sandbox Credentials","沙箱å‡æ®"
-"Sandbox Mode","沙箱模å¼"
-"Schedule","计划"
-"Schedule description is too long.","计划æ述太长。"
-"Scheduled Fetching","计划的获å–"
-"Select a PayPal Solution","选择一个PayPal解决方案"
-"Server Error. Please try again.","æœåŠ¡å™¨é”™è¯¯ã€‚请å†è¯•ä¸€æ¬¡ã€‚"
-"Settlement Consolidation","åˆå¹¶å¤„ç†"
-"Settlement Report Settings","处ç†æŠ¥å‘Šè®¾ç½®"
-"Settlement of a chargeback.","处ç†è¿”款。"
-"Severe 3D Secure Card Validation","æä¾› 3D 安全信用å¡éªŒè¯"
-"Severe Validation Removes Chargeback Liability on Merchant","æ£å¼éªŒè¯å°†æ’¤é”€é“¶è¡Œçš„退款责任"
-"Severe validation removes chargeback liability on merchant.","ä¸¥æ ¼çš„éªŒè¯å¯é¿å…分行的退款责任。"
-"Shipping","è¿é€"
-"Shipping Address","é€è´§åœ°å€"
-"Shipping Method","è¿é€æ–¹å¼"
-"Shop now using (150 X 40)","立刻è´ç‰©å¹¶ä½¿ç”¨ï¼ˆ150X40）"
-"Shop now using (150 X 60)","立刻è´ç‰©å¹¶ä½¿ç”¨ï¼ˆ150X60）"
-"Shortcut","å¿«æ·æ–¹å¼"
-"Shortcut Buttons Flavor","å¿«æ·æ–¹å¼æŒ‰é’®é£Žæ ¼"
-"Shortcut on Product View","产å“视图上的快æ·æ–¹å¼"
-"Shortcut on Shopping Cart","è´ç‰©è½¦ä¸Šçš„å¿«æ·æ–¹å¼"
-"Sign a billing agreement to streamline further purchases with PayPal.","与PayPalç¾ç½²è®°è´¦å议简化åŽç»è´ä¹°ã€‚"
-"Solo","Solo"
-"Sorry, no quotes are available for this order at this time.","抱æ‰ï¼Œå½“å‰è¯¥è®¢å•ä¸æ²¡æœ‰æŠ¥ä»·å¯ç”¨ã€‚"
-"Sort Order","排åºé¡ºåº"
-"Specifies what the Authorization Honor Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","指定商家PayPalå¸æˆ·çš„授æƒå‘¨æœŸæ—¶é•¿ï¼Œè¿™é‡Œçš„设置必须与PayPalä¸çš„设置一致。"
-"Specifies what the Order Valid Interval is on the merchant’s PayPal account. It must mirror the setting in PayPal.","指定商家PayPalå¸æˆ·çš„订å•éªŒè¯å‘¨æœŸã€‚这里的设置必须与PayPalä¸çš„设置一致。"
-"State/Province","å·ž/çœ"
-"Static","é™æ€"
-"Street Address","è¡—é“地å€"
-"Street Address %s","è¡—é“åœ°å€ %s"
-"Submitting order information...","æ£åœ¨æ交订å•ä¿¡æ¯..."
-"Subscriber name is too long.","订阅者姓å太长。"
-"Subscription ID","订阅ID"
-"Subscription Payment, either payment sent or payment received","订阅支付，å¯é€šè¿‡å‘出或收到的付款进行"
-"Subtotal","å°è®¡"
-"Summary Text for Aggregated Cart","èšåˆè´ç‰©è½¦çš„摘è¦æ–‡å—"
-"Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","对美国è¿é€šå¡çš„支æŒè¦æ±‚é¢å¤–çš„å议。欲知详情请访问 <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>。"
-"Switch/Maestro","Switch/Maestro"
-"Test Mode","测试模å¼"
-"The background color for the checkout page around the header and payment form.","付款页é¢ä¸Šå¤´éƒ¨å’Œæ”¯ä»˜è¡¨å•å‘¨å›´çš„背景色。"
-"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","付款页é¢ä¸Šå¤´éƒ¨çš„背景色。请用ASCIIç æ–¹å¼è¾“入大å°å†™æ•æ„Ÿçš„å…ä½ä»£è¡¨HTMLåå…进制颜色代ç çš„å—符。"
-"The billing agreement ""%s"" has been canceled.","该记账åè®® ""%s"" 已被å–消。"
-"The billing agreement ""%s"" has been created.","该记账åè®® ""%s"" 已被创建。"
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","您PayPalå¸æˆ·ä¸æŽˆæƒåå¸æˆ·çš„默认数é‡ä¸º1。如果è¦èŽ·å¾—更多授æƒï¼Œè¯·è”ç³»PayPalå¢žåŠ æ•°é‡ã€‚"
-"The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.","付款页é¢å·¦ä¸Šè§’的图åƒï¼Œæœ€å¤§å°ºå¯¸ä¸º750x90åƒç´ 。 强烈建议使用<strong style=""color:red"">https</strong>地å€ã€‚"
-"The maximum number of child authorizations is reached.","授æƒåå¸æˆ·çš„最大数é‡å·²è¾¾åˆ°ã€‚"
-"The merchant account is not yet verified.","银行å¸æˆ·å°šæœªéªŒè¯ã€‚"
-"The payment curency does not match any of the merchant's balances currency.","支付的å¸ç§ä¸Žé“¶è¡Œæ”¯æŒçš„å¸ç§ä¸ä¸€è‡´ã€‚"
-"The payment eCheck is not yet cleared.","支付的电å支票尚未兑现。"
-"The payment is authorized but not settled.","支付已获授æƒä½†å°šæœªç¡®å®šã€‚"
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","æ”¯ä»˜è¢«æŒ‚èµ·ï¼Œå› ä¸ºæ”¯ä»˜ä½¿ç”¨äº†ä¸€ä¸ªæœªç»ç¡®è®¤çš„电å邮件地å€ã€‚"
-"The payment is pending while it is being reviewed by PayPal for risk.","æ”¯ä»˜è¢«æŒ‚èµ·ï¼Œå› ä¸ºæ£åœ¨ç”±PayPal进行风险评估。"
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","支付是通过信用å¡è¿›è¡Œçš„。为了收到资金，银行必须将å¸æˆ·å‡çº§ä¸ºå•†ä¸šæˆ–白金状æ€ã€‚"
-"There are no billing agreements yet.","å°šæ— è®°è´¦å议。"
-"There was an error processing your order. Please contact us or try again later.","处ç†æ‚¨çš„订å•æ—¶é‡åˆ°äº†é”™è¯¯ã€‚请è”系我们，或ç¨åŽå†è¯•ã€‚"
-"This feature needs be enabled first for the merchant account through PayPal technical support.","è¦ä½¿ç”¨å•†å®¶è´¦æˆ·ï¼Œå¿…须先通过 PayPal 技术支æŒå¯ç”¨è¯¥åŠŸèƒ½ã€‚"
-"This operation requires an existing transaction object.","该æ“作需è¦ä¸€ä¸ªçŽ°æœ‰çš„äº¤æ˜“ç›®æ ‡ã€‚"
-"Time of Day","æ¯å¤©çš„时间段"
-"Title","æ ‡é¢˜"
-"Transaction ID","交易ID"
-"Transaction ID must not be empty.","交易IDä¸èƒ½ä¸ºç©ºã€‚"
-"Transaction Information","交易信æ¯"
-"Transfer Cart Line Items","ä¼ è¾“è´ç‰©è½¦å†…容"
-"Transfer Shipping Options","ä¼ è¾“é€è´§é€‰é¡¹"
-"Triggered Fraud Filters","触å‘的欺诈ç›é€‰å™¨"
-"Unable to cancel Express Checkout.","æ— æ³•å–消快速结账。"
-"Unable to change status. Current status is not correspond to real status.","æ— æ³•æ›´æ”¹çŠ¶æ€ã€‚当å‰çŠ¶æ€ä¸Žå®žé™…状æ€ä¸ä¸€è‡´ã€‚"
-"Unable to communicate with the PayPal gateway.","æ— æ³•ä¸ŽPayPal网关通讯。"
-"Unable to initialize Express Checkout review.","æ— æ³•åˆå§‹åŒ–快速结账评估。"
-"Unable to initialize Express Checkout.","æ— æ³•å‘起快速结账。"
-"Unable to place the order.","æ— æ³•ä¸‹è®¢å•ã€‚"
-"Unable to process Express Checkout approval.","æ— æ³•å¤„ç†å¿«é€Ÿç»“账审批。"
-"Unable to start Express Checkout.","æ— æ³•è¿›è¡Œå¿«é€Ÿç»“è´¦ã€‚"
-"Unable to update Order data.","æ— æ³•æ›´æ–°è®¢å•æ•°æ®ã€‚"
-"Unable to update shipping method.","æ— æ³•æ›´æ–°é€è´§æ–¹æ³•ã€‚"
-"Unknown Error. Please try again later.","未知错误。请ç¨åŽé‡è¯•ã€‚"
-"Unknown reason. Please contact PayPal customer service.","æœªçŸ¥åŽŸå› ã€‚è¯·è”ç³»PayPal客户æœåŠ¡ã€‚"
-"Update Order Data","更新订å•æ•°æ®"
-"Use Proxy","使用代ç†"
-"Use colon to specify port. For example: ""test.example.com:5224"".","使用冒å·æŒ‡å®šç«¯å£ã€‚例如：""test.example.com:5224""。"
-"User","用户"
-"User-initiated Currency Conversion","用户å‘èµ·çš„è´§å¸è½¬æ¢"
-"Uses store frontend name by default.","默认使用店铺å‰ç«¯å称。"
-"VAT Number","VAT ç¼–å·"
-"Vendor","供应商"
-"Vendor / Merchant Login","供应商 / 商户登录"
-"View","查看"
-"View Demo","查看演示"
-"View PayPal solutions.","查看PayPal解决方案。"
-"View Transaction","查看交易"
-"View Transaction Details","查看交易详情"
-"Virtual PayPal Debit Card Transaction","虚拟PayPal借记å¡äº¤æ˜“"
-"Virtual Terminal Payment","虚拟终端支付"
-"Void","æ— æ•ˆ"
-"Waiting until Customer's eCheck will be cleared.","ç‰å¾…直到客户的电å支票兑现。"
-"We prefer PayPal (150 X 40)","我们喜欢PayPal（150X40）"
-"We prefer PayPal (150 X 60)","我们喜欢PayPal（150X60）"
-"Website Payments Plus","网站支付高级版"
-"Website Payments Plus Settings","网站支付高级版设置"
-"Website Payments Pro","网站支付专业版"
-"Website Payments Pro (Payflow Edition) Settings","网站支付专业版（Payflow版）设置"
-"Website Payments Pro Hosted Solution","网站支付专业版托管解决方案"
-"Website Payments Pro Hosted Solution Settings","网站支付专业版托管解决方案设置"
-"Website Payments Pro Payflow Edition (includes Express Checkout)","网站支付专业Payflow版（包å«å¿«é€Ÿç»“账）"
-"Website Payments Pro Settings","网站支付专业版设置"
-"Website Payments Standard","ç½‘ç«™æ”¯ä»˜æ ‡å‡†ç‰ˆ"
-"Website Payments Standard Payment","ç½‘ç«™æ”¯ä»˜æ ‡å‡†ç‰ˆä»˜æ¬¾"
-"Website Payments Standard Settings","ç½‘ç«™æ”¯ä»˜æ ‡å‡†ç‰ˆè®¾ç½®"
-"What is PayPal?","什么是PayPal？"
-"Whether to create a billing agreement, if there are no active billing agreements available.","æ— è®ºæ˜¯å¦åˆ›å»ºè®°è´¦å议，如果没有活跃的记账åè®®å¯ç”¨ã€‚"
-"Will appear as a payment option only for customers who have at least one active billing agreement.","åªæœ‰åœ¨å®¢æˆ·è‡³å°‘有一个活跃记账å议时æ‰èƒ½å‡ºçŽ°ä»˜æ¬¾é€‰é¡¹ã€‚"
-"WorldLink Withdrawal","WorldLink撤销"
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","您是å¦æƒ³è¦é€šè¿‡PayPalç¾ç½²è®°è´¦å议并简化åŽç»çš„付款？"
-"Wrong Order ID (%s) specified.","所指定的订å•ID（%s）有误。"
-"Wrong PayPal Express Checkout Token specified.","所指定的PayPal快速结账令牌有误。"
-"Wrong billing agreement ID specified.","指定的记账åè®®ID有误。"
-"Yes","是"
-"Yes. Matched Address and five-didgit ZIP","是的，匹é…地å€ä¸Žäº”ä½é‚®ç¼–"
-"You cannot void a verification transaction","æ‚¨æ— æ³•å°†éªŒè¯äº¤æ˜“作废"
-"You will be redirected to the PayPal website in a few seconds.","å‡ ç§’é’ŸåŽï¼Œæ‚¨å°†è¢«é‡å®šå‘到PayPal网站。"
-"You will be redirected to the PayPal website when you place an order.","在您下å•æ—¶ï¼Œæ‚¨ä¼šè¢«é‡å®šå‘到PayPal网站。"
-"You will be redirected to the PayPal website.","您将被é‡å®šå‘到PayPal网站。"
-"You will be required to enter your payment details after you place an order.","下å•åŽï¼Œæ‚¨éœ€è¦è¾“入付款详情。"
-"Zip/Postal Code","邮政编ç "
-"chargeback reimbursed","退款å¿è¿˜"
-"chargeback settled","解决退款"
-"customer complaint","客户投诉"
-"customer triggered a chargeback","客户触å‘的退款"
-"customer triggered money-back guarantee","客户触å‘的返款ä¿éšœ"
-"eBay Auction Payment","eBayæ‹å–付款"
-"merchant refunded payment","商家退款支付"
-"no reason","æ— åŽŸå› "
-"reversal of an adjustment","撤销调整"
-"unknown reason","æœªçŸ¥åŽŸå› "
+"eBay Auction Payment",eBayæ‹å–付款
+"Direct Payment API",直接支付API
+"Express Checkout APIs",快速结账API
+"Website Payments Standard Payment",ç½‘ç«™æ”¯ä»˜æ ‡å‡†ç‰ˆä»˜æ¬¾
+"Postage Payment to either USPS or UPS",USPS或UPSçš„è¿è´¹
+"Gift Certificate Payment: purchase of Gift Certificate",礼å“券支付：è´ä¹°ç¤¼å“券
+"Auction Payment other than through eBay",eBay之外的其他æ‹å–支付
+"Mobile Payment (made via a mobile phone)",移动支付（通过手机进行）
+"Virtual Terminal Payment",虚拟终端支付
+"General: non-payment fee of a type not belonging to the other T01xx categories",常规：一ç§ä¸å±žäºŽå…¶ä»–T01xx分类的éžæ”¯ä»˜è´¹ç”¨
+"Fee: Web Site Payments Pro Account Monthly",费用：专业å¸æˆ·æœˆåº¦ç½‘站支付
+"Fee: Foreign ACH Withdrawal",费用：外国ACH撤销
+"Fee: WorldLink Check Withdrawal",费用：WorldLink支票撤销
+"Fee: Mass Pay Request",费用：批é‡ä»˜æ¬¾è¯·æ±‚
+"General Currency Conversion",常规货å¸è½¬æ¢
+"User-initiated Currency Conversion",用户å‘èµ·çš„è´§å¸è½¬æ¢
+"Currency Conversion required to cover negative balance",è´§å¸è½¬æ¢éœ€è¦è€ƒè™‘ä½™é¢è´Ÿå€¼
+"General Funding of PayPal Account ",PayPalå¸æˆ·çš„常规退款
+"PayPal Balance Manager function of PayPal account",PayPalå¸æˆ·çš„PayPalä½™é¢ç®¡ç†å™¨åŠŸèƒ½
+"ACH Funding for Funds Recovery from Account Balance",æ¥è‡ªå¸æˆ·ä½™é¢çš„返款æ¢å¤ACH返款
+"EFT Funding (German banking)",EFT返款（德国银行）
+"General Withdrawal from PayPal Account",æ¥è‡ªPayPalå¸æˆ·çš„常规撤销
+AutoSweep,自动清ç†
+"General: Use of PayPal account for purchasing as well as receiving payments",常规：使用PayPalå¸æˆ·è¿›è¡Œä»˜æ¬¾ä»¥åŠæ”¶æ¬¾
+"Virtual PayPal Debit Card Transaction",虚拟PayPal借记å¡äº¤æ˜“
+"PayPal Debit Card Withdrawal from ATM",从ATM进行PayPal借记å¡æ’¤é”€
+"Hidden Virtual PayPal Debit Card Transaction",éšè—虚拟PayPal借记å¡äº¤æ˜“
+"PayPal Debit Card Cash Advance",PayPal借记å¡é¢„付现金
+"General: Withdrawal from PayPal Account",常规：通过PayPalå¸æˆ·æ’¤é”€
+"General (Purchase with a credit card)",常规（使用信用å¡è´ä¹°ï¼‰
+"Negative Balance",逆差
+"General: bonus of a type not belonging to the other T08xx categories",常规：通过一ç§ä¸å†å±žäºŽå…¶ä»–T08xx类型的奖励
+"Debit Card Cash Back",借记å¡è¿”现
+"Merchant Referral Bonus",银行推è奖励
+"Balance Manager Account Bonus",ä½™é¢ç®¡ç†å™¨å¸æˆ·ç‚¹æ•°
+"PayPal Buyer Warranty Bonus",PayPal买家担ä¿æ´¥è´´
+"PayPal Protection Bonus",PayPalä¿æŠ¤æ´¥è´´
+"Bonus for first ACH Use",首次使用ACH奖励
+"General Redemption",常规兑æ¢
+"Gift Certificate Redemption",礼å“券兑æ¢
+"Points Incentive Redemption",å…‘æ¢å¥–励点
+"Coupon Redemption",代金券兑æ¢
+"Reward Voucher Redemption",奖励兑æ¢
+"General. Product no longer supported",常规。产å“ä¸åœ¨è¢«æ”¯æŒ
+"General: reversal of a type not belonging to the other T11xx categories",常规：ä¸å±žäºŽå…¶ä»–T11xx分类的ä¿ç•™ç±»åž‹
+"ACH Withdrawal",ACH撤销
+"Debit Card Transaction",借记å¡äº¤æ˜“
+"Reversal of Points Usage",点数使用情况撤销
+"ACH Deposit (Reversal)",ACHä¿è¯é‡‘（撤销）
+"Reversal of General Account Hold",常规å¸æˆ·ä¿æŒçš„撤销
+"Account-to-Account Payment, initiated by PayPal",å¸æˆ·åˆ°å¸æˆ·æ”¯ä»˜ï¼Œç”±PayPal开创
+"Payment Refund initiated by merchant",由商户å‘起的支付退款
+"Fee Reversal",撤销手ç»è´¹
+"Hold for Dispute Investigation",ä¿ç•™åšäº‰è®®è°ƒæŸ¥
+"Reversal of hold for Dispute Investigation",撤销ä¿ç•™çš„争议调查
+"General: adjustment of a type not belonging to the other T12xx categories",常规：调整为一ç§ä¸å†å±žäºŽå…¶ä»–T12xx分类的类型
+Reversal,撤销
+Charge-off,收å–
+Incentive,奖励
+"Reimbursement of Chargeback",退款的å¿è¿˜
+"General (Authorization)",常规（身份验è¯ï¼‰
+Reauthorization,撤销授æƒ
+Void,æ— æ•ˆ
+"General (Dividend)",常规（利æ¯ï¼‰
+"General: temporary hold of a type not belonging to the other T15xx categories",常规：ä¸å±žäºŽå…¶ä»–T15xx分类的暂时ä¿ç•™ç±»åž‹
+"Open Authorization",开放授æƒ
+"ACH Deposit (Hold for Dispute or Other Investigation)",ACHä¿è¯é‡‘（用作ä¿è¯æˆ–其他调查用途）
+"Available Balance",å¯ç”¨ä½™é¢
+Funding,退款
+"General: Withdrawal to Non-Bank Entity",常规：通过éžé“¶è¡Œå®žä½“撤销
+"WorldLink Withdrawal",WorldLink撤销
+"Buyer Credit Payment",买家信用支付
+"General Adjustment without businessrelated event",ä¸Žä¸šåŠ¡æ— å…³çš„å¸¸è§„è°ƒæ•´
+"General (Funds Transfer from PayPal Account to Another)",常规（从一个PayPalå¸æˆ·å‘å¦ä¸€ä¸ªè½¬ç§»èµ„金）
+"Settlement Consolidation",åˆå¹¶å¤„ç†
+"General: event not yet categorized",常规：事件尚未分类
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near Bill Me Later checkout button","Near Bill Me Later checkout button"
+"Every 3 days",æ¯3天
+"Every 7 days",æ¯7天
+"Every 10 days",æ¯10天
+"Every 14 days",æ¯14天
+"Every 30 days",æ¯30天
+"Every 40 days",æ¯40天
+"No Logo",æ²¡æœ‰æ ‡ç¤º
+"Pending PayPal",挂起的PayPal
+"Billing Agreement",è®°è´¦åè®®
+"Created At","Created At"
+"Updated At","Updated At"
+"-- Please Select Billing Agreement--","-- 请选择记账åè®® --"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Back to Billing Agreements",返回记账åè®®
+"There are no billing agreements yet.",å°šæ— è®°è´¦å议。
+"New Billing Agreement",新建记账åè®®
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+Create...,Create...
+"Your billing agreement # is: %1.","Your billing agreement # is: %1."
+"Review Order",查看订å•
+"Please select a shipping method...",请选择é€è´§æ–¹æ³•...
+"Update Shipping Method","Update Shipping Method"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart",您è´ç‰©è½¦ä¸çš„商å“
+"Edit Shopping Cart",编辑è´ç‰©è½¦
+"Please update order data to get shipping methods and rates",请更新订å•æ•°æ®ï¼ŒèŽ·å–é…é€æ–¹å¼å’Œä»·æ ¼
+"Checkout with PayPal",使用PayPal结账
+"Please do not refresh the page until you complete payment.",请ä¸è¦åˆ·æ–°è¯¥é¡µé¢ï¼Œç›´åˆ°ä»˜æ¬¾å®Œæˆã€‚
+"You will be required to enter your payment details after you place an order.",下å•åŽï¼Œæ‚¨éœ€è¦è¾“入付款详情。
+"Additional Options",其他选项
+"Acceptance Mark",接å—æ ‡å¿—
+"What is PayPal?",什么是PayPal？
+"Sign a billing agreement to streamline further purchases with PayPal.",与PayPalç¾ç½²è®°è´¦å议简化åŽç»è´ä¹°ã€‚
+Schedule,Schedule
+Size,Size
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"Test Mode","Test Mode"
+"Payment Action","Payment Action"
+"3D Secure","3D Secure"
+"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
+"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
+"Centinel API URL","Centinel API URL"
+"Debug Mode","Debug Mode"
+"Sandbox Mode","Sandbox Mode"
+1,1
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (Includes Express Checkout)"
+"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout."
+"Required PayPal Settings","Required PayPal Settings"
+"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
+"Enable this Solution","Enable this Solution"
+"Advertise Bill Me Later","Advertise Bill Me Later"
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Home Page","Home Page"
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Website Payments Pro","Basic Settings - PayPal Website Payments Pro"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
+"
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ 3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Require CVV Entry","Require CVV Entry"
+"Centinel Custom API URL","Centinel Custom API URL"
+"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+"Settlement Report Settings","Settlement Report Settings"
+"Frontend Experience Settings","Frontend Experience Settings"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+"Website Payments Standard","Website Payments Standard"
+"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely."
+"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Summary Text for Aggregated Cart","Summary Text for Aggregated Cart"
+"Uses store frontend name by default.","Uses store frontend name by default."
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+Partner,Partner
+Vendor,Vendor
+"Use Proxy","Use Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ ","
+ Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
+ "
+"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
+"A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
+"Payflow Link (Includes Express Checkout)","Payflow Link (Includes Express Checkout)"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"CVV Entry is Editable","CVV Entry is Editable"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
+"
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ ","
+ <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
+ "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Credentials","Sandbox Credentials"
+"API Uses Proxy","API Uses Proxy"
+"Enable Bill Me Later","Enable Bill Me Later"
+"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®.
+ <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+ "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"It is recommended to set this value to ""Magento_Paypal"" per store views.","It is recommended to set this value to ""Magento_Paypal"" per store views."
+"Shortcut on Shopping Cart","Shortcut on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Shortcut on Product View","Shortcut on Product View"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+"
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ ","
+ Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
+ "
+"Skip Order Review Step","Skip Order Review Step"
+"
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ ","
+ Will appear as a payment option only for customers who have at least one active billing agreement.
+ "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"SFTP Credentials","SFTP Credentials"
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
+"
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ ","
+ Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
+ "
+"Header Image URL","Header Image URL"
+"
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ ","
+ The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+ "
+"Header Background Color","Header Background Color"
+"
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ ","
+ The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
+ "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
+"
+ The background color for the checkout page around the header and payment form.
+ ","
+ The background color for the checkout page around the header and payment form.
+ "
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site."
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ ","
+ PayPal All-in-One Payment Solutions <i>Accept and process credit cards and PayPal payments.</i>
+ "
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site."
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"Payments Standard","Payments Standard"
+"Basic Settings - PayPal Payments Standard","Basic Settings - PayPal Payments Standard"
+"PayPal Payment Gateways","PayPal Payment Gateways"
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+"
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ ","
+ <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
+ from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
+ Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal.
+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
+ or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+ "
+"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely."
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution (Includes Express Checkout)"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"PayPal Payment Solutions","PayPal Payment Solutions"
diff --git a/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml
index 231c027d4a4..7340e7e84b2 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <referenceContainer name="content.aside">
+ <referenceContainer name="sidebar.additional">
<block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/>
<block class="Magento\Paypal\Block\Bml\Banners" name="bml.right.logo" template="bml.phtml">
<arguments>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml b/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml
index e8f4d422533..741426baecf 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <referenceContainer name="right">
+ <referenceContainer name="sidebar.additional">
<block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/>
<block class="Magento\Paypal\Block\Bml\Banners" name="bml.right.logo" template="bml.phtml">
<arguments>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml b/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
index c9297f0c9d1..8945271ff78 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
@@ -93,7 +93,7 @@
</table>
<?php endif; ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->getBackUrl() ?>" class="action back"><?php echo __('Back to Billing Agreements') ?></a>
</div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
index 0c0e6182e0d..6420a0acc12 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
@@ -78,7 +78,7 @@
</select>
</div>
</div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="primary action create">
<span><?php echo __('Create...') ?></span>
@@ -92,7 +92,7 @@
</fieldset>
</form>
<?php else: ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"
class="action back"><span><?php echo __('Back') ?></span></a>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
index dd3f730f570..8066c90a167 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
@@ -24,7 +24,7 @@
/** @var $this \Magento\Paypal\Block\Express\Review */
?>
-<hgroup class="page title">
+<hgroup class="page-title">
<h1 class="title"><span class="base"><?php echo __('Review Order') ?></span></h1>
</hgroup>
<div class="paypal review view">
diff --git a/app/code/Magento/Persistent/i18n/de_DE.csv b/app/code/Magento/Persistent/i18n/de_DE.csv
index f994c8c7058..adc4ab25a4e 100644
--- a/app/code/Magento/Persistent/i18n/de_DE.csv
+++ b/app/code/Magento/Persistent/i18n/de_DE.csv
@@ -1,64 +1,16 @@
-"""Remember Me"" Default Value","""Login merken""-Standardwert"
-"(Not %s?)","(Nicht %s?)"
-"* Required Fields","* Pflichtfelder"
-"Address","Adresse"
-"Address Information","Addressinformationen"
-"Already registered?","Bereits registriert?"
-"Back","Zurück"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Mit einem Konto bei unserem Shop geht der Bestell- und Bezahlprozess viel schneller, Sie können mehrere Versandadressen speichern, Ihre Bestellungen ansehen und verfolgen und vieles mehr."
-"Cannot load configuration from file %s.","Konfiguration aus Datei %s kann nicht geladen werden."
-"Checkout as Guest","Checkout als Gast"
-"Checkout as a Guest or Register","Als Gast weiter zur Kasse gehen oder registrieren"
-"City","Stadt"
-"Clear Persistence on Log Out","Eindeutige Ausdauer beim Ausloggen"
-"Close","Schließen"
-"Company","Unternehmen"
-"Confirm Password","Passwort bestätigen"
-"Continue","Weiter"
-"Country","Land"
-"Create an Account","Ein Konto anlegen"
-"Easy access to your order history and status","Schneller Zugriff auf Ihre Bestellungen und Ihren Status"
-"Email Address","E-Mail-Adresse"
-"Enable ""Remember Me""","""Login merken"" aktivieren"
-"Enable Persistence","Ausdauer aktivieren"
-"Fast and easy check out","Schnelles und einfaches Bezahlen"
-"Fax","Fax"
-"Forgot Your Password?","Passwort vergessen?"
-"Forgot your password?","Passwort vergessen?"
-"General Options","Allgemeine Optionen"
-"If you have an account with us, please log in.","Falls Sie ein Konto bei uns haben, loggen Sie bitte ein."
-"Loading next step...","Lade nächsten Schritt..."
-"Login","Login"
-"Login Information","Login-Informationen"
-"Login or Create an Account","Einloggen oder Benutzerkonto erstellen"
-"New Customers","Neue Kunden"
-"Password","Passwort"
-"Persist Shopping Cart","Bestehender Warenkorb"
-"Persistence Lifetime (seconds)","Noch bleibende Lebensdauer (Sekunden)"
-"Persistent Shopping Cart","Bleibender Warenkorb"
-"Personal Information","Persönliche Angaben"
-"Please log in below:","Bitte loggen Sie sich hier ein:"
-"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen."
-"Register","Registrieren"
-"Register and save time!","Registrieren und Zeit sparen!"
-"Register to Create an Account","Registrieren, um ein Konto zu erstellen"
-"Register with us for future convenience:","Registrieren Sie sich bei uns, um den Einkauf so bequem wie möglich zu gestalten:"
-"Registered Customers","Registrierte Kunden"
-"Remember Me","Eingaben merken"
-"Save in address book","Im Adressbuch speichern"
-"Select State/Province...","Bundesland auswählen"
-"Select a billing address from your address book or enter a new address.","Rechnungsadresse aus Ihrem Adressbuch auswählen oder neue Adresse eingeben"
-"Ship to different address","An eine abweichende Adresse versenden"
-"Ship to this address","An diese Adresse versenden"
-"Shopping cart has been updated with appropriate prices","Der Einkaufswagen wurde mit entsprechenden Preisen aktualisiert"
-"Sign Up for Newsletter","Melden Sie sich für unseren Newsletter an"
-"State/Province","Staat/Bezirk"
-"Street Address","Anschrift (Straße, Hausnummer, PLZ)"
-"Street Address %s","Hausanschrift %s"
-"Submit","Ãœbermitteln"
-"Phone","Telefon"
-"To proceed to Checkout, please log in using your email address.","Um weiter zur Kasse zu gehen, melden Sie sich bitte mit Ihrer E-Mail-Adresse an."
-"VAT Number","MwSt.-Nummer"
-"Welcome, %s!","Willkommen, %s!"
"What's this?","Was ist das?"
-"Zip/Postal Code","Postleitzahl"
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me","Eingaben merken"
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
+"""Remember Me"" Default Value","""Remember Me"" Default Value"
+"Clear Persistence on Log Out","Clear Persistence on Log Out"
+"Persist Shopping Cart","Persist Shopping Cart"
diff --git a/app/code/Magento/Persistent/i18n/en_US.csv b/app/code/Magento/Persistent/i18n/en_US.csv
index e45246f8ae8..cf99cb92b8a 100644
--- a/app/code/Magento/Persistent/i18n/en_US.csv
+++ b/app/code/Magento/Persistent/i18n/en_US.csv
@@ -1,64 +1,16 @@
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me","Remember Me"
+"What's this?","What's this?"
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
"""Remember Me"" Default Value","""Remember Me"" Default Value"
-"(Not %s?)","(Not %s?)"
-"* Required Fields","* Required Fields"
-"Address","Address"
-"Address Information","Address Information"
-"Already registered?","Already registered?"
-"Back","Back"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more."
-"Cannot load configuration from file %s.","Cannot load configuration from file %s."
-"Checkout as Guest","Checkout as Guest"
-"Checkout as a Guest or Register","Checkout as a Guest or Register"
-"City","City"
"Clear Persistence on Log Out","Clear Persistence on Log Out"
-"Close","Close"
-"Company","Company"
-"Confirm Password","Confirm Password"
-"Continue","Continue"
-"Country","Country"
-"Create an Account","Create an Account"
-"Easy access to your order history and status","Easy access to your order history and status"
-"Email Address","Email Address"
-"Enable ""Remember Me""","Enable ""Remember Me"""
-"Enable Persistence","Enable Persistence"
-"Fast and easy check out","Fast and easy check out"
-"Fax","Fax"
-"Forgot Your Password?","Forgot Your Password?"
-"Forgot your password?","Forgot your password?"
-"General Options","General Options"
-"If you have an account with us, please log in.","If you have an account with us, please log in."
-"Loading next step...","Loading next step..."
-"Login","Login"
-"Login Information","Login Information"
-"Login or Create an Account","Login or Create an Account"
-"New Customers","New Customers"
-"Password","Password"
"Persist Shopping Cart","Persist Shopping Cart"
-"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
-"Persistent Shopping Cart","Persistent Shopping Cart"
-"Personal Information","Personal Information"
-"Please log in below:","Please log in below:"
-"Please select region, state or province","Please select region, state or province"
-"Register","Register"
-"Register and save time!","Register and save time!"
-"Register to Create an Account","Register to Create an Account"
-"Register with us for future convenience:","Register with us for future convenience:"
-"Registered Customers","Registered Customers"
-"Remember Me","Remember Me"
-"Save in address book","Save in address book"
-"Select State/Province...","Select State/Province..."
-"Select a billing address from your address book or enter a new address.","Select a billing address from your address book or enter a new address."
-"Ship to different address","Ship to different address"
-"Ship to this address","Ship to this address"
-"Shopping cart has been updated with appropriate prices","Shopping cart has been updated with appropriate prices"
-"Sign Up for Newsletter","Sign Up for Newsletter"
-"State/Province","State/Province"
-"Street Address","Street Address"
-"Street Address %s","Street Address %s"
-"Submit","Submit"
-"Phone","Phone"
-"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
-"VAT Number","VAT Number"
-"Welcome, %s!","Welcome, %s!"
-"What's this?","What's this?"
-"Zip/Postal Code","Zip/Postal Code"
diff --git a/app/code/Magento/Persistent/i18n/es_ES.csv b/app/code/Magento/Persistent/i18n/es_ES.csv
index 7a6ae4c2e16..635ec9eec5c 100644
--- a/app/code/Magento/Persistent/i18n/es_ES.csv
+++ b/app/code/Magento/Persistent/i18n/es_ES.csv
@@ -1,64 +1,16 @@
-"""Remember Me"" Default Value","Valor predeterminado de ""Recordarme"""
-"(Not %s?)","(¿No %s?)"
-"* Required Fields","* Campos obligatorios"
-"Address","Dirección"
-"Address Information","Información de dirección"
-"Already registered?","¿Ya registrado?"
-"Back","Volver"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Al crear una cuenta con nuestra tienda, podrás moverte por el proceso de compra más rápido, almacenar varias direcciones de envÃo, ver y seguir tus pedidos en tu cuenta y más."
-"Cannot load configuration from file %s.","No se puede cargar la configuración desde el archivo %s."
-"Checkout as Guest","Paga como Invitado"
-"Checkout as a Guest or Register","Comprar como Invitado o Registrarse"
-"City","Ciudad"
-"Clear Persistence on Log Out","Persistencia transparente al cerrar sesión"
-"Close","Cerrar"
-"Company","Empresa"
-"Confirm Password","Confirmar Contraseña"
-"Continue","Continuar"
-"Country","PaÃs"
-"Create an Account","Crear una Cuenta"
-"Easy access to your order history and status","Fácil acceso a tu estado e historial de pedidos"
-"Email Address","Dirección de correo electrónico"
-"Enable ""Remember Me""","Activar ""Recordarme"""
-"Enable Persistence","Activar persistencia"
-"Fast and easy check out","Rápido y sencillo proceso de compra"
-"Fax","Fax"
-"Forgot Your Password?","¿Olvidaste Tu Contraseña?"
-"Forgot your password?","¿Olvidaste tu contraseña?"
-"General Options","Opciones generales"
-"If you have an account with us, please log in.","Si tiene usted una cuenta con nosotros, por favor, inicie sesión."
-"Loading next step...","Cargando paso siguiente..."
-"Login","Iniciar sesión"
-"Login Information","Información de inicio de sesión"
-"Login or Create an Account","IdentifÃquese o cree una cuenta"
-"New Customers","Nuevos clientes"
-"Password","Contraseña"
-"Persist Shopping Cart","Hacer persistente la cesta de la compra"
-"Persistence Lifetime (seconds)","Duración de la persistencia (segundos)"
-"Persistent Shopping Cart","Cesta de la compra persistente"
-"Personal Information","Información personal"
-"Please log in below:","Por favor indentifÃquese abajo:"
-"Please select region, state or province","Por favor seleccione región, estado o provincia"
-"Register","Registrarse"
-"Register and save time!","¡RegÃstrese y ahorre tiempo!"
-"Register to Create an Account","Registrarse para crear una cuenta"
-"Register with us for future convenience:","RegÃstrese con nosotros para mayor comodidad en el futuro:"
-"Registered Customers","Clientes registrados"
-"Remember Me","Recordarme"
-"Save in address book","Guardar en la libreta de direcciones"
-"Select State/Province...","Seleccionar Estado/Provincia..."
-"Select a billing address from your address book or enter a new address.","Seleccionar una dirección de facturación de su agenda o introducir una dirección nueva."
-"Ship to different address","Enviar a una dirección diferente"
-"Ship to this address","Enviar a esta dirección"
-"Shopping cart has been updated with appropriate prices","El carrito de la compra se ha actualizado con precios apropiados"
-"Sign Up for Newsletter","Suscribirse al boletÃn de noticias"
-"State/Province","Estado/Provincia"
-"Street Address","Dirección postal"
-"Street Address %s","Calle %s"
-"Submit","Enviar"
-"Phone","Teléfono"
-"To proceed to Checkout, please log in using your email address.","Para proceder a la comprobación, por favor, inicie sesión con su dirección de correo electrónico."
-"VAT Number","Número de IVA"
-"Welcome, %s!","¡Bienvenido, %s!"
"What's this?","¿Qué es esto?"
-"Zip/Postal Code","Código postal"
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me",Recordarme
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
+"""Remember Me"" Default Value","""Remember Me"" Default Value"
+"Clear Persistence on Log Out","Clear Persistence on Log Out"
+"Persist Shopping Cart","Persist Shopping Cart"
diff --git a/app/code/Magento/Persistent/i18n/fr_FR.csv b/app/code/Magento/Persistent/i18n/fr_FR.csv
index 82d77f2333d..714eab8b971 100644
--- a/app/code/Magento/Persistent/i18n/fr_FR.csv
+++ b/app/code/Magento/Persistent/i18n/fr_FR.csv
@@ -1,64 +1,16 @@
-"""Remember Me"" Default Value","Valeur par défaut « se souvenir de moi »"
-"(Not %s?)","(Pas %s)"
-"* Required Fields","* Champs requis"
-"Address","Adresse"
-"Address Information","Adresse"
-"Already registered?","Déjà enregistré ?"
-"Back","Retour"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","En créant un compte dans notre magasin, vous obtenez la possibilité de payer plus rapidement, d'avoir plusieurs adresses de livraison, de consulter et de suivre vos commandes, et plus encore."
-"Cannot load configuration from file %s.","N'a pas pu charger la configuration depuis le fichier %s"
-"Checkout as Guest","Visitez le site"
-"Checkout as a Guest or Register","Payer en tant qu'invité ou s'enregistrer"
-"City","Ville"
-"Clear Persistence on Log Out","Persistance claire en déconnexion"
-"Close","Fermer"
-"Company","Compagnie"
-"Confirm Password","Confirmer le mot de passe"
-"Continue","Continuer"
-"Country","Pays"
-"Create an Account","Créer un compte"
-"Easy access to your order history and status","Accès facile à l'historique et au statut de vos commandes"
-"Email Address","Adresse email"
-"Enable ""Remember Me""","Activer « se souvenir de moi »"
-"Enable Persistence","Activer persistance"
-"Fast and easy check out","Paiement rapide et facile"
-"Fax","Fax"
-"Forgot Your Password?","Mot de passe oublié ?"
-"Forgot your password?","Mot de passe oublié ?"
-"General Options","Options générales"
-"If you have an account with us, please log in.","Si vous avez un compte chez nous, veuillez vous connecter."
-"Loading next step...","Chargement de l'étape suivante..."
-"Login","Connexion"
-"Login Information","Informations de connexion"
-"Login or Create an Account","Se connecter ou Créer un compte"
-"New Customers","Nouveaux clients"
-"Password","Mot de passe"
-"Persist Shopping Cart","Persister panier d'achat"
-"Persistence Lifetime (seconds)","Durée de la persistance (secondes)"
-"Persistent Shopping Cart","Panier persistent"
-"Personal Information","Informations personnelles"
-"Please log in below:","Veuillez vous connecter ci-dessous :"
-"Please select region, state or province","Veuillez sélectionnez la région, l'état ou le pays"
-"Register","S'inscrire"
-"Register and save time!","Inscrivez-vous et gagnez du temps !"
-"Register to Create an Account","Inscrivez-vous pour créer un compte"
-"Register with us for future convenience:","Inscrivez-vous pour une plus grande commodité :"
-"Registered Customers","Clients inscrits"
-"Remember Me","Se souvenir de moi"
-"Save in address book","Sauvegarder dans le carnet d'adresses"
-"Select State/Province...","Sélectionnez la région"
-"Select a billing address from your address book or enter a new address.","Sélectionnez une adresse de facturation depuis votre carnet d'adresses ou entrez une nouvelle adresse"
-"Ship to different address","Expédier à une adresse différente"
-"Ship to this address","Expédier à cette adresse"
-"Shopping cart has been updated with appropriate prices","Le panier a été mis à jour avec les prix appropriés."
-"Sign Up for Newsletter","Inscrivez-vous à la lettre d'informations"
-"State/Province","Etat / région"
-"Street Address","Adresse de la rue"
-"Street Address %s","Adresse municipale %s"
-"Submit","Soumettre"
-"Phone","Téléphone"
-"To proceed to Checkout, please log in using your email address.","Pour passer votre commande, veuillez vous connecter en utilisant votre adresse e-mail."
-"VAT Number","Numéro TVA"
-"Welcome, %s!","Bienvenue, %s !"
"What's this?","Qu'est-ce ?"
-"Zip/Postal Code","Code postal"
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me","Se souvenir de moi"
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
+"""Remember Me"" Default Value","""Remember Me"" Default Value"
+"Clear Persistence on Log Out","Clear Persistence on Log Out"
+"Persist Shopping Cart","Persist Shopping Cart"
diff --git a/app/code/Magento/Persistent/i18n/nl_NL.csv b/app/code/Magento/Persistent/i18n/nl_NL.csv
index ccba8a511c7..58170d03ce9 100644
--- a/app/code/Magento/Persistent/i18n/nl_NL.csv
+++ b/app/code/Magento/Persistent/i18n/nl_NL.csv
@@ -1,64 +1,16 @@
-"""Remember Me"" Default Value","""Onthoud me"" standaardwaarde"
-"(Not %s?)","(Niet %s?)"
-"* Required Fields","* Vereiste velden"
-"Address","Adres"
-"Address Information","Adresgegevens"
-"Already registered?","Al ingeschreven?"
-"Back","Terug"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Door een account aan te maken bij onze winkel, kunt u sneller afrekenen, meerdere verzendadressen opgeven, uw bestellingen bekijken en tracken en meer."
-"Cannot load configuration from file %s.","Kan configuratie van bestand %s niet laden."
-"Checkout as Guest","Als een gast betalen"
-"Checkout as a Guest or Register","Betaal als Gast of Schrijf in"
-"City","Stad"
-"Clear Persistence on Log Out","Verwijder persistentie bij het uitloggen"
-"Close","Sluiten"
-"Company","Bedrijf"
-"Confirm Password","Bevestig wachtwoord"
-"Continue","Doorgaan"
-"Country","Land"
-"Create an Account","Een account aanmaken"
-"Easy access to your order history and status","Gemakkelijke toegang tot uw bestelgeschiedenis en -status"
-"Email Address","e-mailadres"
-"Enable ""Remember Me""","Zet ""Onthoud mij"" aan"
-"Enable Persistence","Persistentie aanzetten"
-"Fast and easy check out","Snelle en gemakkelijk betalingen"
-"Fax","Fax"
-"Forgot Your Password?","Uw Wachtwoord Vergeten?"
-"Forgot your password?","Uw wachtwoord vergeten?"
-"General Options","Algemene opties"
-"If you have an account with us, please log in.","Als u een account bij ons heeft, logt u dan alstublieft in."
-"Loading next step...","Volgende stap aan het laden..."
-"Login","Log in"
-"Login Information","Log in Gegevens"
-"Login or Create an Account","Log in of Maak een Account aan"
-"New Customers","Nieuwe Klanten"
-"Password","Wachtwoord"
-"Persist Shopping Cart","Blijvend winkelmandje"
-"Persistence Lifetime (seconds)","Duur winkelmandje (seconden)"
-"Persistent Shopping Cart","Blijvend winkelmandje"
-"Personal Information","Persoonlijke Informatie"
-"Please log in below:","Log hieronder in"
-"Please select region, state or province","Selecteer a.u.b. uw provincie"
-"Register","Registreer"
-"Register and save time!","Registreer en bespaar tijd!"
-"Register to Create an Account","Registreer om een Account aan te maken"
-"Register with us for future convenience:","Registreer bij ons voor verder gemak"
-"Registered Customers","Geregistreerde Klanten"
-"Remember Me","Onthoud me"
-"Save in address book","Sla op in adresboek"
-"Select State/Province...","Selecteer Provincie"
-"Select a billing address from your address book or enter a new address.","Selecteer rekeninggegevens uit uw adresboek of voer nieuwe gegevens in"
-"Ship to different address","Verzend naar ander adres"
-"Ship to this address","Verzend naar dit adres"
-"Shopping cart has been updated with appropriate prices","Het winkelkarretje is bijgewerkt met de juiste prijzen."
-"Sign Up for Newsletter","Schrijf in voor Nieuwsbrief"
-"State/Province","Staat/Provincie"
-"Street Address","Adres straat"
-"Street Address %s","Straatnaam en huisnummer %s"
-"Submit","Bevestig"
-"Phone","Telefoon"
-"To proceed to Checkout, please log in using your email address.","Om verder te gaan naar Checkout, gelieve in te loggen met uw email adres."
-"VAT Number","BTW nummer"
-"Welcome, %s!","Welkom, %s!"
"What's this?","Wat is dit?"
-"Zip/Postal Code","Zip/Postcode"
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me","Onthoud me"
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
+"""Remember Me"" Default Value","""Remember Me"" Default Value"
+"Clear Persistence on Log Out","Clear Persistence on Log Out"
+"Persist Shopping Cart","Persist Shopping Cart"
diff --git a/app/code/Magento/Persistent/i18n/pt_BR.csv b/app/code/Magento/Persistent/i18n/pt_BR.csv
index 343991c764e..4f1c67416f1 100644
--- a/app/code/Magento/Persistent/i18n/pt_BR.csv
+++ b/app/code/Magento/Persistent/i18n/pt_BR.csv
@@ -1,64 +1,16 @@
-"""Remember Me"" Default Value","Valor-padrão ""Lembre-me"""
-"(Not %s?)","(Não %s?)"
-"* Required Fields","* Campos obrigatórios"
-"Address","Endereço"
-"Address Information","Informações de Endereço"
-"Already registered?","Já está registado?"
-"Back","Voltar"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Ao criar uma conta na nossa loja, você será capaz de se mover através do processo de compra mais rapidamente, armazenar múltiplos endereços de envio, ver e rastrear seus pedidos em sua conta e muito mais."
-"Cannot load configuration from file %s.","Não é possÃvel carregar configuração do arquivo %s."
-"Checkout as Guest","Checkout como Visitante"
-"Checkout as a Guest or Register","Checkout como um Visitante ou se Registe"
-"City","Cidade"
-"Clear Persistence on Log Out","Remover Persistência ao Sair do Sistema"
-"Close","Fechar"
-"Company","Companhia"
-"Confirm Password","Confirmar a senha"
-"Continue","Continue"
-"Country","PaÃs"
-"Create an Account","Criar uma conta"
-"Easy access to your order history and status","Fácil acesso ao seu histórico de pedidos e estado"
-"Email Address","Endereço de e-mail"
-"Enable ""Remember Me""","Permitir ""Lembre-me"""
-"Enable Persistence","Permitir Persistência"
-"Fast and easy check out","Checkout rápido e fácil"
-"Fax","Fax"
-"Forgot Your Password?","Esqueceu a senha?"
-"Forgot your password?","Esqueceu sua senha?"
-"General Options","Opções gerais"
-"If you have an account with us, please log in.","Se você possui uma conta conosco, por favor, faça seu login"
-"Loading next step...","Carregando próximo passo..."
-"Login","Conectar-se"
-"Login Information","Informações de login"
-"Login or Create an Account","Conectar-se ou criar conta"
-"New Customers","Novos clientes"
-"Password","Senha"
-"Persist Shopping Cart","Processar o Carrinho de Compras"
-"Persistence Lifetime (seconds)","Tempo de vida persistente(segundos)"
-"Persistent Shopping Cart","Carrinho de Compras Persistente"
-"Personal Information","Informações pessoais"
-"Please log in below:","Por favor, faça o login abaixo:"
-"Please select region, state or province","Selecione a região, estado ou provÃncia"
-"Register","Registrar"
-"Register and save time!","Cadastre-se e poupe tempo!"
-"Register to Create an Account","Cadastre-se para Criar uma Conta"
-"Register with us for future convenience:","Faça um cadastro conosco para ter comodidade no futuro:"
-"Registered Customers","Clientes cadastrados"
-"Remember Me","Lembre-se de mim"
-"Save in address book","Salvar no catálogo de endereços"
-"Select State/Province...","Selecione Estado/ProvÃncia..."
-"Select a billing address from your address book or enter a new address.","Selecione um endereço de cobrança de seu catálogo de endereços ou insira um novo endereço"
-"Ship to different address","Enviar para endereço diferente"
-"Ship to this address","Enviar para este endereço"
-"Shopping cart has been updated with appropriate prices","O carrinho de compras foi atualizado com os preços apropriados"
-"Sign Up for Newsletter","Assinar o boletim informativo"
-"State/Province","Estado/ProvÃncia"
-"Street Address","Endereço da Rua"
-"Street Address %s","Endereço da Rua %s"
-"Submit","Enviar"
-"Phone","Telefone"
-"To proceed to Checkout, please log in using your email address.","Para fazer checkout, por favor faça login usando o seu endereço de e-mail."
-"VAT Number","Número VAT"
-"Welcome, %s!","Bem-vindo, %s!"
"What's this?","O que é isso?"
-"Zip/Postal Code","Zip/Código Postal"
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me","Lembre-se de mim"
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
+"""Remember Me"" Default Value","""Remember Me"" Default Value"
+"Clear Persistence on Log Out","Clear Persistence on Log Out"
+"Persist Shopping Cart","Persist Shopping Cart"
diff --git a/app/code/Magento/Persistent/i18n/zh_CN.csv b/app/code/Magento/Persistent/i18n/zh_CN.csv
index 8bab2cf2f41..30fa2f3251c 100644
--- a/app/code/Magento/Persistent/i18n/zh_CN.csv
+++ b/app/code/Magento/Persistent/i18n/zh_CN.csv
@@ -1,64 +1,16 @@
-"""Remember Me"" Default Value","“记ä½æˆ‘â€çš„默认值"
-"(Not %s?)","（ä¸æ˜¯ %s ？）"
-"* Required Fields","*å¿…è¦å—段"
-"Address","地å€"
-"Address Information","地å€ä¿¡æ¯"
-"Already registered?","已注册？"
-"Back","返回"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","通过在我们的店铺ä¸åˆ›å»ºå¸æˆ·ï¼Œæ‚¨å°†èƒ½ç”¨æ›´å¿«é€Ÿåº¦ç»“账，ä¿å˜å¤šä¸ªé€è´§åœ°å€ï¼Œå¹¶å¯åœ¨æ‚¨çš„å¸æˆ·ä¸æŸ¥çœ‹å¹¶è¿½è¸ªæ‚¨çš„订å•ï¼Œè¿˜æœ‰æ›´å¤šåŠŸèƒ½ã€‚"
-"Cannot load configuration from file %s.","æ— æ³•ä»Žæ–‡ä»¶ %s åŠ è½½é…ç½®"
-"Checkout as Guest","作为æ¥å®¾ç»“è´¦"
-"Checkout as a Guest or Register","以æ¥å®¾èº«ä»½ç»“账或注册"
-"City","城市"
-"Clear Persistence on Log Out","注销时清空选项"
-"Close","å…³é—"
-"Company","å…¬å¸"
-"Confirm Password","确认密ç "
-"Continue","继ç»"
-"Country","国家"
-"Create an Account","创建å¸æˆ·"
-"Easy access to your order history and status","è½»æ¾è®¿é—®æ‚¨çš„订å•åŽ†å²è®°å½•å’ŒçŠ¶æ€"
-"Email Address","编辑电å邮件地å€"
-"Enable ""Remember Me""","å¯ç”¨â€œè®°ä½æˆ‘â€"
-"Enable Persistence","å¯ç”¨ä¿ç•™"
-"Fast and easy check out","方便快æ·çš„结账"
-"Fax","ä¼ çœŸ"
-"Forgot Your Password?","忘记您的密ç ？"
-"Forgot your password?","忘记您的密ç ？"
-"General Options","常规选项"
-"If you have an account with us, please log in.","如果您拥有账户，请登录。"
-"Loading next step...","æ£åœ¨è½½å…¥ä¸‹ä¸€æ¥..."
-"Login","登录"
-"Login Information","登录信æ¯"
-"Login or Create an Account","登录或创建å¸æˆ·"
-"New Customers","新客户"
-"Password","密ç "
-"Persist Shopping Cart","ä¿ç•™è´ç‰©è½¦"
-"Persistence Lifetime (seconds)","ä¿ç•™å¯¿å‘½ï¼ˆç§’）"
-"Persistent Shopping Cart","ä¿ç•™è´ç‰©è½¦"
-"Personal Information","个人信æ¯"
-"Please log in below:","请在下é¢ç™»å½•ï¼š"
-"Please select region, state or province","请选择地区ã€å·žï¼Œæˆ–çœ"
-"Register","注册"
-"Register and save time!","注册并节约时间ï¼"
-"Register to Create an Account","注册以创建å¸æˆ·"
-"Register with us for future convenience:","在这里注册以åŽå¯ä»¥æ›´æ–¹ä¾¿ï¼š"
-"Registered Customers","已注册的客户"
-"Remember Me","è®°ä½æˆ‘"
-"Save in address book","ä¿å˜åˆ°åœ°å€ç°¿"
-"Select State/Province...","选择州/çœ..."
-"Select a billing address from your address book or enter a new address.","从您的地å€ç°¿é€‰æ‹©è´¦å•åœ°å€ï¼Œæˆ–输入新地å€ã€‚"
-"Ship to different address","é€è´§åˆ°ä¸åŒåœ°å€"
-"Ship to this address","é€è´§åˆ°è¿™ä¸ªåœ°å€"
-"Shopping cart has been updated with appropriate prices","è´ç‰©è½¦å·²ä½¿ç”¨æ£ç¡®çš„ä»·æ ¼æ›´æ–°"
-"Sign Up for Newsletter","订阅新闻邮件"
-"State/Province","å·ž/çœ"
-"Street Address","è¡—é“地å€"
-"Street Address %s","è¡—é“åœ°å€ %s"
-"Submit","æ交"
-"Phone","电è¯"
-"To proceed to Checkout, please log in using your email address.","è¦ç»§ç»ç»“è´¦ï¼Œè¯·ä½¿ç”¨ä½ çš„ç”µå邮件地å€ç™»å½•ã€‚"
-"VAT Number","VAT ç¼–å·"
-"Welcome, %s!","欢迎，%sï¼"
-"What's this?","这是什么？"
-"Zip/Postal Code","邮政编ç "
+"What's this?",这是什么？
+"(Not %1?)","(Not %1?)"
+"Your shopping cart has been updated with new prices.","Your shopping cart has been updated with new prices."
+"Welcome, %1!","Welcome, %1!"
+"To check out, please log in using your email address.","To check out, please log in using your email address."
+"We cannot load the configuration from file %1.","We cannot load the configuration from file %1."
+"Remember Me",è®°ä½æˆ‘
+"Check "Remember Me" to access your shopping cart on this computer when you are logged out","Check "Remember Me" to access your shopping cart on this computer when you are logged out"
+"General Options","General Options"
+"Persistent Shopping Cart","Persistent Shopping Cart"
+"Enable Persistence","Enable Persistence"
+"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
+"Enable ""Remember Me""","Enable ""Remember Me"""
+"""Remember Me"" Default Value","""Remember Me"" Default Value"
+"Clear Persistence on Log Out","Clear Persistence on Log Out"
+"Persist Shopping Cart","Persist Shopping Cart"
diff --git a/app/code/Magento/ProductAlert/i18n/de_DE.csv b/app/code/Magento/ProductAlert/i18n/de_DE.csv
index 21ce1e6627f..04a4c4f44f2 100644
--- a/app/code/Magento/ProductAlert/i18n/de_DE.csv
+++ b/app/code/Magento/ProductAlert/i18n/de_DE.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","Email-Absender für Benachrichtigung"
-"Alert subscription has been saved.","Benachrichtigungsabonnement wurde gespeichert."
-"Allow Alert When Product Comes Back in Stock","Benachrichtigung, sobald ein ausverkauftes Produkt wieder verfügbar ist, zulassen"
-"Allow Alert When Product Price Changes","Benachrichtigung bei Preisänderungen eines Produkts zulassen"
-"Click here not to receive alerts for this product","Klicken Sie hier um keine Benachrichtigungen zu diesem Produkt zu erhalten"
-"Error Email Recipient","Email-Empfänger bei auftretenden Fehlern"
-"Error Email Sender","Email-Absender bei auftretenden Fehlern"
-"Error Email Template","Email-Vorlage bei auftretenden Fehlern"
-"Frequency","Frequenz"
-"Not enough parameters.","Angaben reichen nicht aus."
-"Price Alert Email Template","Email-Vorlage für Preisbenachrichtigungen"
-"Price:","Preis:"
-"Product Alerts","Produktbenachrichtigungen"
-"Product Alerts Run Settings","Produktbenachrichtigungen Ausführungseinstellungen"
-"Product alerts Cron error","Produktbenachrichtigungen Cron-Fehler"
-"Product price alert","Produktpreisbenachrichtigung"
-"Product stock alert","Produktverfügbarkeitsbenachrichtigung"
-"Regular Price:","Regulärer Preis:"
-"Sign up for price alert","Für Preisbenachrichtigungen anmelden"
-"Sign up to get notified when this product is back in stock","Lassen Sie sich benachrichtigen, sobald dieses Produkt wieder verfügbar ist."
-"Special price:","Spezialpreis:"
-"Start Time","Startzeit"
-"Stock Alert Email Template","Email-Vorlage für Verfügbarkeitsbenachrichtigung"
-"The alert subscription has been deleted.","Das Benachrichtigungsabonnement wurde gelöscht."
-"The alert subscription has been saved.","Das Benachrichtigungsabonnement wurde gespeichert."
-"The product is not found.","Das Produkt konnte nicht gefunden werden."
-"The product was not found.","Das Produkt konnte nicht gefunden werden."
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
"Unable to update the alert subscription.","Aktualisierung des Benachrichtigungsabonnements nicht möglich."
-"Unsubscribe from all price alerts","Von allen Preisbenachrichtigungen abmelden"
-"Unsubscribe from all stock alerts","Von allen Verfügbarkeitsbenachrichtigungen abmelden"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Sie erhalten diese Benachrichtigung, da Sie informiert werden wollten, wenn folgende Produkte wieder verfügbar sind:"
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Sie erhalten diese Benachrichtigung, da Sie informiert werden wollten, wenn sich die Preise folgender Produkte ändern:"
+"Alert subscription has been saved.","Benachrichtigungsabonnement wurde gespeichert."
+"You deleted the alert subscription.","You deleted the alert subscription."
"You will no longer receive price alerts for this product.","Sie erhalten zukünftig keine Preisbenachrichtigungen mehr."
+"The product was not found.","Das Produkt konnte nicht gefunden werden."
"You will no longer receive stock alerts for this product.","Sie erhalten zukünftig keine weiteren Verfügbarkeitsbenachrichtigungen mehr für dieses Produkt."
"You will no longer receive stock alerts.","Sie erhalten zukünftig keine Verfügbarkeitsbenachrichtigungen mehr."
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Sie erhalten diese Benachrichtigung, da Sie informiert werden wollten, wenn sich die Preise folgender Produkte ändern:"
+Price:,Preis:
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts","Von allen Preisbenachrichtigungen abmelden"
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Sie erhalten diese Benachrichtigung, da Sie informiert werden wollten, wenn folgende Produkte wieder verfügbar sind:"
+"Unsubscribe from all stock alerts","Von allen Verfügbarkeitsbenachrichtigungen abmelden"
+"Start Time","Start Time"
+Frequency,Frequency
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
+"Price Alert Email Template","Price Alert Email Template"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
+"Product Alerts Run Settings","Product Alerts Run Settings"
+"Sign up for price alert","Für Preisbenachrichtigungen anmelden"
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/ProductAlert/i18n/en_US.csv b/app/code/Magento/ProductAlert/i18n/en_US.csv
index 9663034be9c..8ecf4372a4f 100644
--- a/app/code/Magento/ProductAlert/i18n/en_US.csv
+++ b/app/code/Magento/ProductAlert/i18n/en_US.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","Alert Email Sender"
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
+"Unable to update the alert subscription.","Unable to update the alert subscription."
"Alert subscription has been saved.","Alert subscription has been saved."
-"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
-"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
-"Click here not to receive alerts for this product","Click here not to receive alerts for this product"
+"You deleted the alert subscription.","You deleted the alert subscription."
+"You will no longer receive price alerts for this product.","You will no longer receive price alerts for this product."
+"The product was not found.","The product was not found."
+"You will no longer receive stock alerts for this product.","You will no longer receive stock alerts for this product."
+"You will no longer receive stock alerts.","You will no longer receive stock alerts."
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:"
+Price:,Price:
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts","Unsubscribe from all price alerts"
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:"
+"Unsubscribe from all stock alerts","Unsubscribe from all stock alerts"
+"Start Time","Start Time"
+Frequency,Frequency
"Error Email Recipient","Error Email Recipient"
"Error Email Sender","Error Email Sender"
"Error Email Template","Error Email Template"
-"Frequency","Frequency"
-"Not enough parameters.","Not enough parameters."
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
"Price Alert Email Template","Price Alert Email Template"
-"Price:","Price:"
-"Product Alerts","Product Alerts"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
"Product Alerts Run Settings","Product Alerts Run Settings"
-"Product alerts Cron error","Product alerts Cron error"
-"Product price alert","Product price alert"
-"Product stock alert","Product stock alert"
-"Regular Price:","Regular Price:"
"Sign up for price alert","Sign up for price alert"
-"Sign up to get notified when this product is back in stock","Sign up to get notified when this product is back in stock"
-"Special price:","Special price:"
-"Start Time","Start Time"
-"Stock Alert Email Template","Stock Alert Email Template"
-"The alert subscription has been deleted.","The alert subscription has been deleted."
-"The alert subscription has been saved.","The alert subscription has been saved."
-"The product is not found.","The product is not found."
-"The product was not found.","The product was not found."
-"Unable to update the alert subscription.","Unable to update the alert subscription."
-"Unsubscribe from all price alerts","Unsubscribe from all price alerts"
-"Unsubscribe from all stock alerts","Unsubscribe from all stock alerts"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:"
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:"
-"You will no longer receive price alerts for this product.","You will no longer receive price alerts for this product."
-"You will no longer receive stock alerts for this product.","You will no longer receive stock alerts for this product."
-"You will no longer receive stock alerts.","You will no longer receive stock alerts."
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/ProductAlert/i18n/es_ES.csv b/app/code/Magento/ProductAlert/i18n/es_ES.csv
index 2e7986ee86c..232ca85163d 100644
--- a/app/code/Magento/ProductAlert/i18n/es_ES.csv
+++ b/app/code/Magento/ProductAlert/i18n/es_ES.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","Alerta de correo electrónico del remitente"
-"Alert subscription has been saved.","Alerta de suscripción guardada."
-"Allow Alert When Product Comes Back in Stock","Avisar cuando el producto vuelva a estar en existencias."
-"Allow Alert When Product Price Changes","Permitir aviso cuando el precio del producto cambie"
-"Click here not to receive alerts for this product","Hacer click aquà para no recibir alertas para este producto"
-"Error Email Recipient","Error en el destinatario del mensaje"
-"Error Email Sender","Error en el remitente del mensaje"
-"Error Email Template","Error en la plantilla del mensaje"
-"Frequency","Frecuencia"
-"Not enough parameters.","Parámetros insuficientes."
-"Price Alert Email Template","Plantilla de correo eléctronico de alerta de precio"
-"Price:","Precio:"
-"Product Alerts","Alertas de Producto"
-"Product Alerts Run Settings","Configuración de la función de alertas de producto"
-"Product alerts Cron error","Error de cron de las alertas de producto"
-"Product price alert","Alerta de precio del producto"
-"Product stock alert","Alerta de producto en existencias"
-"Regular Price:","Precio Habitual:"
-"Sign up for price alert","Incribirse para alerta de precio"
-"Sign up to get notified when this product is back in stock","InscrÃbase para ser notificado cuando este producto vuelva a estar en existencias"
-"Special price:","Precio especial:"
-"Start Time","Tiempo de inicio."
-"Stock Alert Email Template","Plantilla de correo electrónico de alerta de existencias"
-"The alert subscription has been deleted.","La suscripción de alerta ha sido borrada."
-"The alert subscription has been saved.","La suscripción de alerta ha sido guardada."
-"The product is not found.","Producto no encontrado."
-"The product was not found.","No se encontró el producto."
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
"Unable to update the alert subscription.","Imposible actualizar la suscripción de alerta."
-"Unsubscribe from all price alerts","Darse de baja de todas las alertas de precio"
-"Unsubscribe from all stock alerts","Darse de baja de todas las alertas de existencias"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Usted está recibiendo esta notificación porque está suscrito para recibir alertas cuando los siguientes productos vuelvan a estar en existencias:"
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Usted está recibiendo esta notificación porque está suscrito para recibir alertas cuando los precios de los siguientes productos cambien:"
+"Alert subscription has been saved.","Alerta de suscripción guardada."
+"You deleted the alert subscription.","You deleted the alert subscription."
"You will no longer receive price alerts for this product.","Usted no recibirá más alertas de precio para este producto."
+"The product was not found.","No se encontró el producto."
"You will no longer receive stock alerts for this product.","Usted no recibirá más alertas de existencias para este producto."
"You will no longer receive stock alerts.","Usted no recibirá más alertas de existencias."
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Usted está recibiendo esta notificación porque está suscrito para recibir alertas cuando los precios de los siguientes productos cambien:"
+Price:,Precio:
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts","Darse de baja de todas las alertas de precio"
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Usted está recibiendo esta notificación porque está suscrito para recibir alertas cuando los siguientes productos vuelvan a estar en existencias:"
+"Unsubscribe from all stock alerts","Darse de baja de todas las alertas de existencias"
+"Start Time","Start Time"
+Frequency,Frequency
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
+"Price Alert Email Template","Price Alert Email Template"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
+"Product Alerts Run Settings","Product Alerts Run Settings"
+"Sign up for price alert","Incribirse para alerta de precio"
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/ProductAlert/i18n/fr_FR.csv b/app/code/Magento/ProductAlert/i18n/fr_FR.csv
index d02e1bc28d5..d88711bc72d 100644
--- a/app/code/Magento/ProductAlert/i18n/fr_FR.csv
+++ b/app/code/Magento/ProductAlert/i18n/fr_FR.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","Alerter l'expéditeur de l'email"
-"Alert subscription has been saved.","La souscription aux alertes a été enregistrée."
-"Allow Alert When Product Comes Back in Stock","Autoriser les alertes quand le produit est à nouveau disponible."
-"Allow Alert When Product Price Changes","Autoriser les alertes quand le prix du produit change."
-"Click here not to receive alerts for this product","Cliquez ici pour ne plus recevoir d'alertes pour ce produit."
-"Error Email Recipient","Erreur dans le destinataire du mail"
-"Error Email Sender","Erreur dans l'expéditeur du mail"
-"Error Email Template","Erreur dans le modèle du mail"
-"Frequency","Fréquence"
-"Not enough parameters.","Pas assez de paramètres."
-"Price Alert Email Template","Modèle du mail d'alerte de prix."
-"Price:","Prix:"
-"Product Alerts","Alertes sur les produits"
-"Product Alerts Run Settings","Options des alertes sur les produits"
-"Product alerts Cron error","Erreur des alertes sur les produits"
-"Product price alert","Alerte sur le prix du produit"
-"Product stock alert","Alerte sur le stock du produit"
-"Regular Price:","Prix normal"
-"Sign up for price alert","S'enregistrer pour les alertes sur le prix"
-"Sign up to get notified when this product is back in stock","S'enregistrer pour être notifié lorsque ce produit est nouveau en stock"
-"Special price:","Prix spécial"
-"Start Time","Heure de début"
-"Stock Alert Email Template","Modèle du mail d'alerte de stock"
-"The alert subscription has been deleted.","La souscription aux alertes a été supprimée."
-"The alert subscription has been saved.","La souscription aux alertes a été enregistrée."
-"The product is not found.","Le produit n'a pas été trouvé."
-"The product was not found.","Le produit n'a pas été trouvé."
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
"Unable to update the alert subscription.","Échec lors de la mise à jour de la souscription aux alertes."
-"Unsubscribe from all price alerts","Se désabonner de toutes les alertes de prix"
-"Unsubscribe from all stock alerts","Se désabonner de toutes les alertes de stock"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Vous recevez cette notification car vous avez choisi de recevoir des alertes lorsque les produits suivants sont de nouveau disponibles :"
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Vous recevez cette notification car vous avez choisi de recevoir des alertes lorsque les prix des produits suivants changent :"
+"Alert subscription has been saved.","La souscription aux alertes a été enregistrée."
+"You deleted the alert subscription.","You deleted the alert subscription."
"You will no longer receive price alerts for this product.","Vous ne recevrez plus d'alertes de prix pour ce produit."
+"The product was not found.","Le produit n'a pas été trouvé."
"You will no longer receive stock alerts for this product.","Vous ne recevrez plus d'alertes de stock pour ce produit."
"You will no longer receive stock alerts.","Vous ne recevrez plus d'alertes de stock."
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Vous recevez cette notification car vous avez choisi de recevoir des alertes lorsque les prix des produits suivants changent :"
+Price:,Prix:
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts","Se désabonner de toutes les alertes de prix"
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Vous recevez cette notification car vous avez choisi de recevoir des alertes lorsque les produits suivants sont de nouveau disponibles :"
+"Unsubscribe from all stock alerts","Se désabonner de toutes les alertes de stock"
+"Start Time","Start Time"
+Frequency,Frequency
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
+"Price Alert Email Template","Price Alert Email Template"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
+"Product Alerts Run Settings","Product Alerts Run Settings"
+"Sign up for price alert","S'enregistrer pour les alertes sur le prix"
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/ProductAlert/i18n/nl_NL.csv b/app/code/Magento/ProductAlert/i18n/nl_NL.csv
index 5073cf0f7d0..b2c760474a4 100644
--- a/app/code/Magento/ProductAlert/i18n/nl_NL.csv
+++ b/app/code/Magento/ProductAlert/i18n/nl_NL.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","Waarschuwing E-mail Verzender"
-"Alert subscription has been saved.","Waarschuwing subscriptie is opgeslagen."
-"Allow Alert When Product Comes Back in Stock","Ik wil een waarschuwing ontvangen wanneer dit product weer in voorraad is"
-"Allow Alert When Product Price Changes","Ik wil een waarschuwing ontvangen wanneer de prijs van dit product veranderd"
-"Click here not to receive alerts for this product","Klik hier om geen waarschuwingen voor dit product te ontvangen"
-"Error Email Recipient","Foutmelding Email Ontvanger"
-"Error Email Sender","Foutmelding Email Verstuurder"
-"Error Email Template","Foutmelding Email Template"
-"Frequency","Frequentie"
-"Not enough parameters.","Niet genoeg parameters."
-"Price Alert Email Template","Prijs Waarschuwing E-mail Sjabloon"
-"Price:","Prijs:"
-"Product Alerts","Product Waarschuwingen"
-"Product Alerts Run Settings","Product Waarschuwingen Uitvoer Instellingen"
-"Product alerts Cron error","Product waarschuwingen Cron fout"
-"Product price alert","Product prijs waarschuwing"
-"Product stock alert","Product voorraad waarschuwing"
-"Regular Price:","Normale prijs:"
-"Sign up for price alert","Meld u nu aan voor prijs waarschuwingen"
-"Sign up to get notified when this product is back in stock","Meld u nu aan om gewaarschuwd te worden wanneer dit product weer in voorraad is"
-"Special price:","Speciale prijs:"
-"Start Time","Begintijd"
-"Stock Alert Email Template","Voorraad Waarschuwing E-mail Sjabloon"
-"The alert subscription has been deleted.","De waarschuwingssubscriptie is verwijderd."
-"The alert subscription has been saved.","De waarschuwingssubscriptie is opgeslagen."
-"The product is not found.","Het product is niet gevonden."
-"The product was not found.","Het product kon niet worden gevonden."
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
"Unable to update the alert subscription.","Niet instaat om de alarm subscriptie te updaten."
-"Unsubscribe from all price alerts","Schrijf u uit van alle prijs alarmen"
-"Unsubscribe from all stock alerts","Schrijf u uit van alle aandeel alarmen"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","U ontvangt deze notificatie omdat u zich ingeschreven heeft om een waarschuwing te ontvangen wanneer de volgende producten weer beschikbaar zijn:"
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","U ontvangt deze notificatie omdat u zich ingeschreven heeft om een waarschuwing te ontvangen wanneer de prijs van de volgende producten veranderd:"
+"Alert subscription has been saved.","Waarschuwing subscriptie is opgeslagen."
+"You deleted the alert subscription.","You deleted the alert subscription."
"You will no longer receive price alerts for this product.","U zult geen waarschuwing over de prijs van dit product meer ontvangen."
+"The product was not found.","Het product kon niet worden gevonden."
"You will no longer receive stock alerts for this product.","U zult geen waarschuwingen over de beschikbaarheid van dit product ontvangen."
"You will no longer receive stock alerts.","U zult geen voorraad waarschuwingen meer ontvangen."
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","U ontvangt deze notificatie omdat u zich ingeschreven heeft om een waarschuwing te ontvangen wanneer de prijs van de volgende producten veranderd:"
+Price:,Prijs:
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts","Schrijf u uit van alle prijs alarmen"
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","U ontvangt deze notificatie omdat u zich ingeschreven heeft om een waarschuwing te ontvangen wanneer de volgende producten weer beschikbaar zijn:"
+"Unsubscribe from all stock alerts","Schrijf u uit van alle aandeel alarmen"
+"Start Time","Start Time"
+Frequency,Frequency
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
+"Price Alert Email Template","Price Alert Email Template"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
+"Product Alerts Run Settings","Product Alerts Run Settings"
+"Sign up for price alert","Meld u nu aan voor prijs waarschuwingen"
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/ProductAlert/i18n/pt_BR.csv b/app/code/Magento/ProductAlert/i18n/pt_BR.csv
index 48f0c4df8f5..23f724a9968 100644
--- a/app/code/Magento/ProductAlert/i18n/pt_BR.csv
+++ b/app/code/Magento/ProductAlert/i18n/pt_BR.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","Remetente de Email de Alerta"
-"Alert subscription has been saved.","Alerta de assinatura foi salva."
-"Allow Alert When Product Comes Back in Stock","Permitir Alerta Quando o Produto Voltar ao Estoque"
-"Allow Alert When Product Price Changes","Permitir Alerta Quando o Preço do Produto Mudar"
-"Click here not to receive alerts for this product","Clique aqui para não receber alertas para este produto"
-"Error Email Recipient","Erro de Destinatário de Email"
-"Error Email Sender","Erro de Remetente de Email"
-"Error Email Template","Erro de Template de Email"
-"Frequency","Freqüência"
-"Not enough parameters.","Não há parâmetros suficientes."
-"Price Alert Email Template","Modelo do Email de Alerta de Preço"
-"Price:","Preço:"
-"Product Alerts","Alertas de Produto"
-"Product Alerts Run Settings","Executar Configurações de Alertas de Produto"
-"Product alerts Cron error","Erro Cron de Alertas de Produto"
-"Product price alert","Alerta de Preço de Produto"
-"Product stock alert","Alerta de Estoque de Produto"
-"Regular Price:","Preço Normal:"
-"Sign up for price alert","Registe-se para alerta de preço"
-"Sign up to get notified when this product is back in stock","Registe-se para ser notificado quando este produto estiver em estoque"
-"Special price:","Preço especial:"
-"Start Time","Tempo de InÃcio"
-"Stock Alert Email Template","Modelo de Email de Alerta de Estoque"
-"The alert subscription has been deleted.","O alerta de subscrição foi apagado."
-"The alert subscription has been saved.","O alerta de subscrição foi salvo."
-"The product is not found.","Não se encontra o produto."
-"The product was not found.","O produto não foi encontrado."
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
"Unable to update the alert subscription.","Não é possÃvel atualizar a subscrição de alertas."
-"Unsubscribe from all price alerts","Anular a subscrição de todos os alertas de preços"
-"Unsubscribe from all stock alerts","Anular a subscrição do todos os alertas estoque"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Você está recebendo esta notificação porque você se inscreveu para receber alertas quando os seguintes produtos estão de volta em estoque:"
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Você está recebendo esta notificação porque você se inscreveu para receber alertas quando os preços dos seguintes produtos se alterassem:"
+"Alert subscription has been saved.","Alerta de assinatura foi salva."
+"You deleted the alert subscription.","You deleted the alert subscription."
"You will no longer receive price alerts for this product.","Você não receberá mais alertas de preço para este produto."
+"The product was not found.","O produto não foi encontrado."
"You will no longer receive stock alerts for this product.","Você não receberá mais alertas de estoque para este produto."
"You will no longer receive stock alerts.","Você não receberá mais alertas de estoque."
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Você está recebendo esta notificação porque você se inscreveu para receber alertas quando os preços dos seguintes produtos se alterassem:"
+Price:,Preço:
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts","Anular a subscrição de todos os alertas de preços"
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Você está recebendo esta notificação porque você se inscreveu para receber alertas quando os seguintes produtos estão de volta em estoque:"
+"Unsubscribe from all stock alerts","Anular a subscrição do todos os alertas estoque"
+"Start Time","Start Time"
+Frequency,Frequency
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
+"Price Alert Email Template","Price Alert Email Template"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
+"Product Alerts Run Settings","Product Alerts Run Settings"
+"Sign up for price alert","Registe-se para alerta de preço"
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/ProductAlert/i18n/zh_CN.csv b/app/code/Magento/ProductAlert/i18n/zh_CN.csv
index aa267b805c6..17aef9a799e 100644
--- a/app/code/Magento/ProductAlert/i18n/zh_CN.csv
+++ b/app/code/Magento/ProductAlert/i18n/zh_CN.csv
@@ -1,35 +1,31 @@
-"Alert Email Sender","æ醒电å邮件å‘é€è€…"
-"Alert subscription has been saved.","æ醒订阅已ä¿å˜ã€‚"
-"Allow Alert When Product Comes Back in Stock","当产å“é‡æ–°æœ‰åº“å˜æ—¶å…许æ醒"
-"Allow Alert When Product Price Changes","当产å“ä»·æ ¼å˜æ›´æ—¶å…许æ醒"
-"Click here not to receive alerts for this product","å•å‡»è¿™é‡Œä¸å†æŽ¥æ”¶æ¤äº§å“çš„æ醒"
-"Error Email Recipient","邮件接收有误"
-"Error Email Sender","邮件å‘é€æœ‰è¯¯"
-"Error Email Template","邮件模æ¿æœ‰è¯¯"
-"Frequency","频率"
-"Not enough parameters.","没有足够的å‚数。"
-"Price Alert Email Template","ä»·æ ¼æ醒电å邮件模æ¿"
-"Price:","ä»·æ ¼ï¼š"
-"Product Alerts","产å“è¦æŠ¥"
-"Product Alerts Run Settings","产å“æ醒è¿è¡Œè®¾ç½®"
-"Product alerts Cron error","产å“æ醒 Cron 错误"
-"Product price alert","产å“ä»·æ ¼æ醒"
-"Product stock alert","产å“库å˜æ醒"
-"Regular Price:","å¸¸è§„ä»·æ ¼ï¼š"
-"Sign up for price alert","æ³¨å†Œä»·æ ¼æ醒"
-"Sign up to get notified when this product is back in stock","注册以在æ¤äº§å“é‡æ–°æœ‰åº“å˜æ—¶èŽ·å¾—通知"
-"Special price:","ç‰¹æƒ ä»·æ ¼ï¼š"
-"Start Time","开始时间"
-"Stock Alert Email Template","库å˜æ醒电å邮件模版"
-"The alert subscription has been deleted.","æé†’è®¢é˜…å·²è¢«åˆ é™¤ã€‚"
-"The alert subscription has been saved.","æ醒订阅已ä¿å˜ã€‚"
-"The product is not found.","产å“未找到。"
-"The product was not found.","产å“未找到。"
-"Unable to update the alert subscription.","æ— æ³•æ›´æ–°æ醒订阅。"
-"Unsubscribe from all price alerts","é€€è®¢æ‰€æœ‰ä»·æ ¼æ醒"
-"Unsubscribe from all stock alerts","退订所有库å˜æ醒"
-"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","æ‚¨æ”¶åˆ°è¯¥é€šçŸ¥çš„åŽŸå› æ˜¯æ‚¨è®¢é˜…äº†å½“ä¸‹åˆ—äº§å“有库å˜æ—¶æŽ¥æ”¶æ醒："
-"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","æ‚¨æ”¶åˆ°è¯¥é€šçŸ¥çš„åŽŸå› æ˜¯æ‚¨è®¢é˜…äº†å½“ä¸‹åˆ—äº§å“ä»·æ ¼æ›´æ”¹æ—¶æŽ¥å—æ醒："
-"You will no longer receive price alerts for this product.","您ä¸å†æŽ¥æ”¶æ¤äº§å“çš„ä»·æ ¼æ醒。"
-"You will no longer receive stock alerts for this product.","您ä¸å†æŽ¥æ”¶æ¤äº§å“的库å˜æ醒。"
-"You will no longer receive stock alerts.","您ä¸å†æŽ¥æ”¶åº“å˜æ醒。"
+"Product Alerts","Product Alerts"
+"We can't find the product.","We can't find the product."
+"There are not enough parameters.","There are not enough parameters."
+"You saved the alert subscription.","You saved the alert subscription."
+"Unable to update the alert subscription.",æ— æ³•æ›´æ–°æ醒订阅。
+"Alert subscription has been saved.",æ醒订阅已ä¿å˜ã€‚
+"You deleted the alert subscription.","You deleted the alert subscription."
+"You will no longer receive price alerts for this product.",您ä¸å†æŽ¥æ”¶æ¤äº§å“çš„ä»·æ ¼æ醒。
+"The product was not found.",产å“未找到。
+"You will no longer receive stock alerts for this product.",您ä¸å†æŽ¥æ”¶æ¤äº§å“的库å˜æ醒。
+"You will no longer receive stock alerts.",您ä¸å†æŽ¥æ”¶åº“å˜æ醒。
+"Invalid block type: %1","Invalid block type: %1"
+"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:",æ‚¨æ”¶åˆ°è¯¥é€šçŸ¥çš„åŽŸå› æ˜¯æ‚¨è®¢é˜…äº†å½“ä¸‹åˆ—äº§å“ä»·æ ¼æ›´æ”¹æ—¶æŽ¥å—æ醒：
+Price:,ä»·æ ¼ï¼š
+"Click here not to receive alerts for this product.","Click here not to receive alerts for this product."
+"Unsubscribe from all price alerts",é€€è®¢æ‰€æœ‰ä»·æ ¼æ醒
+"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:",æ‚¨æ”¶åˆ°è¯¥é€šçŸ¥çš„åŽŸå› æ˜¯æ‚¨è®¢é˜…äº†å½“ä¸‹åˆ—äº§å“有库å˜æ—¶æŽ¥æ”¶æ醒：
+"Unsubscribe from all stock alerts",退订所有库å˜æ醒
+"Start Time","Start Time"
+Frequency,Frequency
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
+"Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
+"Price Alert Email Template","Price Alert Email Template"
+"Stock Alert Email Template","Stock Alert Email Template"
+"Alert Email Sender","Alert Email Sender"
+"Product Alerts Run Settings","Product Alerts Run Settings"
+"Sign up for price alert",æ³¨å†Œä»·æ ¼æ醒
+"Sign up to be notified when this product is back in stock.","Sign up to be notified when this product is back in stock."
diff --git a/app/code/Magento/RecurringPayment/i18n/de_DE.csv b/app/code/Magento/RecurringPayment/i18n/de_DE.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/de_DE.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/i18n/en_US.csv b/app/code/Magento/RecurringPayment/i18n/en_US.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/en_US.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/i18n/es_ES.csv b/app/code/Magento/RecurringPayment/i18n/es_ES.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/es_ES.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/i18n/fr_FR.csv b/app/code/Magento/RecurringPayment/i18n/fr_FR.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/fr_FR.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/i18n/nl_NL.csv b/app/code/Magento/RecurringPayment/i18n/nl_NL.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/nl_NL.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/i18n/pt_BR.csv b/app/code/Magento/RecurringPayment/i18n/pt_BR.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/pt_BR.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/i18n/zh_CN.csv b/app/code/Magento/RecurringPayment/i18n/zh_CN.csv
new file mode 100644
index 00000000000..014e81d97f4
--- /dev/null
+++ b/app/code/Magento/RecurringPayment/i18n/zh_CN.csv
@@ -0,0 +1,142 @@
+Cancel,Cancel
+Back,Back
+Quantity,Quantity
+SKU,SKU
+No,No
+Action,Action
+Store,Store
+"-- Please Select --","-- Please Select --"
+Yes,Yes
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Order,Order
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+Active,Active
+Canceled,Canceled
+Day,Day
+Month,Month
+Year,Year
+"Start Date","Start Date"
+"Product Name","Product Name"
+"Payment Information","Payment Information"
+"Order #","Order #"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Created,Created
+Currency,Currency
+Date,Date
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+Updated,Updated
+Billing,Billing
+"Order Status","Order Status"
+Pending,Pending
+Expired,Expired
+Activate,Activate
+"Related Orders","Related Orders"
+"Recurring Billing Payments (beta)","Recurring Billing Payments (beta)"
+Schedule,Schedule
+"Customer Can Define Start Date","Customer Can Define Start Date"
+"Select whether buyer can define the date when billing for the payment begins.","Select whether buyer can define the date when billing for the payment begins."
+"Trial Period","Trial Period"
+"-- Not Selected --","-- Not Selected --"
+"Initial Fees","Initial Fees"
+Suspend,Suspend
+"Get Update","Get Update"
+"Recurring Payment # %1","Recurring Payment # %1"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Purchased Date","Purchased Date"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Purchased Item","Purchased Item"
+"Payment State","Payment State"
+"Subscriber Name","Subscriber Name"
+"Internal Reference ID","Internal Reference ID"
+"Schedule Description","Schedule Description"
+"Maximum Payment Failures","Maximum Payment Failures"
+"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
+"Billing Period Unit","Billing Period Unit"
+"Billing Frequency","Billing Frequency"
+"Maximum Billing Cycles","Maximum Billing Cycles"
+"Billing Amount","Billing Amount"
+"Trial Billing Period Unit","Trial Billing Period Unit"
+"Trial Billing Frequency","Trial Billing Frequency"
+"Maximum Trial Billing Cycles","Maximum Trial Billing Cycles"
+"Trial Billing Amount","Trial Billing Amount"
+"Initial Fee","Initial Fee"
+"Allow Initial Fee Failure","Allow Initial Fee Failure"
+"Payment Reference ID","Payment Reference ID"
+"Original order item that recurring payment corresponds to","Original order item that recurring payment corresponds to"
+"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
+"This is the date when billing for the payment begins.","This is the date when billing for the payment begins."
+"Enter a short description of the recurring payment. ' 'By default, this description will match the product name.","Enter a short description of the recurring payment. ' 'By default, this description will match the product name."
+"This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended.","This is the number of scheduled payments ' 'that can fail before the payment is automatically suspended."
+"Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments).","Use this to automatically bill the outstanding balance amount in the next billing cycle ' '(if there were failed payments)."
+"This is the unit for billing during the subscription period.","This is the unit for billing during the subscription period."
+"This is the number of billing periods that make up one billing cycle.","This is the number of billing periods that make up one billing cycle."
+"This is the number of billing cycles for the payment period.","This is the number of billing cycles for the payment period."
+"The initial, non-recurring payment amount is due immediately when the payment is created.","The initial, non-recurring payment amount is due immediately when the payment is created."
+"This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance.","This sets whether to suspend the payment if the initial fee fails or, ' 'instead, add it to the outstanding balance."
+"Customer Name","Customer Name"
+"Recurring Billing Payments","Recurring Billing Payments"
+"Payment #%1","Payment #%1"
+"The payment state has been updated.","The payment state has been updated."
+"We could not update the payment.","We could not update the payment."
+"You updated the payment.","You updated the payment."
+"The payment has no changes.","The payment has no changes."
+"The payment you specified does not exist.","The payment you specified does not exist."
+"We couldn't update the payment.","We couldn't update the payment."
+"The payment has been updated.","The payment has been updated."
+"We can't find the payment you specified.","We can't find the payment you specified."
+"Wrong state: ""%1""","Wrong state: ""%1"""
+"This payment state cannot be changed to ""%1"".","This payment state cannot be changed to ""%1""."
+"Trial ","Trial "
+"Payment type","Payment type"
+"Trial period payment","Trial period payment"
+"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
+"Initial period payment","Initial period payment"
+Week,Week
+"Two Weeks","Two Weeks"
+"Trial Payment","Trial Payment"
+"The start date is undefined.","The start date is undefined."
+"The start date has an invalid format.","The start date has an invalid format."
+"The schedule description must be provided.","The schedule description must be provided."
+"The billing period unit is not defined or wrong.","The billing period unit is not defined or wrong."
+"The period frequency is wrong.","The period frequency is wrong."
+"The trial billing period unit is wrong.","The trial billing period unit is wrong."
+"The trial period frequency is wrong.","The trial period frequency is wrong."
+"The trial period max cycles is wrong.","The trial period max cycles is wrong."
+"The trial billing amount is wrong.","The trial billing amount is wrong."
+"We found a wrong or empty billing amount specified.","We found a wrong or empty billing amount specified."
+"The wrong %1 is specified.","The wrong %1 is specified."
+"The currency code is undefined.","The currency code is undefined."
+"The payment method code is undefined.","The payment method code is undefined."
+"The payment is invalid:\n%1.","The payment is invalid:\n%1."
+"The recurring payment start date has invalid format.","The recurring payment start date has invalid format."
+"Billing Period","Billing Period"
+"An internal reference ID is required to save the payment.","An internal reference ID is required to save the payment."
+"%1 %2 cycle.","%1 %2 cycle."
+"Repeats %1 time(s)","Repeats %1 time(s)"
+"Repeats until suspended or canceled.","Repeats until suspended or canceled."
+"Not Initialized","Not Initialized"
+Suspended,Suspended
+"No information available.","No information available."
+"Recurring Payment Start Date","Recurring Payment Start Date"
+"Your recurring payments:","Your recurring payments:"
+"Payment # %1: ""%2"".","Payment # %1: ""%2""."
+"About This Payment:","About This Payment:"
+"Back to Recurring Billing Payments","Back to Recurring Billing Payments"
+"Recurring Payment View","Recurring Payment View"
+Reference,Reference
+"Payment Schedule","Payment Schedule"
+Payments,Payments
+"Recurring Payment","Recurring Payment"
+"Recurring Payments","Recurring Payments"
+"There are no recurring payments yet.","There are no recurring payments yet."
+"Orders Based on This Payment","Orders Based on This Payment"
+"There are no orders yet.","There are no orders yet."
diff --git a/app/code/Magento/RecurringPayment/view/frontend/templates/recurring/payments.phtml b/app/code/Magento/RecurringPayment/view/frontend/templates/recurring/payments.phtml
index 030800c92a5..3b4ed3d27d7 100644
--- a/app/code/Magento/RecurringPayment/view/frontend/templates/recurring/payments.phtml
+++ b/app/code/Magento/RecurringPayment/view/frontend/templates/recurring/payments.phtml
@@ -25,7 +25,7 @@
<?php /* @var $this \Magento\RecurringPayment\Block\Payments */ ?>
<div class="block recurring payments">
<?php echo $this->getChildHtml('grid')?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="action back"><span><?php echo __('Back') ?></span></a>
</div>
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 78f54869ca8..108c94234c6 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -315,6 +315,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
if (count($totalsCollection->getItems()) < 1 || !$filterData->getData('from')) {
$this->setTotals(new \Magento\Framework\Object());
+ $this->setCountTotals(false);
} else {
foreach ($totalsCollection->getItems() as $item) {
$this->setTotals($item);
diff --git a/app/code/Magento/Reports/etc/widget.xml b/app/code/Magento/Reports/etc/widget.xml
index 62145b9b6e1..475cd93985e 100644
--- a/app/code/Magento/Reports/etc/widget.xml
+++ b/app/code/Magento/Reports/etc/widget.xml
@@ -56,7 +56,7 @@
</parameter>
</parameters>
<containers>
- <container name="left">
+ <container name="sidebar.main">
<template name="default" value="list_default" />
<template name="names_only" value="list_names" />
<template name="images_only" value="list_images" />
@@ -65,7 +65,7 @@
<template name="grid" value="default" />
<template name="list" value="list" />
</container>
- <container name="right">
+ <container name="sidebar.additional">
<template name="default" value="list_default" />
<template name="names_only" value="list_names" />
<template name="images_only" value="list_images" />
@@ -103,7 +103,7 @@
</parameter>
</parameters>
<containers>
- <container name="left">
+ <container name="sidebar.main">
<template name="default" value="list_default" />
<template name="names_only" value="list_names" />
<template name="images_only" value="list_images" />
@@ -112,7 +112,7 @@
<template name="grid" value="default" />
<template name="list" value="list" />
</container>
- <container name="right">
+ <container name="sidebar.additional">
<template name="default" value="list_default" />
<template name="names_only" value="list_names" />
<template name="images_only" value="list_images" />
diff --git a/app/code/Magento/Reports/i18n/de_DE.csv b/app/code/Magento/Reports/i18n/de_DE.csv
index 650567426b1..2afa2d4426d 100644
--- a/app/code/Magento/Reports/i18n/de_DE.csv
+++ b/app/code/Magento/Reports/i18n/de_DE.csv
@@ -1,174 +1,220 @@
-"Abandoned Carts","Unbenutzte Einkaufswagen"
-"Abandoned carts","Verlassene Warenkörbe"
-"Action","Aktion"
+Product,Produktname
+Price,Preis
+Quantity,Artikelmenge
+Products,Produkte
+ID,ID
+SKU,SKU
+Customers,Kunden
+"Shopping Cart",Warenkorb
+No,Nein
+Subtotal,Zwischensumme
+Discount,Discount
+Action,Aktion
+Total,Gesamtbetrag
"Add to Cart","Zum Warenkobrn hinzufügen"
-"Add to Compare","Hinzufügen um zu vergleichen"
+Orders,Aufträge
+Bestsellers,Bestseller
+Customer,Kundenname
+Guest,Gast
+Items,Items
+Results,Ergebnisse
+Uses,Uses
+Average,Average
+"Order Quantity","bestellte Menge"
+Views,"Anzahl wie oft angesehen"
+Revenue,Umsatz
+Tax,Steuer
+Shipping,Lieferung
+"First Name",Vorname
+"Last Name",Nachname
+Email,E-Mail
+Refresh,Refresh
+Store,Store
+Yes,Ja
+Name,Name
+Title,Titel
+Description,Beschreibung
+From,Von
+To,An
+Dashboard,Dashboard
+"IP Address","IP Adresse"
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,"In Rechnung gestellt."
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock","Nicht lieferbar"
+Day,Tag
+Month,Monat
+Year,Jahr
+"Search Query",Suchbegriff
+"Search Terms",Suchbegriffe
"Add to Wishlist","Zum Wunschzettel hinzufügen"
-"Any","Etwas"
-"Applied Coupon","Benutzter Gutschein"
-"Applies to Any of the Specified Order Statuses","Gilt für jeden spezifischen Stand der Bestellung"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Sind Sie sicher, dass Sie die Laufzeit der Statistiken aktualisieren möchten? Während dieser Tätigkeit kann die Leistung beeinflusst werden."
-"Are you sure?","Sind Sie sicher?"
-"Avg. Approved Rating","Durchschnittliche anerkannte Bewertung"
-"Avg. Rating","Durchschnittliche Bewertung"
-"Bestsellers","Bestseller"
-"Wishlist Purchase","Vom Wunschzettel gekauft"
-"CSV","CSV"
-"Carts","Einkaufswagen"
-"Catalog Category (Without Subcategories)","Katalogkategorie (ohne Unterkategorien)"
-"Compared Products Grid Template","Gittermustervorlage für verglichene Produkte"
-"Compared Products List Template","Vorlage für die Liste verglichener Produkte"
-"Coupons","Gutscheine"
-"Coupons Usage Report","Protokoll zur Anwendung von Gutscheinen"
-"Created At","Erstellte At"
-"Current Month Starts","Aktuelle monatliche Starts"
-"Customer","Kunde"
-"Customer","Kundenname"
-"Customer Tags","Tags des Kunden"
-"Customers","Kunden"
-"Customers Report","Erfahrungsbericht der Kunden"
-"Customers Reviews","Berichte der Kunden"
-"Customers Tags","Tags der Kunden"
-"Customers by Orders","Kunden nach Bestellnummer"
-"Customers by Orders Total","Kunden nach Gesamtzahl der Bestellung"
+"Add to Compare","Hinzufügen um zu vergleichen"
+"Items in Cart","Waren im Einkaufswagen"
+Sales,Verkäufe
+Created,Created
+"Product Reviews",Produktreviews
+Updated,Updated
+Reports,Berichte
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,Filter
+Link,Link
+Report,Report
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts","Anzahl der neuen Konten"
"Customers by number of orders","Kunden nach der Anzahl der Aufträge"
-"Customers by orders total","Kunden nach Aufträgen insgesamt"
-"Customers that have wishlist: %s%","Kunden, die einen Wunschzettel haben: %s%"
-"Dashboard","Dashboard"
-"Day","Tag"
-"Default Recently Compared Products Count","Default der kürzlich verglichenen Anzahl der Produkte"
-"Default Recently Viewed Products Count","Default der kürzlich angesehenen Anzahl der Produkte"
-"Description","Beschreibung"
-"Detail","Detail"
-"Downloads","Downloads"
-"Email","E-Mail"
+"Customers by Orders Total","Kunden nach Gesamtzahl der Bestellung"
+"Match Period To","Match Period To"
+Period,Period
"Empty Rows","Leere Reihe"
-"Excel XML","Excel-XML"
-"Filter","Filter"
-"First Name","Vorname"
-"From","Von"
-"Guest","Gast"
-"Hits","Treffer"
-"ID","ID"
-"IP Address","IP Adresse"
-"Index model name must be defined","Index Modellname muss definiert sein"
-"Invalid date specified.","Ungültiges angegebenes Datum"
-"Invoiced","In Rechnung gestellt."
-"Items in Cart","Waren im Einkaufswagen"
-"Last Name","Nachname"
-"Last Review","Letzte Überprüfung"
-"Link","Link"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","Liste der kürzlich verglichenen Produkte und Produkte, die vom Besucher von der Vergleichsliste entfernt wurden"
-"List of Products Recently Viewed by Visitor","Liste der kürzlich angesehenen Produkte des Besuchers"
-"Low Stock","Niedriger Lagerbestand"
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report",Artikelmeldung
+Downloads,Downloads
+Purchases,Käufe
+CSV,CSV
+"Excel XML",Excel-XML
+Viewed,"Anzahl wie oft angesehen"
+Purchased,Purchased
"Low stock","Wenige Artikel vorrätig"
-"Match Interval To","Entsprechungszeitraum"
-"Month","Monat"
-"Most Viewed","am meisten angesehen"
-"Name","Name"
-"New Accounts","Neue Konten"
-"No","Nein"
-"Number Added","Anzahl hinzugefügt"
-"Number Fulfilled","Anzahl erfüllt"
-"Reviews","Anzahl der Bewertungen"
-"Number Purchased","Anzahl der erworbenen Artikel"
-"Viewed","Anzahl wie oft angesehen"
-"Products","Anzahl der Artikel"
-"New Accounts","Anzahl der neuen Konten"
-"Number of Products to display","Anzahl der darzustellenden Artikel"
-"Number of Reviews","Anzahl der Bewertungen"
-"Times Deleted","Anzahl wie oft gelöscht"
-"Total Tags","Gesamtzahl aller Etiketten"
-"Unique Tags","Anzahl einzelner Etiketten"
-"Views","Anzahl wie oft angesehen"
-"Number of items bought from a wishlist: %s","Anzahl der Artikel die aus einer Wunschliste gekauft wurden: in %"
-"Number of times wishlists have been shared (emailed): %s","Anzahl wie oft Wunschlisten per email verteilt wurden: in %"
-"Number of wishlist conversions: %s","Anzahl der Konvertierung von Wunschlisten: in %"
-"Number of wishlist referrals: %s","Anzahl der Empfehlungen von Wunschlisten: in %"
-"Number of wishlists: %s","Anzahl der Wunschlisten: in %"
-"Order Status","Status des Auftrags"
-"Order Taxes Report Grouped by Tax Rate","Auftragssteuermeldung unterteilt nach Steuersatz"
-"Orders","Aufträge"
-"Out of stock","Nicht lieferbar"
-"Interval","Zeitraum"
-"Poducts Report","Artikelmeldung"
-"Popular Tags","Beliebte Tags"
-"Popularity","Popularität"
-"Price","Preis"
-"Product","Produktname"
-"Product Reviews","Produktreviews"
-"Product SKU","Bestandseinheit des Produktes"
-"Product Tags","Produkttags"
-"Products","Produkte"
"Products Ordered","Bestellte Artikel"
-"Products Report","Artikelmeldung"
-"Products Reviews","Artikelbewertungen"
-"Products Tags","Etiketten der Artikel"
-"Products in carts","Artikel in den Warenkörben"
-"Purchases","Käufe"
-"Order Quantity","bestellte Menge"
-"Quantity","Artikelmenge"
-"Recently Compared","zuletzt verglichen"
-"Recently Compared Products","zuletzt verglichene Artikel"
-"Recently Viewed","Kürzlich angesehen"
-"Recently Viewed Products","Kürzlich angesehene Produkte"
-"Recently Viewed/Compared Products","Kürzlich angesehene / verglichene Produkte"
-"Refresh Lifetime Statistics","Aktualisiere lebenslange Statistik"
+"Most Viewed","am meisten angesehen"
+"Show Report","Report anzeigen"
+Interval,Zeitraum
"Refresh Statistics","Aktualisiere Statistik"
-"Refresh Statistics for the Last Day","Aktualisiere Statistik für den letzten Tag"
-"Refunds","Gutschriften"
-"Report","Report"
-"Reports","Berichte"
-"Results","Ergebnisse"
-"Revenue","Umsatz"
-"Review","Review"
-"Reviews","Bewertungen"
-"Reviews for %s","Bewertungen für %s"
-"Sales","Verkäufe"
-"Sales Report","Verkaufsreport"
-"Search Query","Suchbegriff"
-"Search Terms","Suchbegriffe"
-"Select day of the month.","Wählen Sie ein Datum aus."
-"Shipping","Lieferung"
-"Shopping Cart","Warenkorb"
+"Customers Reviews","Berichte der Kunden"
+"Reviews for %1","Reviews for %1"
+Detail,Detail
+"Products Reviews",Artikelbewertungen
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report","Protokoll zur Anwendung von Gutscheinen"
"Price Rule","Warenkorb Preisregel"
-"Show Actual Values","Tatsächliche Werte anzeigen"
-"Show Report","Report anzeigen"
-"Show for Current","Anzeige für aktuellen Eintrag"
-"Specified","Spezifiziert"
-"Statistics","Statistik"
-"Stock Quantity","Anzahl auf Lager"
-"Submit Locale","Abgeschickt in"
-"Submit Date","Abgeschickt am"
-"Subtotal","Zwischensumme"
-"Tag","Tag"
-"Tag ""%s"" details","Schild ""%s"" Details"
-"Tag Detail","Detail zu Tag"
-"Tag","Tagname"
-"Tag Use","Tag-Benutzung"
-"Tags Submitted by %s","Tags eingetragen von %s"
-"Tags submitted to %s","Tags versandt an %s"
-"Tax","Steuer"
-"Title","Titel"
-"To","An"
-"Total","Gesamtbetrag"
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
"Total Invoiced vs. Paid Report","Gesamtgegenüberstellung Berechnet zu Bezahlt"
-"Total Ordered Report","Report Gesamtbestellvolumen"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
"Total Refunded Report","Gesamtreport zu Rückerstattungen"
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report","Report Gesamtbestellvolumen"
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
"Total Shipped Report","Gesamtreport versendeter Produkte"
-"Total Tags","Gesamtanzahl Tags"
-"Total invoiced","Insgesamt berechnet"
-"Total refunded","Erstatteter Gesamtbetrag"
-"Updated At","Aktualisiert am"
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate","Auftragssteuermeldung unterteilt nach Steuersatz"
+Rate,Rate
+"Abandoned carts","Verlassene Warenkörbe"
+"Applied Coupon","Benutzter Gutschein"
+"Products in carts","Artikel in den Warenkörben"
+Carts,Einkaufswagen
+"Wish Lists","Wish Lists"
+"Wishlist Purchase","Vom Wunschzettel gekauft"
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted","Anzahl wie oft gelöscht"
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock","Niedriger Lagerbestand"
+"Downloads Report","Downloads Report"
+Review,Review
+Reviews,Bewertungen
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report","Erfahrungsbericht der Kunden"
+"Product Reviews Report","Product Reviews Report"
+"Sales Report",Verkaufsreport
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,Gutscheine
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts","Unbenutzte Einkaufswagen"
+Statistics,Statistik
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
+"Recently Viewed","Kürzlich angesehen"
+"Recently Compared Products","zuletzt verglichene Artikel"
+"Recently Viewed Products","Kürzlich angesehene Produkte"
+"Recently Compared","zuletzt verglichen"
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Show for Current","Show for Current"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor","Liste der kürzlich angesehenen Produkte des Besuchers"
+"Number of Products to display","Anzahl der darzustellenden Artikel"
"Viewed Products Grid Template","Tabellarische Vorlage für angesehene Produkte"
"Viewed Products List Template","Vorlage für Liste der angesehenen Produkte"
-"Visibility","Sichtbar in"
-"Wishlist Report","Wunschzettelreport"
-"Wishlist vs. Regular Order","Gegenüberstellung Wunschzettel zu regulärer Bestellung"
-"Wishlists","Wunschzettel"
-"Year","Jahr"
-"Year-To-Date Starts","Kalenderjahr startet"
-"Yes","Ja"
-"Your Recently Compared","Ihre letzten Vergleiche"
-"Your Recently Viewed","Ihre zuletzt angesehenen"
-"undefined","undefiniert"
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor","Liste der kürzlich verglichenen Produkte und Produkte, die vom Besucher von der Vergleichsliste entfernt wurden"
+"Compared Products Grid Template","Gittermustervorlage für verglichene Produkte"
+"Compared Products List Template","Vorlage für die Liste verglichener Produkte"
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,Treffer
+"Stock Quantity","Anzahl auf Lager"
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review","Letzte Überprüfung"
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics","Aktualisiere lebenslange Statistik"
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Sind Sie sicher, dass Sie die Laufzeit der Statistiken aktualisieren möchten? Während dieser Tätigkeit kann die Leistung beeinflusst werden."
+"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
diff --git a/app/code/Magento/Reports/i18n/en_US.csv b/app/code/Magento/Reports/i18n/en_US.csv
index 015dc1f2165..03173d8b230 100644
--- a/app/code/Magento/Reports/i18n/en_US.csv
+++ b/app/code/Magento/Reports/i18n/en_US.csv
@@ -1,174 +1,221 @@
-"Abandoned Carts","Abandoned Carts"
-"Abandoned carts","Abandoned carts"
-"Action","Action"
+Product,Product
+Price,Price
+Quantity,Quantity
+Products,Products
+ID,ID
+SKU,SKU
+Customers,Customers
+"Shopping Cart","Shopping Cart"
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Action
+Total,Total
"Add to Cart","Add to Cart"
-"Add to Compare","Add to Compare"
+Orders,Orders
+Bestsellers,Bestsellers
+Customer,Customer
+Guest,Guest
+Items,Items
+Results,Results
+Uses,Uses
+Average,Average
+"Order Quantity","Order Quantity"
+Views,Views
+Revenue,Revenue
+Tax,Tax
+Shipping,Shipping
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+Refresh,Refresh
+Store,Store
+Yes,Yes
+Name,Name
+Title,Title
+Description,Description
+From,From
+To,To
+Dashboard,Dashboard
+"IP Address","IP Address"
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,Invoiced
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock","Out of stock"
+Day,Day
+Month,Month
+Year,Year
+"Search Query","Search Query"
+"Search Terms","Search Terms"
"Add to Wishlist","Add to Wishlist"
-"Any","Any"
-"Applied Coupon","Applied Coupon"
-"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation."
-"Are you sure?","Are you sure?"
-"Avg. Approved Rating","Avg. Approved Rating"
-"Avg. Rating","Avg. Rating"
-"Bestsellers","Bestsellers"
-"Wishlist Purchase","Wishlist Purchase"
-"CSV","CSV"
-"Carts","Carts"
-"Catalog Category (Without Subcategories)","Catalog Category (Without Subcategories)"
-"Compared Products Grid Template","Compared Products Grid Template"
-"Compared Products List Template","Compared Products List Template"
-"Coupons","Coupons"
-"Coupons Usage Report","Coupons Usage Report"
-"Created At","Created At"
-"Current Month Starts","Current Month Starts"
-"Customer","Customer"
-"Customer","Customer"
-"Customer Tags","Customer Tags"
-"Customers","Customers"
-"Customers Report","Customers Report"
-"Customers Reviews","Customers Reviews"
-"Customers Tags","Customers Tags"
-"Customers by Orders","Customers by Orders"
-"Customers by Orders Total","Customers by Orders Total"
+"Add to Compare","Add to Compare"
+"Items in Cart","Items in Cart"
+Sales,Sales
+Created,Created
+"Product Reviews","Product Reviews"
+Updated,Updated
+Reports,Reports
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,Filter
+Link,Link
+Report,Report
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts","New Accounts"
"Customers by number of orders","Customers by number of orders"
-"Customers by orders total","Customers by orders total"
-"Customers that have wishlist: %s%","Customers that have wishlist: %s%"
-"Dashboard","Dashboard"
-"Day","Day"
-"Default Recently Compared Products Count","Default Recently Compared Products Count"
-"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
-"Description","Description"
-"Detail","Detail"
-"Downloads","Downloads"
-"Email","Email"
+"Customers by Orders Total","Customers by Orders Total"
+"Match Period To","Match Period To"
+Period,Period
"Empty Rows","Empty Rows"
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report","Products Report"
+Downloads,Downloads
+Purchases,Purchases
+CSV,CSV
"Excel XML","Excel XML"
-"Filter","Filter"
-"First Name","First Name"
-"From","From"
-"Guest","Guest"
-"Hits","Hits"
-"ID","ID"
-"IP Address","IP Address"
-"Index model name must be defined","Index model name must be defined"
-"Invalid date specified.","Invalid date specified."
-"Invoiced","Invoiced"
-"Items in Cart","Items in Cart"
-"Last Name","Last Name"
-"Last Review","Last Review"
-"Link","Link"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","List of Products Recently Compared and Removed from the Compare List by Visitor"
-"List of Products Recently Viewed by Visitor","List of Products Recently Viewed by Visitor"
-"Low Stock","Low Stock"
+Viewed,Viewed
+Purchased,Purchased
"Low stock","Low stock"
-"Match Interval To","Match Interval To"
-"Month","Month"
-"Most Viewed","Most Viewed"
-"Name","Name"
-"New Accounts","New Accounts"
-"No","No"
-"Number Added","Number Added"
-"Number Fulfilled","Number Fulfilled"
-"Reviews","Reviews"
-"Number Purchased","Number Purchased"
-"Viewed","Viewed"
-"Products","Products"
-"New Accounts","New Accounts"
-"Number of Products to display","Number of Products to display"
-"Number of Reviews","Number of Reviews"
-"Times Deleted","Times Deleted"
-"Total Tags","Total Tags"
-"Unique Tags","Unique Tags"
-"Views","Views"
-"Number of items bought from a wishlist: %s","Number of items bought from a wishlist: %s"
-"Number of times wishlists have been shared (emailed): %s","Number of times wishlists have been shared (emailed): %s"
-"Number of wishlist conversions: %s","Number of wishlist conversions: %s"
-"Number of wishlist referrals: %s","Number of wishlist referrals: %s"
-"Number of wishlists: %s","Number of wishlists: %s"
-"Order Status","Order Status"
-"Order Taxes Report Grouped by Tax Rate","Order Taxes Report Grouped by Tax Rate"
-"Orders","Orders"
-"Out of stock","Out of stock"
-"Interval","Interval"
-"Poducts Report","Poducts Report"
-"Popular Tags","Popular Tags"
-"Popularity","Popularity"
-"Price","Price"
-"Product","Product"
-"Product Reviews","Product Reviews"
-"Product SKU","Product SKU"
-"Product Tags","Product Tags"
-"Products","Products"
"Products Ordered","Products Ordered"
-"Products Report","Products Report"
+"Most Viewed","Most Viewed"
+"Show Report","Show Report"
+Interval,Interval
+"Refresh Statistics","Refresh Statistics"
+"Customers Reviews","Customers Reviews"
+"Reviews for %1","Reviews for %1"
+Detail,Detail
"Products Reviews","Products Reviews"
-"Products Tags","Products Tags"
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report","Coupons Usage Report"
+"Price Rule","Price Rule"
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
+"Total Invoiced vs. Paid Report","Total Invoiced vs. Paid Report"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
+"Total Refunded Report","Total Refunded Report"
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report","Total Ordered Report"
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
+"Total Shipped Report","Total Shipped Report"
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate","Order Taxes Report Grouped by Tax Rate"
+Rate,Rate
+"Abandoned carts","Abandoned carts"
+"Applied Coupon","Applied Coupon"
"Products in carts","Products in carts"
-"Purchases","Purchases"
-"Order Quantity","Order Quantity"
-"Quantity","Quantity"
-"Recently Compared","Recently Compared"
-"Recently Compared Products","Recently Compared Products"
+Carts,Carts
+"Wish Lists","Wish Lists"
+"Wishlist Purchase","Wishlist Purchase"
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted","Times Deleted"
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock","Low Stock"
+"Downloads Report","Downloads Report"
+Review,Review
+Reviews,Reviews
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report","Customers Report"
+"Product Reviews Report","Product Reviews Report"
+"Sales Report","Sales Report"
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,Coupons
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts","Abandoned Carts"
+Statistics,Statistics
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
"Recently Viewed","Recently Viewed"
+"Recently Compared Products","Recently Compared Products"
"Recently Viewed Products","Recently Viewed Products"
+"Recently Compared","Recently Compared"
"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
-"Refresh Lifetime Statistics","Refresh Lifetime Statistics"
-"Refresh Statistics","Refresh Statistics"
-"Refresh Statistics for the Last Day","Refresh Statistics for the Last Day"
-"Refunds","Refunds"
-"Report","Report"
-"Reports","Reports"
-"Results","Results"
-"Revenue","Revenue"
-"Review","Review"
-"Reviews","Reviews"
-"Reviews for %s","Reviews for %s"
-"Sales","Sales"
-"Sales Report","Sales Report"
-"Search Query","Search Query"
-"Search Terms","Search Terms"
-"Select day of the month.","Select day of the month."
-"Shipping","Shipping"
-"Shopping Cart","Shopping Cart"
-"Price Rule","Price Rule"
-"Show Actual Values","Show Actual Values"
-"Show Report","Show Report"
"Show for Current","Show for Current"
-"Specified","Specified"
-"Statistics","Statistics"
-"Stock Quantity","Stock Quantity"
-"Submit Locale","Submit Locale"
-"Submit Date","Submit Date"
-"Subtotal","Subtotal"
-"Tag","Tag"
-"Tag ""%s"" details","Tag ""%s"" details"
-"Tag Detail","Tag Detail"
-"Tag","Tag"
-"Tag Use","Tag Use"
-"Tags Submitted by %s","Tags Submitted by %s"
-"Tags submitted to %s","Tags submitted to %s"
-"Tax","Tax"
-"Title","Title"
-"To","To"
-"Total","Total"
-"Total Invoiced vs. Paid Report","Total Invoiced vs. Paid Report"
-"Total Ordered Report","Total Ordered Report"
-"Total Refunded Report","Total Refunded Report"
-"Total Shipped Report","Total Shipped Report"
-"Total Tags","Total Tags"
-"Total invoiced","Total invoiced"
-"Total refunded","Total refunded"
-"Updated At","Updated At"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor","List of Products Recently Viewed by Visitor"
+"Number of Products to display","Number of Products to display"
"Viewed Products Grid Template","Viewed Products Grid Template"
"Viewed Products List Template","Viewed Products List Template"
-"Visibility","Visibility"
-"Wishlist Report","Wishlist Report"
-"Wishlist vs. Regular Order","Wishlist vs. Regular Order"
-"Wishlists","Wishlists"
-"Year","Year"
-"Year-To-Date Starts","Year-To-Date Starts"
-"Yes","Yes"
-"Your Recently Compared","Your Recently Compared"
-"Your Recently Viewed","Your Recently Viewed"
-"undefined","undefined"
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor","List of Products Recently Compared and Removed from the Compare List by Visitor"
+"Compared Products Grid Template","Compared Products Grid Template"
+"Compared Products List Template","Compared Products List Template"
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,Hits
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Stock Quantity","Stock Quantity"
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review","Last Review"
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics","Refresh Lifetime Statistics"
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation."
+"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
diff --git a/app/code/Magento/Reports/i18n/es_ES.csv b/app/code/Magento/Reports/i18n/es_ES.csv
index 56539e5616e..26595380f01 100644
--- a/app/code/Magento/Reports/i18n/es_ES.csv
+++ b/app/code/Magento/Reports/i18n/es_ES.csv
@@ -1,174 +1,220 @@
-"Abandoned Carts","Carritos Dejados"
-"Abandoned carts","Carros dejados"
-"Action","Acción"
+Product,"Nombre de Producto"
+Price,Precio
+Quantity,"Cantidad de ArtÃculos"
+Products,Productos
+ID,ID
+SKU,SKU
+Customers,Clientes
+"Shopping Cart","Cesta de la Compra"
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Action,Acción
+Total,Total
"Add to Cart","Añadir al Carrito"
-"Add to Compare","Añadir para comparar."
+Orders,Pedidos
+Bestsellers,"Los más vendidos"
+Customer,"Nombre del Cliente"
+Guest,Invitado
+Items,Items
+Results,Resultados
+Uses,Uses
+Average,Average
+"Order Quantity","Cantidad Pedida"
+Views,"Número de Visitas"
+Revenue,Ingresos
+Tax,Impuestos
+Shipping,Transporte
+"First Name",Nombre
+"Last Name",Apellido
+Email,"Correo electrónico"
+Refresh,Refresh
+Store,Store
+Yes,SÃ
+Name,Nombre
+Title,TÃtulo
+Description,Descripción
+From,De
+To,Para
+Dashboard,Dashboard
+"IP Address","Dirección IP"
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,Facturado
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock",Agotado
+Day,DÃa
+Month,Mes
+Year,Año
+"Search Query","Query de Búsqueda"
+"Search Terms","Términos de búsqueda"
"Add to Wishlist","Añadir a lista que quieres."
-"Any","Cualquier"
-"Applied Coupon","Descuento Aplicado"
-"Applies to Any of the Specified Order Statuses","Se Aplica a Cualquiera de los Estados de Pedido Especificados"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","¿Está seguro de que desea actualizar las estadÃsticas? PodrÃa producirse un fallo en el rendimiento durante dicha operación."
-"Are you sure?","¿Está seguro?"
-"Avg. Approved Rating","Ãndice Medio de Aprobados"
-"Avg. Rating","Ãndice Medio"
-"Bestsellers","Los más vendidos"
-"Wishlist Purchase","Comprado desde la lista de deseos"
-"CSV","CSV"
-"Carts","Carritos"
-"Catalog Category (Without Subcategories)","CategorÃa del catálogo (sin subcategorÃas)"
-"Compared Products Grid Template","Plantilla en Red de los Productos Comparados"
-"Compared Products List Template","Plantilla en Lista de los Productos Comparados"
-"Coupons","Cupones"
-"Coupons Usage Report","Informe del Uso de Cupones"
-"Created At","Creado en"
-"Current Month Starts","Inicios del Mes Actual"
-"Customer","Cliente"
-"Customer","Nombre del Cliente"
-"Customer Tags","Etiquetas del Cliente"
-"Customers","Clientes"
-"Customers Report","Informe de Clientes"
-"Customers Reviews","Revisiones Personalizadas"
-"Customers Tags","Etiquetas de Clientes"
-"Customers by Orders","Clientes por número de pedidos"
-"Customers by Orders Total","Clientes por total de pedidos"
+"Add to Compare","Añadir para comparar."
+"Items in Cart","ArtÃculos en el Carro"
+Sales,Ventas
+Created,Created
+"Product Reviews","Opiniones de Producto"
+Updated,Updated
+Reports,Informes
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,Filtro.
+Link,Enlace
+Report,Informe
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts","Número de Nuevas Cuentas"
"Customers by number of orders","Clientes por número de pedidos"
-"Customers by orders total","Total de clientes por pedidos"
-"Customers that have wishlist: %s%","Clientes que tienen lista de deseos: %s%"
-"Dashboard","Panel de control"
-"Day","DÃa"
-"Default Recently Compared Products Count","Recuento de Productos Comparados Recientemente por Defecto"
-"Default Recently Viewed Products Count","Recuento de Productos Vistos Recientemente por Defecto"
-"Description","Descripción"
-"Detail","Detalles"
-"Downloads","Descargas."
-"Email","Correo electrónico"
+"Customers by Orders Total","Clientes por total de pedidos"
+"Match Period To","Match Period To"
+Period,Period
"Empty Rows","Filas VacÃas."
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report","Informe de Productos"
+Downloads,Descargas.
+Purchases,Adquisiciones
+CSV,CSV
"Excel XML","Excel XML"
-"Filter","Filtro."
-"First Name","Nombre"
-"From","De"
-"Guest","Invitado"
-"Hits","Visitas."
-"ID","ID"
-"IP Address","Dirección IP"
-"Index model name must be defined","Debe definirse el nombre del modelo de Ãndice"
-"Invalid date specified.","Fecha especificada no válida."
-"Invoiced","Facturado"
-"Items in Cart","ArtÃculos en el Carro"
-"Last Name","Apellido"
-"Last Review","Última Revisión"
-"Link","Enlace"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","Lista de Productos Comparada y Eliminada Recientemente de la Lista de Comparación por el Visitante"
-"List of Products Recently Viewed by Visitor","Lista de Productos Recientemente Examinados por el Visitante"
-"Low Stock","Pocas existencias"
+Viewed,"Número Visto"
+Purchased,Purchased
"Low stock","Pocas reservas"
-"Match Interval To","Ajustar el PerÃodo A"
-"Month","Mes"
-"Most Viewed","Los Más Vistos"
-"Name","Nombre"
-"New Accounts","Cuentas Nuevas"
-"No","No"
-"Number Added","Número Añadido"
-"Number Fulfilled","Número Alcanzado"
-"Reviews","Número de Reseñas"
-"Number Purchased","Número de Adquisiciones"
-"Viewed","Número Visto"
-"Products","Cantidad de artÃculos"
-"New Accounts","Número de Nuevas Cuentas"
-"Number of Products to display","Número de Productos para exponer"
-"Number of Reviews","Número de opiniones"
-"Times Deleted","Número de Veces Borrado"
-"Total Tags","Número Total de Etiquetas"
-"Unique Tags","Número de Etiquetas Únicas"
-"Views","Número de Visitas"
-"Number of items bought from a wishlist: %s","Número de artÃculos comprados desde una lista de la compra: %s"
-"Number of times wishlists have been shared (emailed): %s","Número de veces que se han compartido (enviado por correo electrónico) las listas de la compra: %s"
-"Number of wishlist conversions: %s","Número de conversiones de lista de la compra: %s"
-"Number of wishlist referrals: %s","Número de referencias de lista de la compra: %s"
-"Number of wishlists: %s","Número de listas de la compra: %s"
-"Order Status","Estado del pedido"
-"Order Taxes Report Grouped by Tax Rate","Informe de Impuestos de Pedido Agrupados por Tasa Impositiva"
-"Orders","Pedidos"
-"Out of stock","Agotado"
-"Interval","PerÃodo"
-"Poducts Report","Informe de Productos"
-"Popular Tags","Etiquetas Populares"
-"Popularity","Popularidad"
-"Price","Precio"
-"Product","Nombre de Producto"
-"Product Reviews","Opiniones de Producto"
-"Product SKU","Unidad de Mantenimiento de Existencias de Producto"
-"Product Tags","Etiqueta de Producto"
-"Products","Productos"
"Products Ordered","Productos Encargados"
-"Products Report","Informe de Productos"
-"Products Reviews","Opiniones de Productos"
-"Products Tags","Etiquetas de Productos"
-"Products in carts","Productos en carros de la compra"
-"Purchases","Adquisiciones"
-"Order Quantity","Cantidad Pedida"
-"Quantity","Cantidad de ArtÃculos"
-"Recently Compared","Comparados recientemente"
-"Recently Compared Products","Productos recientemente comparados"
-"Recently Viewed","Vistos recientemente"
-"Recently Viewed Products","Productos vistos recientemente"
-"Recently Viewed/Compared Products","Productos recientemente vistos/comparados"
-"Refresh Lifetime Statistics","Actualiza estadÃsticas del ciclo total"
+"Most Viewed","Los Más Vistos"
+"Show Report","Muestra el informe"
+Interval,PerÃodo
"Refresh Statistics","Actualiza estadÃsticas"
-"Refresh Statistics for the Last Day","Actualiza estadÃsticas del último dÃa"
-"Refunds","Reembolsos"
-"Report","Informe"
-"Reports","Informes"
-"Results","Resultados"
-"Revenue","Ingresos"
-"Review","Revisión"
-"Reviews","Reseñas"
-"Reviews for %s","Reajustes del %s"
-"Sales","Ventas"
-"Sales Report","Informe de ventas"
-"Search Query","Query de Búsqueda"
-"Search Terms","Términos de búsqueda"
-"Select day of the month.","Selecciona dÃa del mes"
-"Shipping","Transporte"
-"Shopping Cart","Cesta de la Compra"
+"Customers Reviews","Revisiones Personalizadas"
+"Reviews for %1","Reviews for %1"
+Detail,Detalles
+"Products Reviews","Opiniones de Productos"
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report","Informe del Uso de Cupones"
"Price Rule","Regla del precio del carrito de la compra."
-"Show Actual Values","Muestra los valores actuales"
-"Show Report","Muestra el informe"
-"Show for Current","Muestra los actuales"
-"Specified","Especificado"
-"Statistics","EstadÃsticas"
-"Stock Quantity","Cantidad de existencias"
-"Submit Locale","Presentados en"
-"Submit Date","Presentados a"
-"Subtotal","Subtotal"
-"Tag","Etiqueta"
-"Tag ""%s"" details","Datos de la pestaña""%s"""
-"Tag Detail","Detalle de etiqueta"
-"Tag","Nombre de la etiqueta"
-"Tag Use","Uso de etiqueta"
-"Tags Submitted by %s","Etiquetas presentadas por %"
-"Tags submitted to %s","Estiquetas presentadas a %"
-"Tax","Impuestos"
-"Title","TÃtulo"
-"To","Para"
-"Total","Total"
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
"Total Invoiced vs. Paid Report","Total facturado vs. Informe de pagos"
-"Total Ordered Report","Informe del total solicitado"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
"Total Refunded Report","Informe del total reembolsado"
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report","Informe del total solicitado"
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
"Total Shipped Report","Informe del total enviado"
-"Total Tags","Total de etiquetas"
-"Total invoiced","Total facturado"
-"Total refunded","Total reembolsado"
-"Updated At","Hora de actualización"
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate","Informe de Impuestos de Pedido Agrupados por Tasa Impositiva"
+Rate,Rate
+"Abandoned carts","Carros dejados"
+"Applied Coupon","Descuento Aplicado"
+"Products in carts","Productos en carros de la compra"
+Carts,Carritos
+"Wish Lists","Wish Lists"
+"Wishlist Purchase","Comprado desde la lista de deseos"
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted","Número de Veces Borrado"
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock","Pocas existencias"
+"Downloads Report","Downloads Report"
+Review,Revisión
+Reviews,Reseñas
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report","Informe de Clientes"
+"Product Reviews Report","Product Reviews Report"
+"Sales Report","Informe de ventas"
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,Cupones
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts","Carritos Dejados"
+Statistics,EstadÃsticas
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
+"Recently Viewed","Vistos recientemente"
+"Recently Compared Products","Productos recientemente comparados"
+"Recently Viewed Products","Productos vistos recientemente"
+"Recently Compared","Comparados recientemente"
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Show for Current","Show for Current"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor","Lista de Productos Recientemente Examinados por el Visitante"
+"Number of Products to display","Número de Productos para exponer"
"Viewed Products Grid Template","Ver plantilla de cuadrÃcula de productos"
"Viewed Products List Template","Plantilla de lista de productos vistos"
-"Visibility","Visible en"
-"Wishlist Report","Informe de lista de deseos"
-"Wishlist vs. Regular Order","Lista de deseos vs. Orden regular"
-"Wishlists","Lista de deseos"
-"Year","Año"
-"Year-To-Date Starts","Arranques desde principios de año hasta la fecha"
-"Yes","SÃ"
-"Your Recently Compared","Lo que ha comparado recientemente"
-"Your Recently Viewed","Sus vistas recientes"
-"undefined","Indefinido"
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor","Lista de Productos Comparada y Eliminada Recientemente de la Lista de Comparación por el Visitante"
+"Compared Products Grid Template","Plantilla en Red de los Productos Comparados"
+"Compared Products List Template","Plantilla en Lista de los Productos Comparados"
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,Visitas.
+"Stock Quantity","Cantidad de existencias"
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review","Última Revisión"
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics","Actualiza estadÃsticas del ciclo total"
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","¿Está seguro de que desea actualizar las estadÃsticas? PodrÃa producirse un fallo en el rendimiento durante dicha operación."
+"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
diff --git a/app/code/Magento/Reports/i18n/fr_FR.csv b/app/code/Magento/Reports/i18n/fr_FR.csv
index 8714a617d10..488b76e42c4 100644
--- a/app/code/Magento/Reports/i18n/fr_FR.csv
+++ b/app/code/Magento/Reports/i18n/fr_FR.csv
@@ -1,174 +1,220 @@
-"Abandoned Carts","Paniers abandonnés"
-"Abandoned carts","Paniers abandonnés"
-"Action","Action"
+Product,"Nom produit"
+Price,Prix
+Quantity,"Quantité d'articles"
+Products,Produits
+ID,ID
+SKU,SKU
+Customers,Clients
+"Shopping Cart",Panier
+No,Non
+Subtotal,Sous-total
+Discount,Discount
+Action,Action
+Total,Total
"Add to Cart","Ajouter au panier"
-"Add to Compare","Ajouter au comparateur"
+Orders,Commandes
+Bestsellers,"Meilleures ventes"
+Customer,"Nom du client"
+Guest,Invité
+Items,Items
+Results,Résultats
+Uses,Uses
+Average,Average
+"Order Quantity","Quantité commandée"
+Views,"Nombre de vues"
+Revenue,Revenu
+Tax,Taxe
+Shipping,Envoi
+"First Name",Prénom
+"Last Name",Nom
+Email,Email
+Refresh,Refresh
+Store,Store
+Yes,oui
+Name,Nom
+Title,Titre
+Description,Description
+From,De
+To,A
+Dashboard,Dashboard
+"IP Address","Adresse IP"
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,Facturé
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock",Épuisé
+Day,Jour
+Month,Mois
+Year,Année
+"Search Query",Recherche
+"Search Terms","Termes de recherche"
"Add to Wishlist","Ajouter à la liste de cadeaux"
-"Any","Indifférent"
-"Applied Coupon","Coupon appliqué"
-"Applies to Any of the Specified Order Statuses","S'applique à tous les statuts de commande spécifiés"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Voulez-vous vraiment actualiser les statistiques ? Il peut y avoir une baisse des performances pendant cette opération."
-"Are you sure?","Etes-vous sûr ?"
-"Avg. Approved Rating","Évaluation moyenne approuvée"
-"Avg. Rating","Évaluation moyenne"
-"Bestsellers","Meilleures ventes"
-"Wishlist Purchase","Achetés depuis une liste de cadeaux"
-"CSV","CSV (valeurs séparées par des virgules)"
-"Carts","Paniers"
-"Catalog Category (Without Subcategories)","Catégorie de catalogue (sans sous-catégories)"
-"Compared Products Grid Template","Produits comparés sur une grille"
-"Compared Products List Template","Produits comparés sur une liste"
-"Coupons","Coupons"
-"Coupons Usage Report","Rapport sur l'utilisation des coupons"
-"Created At","Créé à "
-"Current Month Starts","Le mois actuel commence"
-"Customer","Client"
-"Customer","Nom du client"
-"Customer Tags","Tags du client"
-"Customers","Clients"
-"Customers Report","Rapports du client"
-"Customers Reviews","Avis des clients"
-"Customers Tags","Tags des clients"
-"Customers by Orders","Clients par nombre d'achats"
-"Customers by Orders Total","Clients par nombre de commandes total"
+"Add to Compare","Ajouter au comparateur"
+"Items in Cart","Articles dans le panier"
+Sales,Ventes
+Created,Created
+"Product Reviews","Avis sur le produit"
+Updated,Updated
+Reports,Rapports
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,Filtre
+Link,Lien
+Report,Rapport
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts","Nombre de nouveaux comptes"
"Customers by number of orders","Clients par nombre de commandes"
-"Customers by orders total","Clients par total des commandes"
-"Customers that have wishlist: %s%","Clients qui ont une liste de cadeaux : %s%"
-"Dashboard","Tableau de bord"
-"Day","Jour"
-"Default Recently Compared Products Count","Par défaut Récemment comparé Compte de produits"
-"Default Recently Viewed Products Count","Par défaut Récemment vu Compte de produits"
-"Description","Description"
-"Detail","Détail"
-"Downloads","Téléchargements"
-"Email","Email"
+"Customers by Orders Total","Clients par nombre de commandes total"
+"Match Period To","Match Period To"
+Period,Period
"Empty Rows","Lignes vides"
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report","Rapport sur les produits"
+Downloads,Téléchargements
+Purchases,Achats
+CSV,"CSV (valeurs séparées par des virgules)"
"Excel XML","Excel XML"
-"Filter","Filtre"
-"First Name","Prénom"
-"From","De"
-"Guest","Invité"
-"Hits","Clics"
-"ID","ID"
-"IP Address","Adresse IP"
-"Index model name must be defined","Le nom du modèle Index doit être défini"
-"Invalid date specified.","Date spécifiée invalide"
-"Invoiced","Facturé"
-"Items in Cart","Articles dans le panier"
-"Last Name","Nom"
-"Last Review","Dernier avis"
-"Link","Lien"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","Liste des produits récemment comparés et supprimés de la liste de comparaison de Visiteur"
-"List of Products Recently Viewed by Visitor","Liste des produits récemment consultés par Visiteur"
-"Low Stock","Stock faible"
+Viewed,"Nombre de vues"
+Purchased,Purchased
"Low stock","Stock bas"
-"Match Interval To","Définir la période à "
-"Month","Mois"
-"Most Viewed","Les plus vus"
-"Name","Nom"
-"New Accounts","Nouveaux comptes"
-"No","Non"
-"Number Added","Nombre ajouté"
-"Number Fulfilled","Nombre complété"
-"Reviews","Nombre d'avis"
-"Number Purchased","Nombre d'achetés"
-"Viewed","Nombre de vues"
-"Products","Nombre d'articles"
-"New Accounts","Nombre de nouveaux comptes"
-"Number of Products to display","Nombre de produits à afficher"
-"Number of Reviews","Nombre de remarques"
-"Times Deleted","Nombre de fois supprimés"
-"Total Tags","Nombre total de tags"
-"Unique Tags","Nombre de tags uniques"
-"Views","Nombre de vues"
-"Number of items bought from a wishlist: %s","Nombre d'articles achetés depuis une liste de cadeaux : %s"
-"Number of times wishlists have been shared (emailed): %s","Nombre de fois que les listes de cadeaux ont été partagées (par e-mail) : %s"
-"Number of wishlist conversions: %s","Nombre de conversions de listes de cadeaux : %s"
-"Number of wishlist referrals: %s","Nombre de parrains de la liste de cadeaux : %s"
-"Number of wishlists: %s","Nombre de listes de cadeaux : %s"
-"Order Status","Statut de la commande"
-"Order Taxes Report Grouped by Tax Rate","Commandes Taxes Rapport Groupés par taux d'imposition"
-"Orders","Commandes"
-"Out of stock","Épuisé"
-"Interval","Période"
-"Poducts Report","Rapport sur les produits"
-"Popular Tags","Tags populaires"
-"Popularity","Popularité"
-"Price","Prix"
-"Product","Nom produit"
-"Product Reviews","Avis sur le produit"
-"Product SKU","Produit UGS"
-"Product Tags","Étiquettes des produits"
-"Products","Produits"
"Products Ordered","Produits commandés"
-"Products Report","Rapport sur les produits"
-"Products Reviews","Avis sur les produits"
-"Products Tags","Tags des produits"
-"Products in carts","Produits dans les paniers"
-"Purchases","Achats"
-"Order Quantity","Quantité commandée"
-"Quantity","Quantité d'articles"
-"Recently Compared","Récemment comparés"
-"Recently Compared Products","Produits récemment comparés"
-"Recently Viewed","Récemment vus"
-"Recently Viewed Products","Produits récemment vus"
-"Recently Viewed/Compared Products","Produits récemment vus/comparés"
-"Refresh Lifetime Statistics","Rafraîchir les statistiques de durée de vie"
+"Most Viewed","Les plus vus"
+"Show Report","Afficher le rapport"
+Interval,Période
"Refresh Statistics","Rafraîchir les statistiques"
-"Refresh Statistics for the Last Day","Rafraîchir les statistiques de la veille"
-"Refunds","Remboursements"
-"Report","Rapport"
-"Reports","Rapports"
-"Results","Résultats"
-"Revenue","Revenu"
-"Review","Avis"
-"Reviews","Commentaires"
-"Reviews for %s","Commentaires pour %s"
-"Sales","Ventes"
-"Sales Report","Rapport de ventes"
-"Search Query","Recherche"
-"Search Terms","Termes de recherche"
-"Select day of the month.","Sélectionner le jour du mois"
-"Shipping","Envoi"
-"Shopping Cart","Panier"
+"Customers Reviews","Avis des clients"
+"Reviews for %1","Reviews for %1"
+Detail,Détail
+"Products Reviews","Avis sur les produits"
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report","Rapport sur l'utilisation des coupons"
"Price Rule","Règle de prix du panier"
-"Show Actual Values","Afficher les valeurs"
-"Show Report","Afficher le rapport"
-"Show for Current","Afficher pour le courant"
-"Specified","Spécifié"
-"Statistics","Statistiques"
-"Stock Quantity","Qté en stock"
-"Submit Locale","Soumis dans"
-"Submit Date","Soumis sur"
-"Subtotal","Sous-total"
-"Tag","Étiquette"
-"Tag ""%s"" details","Détails ""%s"" du tag"
-"Tag Detail","Détail de l'étiquette"
-"Tag","Nom de l'étiquette"
-"Tag Use","Usage de l'étiquette"
-"Tags Submitted by %s","Étiquettes soumises par %s"
-"Tags submitted to %s","Étiquettes soumises à %s"
-"Tax","Taxe"
-"Title","Titre"
-"To","A"
-"Total","Total"
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
"Total Invoiced vs. Paid Report","Total facturé / Rapport payé"
-"Total Ordered Report","Rapport du total commandé"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
"Total Refunded Report","Rapport du total remboursé"
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report","Rapport du total commandé"
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
"Total Shipped Report","Rapport du total envoyé"
-"Total Tags","Total des étiquettes"
-"Total invoiced","Total facturé"
-"Total refunded","Total remboursé"
-"Updated At","Mis à jour à "
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate","Commandes Taxes Rapport Groupés par taux d'imposition"
+Rate,Rate
+"Abandoned carts","Paniers abandonnés"
+"Applied Coupon","Coupon appliqué"
+"Products in carts","Produits dans les paniers"
+Carts,Paniers
+"Wish Lists","Wish Lists"
+"Wishlist Purchase","Achetés depuis une liste de cadeaux"
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted","Nombre de fois supprimés"
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock","Stock faible"
+"Downloads Report","Downloads Report"
+Review,Avis
+Reviews,Commentaires
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report","Rapports du client"
+"Product Reviews Report","Product Reviews Report"
+"Sales Report","Rapport de ventes"
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,Coupons
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts","Paniers abandonnés"
+Statistics,Statistiques
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
+"Recently Viewed","Récemment vus"
+"Recently Compared Products","Produits récemment comparés"
+"Recently Viewed Products","Produits récemment vus"
+"Recently Compared","Récemment comparés"
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Show for Current","Show for Current"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor","Liste des produits récemment consultés par Visiteur"
+"Number of Products to display","Nombre de produits à afficher"
"Viewed Products Grid Template","Modèle de grille de produits vus"
"Viewed Products List Template","Formulaire-type de la liste des produits consultés"
-"Visibility","Visible dans"
-"Wishlist Report","Rapport de liste cadeaux"
-"Wishlist vs. Regular Order","Liste cadeaux / Commande régulière"
-"Wishlists","Listes cadeaux"
-"Year","Année"
-"Year-To-Date Starts","Début date à année"
-"Yes","oui"
-"Your Recently Compared","Vos produits récemment comparés"
-"Your Recently Viewed","Récemment vus"
-"undefined","indéfini"
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor","Liste des produits récemment comparés et supprimés de la liste de comparaison de Visiteur"
+"Compared Products Grid Template","Produits comparés sur une grille"
+"Compared Products List Template","Produits comparés sur une liste"
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,Clics
+"Stock Quantity","Qté en stock"
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review","Dernier avis"
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics","Rafraîchir les statistiques de durée de vie"
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Voulez-vous vraiment actualiser les statistiques ? Il peut y avoir une baisse des performances pendant cette opération."
+"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
diff --git a/app/code/Magento/Reports/i18n/nl_NL.csv b/app/code/Magento/Reports/i18n/nl_NL.csv
index 2cafb64a871..d35cbaf6f85 100644
--- a/app/code/Magento/Reports/i18n/nl_NL.csv
+++ b/app/code/Magento/Reports/i18n/nl_NL.csv
@@ -1,174 +1,220 @@
-"Abandoned Carts","Verlaten winkelwagens"
-"Abandoned carts","Verlaten winkelmanden"
-"Action","Actie"
+Product,Productnaam
+Price,Prijs
+Quantity,"Hoeveelheid artikelen"
+Products,Producten
+ID,ID
+SKU,SKU
+Customers,Klanten
+"Shopping Cart",Winkelmandje
+No,Nee
+Subtotal,Subtotaal
+Discount,Discount
+Action,Actie
+Total,Totaal
"Add to Cart","Aan mandje toevoegen"
-"Add to Compare","Voeg toe om te Vergelijken"
+Orders,Bestellingen
+Bestsellers,Bestsellers
+Customer,"Naam klant"
+Guest,Gast
+Items,Items
+Results,Resultaten
+Uses,Uses
+Average,Average
+"Order Quantity","Bestelde hoeveelheid"
+Views,"Aantal keer bekeken"
+Revenue,Omzet
+Tax,Belasting
+Shipping,Verzending
+"First Name",Voornaam
+"Last Name",Achternaam
+Email,Email
+Refresh,Refresh
+Store,Store
+Yes,Ja
+Name,Naam
+Title,Titel
+Description,Beschrijving
+From,Van
+To,Naar
+Dashboard,Dashboard
+"IP Address","IP Adres"
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,Gefactureerd
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock","Uit voorraad"
+Day,Dag
+Month,Maand
+Year,Jaar
+"Search Query","Zoek Query"
+"Search Terms","Zoek Voorwaarden"
"Add to Wishlist","Aan verlanglijst toevoegen"
-"Any","Iedere"
-"Applied Coupon","Gebruikte kortingsbon"
-"Applies to Any of the Specified Order Statuses","Van toepassing op elk van de gespecificeerde bestellingsstatussen"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Weet u zeker dat u de levensduur statistieken wilt verversen? Deze operatie kan de performantie negatief beïnvloeden."
-"Are you sure?","Weet u het zeker?"
-"Avg. Approved Rating","Gem. goede beoordeling"
-"Avg. Rating","Gem. beoordeling"
-"Bestsellers","Bestsellers"
-"Wishlist Purchase","Gekocht van verlanglijstjes"
-"CSV","CSV"
-"Carts","Mandjes"
-"Catalog Category (Without Subcategories)","Catalogus categorie (zonder subcategorieën)"
-"Compared Products Grid Template","Vergeleken producten rooster sjabloon"
-"Compared Products List Template","Vergeleken producten lijst sjabloon"
-"Coupons","Waardebonnen"
-"Coupons Usage Report","Kortingsbonnengebruik verslag"
-"Created At","Gecreëerd op"
-"Current Month Starts","Huidige maand begint"
-"Customer","Klant"
-"Customer","Naam klant"
-"Customer Tags","Klantenlabels"
-"Customers","Klanten"
-"Customers Report","Klantenverslag"
-"Customers Reviews","Klantenrecensies"
-"Customers Tags","Klantenlabels"
-"Customers by Orders","Klanten op volgorde van aantal bestellingen"
-"Customers by Orders Total","Klanten op volgorde van totaal bestellingen"
+"Add to Compare","Voeg toe om te Vergelijken"
+"Items in Cart","Items in Winkelwagentje"
+Sales,Verkoop
+Created,Created
+"Product Reviews",Productbeoordelingen
+Updated,Updated
+Reports,Verslagen
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,Filter
+Link,Link
+Report,Verslag
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts","Aantal nieuwe accounts"
"Customers by number of orders","Klanten op aantal bestellingen"
-"Customers by orders total","Klanten op totaal bestellingen"
-"Customers that have wishlist: %s%","Klanten die een verlanglijstje hebben: %s%"
-"Dashboard","Dashboard"
-"Day","Dag"
-"Default Recently Compared Products Count","Standaard aantal recent vergeleken producten"
-"Default Recently Viewed Products Count","Standaard aantal recent bekeken producten"
-"Description","Beschrijving"
-"Detail","Detail"
-"Downloads","Downloads"
-"Email","Email"
+"Customers by Orders Total","Klanten op volgorde van totaal bestellingen"
+"Match Period To","Match Period To"
+Period,Period
"Empty Rows","Lege rijen"
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report",Productverslag
+Downloads,Downloads
+Purchases,Aankopen
+CSV,CSV
"Excel XML","Excel XML"
-"Filter","Filter"
-"First Name","Voornaam"
-"From","Van"
-"Guest","Gast"
-"Hits","Bezoeken"
-"ID","ID"
-"IP Address","IP Adres"
-"Index model name must be defined","Indexnaam van het model moet gedefinieerd worden."
-"Invalid date specified.","Ongeldige datum opgegeven."
-"Invoiced","Gefactureerd"
-"Items in Cart","Items in Winkelwagentje"
-"Last Name","Achternaam"
-"Last Review","Laatste Beoordeling"
-"Link","Link"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","Lijst van Producten die Recentelijk Vergeleken en Verwijderd zijn van de Vergelijkingslijst door de Bezoeker."
-"List of Products Recently Viewed by Visitor","Lijst van Producten die Recentelijk Bekeken zijn door Bezoeker"
-"Low Stock","Lage Voorraad"
+Viewed,"Aantal keer bekeken"
+Purchased,Purchased
"Low stock","Lage voorraad"
-"Match Interval To","Evenaar Periode Aan"
-"Month","Maand"
-"Most Viewed","Meest bekeken"
-"Name","Naam"
-"New Accounts","Nieuwe Accounts"
-"No","Nee"
-"Number Added","Aantal Toegevoegd"
-"Number Fulfilled","Aantal Voldaan"
-"Reviews","Aantal Beoordelingen"
-"Number Purchased","Aantal Gekocht"
-"Viewed","Aantal keer bekeken"
-"Products","Aantal artikelen"
-"New Accounts","Aantal nieuwe accounts"
-"Number of Products to display","Aantal producten die u kunt laten zien"
-"Number of Reviews","Aantal beoordelingen"
-"Times Deleted","Aantal keer verwijderd"
-"Total Tags","Totale hoeveelheid labels"
-"Unique Tags","Hoeveelheid unieke labels"
-"Views","Aantal keer bekeken"
-"Number of items bought from a wishlist: %s","Hoeveelheid artikelen gekocht vanuit een wensenlijst: %s"
-"Number of times wishlists have been shared (emailed): %s","Hoe vaak wensenlijsten gedeeld werden over e-mail: %s"
-"Number of wishlist conversions: %s","Hoeveelheid van wensenlijst conversies: %s"
-"Number of wishlist referrals: %s","Hoeveelheid wensenlijst verwijzingen: %s"
-"Number of wishlists: %s","Hoeveelheid wensenlijsten: %s"
-"Order Status","Status Bestelling"
-"Order Taxes Report Grouped by Tax Rate","Bestelling Belasting Verslagen gesorteerd op Belastingtarief"
-"Orders","Bestellingen"
-"Out of stock","Uit voorraad"
-"Interval","Periode"
-"Poducts Report","Product Verslag"
-"Popular Tags","Populaire Tags"
-"Popularity","Populariteit"
-"Price","Prijs"
-"Product","Productnaam"
-"Product Reviews","Productbeoordelingen"
-"Product SKU","Product SKU"
-"Product Tags","Productlabels"
-"Products","Producten"
"Products Ordered","Bestelde Producten"
-"Products Report","Productverslag"
-"Products Reviews","Productrecensies"
-"Products Tags","Productenlabels"
-"Products in carts","Producten in mandjes"
-"Purchases","Aankopen"
-"Order Quantity","Bestelde hoeveelheid"
-"Quantity","Hoeveelheid artikelen"
-"Recently Compared","Recent vergeleken"
-"Recently Compared Products","Recent vergeleken producten"
-"Recently Viewed","Recent bekeken"
-"Recently Viewed Products","Onlangs Bekeken Producten"
-"Recently Viewed/Compared Products","Recent bekeken/vergeleken producten"
-"Refresh Lifetime Statistics","Levensduur statistieken verversen"
+"Most Viewed","Meest bekeken"
+"Show Report","Toon Rapport"
+Interval,Periode
"Refresh Statistics","Statistieken verversen"
-"Refresh Statistics for the Last Day","Statistiek voor de laatste dag verversen"
-"Refunds","Terugbetalingen"
-"Report","Verslag"
-"Reports","Verslagen"
-"Results","Resultaten"
-"Revenue","Omzet"
-"Review","recensie"
-"Reviews","Reviews"
-"Reviews for %s","Reviews voor %s"
-"Sales","Verkoop"
-"Sales Report","Verkooprapport"
-"Search Query","Zoek Query"
-"Search Terms","Zoek Voorwaarden"
-"Select day of the month.","Selecteer dag van de maand"
-"Shipping","Verzending"
-"Shopping Cart","Winkelmandje"
+"Customers Reviews",Klantenrecensies
+"Reviews for %1","Reviews for %1"
+Detail,Detail
+"Products Reviews",Productrecensies
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report","Kortingsbonnengebruik verslag"
"Price Rule","Winkelkarretje Prijs Regel"
-"Show Actual Values","Toon Huidige Waarden"
-"Show Report","Toon Rapport"
-"Show for Current","Toon voor Huidige"
-"Specified","Gespecificeerd"
-"Statistics","Statistieken"
-"Stock Quantity","Voorraad Quantity"
-"Submit Locale","Ingediend In"
-"Submit Date","Ingediend Op"
-"Subtotal","Subtotaal"
-"Tag","Tag"
-"Tag ""%s"" details","Tag ""%s"" gegevens"
-"Tag Detail","Tag Detail"
-"Tag","Tag Naam"
-"Tag Use","Tag Gebruik"
-"Tags Submitted by %s","Tags Ingediend door %s"
-"Tags submitted to %s","Tags Ingediend In %s"
-"Tax","Belasting"
-"Title","Titel"
-"To","Naar"
-"Total","Totaal"
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
"Total Invoiced vs. Paid Report","Totaal gefactureerd vs. betaald verslag"
-"Total Ordered Report","Totaal besteld verslag"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
"Total Refunded Report","Totaal terugbetaald verslag"
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report","Totaal besteld verslag"
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
"Total Shipped Report","Totaal verzonden verslag"
-"Total Tags","Totaal labels"
-"Total invoiced","Totaal gefactureerd"
-"Total refunded","Totaal terugbetaald"
-"Updated At","Geüpdate At"
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate","Bestelling Belasting Verslagen gesorteerd op Belastingtarief"
+Rate,Rate
+"Abandoned carts","Verlaten winkelmanden"
+"Applied Coupon","Gebruikte kortingsbon"
+"Products in carts","Producten in mandjes"
+Carts,Mandjes
+"Wish Lists","Wish Lists"
+"Wishlist Purchase","Gekocht van verlanglijstjes"
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted","Aantal keer verwijderd"
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock","Lage Voorraad"
+"Downloads Report","Downloads Report"
+Review,recensie
+Reviews,Reviews
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report",Klantenverslag
+"Product Reviews Report","Product Reviews Report"
+"Sales Report",Verkooprapport
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,Waardebonnen
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts","Verlaten winkelwagens"
+Statistics,Statistieken
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
+"Recently Viewed","Recent bekeken"
+"Recently Compared Products","Recent vergeleken producten"
+"Recently Viewed Products","Onlangs Bekeken Producten"
+"Recently Compared","Recent vergeleken"
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Show for Current","Show for Current"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor","Lijst van Producten die Recentelijk Bekeken zijn door Bezoeker"
+"Number of Products to display","Aantal producten die u kunt laten zien"
"Viewed Products Grid Template","Toon productenrooster sjabloon"
"Viewed Products List Template","Toon productenlijst sjabloon"
-"Visibility","Zichtbaar in"
-"Wishlist Report","Wishlist Rapport"
-"Wishlist vs. Regular Order","Verlanglijstje vs. normale bestelling"
-"Wishlists","Verlanglijstje"
-"Year","Jaar"
-"Year-To-Date Starts","Jaar-tot-datum start"
-"Yes","Ja"
-"Your Recently Compared","Uw recent vergeleken producten"
-"Your Recently Viewed","Uw recent bekeken producten"
-"undefined","ongedefinieerd"
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor","Lijst van Producten die Recentelijk Vergeleken en Verwijderd zijn van de Vergelijkingslijst door de Bezoeker."
+"Compared Products Grid Template","Vergeleken producten rooster sjabloon"
+"Compared Products List Template","Vergeleken producten lijst sjabloon"
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,Bezoeken
+"Stock Quantity","Voorraad Quantity"
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review","Laatste Beoordeling"
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics","Levensduur statistieken verversen"
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Weet u zeker dat u de levensduur statistieken wilt verversen? Deze operatie kan de performantie negatief beïnvloeden."
+"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
diff --git a/app/code/Magento/Reports/i18n/pt_BR.csv b/app/code/Magento/Reports/i18n/pt_BR.csv
index 20314a6ab15..03072fb8a8d 100644
--- a/app/code/Magento/Reports/i18n/pt_BR.csv
+++ b/app/code/Magento/Reports/i18n/pt_BR.csv
@@ -1,174 +1,220 @@
-"Abandoned Carts","Carrinhos de Compras Abandonados"
-"Abandoned carts","Carrinhos de compra abandonados"
-"Action","Ação"
+Product,"Nome do produto"
+Price,Preço
+Quantity,"Quantidade de itens"
+Products,Produtos
+ID,Identidade
+SKU,SKU
+Customers,Clientes
+"Shopping Cart","Carrinho de compras"
+No,Não
+Subtotal,Subtotal
+Discount,Discount
+Action,Ação
+Total,Total
"Add to Cart","Adicionar ao carrinho"
-"Add to Compare","Adicionar para Comparar"
+Orders,Ordens
+Bestsellers,"Mais vendidos"
+Customer,"Nome do Cliente"
+Guest,Convidado
+Items,Items
+Results,Resultados
+Uses,Uses
+Average,Average
+"Order Quantity","Quantidade pedida"
+Views,"Número de Visualizações"
+Revenue,Receita
+Tax,Taxas
+Shipping,Remessa
+"First Name","Primeiro nome"
+"Last Name","Último nome"
+Email,E-mail
+Refresh,Refresh
+Store,Store
+Yes,Sim
+Name,Nome
+Title,TÃtulo
+Description,Descrição
+From,De
+To,Para
+Dashboard,Dashboard
+"IP Address","Endereço de IP"
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,Faturado
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock","Fora de estoque"
+Day,Dia
+Month,Mês
+Year,Ano
+"Search Query","Palavras-Chave da Busca"
+"Search Terms","Buscar Termos"
"Add to Wishlist","Adicionar à Lista de Desejos"
-"Any","Qualquer um"
-"Applied Coupon","Cupons aplicados"
-"Applies to Any of the Specified Order Statuses","Aplica-se a qualquer um dos status de pedidos especificados"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Tem certeza que deseja atualizar as estatÃsticas de tempo de vida útil? Pode ocorrer um impacto no desempenho durante esta operação."
-"Are you sure?","Tem certeza?"
-"Avg. Approved Rating","Taxa de aprovação média"
-"Avg. Rating","Taxa média"
-"Bestsellers","Mais vendidos"
-"Wishlist Purchase","Comprado da lista de presentes"
-"CSV","CSV"
-"Carts","Carrinhos de compra"
-"Catalog Category (Without Subcategories)","Categoria do catálogo (Sem subcategorias)"
-"Compared Products Grid Template","Modelo de grade de produtos comparados"
-"Compared Products List Template","Modelo de lista de produtos comparados"
-"Coupons","Cupons"
-"Coupons Usage Report","Relatório de utilização de cupons"
-"Created At","Criada Em"
-"Current Month Starts","O mês atual começa"
-"Customer","Cliente"
-"Customer","Nome do Cliente"
-"Customer Tags","Etiquetas do cliente"
-"Customers","Clientes"
-"Customers Report","Relatórios de clientes"
-"Customers Reviews","Análises dos clientes"
-"Customers Tags","Etiquetas de clientes"
-"Customers by Orders","Clientes por Número de Pedidos"
-"Customers by Orders Total","Clientes por Total dos Pedidos"
+"Add to Compare","Adicionar para Comparar"
+"Items in Cart","Itens no carrinho"
+Sales,Vendas
+Created,Created
+"Product Reviews","Comentários sobre Produto"
+Updated,Updated
+Reports,Relatórios
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,Filtro
+Link,Link
+Report,Relatório
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts","Número de Novas Contas"
"Customers by number of orders","Clientes por número de pedidos"
-"Customers by orders total","Clientes por total de pedidos"
-"Customers that have wishlist: %s%","Clientes que têm uma lista de presentes: %s%"
-"Dashboard","Painel"
-"Day","Dia"
-"Default Recently Compared Products Count","Contagem padrão de produtos comparados recentemente"
-"Default Recently Viewed Products Count","Contagem padrão de produtos visualizados recentemente"
-"Description","Descrição"
-"Detail","Detalhe"
-"Downloads","Transferências"
-"Email","E-mail"
+"Customers by Orders Total","Clientes por Total dos Pedidos"
+"Match Period To","Match Period To"
+Period,Period
"Empty Rows","Colunas vazias"
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report","Relatórios de produtos"
+Downloads,Transferências
+Purchases,Compras
+CSV,CSV
"Excel XML","Excel XML"
-"Filter","Filtro"
-"First Name","Primeiro nome"
-"From","De"
-"Guest","Convidado"
-"Hits","CrÃticas"
-"ID","Identidade"
-"IP Address","Endereço de IP"
-"Index model name must be defined","O nome do Ãndice do modelo precisa ser definido"
-"Invalid date specified.","Data especificada inválida."
-"Invoiced","Faturado"
-"Items in Cart","Itens no carrinho"
-"Last Name","Último nome"
-"Last Review","Última revisão"
-"Link","Link"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","Lista de produtos comparados recentemente e removidos da lista de comparação pelo visitante"
-"List of Products Recently Viewed by Visitor","Lista de produtos analisados recentemente pelo visitante"
-"Low Stock","Baixo Estoque"
+Viewed,"Número Vistos"
+Purchased,Purchased
"Low stock","Estoque baixo"
-"Match Interval To","Igualar perÃodo a"
-"Month","Mês"
-"Most Viewed","Mais vistos"
-"Name","Nome"
-"New Accounts","Novas Contas"
-"No","Não"
-"Number Added","Número Adicionado"
-"Number Fulfilled","Número Cumprido"
-"Reviews","Número De Comentários"
-"Number Purchased","Número Comprado"
-"Viewed","Número Vistos"
-"Products","Número de Itens"
-"New Accounts","Número de Novas Contas"
-"Number of Products to display","Números de Produtos para apresentar"
-"Number of Reviews","Número de Comentários"
-"Times Deleted","Número de Tempos Apagados"
-"Total Tags","Número de Marcas Total"
-"Unique Tags","Número de Marcas Únicas"
-"Views","Número de Visualizações"
-"Number of items bought from a wishlist: %s","Número de itens comprados a partir de uma lista de desejos: %s"
-"Number of times wishlists have been shared (emailed): %s","Número de vezes que listas de desejos foram compartilhadas (por e-mail): %s"
-"Number of wishlist conversions: %s","Número de conversões na lista de desejos: %s"
-"Number of wishlist referrals: %s","Número de referências na lista de desejos: %s"
-"Number of wishlists: %s","Número de listas de desejos: %s"
-"Order Status","Status do pedido"
-"Order Taxes Report Grouped by Tax Rate","Relatório de Impostos de Ordens Agrupados por Taxa de Imposto"
-"Orders","Ordens"
-"Out of stock","Fora de estoque"
-"Interval","PerÃodo"
-"Poducts Report","Relatório do produto"
-"Popular Tags","Tags Populares"
-"Popularity","Popularidade"
-"Price","Preço"
-"Product","Nome do produto"
-"Product Reviews","Comentários sobre Produto"
-"Product SKU","SKU do Produto"
-"Product Tags","Etiquetas de Produto"
-"Products","Produtos"
"Products Ordered","Produtos Encomendados"
-"Products Report","Relatórios de produtos"
-"Products Reviews","Comentários sobre Produtos"
-"Products Tags","Etiquetas de produtos"
-"Products in carts","Produtos no carrinho"
-"Purchases","Compras"
-"Order Quantity","Quantidade pedida"
-"Quantity","Quantidade de itens"
-"Recently Compared","Comparados recentemente"
-"Recently Compared Products","Produtos Recentemente Comparados"
-"Recently Viewed","Recentemente Visto"
-"Recently Viewed Products","Produtos Recentemente Vistos"
-"Recently Viewed/Compared Products","Produtos visualizados/comparados recentemente"
-"Refresh Lifetime Statistics","Atualizar estatÃsticas de tempo de vida útil"
+"Most Viewed","Mais vistos"
+"Show Report","Exibir relatório"
+Interval,PerÃodo
"Refresh Statistics","Atualizar EstatÃsticas"
-"Refresh Statistics for the Last Day","Atualizar estatÃsticas para o Último dia"
-"Refunds","Reembolsos"
-"Report","Relatório"
-"Reports","Relatórios"
-"Results","Resultados"
-"Revenue","Receita"
-"Review","Análise"
-"Reviews","Resenhas"
-"Reviews for %s","Revisões para %s"
-"Sales","Vendas"
-"Sales Report","Relatório de Vendas"
-"Search Query","Palavras-Chave da Busca"
-"Search Terms","Buscar Termos"
-"Select day of the month.","Escolher o dia do mês."
-"Shipping","Remessa"
-"Shopping Cart","Carrinho de compras"
+"Customers Reviews","Análises dos clientes"
+"Reviews for %1","Reviews for %1"
+Detail,Detalhe
+"Products Reviews","Comentários sobre Produtos"
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report","Relatório de utilização de cupons"
"Price Rule","Regra de Preço de Carrinho de Compras"
-"Show Actual Values","Exibir valores reais"
-"Show Report","Exibir relatório"
-"Show for Current","Exibir atual"
-"Specified","Especificado"
-"Statistics","EstatÃsticas"
-"Stock Quantity","Quantidade em estoque"
-"Submit Locale","Enviado em"
-"Submit Date","Enviado em"
-"Subtotal","Subtotal"
-"Tag","Tag"
-"Tag ""%s"" details","Detalhes da etiqueta ""%s"""
-"Tag Detail","Detalhe da etiqueta"
-"Tag","Nome de Marca"
-"Tag Use","Uso da etiqueta"
-"Tags Submitted by %s","Etiquetas enviadas por %s"
-"Tags submitted to %s","Etiquetas enviadas para %s"
-"Tax","Taxas"
-"Title","TÃtulo"
-"To","Para"
-"Total","Total"
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
"Total Invoiced vs. Paid Report","Total faturado versus Relatório de pagamento"
-"Total Ordered Report","Relatório do Total Encomendado"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
"Total Refunded Report","Relatório do total reembolsado"
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report","Relatório do Total Encomendado"
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
"Total Shipped Report","Relatório do total remessado"
-"Total Tags","Total de etiquetas"
-"Total invoiced","Total faturado"
-"Total refunded","Total reembolsado"
-"Updated At","Atualizado Em"
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate","Relatório de Impostos de Ordens Agrupados por Taxa de Imposto"
+Rate,Rate
+"Abandoned carts","Carrinhos de compra abandonados"
+"Applied Coupon","Cupons aplicados"
+"Products in carts","Produtos no carrinho"
+Carts,"Carrinhos de compra"
+"Wish Lists","Wish Lists"
+"Wishlist Purchase","Comprado da lista de presentes"
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted","Número de Tempos Apagados"
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock","Baixo Estoque"
+"Downloads Report","Downloads Report"
+Review,Análise
+Reviews,Resenhas
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report","Relatórios de clientes"
+"Product Reviews Report","Product Reviews Report"
+"Sales Report","Relatório de Vendas"
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,Cupons
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts","Carrinhos de Compras Abandonados"
+Statistics,EstatÃsticas
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
+"Recently Viewed","Recentemente Visto"
+"Recently Compared Products","Produtos Recentemente Comparados"
+"Recently Viewed Products","Produtos Recentemente Vistos"
+"Recently Compared","Comparados recentemente"
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Show for Current","Show for Current"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor","Lista de produtos analisados recentemente pelo visitante"
+"Number of Products to display","Números de Produtos para apresentar"
"Viewed Products Grid Template","Modelo de grade de produtos visualizados"
"Viewed Products List Template","Modelo de lista de produtos visualizados"
-"Visibility","VisÃvel em"
-"Wishlist Report","Assinalar na Lista de Desejos"
-"Wishlist vs. Regular Order","Lista de presentes versus Pedidos normais"
-"Wishlists","Lista de presentes"
-"Year","Ano"
-"Year-To-Date Starts","InÃcio do acumulado anual"
-"Yes","Sim"
-"Your Recently Compared","Seus comparados recentemente"
-"Your Recently Viewed","Seus visualizados recentemente"
-"undefined","indefinido"
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor","Lista de produtos comparados recentemente e removidos da lista de comparação pelo visitante"
+"Compared Products Grid Template","Modelo de grade de produtos comparados"
+"Compared Products List Template","Modelo de lista de produtos comparados"
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,CrÃticas
+"Stock Quantity","Quantidade em estoque"
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review","Última revisão"
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics","Atualizar estatÃsticas de tempo de vida útil"
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Tem certeza que deseja atualizar as estatÃsticas de tempo de vida útil? Pode ocorrer um impacto no desempenho durante esta operação."
+"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
diff --git a/app/code/Magento/Reports/i18n/zh_CN.csv b/app/code/Magento/Reports/i18n/zh_CN.csv
index abe20c43ff6..3b36163f6b0 100644
--- a/app/code/Magento/Reports/i18n/zh_CN.csv
+++ b/app/code/Magento/Reports/i18n/zh_CN.csv
@@ -1,174 +1,220 @@
-"Abandoned Carts","放弃è´ç‰©è½¦"
-"Abandoned carts","废弃的è´ç‰©è½¦"
-"Action","æ“作"
-"Add to Cart","æ·»åŠ åˆ°è´ç‰©è½¦"
-"Add to Compare","æ·»åŠ å¹¶æ¯”è¾ƒ"
-"Add to Wishlist","æ·»åŠ åˆ°æ”¶è—"
-"Any","ä»»æ„"
-"Applied Coupon","å·²åº”ç”¨çš„ä¼˜æƒ åˆ¸"
-"Applies to Any of the Specified Order Statuses","适用于任何指定的顺åºçŠ¶æ€"
-"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","您确认è¦åˆ·æ–°ç”Ÿå‘½æœŸæ•°æ®å—？æ¤æ“作过程å¯èƒ½ä¼šå½±å“性能。"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Avg. Approved Rating","å¹³å‡å·²å®¡æ ¸çš„评级"
-"Avg. Rating","å¹³å‡è¯„级"
-"Bestsellers","最佳销é‡"
-"Wishlist Purchase","è´ä¹°è‡ªæ„¿æœ›æ¸…å•"
-"CSV","CSV"
-"Carts","è´ç‰©è½¦"
-"Catalog Category (Without Subcategories)","ç›®å½•ç±»åˆ«ï¼ˆæ— å类）"
-"Compared Products Grid Template","比对的产å“ç½‘æ ¼æ¨¡æ¿"
-"Compared Products List Template","比对的产å“列表模æ¿"
-"Coupons","折价券"
-"Coupons Usage Report","ä¼˜æƒ åˆ¸ä½¿ç”¨æŠ¥å‘Š"
-"Created At","创建于"
-"Current Month Starts","当å‰æœˆèµ·å§‹"
-"Customer","客户"
-"Customer","顾客姓å"
-"Customer Tags","é¡¾å®¢æ ‡ç¾"
-"Customers","客户"
-"Customers Report","顾客报告"
-"Customers Reviews","客户评测"
-"Customers Tags","é¡¾å®¢æ ‡ç¾"
-"Customers by Orders","按订å•ç¼–å·æŽ’列顾客"
-"Customers by Orders Total","按订å•æ•°é‡æŽ’列顾客"
-"Customers by number of orders","按订å•æ•°æŽ’列顾客"
-"Customers by orders total","按订å•æ€»æ•°æŽ’列顾客"
-"Customers that have wishlist: %s%","有愿望清å•çš„顾客：%s%"
-"Dashboard","仪表æ¿"
-"Day","天"
-"Default Recently Compared Products Count","默认最近比较的产å“æ•°é‡"
-"Default Recently Viewed Products Count","默认最近查看的产å“æ•°é‡"
-"Description","æè¿°"
-"Detail","详情"
-"Downloads","下载"
-"Email","电å邮件"
-"Empty Rows","空行"
+Product,产å“å
+Price,ä»·æ ¼
+Quantity,商å“çš„æ•°é‡
+Products,产å“
+ID,ID
+SKU,SKU
+Customers,客户
+"Shopping Cart",è´ç‰©è½¦
+No,å¦
+Subtotal,å°è®¡
+Discount,Discount
+Action,æ“作
+Total,总数
+"Add to Cart",æ·»åŠ åˆ°è´ç‰©è½¦
+Orders,订å•
+Bestsellers,最佳销é‡
+Customer,顾客姓å
+Guest,æ¥å®¾
+Items,Items
+Results,结果
+Uses,Uses
+Average,Average
+"Order Quantity",下å•çš„æ•°é‡
+Views,æµè§ˆæ•°é‡
+Revenue,收入
+Tax,ä¼ çœŸ
+Shipping,è¿é€
+"First Name",åå—
+"Last Name",姓æ°
+Email,电å邮件
+Refresh,Refresh
+Store,Store
+Yes,是
+Name,姓å
+Title,æ ‡é¢˜
+Description,æè¿°
+From,æ¥è‡ª
+To,å‘é€è‡³
+Dashboard,Dashboard
+"IP Address",IP地å€
+"All Websites","All Websites"
+"Tax Amount","Tax Amount"
+Invoiced,已出å‘票
+Refunded,Refunded
+Canceled,Canceled
+"In stock","In stock"
+"Out of stock",缺货
+Day,天
+Month,月
+Year,å¹´
+"Search Query",æœç´¢æŸ¥è¯¢
+"Search Terms",æœç´¢æ¡ä»¶
+"Add to Wishlist",æ·»åŠ åˆ°æ”¶è—
+"Add to Compare",æ·»åŠ å¹¶æ¯”è¾ƒ
+"Items in Cart",è´ç‰©è½¦ä¸çš„项目
+Sales,销售
+Created,Created
+"Product Reviews",产å“评测
+Updated,Updated
+Reports,报告
+Details,Details
+Unlimited,Unlimited
+Fulfilled,Fulfilled
+Filter,过滤器
+Link,链接
+Report,报告
+Added,Added
+"Coupon Code","Coupon Code"
+"New Accounts",新账户数é‡
+"Customers by number of orders",按订å•æ•°æŽ’列顾客
+"Customers by Orders Total",按订å•æ•°é‡æŽ’列顾客
+"Match Period To","Match Period To"
+Period,Period
+"Empty Rows",空行
+"Invalid date specified","Invalid date specified"
+"We couldn't find records for this period.","We couldn't find records for this period."
+"Show Reviews","Show Reviews"
+"Products Report",产å“报告
+Downloads,下载
+Purchases,è´ä¹°
+CSV,CSV
"Excel XML","Excel XML"
-"Filter","过滤器"
-"First Name","åå—"
-"From","æ¥è‡ª"
-"Guest","æ¥å®¾"
-"Hits","æ示"
-"ID","ID"
-"IP Address","IP地å€"
-"Index model name must be defined","索引模型å称必须被定义"
-"Invalid date specified.","å·²æŒ‡å®šçš„æ—¥æœŸæ— æ•ˆã€‚"
-"Invoiced","已出å‘票"
-"Items in Cart","è´ç‰©è½¦ä¸çš„项目"
-"Last Name","姓æ°"
-"Last Review","上次评论"
-"Link","链接"
-"List of Products Recently Compared and Removed from the Compare List by Visitor","最近由访客从比较列表ä¸æ¯”è¾ƒå’Œåˆ é™¤çš„äº§å“列表"
-"List of Products Recently Viewed by Visitor","最近由访客æµè§ˆè¿‡çš„产å“列表"
-"Low Stock","库å˜é‡ä½Ž"
-"Low stock","低库å˜"
-"Match Interval To","匹é…期间至"
-"Month","月"
-"Most Viewed","最å—欢迎"
-"Name","姓å"
-"New Accounts","æ–°å¸æˆ·"
-"No","å¦"
-"Number Added","æ•°å—å·²æ·»åŠ "
-"Number Fulfilled","已履行的数å—"
-"Reviews","评论数目"
-"Number Purchased","å·²è´ä¹°æ•°ç›®"
-"Viewed","æµè§ˆæ•°ç›®"
-"Products","项目的数é‡"
-"New Accounts","新账户数é‡"
-"Number of Products to display","显示产å“çš„æ•°é‡"
-"Number of Reviews","评价数é‡"
-"Times Deleted","å·²åˆ é™¤æ—¶é—´æ•°é‡"
-"Total Tags","æ€»æ ‡ç¾æ•°é‡"
-"Unique Tags","å”¯ä¸€æ ‡ç¾æ•°é‡"
-"Views","æµè§ˆæ•°é‡"
-"Number of items bought from a wishlist: %s","从愿望清å•ä¸è´ä¹°é¡¹ç›®çš„æ•°é‡ï¼š%s"
-"Number of times wishlists have been shared (emailed): %s","愿望清å•è¢«åˆ†äº«ï¼ˆé€šè¿‡å‘é€ç”µå邮件）的次数：%s"
-"Number of wishlist conversions: %s","愿望清å•è½¬æ¢çš„æ•°é‡ï¼š%s"
-"Number of wishlist referrals: %s","愿望清å•æŽ¨è次数：%s"
-"Number of wishlists: %s","愿望清å•æ•°é‡ï¼š%s"
-"Order Status","订å•çŠ¶æ€"
-"Order Taxes Report Grouped by Tax Rate","按税率分组的订è´ç¨Žè´¹æŠ¥å‘Š"
-"Orders","订å•"
-"Out of stock","缺货"
-"Interval","周期"
-"Poducts Report","产å“报告"
-"Popular Tags","çƒé—¨æ ‡ç¾"
-"Popularity","人气"
-"Price","ä»·æ ¼"
-"Product","产å“å"
-"Product Reviews","产å“评测"
-"Product SKU","产å“SKU"
-"Product Tags","产å“æ ‡ç¾"
-"Products","产å“"
-"Products Ordered","产å“已下å•"
-"Products Report","产å“报告"
-"Products Reviews","产å“评论"
-"Products Tags","产å“æ ‡ç¾"
-"Products in carts","è´ç‰©è½¦ä¸çš„产å“"
-"Purchases","è´ä¹°"
-"Order Quantity","下å•çš„æ•°é‡"
-"Quantity","商å“çš„æ•°é‡"
-"Recently Compared","最近比较过的"
-"Recently Compared Products","最近比较过的产å“"
-"Recently Viewed","最近查看过的"
-"Recently Viewed Products","最近查看过的产å“"
-"Recently Viewed/Compared Products","最近查看/比较过的产å“"
-"Refresh Lifetime Statistics","刷新寿命状æ€"
-"Refresh Statistics","刷新状æ€"
-"Refresh Statistics for the Last Day","刷新昨天的状æ€"
-"Refunds","退款"
-"Report","报告"
-"Reports","报告"
-"Results","结果"
-"Revenue","收入"
-"Review","评测"
-"Reviews","评测"
-"Reviews for %s","%s的评测"
-"Sales","销售"
-"Sales Report","销售报告"
-"Search Query","æœç´¢æŸ¥è¯¢"
-"Search Terms","æœç´¢æ¡ä»¶"
-"Select day of the month.","选择æ¯æœˆçš„天数。"
-"Shipping","è¿é€"
-"Shopping Cart","è´ç‰©è½¦"
-"Price Rule","共享è´ç‰©è½¦è§„则"
-"Show Actual Values","显示实际值"
-"Show Report","显示报告"
-"Show for Current","显示最新值"
-"Specified","已指定"
-"Statistics","状æ€"
-"Stock Quantity","库å˜æ•°é‡"
-"Submit Locale","æ交于"
-"Submit Date","æ交到"
-"Subtotal","å°è®¡"
-"Tag","æ ‡ç¾"
-"Tag ""%s"" details","æ ‡ç¾ ""%s"" 详情"
-"Tag Detail","æ ‡ç¾è¯¦æƒ…"
-"Tag","æ ‡ç¾å称"
-"Tag Use","æ ‡ç¾çš„使用"
-"Tags Submitted by %s","ç”±%s æäº¤çš„æ ‡ç¾"
-"Tags submitted to %s","ç”±%s æäº¤çš„æ ‡ç¾"
-"Tax","ä¼ çœŸ"
-"Title","æ ‡é¢˜"
-"To","å‘é€è‡³"
-"Total","总数"
+Viewed,æµè§ˆæ•°ç›®
+Purchased,Purchased
+"Low stock",低库å˜
+"Products Ordered",产å“已下å•
+"Most Viewed",最å—欢迎
+"Show Report",显示报告
+Interval,周期
+"Refresh Statistics",刷新状æ€
+"Customers Reviews",客户评测
+"Reviews for %1","Reviews for %1"
+Detail,详情
+"Products Reviews",产å“评论
+"Products Bestsellers Report","Products Bestsellers Report"
+"Coupons Usage Report",ä¼˜æƒ åˆ¸ä½¿ç”¨æŠ¥å‘Š
+"Price Rule",共享è´ç‰©è½¦è§„则
+"Sales Subtotal","Sales Subtotal"
+"Sales Discount","Sales Discount"
+"Sales Total","Sales Total"
"Total Invoiced vs. Paid Report","å‘票总数 vs. 付款报告"
-"Total Ordered Report","订å•æ€»æ•°æŠ¥å‘Š"
-"Total Refunded Report","退款总数报告"
-"Total Shipped Report","å‘货总数报告"
-"Total Tags","æ ‡ç¾æ€»æ•°"
-"Total invoiced","å‘票总数"
-"Total refunded","退款总数"
-"Updated At","更新于"
-"Viewed Products Grid Template","查看过的产å“ç½‘æ ¼æ¨¡æ¿"
-"Viewed Products List Template","查看的产å“列表模æ¿"
-"Visibility","å¯è§æ€§"
-"Wishlist Report","愿望清å•æŠ¥å‘Š"
-"Wishlist vs. Regular Order","æ„¿æœ›æ¸…å• vs. æ£å¸¸è®¢å•"
-"Wishlists","愿望清å•"
-"Year","å¹´"
-"Year-To-Date Starts","开始的年月日"
-"Yes","是"
-"Your Recently Compared","您最近的比较"
-"Your Recently Viewed","您最近看过的"
-"undefined","未定义"
+"Invoiced Orders","Invoiced Orders"
+"Total Invoiced","Total Invoiced"
+"Paid Invoices","Paid Invoices"
+"Unpaid Invoices","Unpaid Invoices"
+"Total Refunded Report",退款总数报告
+"Refunded Orders","Refunded Orders"
+"Total Refunded","Total Refunded"
+"Online Refunds","Online Refunds"
+"Offline Refunds","Offline Refunds"
+"Total Ordered Report",订å•æ€»æ•°æŠ¥å‘Š
+"Sales Items","Sales Items"
+Profit,Profit
+Paid,Paid
+"Sales Tax","Sales Tax"
+"Sales Shipping","Sales Shipping"
+"Total Shipped Report",å‘货总数报告
+Carrier/Method,Carrier/Method
+"Total Sales Shipping","Total Sales Shipping"
+"Total Shipping","Total Shipping"
+"Order Taxes Report Grouped by Tax Rate",按税率分组的订è´ç¨Žè´¹æŠ¥å‘Š
+Rate,Rate
+"Abandoned carts",废弃的è´ç‰©è½¦
+"Applied Coupon",å·²åº”ç”¨çš„ä¼˜æƒ åˆ¸
+"Products in carts",è´ç‰©è½¦ä¸çš„产å“
+Carts,è´ç‰©è½¦
+"Wish Lists","Wish Lists"
+"Wishlist Purchase",è´ä¹°è‡ªæ„¿æœ›æ¸…å•
+"Wish List vs. Regular Order","Wish List vs. Regular Order"
+"Times Deleted",å·²åˆ é™¤æ—¶é—´æ•°é‡
+"Index type is not valid","Index type is not valid"
+"Search Terms Report","Search Terms Report"
+"Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>.","Last updated: %1. To refresh last day's <a href=""%2"">statistics</a>, ' 'click <a href=""%3"">here</a>."
+"New Accounts Report","New Accounts Report"
+"Order Count Report","Order Count Report"
+"Customers by Number of Orders","Customers by Number of Orders"
+"Order Total Report","Order Total Report"
+"Ordered Products Report","Ordered Products Report"
+"Product Views Report","Product Views Report"
+"Products Most Viewed Report","Products Most Viewed Report"
+"Low Stock Report","Low Stock Report"
+"Low Stock",库å˜é‡ä½Ž
+"Downloads Report","Downloads Report"
+Review,评测
+Reviews,评测
+"Customer Reviews Report","Customer Reviews Report"
+"Customers Report",顾客报告
+"Product Reviews Report","Product Reviews Report"
+"Sales Report",销售报告
+"Best Sellers Report","Best Sellers Report"
+"Tax Report","Tax Report"
+"Shipping Report","Shipping Report"
+"Invoice Report","Invoice Report"
+"Refunds Report","Refunds Report"
+"Coupons Report","Coupons Report"
+Coupons,折价券
+"Customer Shopping Carts","Customer Shopping Carts"
+"Products in Carts","Products in Carts"
+"Abandoned Carts",放弃è´ç‰©è½¦
+Statistics,状æ€
+"No report code is specified.","No report code is specified."
+"Recent statistics have been updated.","Recent statistics have been updated."
+"We can't refresh recent statistics.","We can't refresh recent statistics."
+"We updated lifetime statistics.","We updated lifetime statistics."
+"We can't refresh lifetime statistics.","We can't refresh lifetime statistics."
+"The product type filter specified is incorrect.","The product type filter specified is incorrect."
+"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
+"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
+"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
+"Most Viewed Products Report","Most Viewed Products Report"
+"Show By","Show By"
+"Select Date","Select Date"
+"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Number of wish lists: %1","Number of wish lists: %1"
+"Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
+"Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
+"Number of wish list referrals: %1","Number of wish list referrals: %1"
+"Number of wish list conversions: %1","Number of wish list conversions: %1"
+"Show Report For:","Show Report For:"
+"Recently Viewed",最近查看过的
+"Recently Compared Products",最近比较过的产å“
+"Recently Viewed Products",最近查看过的产å“
+"Recently Compared",最近比较过的
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Show for Current","Show for Current"
+"Default Recently Viewed Products Count","Default Recently Viewed Products Count"
+"Default Recently Compared Products Count","Default Recently Compared Products Count"
+"Year-To-Date Starts","Year-To-Date Starts"
+"Current Month Starts","Current Month Starts"
+"Select day of the month.","Select day of the month."
+"List of Products Recently Viewed by Visitor",最近由访客æµè§ˆè¿‡çš„产å“列表
+"Number of Products to display",显示产å“çš„æ•°é‡
+"Viewed Products Grid Template",查看过的产å“ç½‘æ ¼æ¨¡æ¿
+"Viewed Products List Template",查看的产å“列表模æ¿
+"Viewed Products Images and Names Template","Viewed Products Images and Names Template"
+"Viewed Products Names Only Template","Viewed Products Names Only Template"
+"Viewed Products Images Only Template","Viewed Products Images Only Template"
+"List of Products Recently Compared and Removed from the Compare List by Visitor",最近由访客从比较列表ä¸æ¯”è¾ƒå’Œåˆ é™¤çš„äº§å“列表
+"Compared Products Grid Template",比对的产å“ç½‘æ ¼æ¨¡æ¿
+"Compared Products List Template",比对的产å“列表模æ¿
+"Compared Products Images and Names Template","Compared Products Images and Names Template"
+"Compared Product Names Only Template","Compared Product Names Only Template"
+"Compared Product Images Only Template","Compared Product Images Only Template"
+Hits,æ示
+"Stock Quantity",库å˜æ•°é‡
+"Ordered Quantity","Ordered Quantity"
+"This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.","This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone."
+"Average (Approved)","Average (Approved)"
+"Last Review",上次评论
+"Order Created Date","Order Created Date"
+"Order Updated Date","Order Updated Date"
+"The Order Updated Date report is displayed in real-time, and does not need to be refreshed.","The Order Updated Date report is displayed in real-time, and does not need to be refreshed."
+"Last Invoice Created Date","Last Invoice Created Date"
+"Last Credit Memo Created Date","Last Credit Memo Created Date"
+"First Invoice Created Date","First Invoice Created Date"
+"Refresh Lifetime Statistics",刷新寿命状æ€
+"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.",您确认è¦åˆ·æ–°ç”Ÿå‘½æœŸæ•°æ®å—？æ¤æ“作过程å¯èƒ½ä¼šå½±å“性能。
+"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,未定义
diff --git a/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_default_without_children.xml b/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_default_without_children.xml
index 3901cca2237..fd22a208202 100644
--- a/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_default_without_children.xml
+++ b/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_default_without_children.xml
@@ -24,8 +24,4 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <remove name="right.reports.product.viewed"/>
- <referenceContainer name="right">
- <block class="Magento\Reports\Block\Product\Viewed" name="left.reports.product.viewed" template="product_viewed.phtml"/>
- </referenceContainer>
</layout>
diff --git a/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_layered_without_children.xml b/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_layered_without_children.xml
index 3901cca2237..fd22a208202 100644
--- a/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_layered_without_children.xml
+++ b/app/code/Magento/Reports/view/frontend/layout/catalog_category_view_type_layered_without_children.xml
@@ -24,8 +24,4 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <remove name="right.reports.product.viewed"/>
- <referenceContainer name="right">
- <block class="Magento\Reports\Block\Product\Viewed" name="left.reports.product.viewed" template="product_viewed.phtml"/>
- </referenceContainer>
</layout>
diff --git a/app/code/Magento/Reports/view/frontend/layout/default.xml b/app/code/Magento/Reports/view/frontend/layout/default.xml
index a61e3c9a6b9..73df9454121 100644
--- a/app/code/Magento/Reports/view/frontend/layout/default.xml
+++ b/app/code/Magento/Reports/view/frontend/layout/default.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
- <referenceContainer name="right">
- <block class="Magento\Reports\Block\Product\Viewed" name="right.reports.product.viewed" template="product_viewed.phtml"/>
- <block class="Magento\Reports\Block\Product\Compared" name="right.reports.product.compared" template="product_compared.phtml"/>
+ <referenceContainer name="sidebar.additional">
+ <block class="Magento\Reports\Block\Product\Viewed" name="reports.product.viewed" template="product_viewed.phtml"/>
+ <block class="Magento\Reports\Block\Product\Compared" name="reports.product.compared" template="product_compared.phtml"/>
</referenceContainer>
<referenceBlock name="head.components">
<block class="Magento\Framework\View\Element\Js\Components" name="reports_page_head_components" template="Magento_Reports::js/components.phtml"/>
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
index c8c2ba76522..532168f0ba5 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
@@ -77,7 +77,7 @@ $rating = 'short';
<?php endif; ?>
</div>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()): ?>
<a href="#" data-post='<?php echo $this->getAddToWishlistParams($item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
<span><?php echo __('Add to Wishlist') ?></span>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
index c30fe953098..5bda296b6a9 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -105,7 +105,7 @@ if ($exist = $this->getRecentlyComparedProducts()) {
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
data-post='<?php echo $this->getAddToWishlistParams($_item); ?>'
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index 3716021eb2a..19c06d1021b 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -105,7 +105,7 @@ if ($exist = $this->getRecentlyComparedProducts()) {
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
data-post='<?php echo $this->getAddToWishlistParams($_item); ?>'
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
index be20fb21a4c..3ad49828937 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -104,7 +104,7 @@ if ($exist = $this->getRecentlyViewedProducts()) {
</div>
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
class="action towishlist" data-action="add-to-wishlist"
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index 3d70251c710..eeef1f0bbae 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -108,7 +108,7 @@ if ($exist = $this->getRecentlyViewedProducts()) {
<?php endif; ?>
<?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links" data-role="add-to-links">
+ <div class="secondary-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
class="action towishlist" data-action="add-to-wishlist"
diff --git a/app/code/Magento/Review/i18n/de_DE.csv b/app/code/Magento/Review/i18n/de_DE.csv
index b5d7b312d12..842ec89c34c 100644
--- a/app/code/Magento/Review/i18n/de_DE.csv
+++ b/app/code/Magento/Review/i18n/de_DE.csv
@@ -1,132 +1,130 @@
-"%d Review(s)","%d Review(s)"
-"%s Review(s)","%s Review(s)"
-"(Posted on %s)","(Am %s gepostet)"
-"1 star","1 Stern"
-"2 stars","2 Sterne"
-"3 stars","3 Sterne"
-"4 stars","4 Sterne"
-"5 stars","5 Sterne"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","Neues Review hinzufügen"
-"Add Your Review","Eigenes Review hinzufügen"
-"Administrator","Administrator"
-"All Reviews","Alle Reviews"
-"All Reviews of Customer `%s`","Alle Reviews des Kunden '%s'"
-"Allow Guests to Write Reviews","Erlaube Gäste Reviews zu schreiben"
-"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?"
"Are you sure?","Sind Sie sicher?"
-"Average Customer Rating","Durschschnittliche Kundenbewertung"
-"Average Customer Rating:","Durschschnittliche Kundenbewertung:"
-"Back","Zurück"
-"Back to Main Product Info","Zurück zur Hauptproduktinfo"
-"Back to My Reviews","Zurück zu Meinen Reviews"
-"Back to Product Reviews","Zurück zu Produktreviews"
-"Be the first to review this product","Bewerten Sie dieses Produkt als Erster"
-"Catalog Product Review View","Katalogprodukt Review Ansicht"
-"Catalog Product Reviews List","Katalogprodukt Review Liste"
-"Create","Erstellt am"
-"Customer","Kunde"
-"Customer My Account Product Reviews","Kunde Mein Konto Produktreviews"
-"Customer My Account Review Details","Kunde Mein Konto Reviewdetails"
-"Customer Reviews","Kundenreviews"
-"Customers Reviews","Kundenbewertungen"
-"Delete","Löschen"
+Cancel,Cancel
+Back,Zurück
+Product,Produktname
+Price,Preis
+Quantity,Anzahl
+ID,ID
+SKU,SKU
+Action,Action
+Edit,Edit
+Customer,Kunde
+Guest,Gast
+Delete,Löschen
+Name,Name
+Status,Status
+"Sort Order",Sortierfolge
+Title,Titel
+"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?"
+Type,Typ
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,"Sichtbar in"
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value","Vorgegebener Wert"
+Websites,Webseiten
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details","Details ansehen"
+Created,Created
+"Product Reviews",Produktreviews
+Pending,Pending
+Review,Review
+Reviews,Bewertungen
+"Save Review","Review speichern"
+"Add New Review","Neues Review hinzufügen"
+"Review Details",Reviewdetails
+"Product Rating",Produktbewertung
+"Visible In","Visible In"
+Nickname,Nickname
+"Summary of Review",Reviewzusammenfassung
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
"Delete Review","Review löschen"
-"Detailed Rating","Detailierte Bewertung"
-"Edit Review '%s'","Review '%s' bearbeiten"
-"Guest","Gast"
-"How do you rate this product?","Wie bewerten Sie dieses Produkt?"
-"ID","ID"
-"Manage Ratings","Bewertungen verwalten"
-"My Product Reviews","Meine Produktreviews"
-"My Recent Reviews","Meine letzten Reviews"
-"Name","Name"
-"Name in Store","Name im Shop"
+"Edit Review '%1'","Edit Review '%1'"
"New Review","Neues Review"
-"Nickname","Nickname"
-"Nickname can't be empty","Nickname darf nicht leer sein"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Nur registrierte Benutzer können Bewertungen schreiben. Bitte <a href=""%s"">loggen Sie sich ein</a> oder <a href=""%s"">registrieren Sie sich</a>"
-"Pending Reviews","Ausstehende Reviews"
-"Pending Reviews of Customer `%s`","Ausstehende Reviews des Kunden '%s'"
-"Please select a product","Bitte wählen Sie ein Produkt"
-"Please select one of each of the ratings above","Bitte wählen Sie jeweils eine der obenstehenden Bewertungen"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,Administrator
"Posted By","Geposted von"
-"Price","Preis"
-"Product","Produkt"
-"Product","Produktname"
-"Product Rating","Produktbewertung"
-"Product Rating:","Produktbewertung:"
-"Product Review (submitted on %s):","Produktreview (von %s hinzugefügt):"
-"Product Reviews","Produktreviews"
-"Product SKU","Bestandseinheit des Produktes"
-"Products Reviews","Produktbewertungen"
-"Quantity","Anzahl"
-"Rating:","Bewertung"
-"Review","Review"
-"Review (submitted on %s):","Review (von %s hinzugefügt):"
-"Review Details","Reviewdetails"
-"Review Form Fields Before","Felder Bewertungsformular vorher"
-"Review by <span>%s</span>","Review von <span>%s</span>"
-"Review can't be empty","Review darf nicht leer sein"
-"Review summary can't be empty","Zusammenfassung des Reviews darf nicht leer sein"
-"Reviews and Ratings","Reviews und Bewertungen"
-"SKU","SKU"
-"Save Review","Review speichern"
-"Status","Status"
-"Submit Review","Review abschicken"
-"Summary Rating","Bewertungszusammenfassung"
-"Summary of Review","Reviewzusammenfassung"
-"Summary of Your Review","Zusammenfassung Ihres Reviews"
-"Title","Titel"
-"Type","Typ"
-"Unable to post the review.","Review kann nicht geposted werden."
-"Update Status","Status aktualisieren"
-"View All Reviews","Alle Reviews ansehen"
-"View Details","Details ansehen"
-"Visibility","Sichtbar in"
-"Websites","Webseiten"
-"Write Your Own Review","Schreiben Sie Ihr eigenes Review"
-"You have submitted no reviews.","Sie haben keine Reviews geschrieben."
-"You're reviewing:","Sie schreiben ein Review für:"
-"Your Rating:","Ihre Bewertung:"
-"Your Review (submitted on %s):","Ihr Review (von % hinzugefügt)"
-"Your review has been accepted for moderation.","Ihr Review wurde für Moderation akzeptiert."
-"An error occurred while deleting this review.","Beim Löschen dieser Rezension ist ein Fehler aufgetreten."
-"An error occurred while saving this review.","Beim Speichern der Rezension ist ein Fehler aufgetreten."
-"Product Reviews","Produktreviews"
-"The review has been deleted","Diese Bewertung wurde gelöscht"
-"The review has been saved.","Diese Bewertung wrude gespeichert."
-"The review was removed by another user or does not exist.","Diese Bewertung wurde von einem anderen Benutzer entfernt oder existiert nicht."
+"Summary Rating",Bewertungszusammenfassung
+"Detailed Rating","Detailierte Bewertung"
"Pending Reviews RSS","Ausstehende Kundenmeinungen RSS"
-"Products Reviews","Artikelbewertungen"
-"Reviews","Bewertungen"
-"Customers Reviews","Berichte der Kunden"
-"1 star","1 Stern"
-"2 stars","2 Sterne"
-"3 stars","3 Sterne"
-"4 stars","4 Sterne"
-"5 stars","5 Sterne"
+"Update Status","Status aktualisieren"
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews","Ausstehende Reviews"
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews","Alle Reviews"
+"Product Store Name","Product Store Name"
+"Manage Ratings","Bewertungen verwalten"
"Add New Rating","Neue Bewertung hinzufügen"
-"Assigned Options","Zugewiesene Optionen"
-"Be the first to review this product","Bewerten Sie dieses Produkt als Erster"
-"Default Value","Vorgegebener Wert"
+"Save Rating","Bewertung speichern"
"Delete Rating","Vorgegebene Bewertung"
-"Edit Rating","Bewertung bearbeiten"
-"ID","ID"
-"If you do not specify a rating title for a store, the default value will be used.","Wenn Sie keinen Bewertungstitel für einen Store spezifizieren, wird der vorgegebene Wert genutzt."
-"Manage Ratings","Bewertungen verwalten"
+"Edit Rating #%1","Edit Rating #%1"
"New Rating","Neue Bewertung"
-"Option Label","Option Label"
-"Option Title","Option Titel"
-"Option Title:","Option Titel:"
-"Please select one of each ratings above","Bitte wählen Sie oben eine Bewertung"
-"Rating Information","Bewertungsinformation"
-"Rating","Bewertungsname"
-"Rating Options","Bewertungsoptionen"
-"Rating Title","Bewertungstitel"
+"Rating Title",Bewertungstitel
"Rating Visibility","Sichtbarkeit der Bewertung"
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information",Bewertungsinformation
+"Customer Reviews",Kundenreviews
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.","Diese Bewertung wurde von einem anderen Benutzer entfernt oder existiert nicht."
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews","Meine Produktreviews"
+"Your review has been accepted for moderation.","Ihr Review wurde für Moderation akzeptiert."
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
"Rating isn't Available","Bewertung ist nicht verfügbar"
-"Rating with the same title","Bewertung mit gleichem Titel"
-"Save Rating","Bewertung speichern"
-"Sort Order","Sortierfolge"
-"Visibility","Sichtbar in"
+"Assigned Options","Zugewiesene Optionen"
+"Option Title:","Option Titel:"
+Rating,Bewertungsname
+"You have submitted no reviews.","Sie haben keine Reviews geschrieben."
+"My Recent Reviews","Meine letzten Reviews"
+"View All Reviews","Alle Reviews ansehen"
+"Average Customer Rating:","Durschschnittliche Kundenbewertung:"
+"Your Rating:","Ihre Bewertung:"
+Rating:,Bewertung
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews","Zurück zu Meinen Reviews"
+"Be the first to review this product","Bewerten Sie dieses Produkt als Erster"
+"Write Your Own Review","Schreiben Sie Ihr eigenes Review"
+"You're reviewing:","Sie schreiben ein Review für:"
+"How do you rate this product?","Wie bewerten Sie dieses Produkt?"
+"%1 %2","%1 %2"
+"Summary of Your Review","Zusammenfassung Ihres Reviews"
+"Submit Review","Review abschicken"
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review","Eigenes Review hinzufügen"
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info","Zurück zur Hauptproduktinfo"
+"Average Customer Rating","Durschschnittliche Kundenbewertung"
+"Product Rating:",Produktbewertung:
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews","Zurück zu Produktreviews"
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/i18n/en_US.csv b/app/code/Magento/Review/i18n/en_US.csv
index dc8f2834e8b..941143029a0 100644
--- a/app/code/Magento/Review/i18n/en_US.csv
+++ b/app/code/Magento/Review/i18n/en_US.csv
@@ -1,133 +1,130 @@
-"%d Review(s)","%d Review(s)"
-"%s Review(s)","%s Review(s)"
-"(Posted on %s)","(Posted on %s)"
-"1 star","1 star"
-"2 stars","2 stars"
-"3 stars","3 stars"
-"4 stars","4 stars"
-"5 stars","5 stars"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","Add New Review"
-"Add Your Review","Add Your Review"
-"Administrator","Administrator"
-"All Reviews","All Reviews"
-"All Reviews of Customer `%s`","All Reviews of Customer `%s`"
-"All Reviews of Product `%s`","All Reviews of Product `%s`"
-"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
-"Are you sure you want to do this?","Are you sure you want to do this?"
"Are you sure?","Are you sure?"
-"Average Customer Rating","Average Customer Rating"
-"Average Customer Rating:","Average Customer Rating:"
-"Back","Back"
-"Back to Main Product Info","Back to Main Product Info"
-"Back to My Reviews","Back to My Reviews"
-"Back to Product Reviews","Back to Product Reviews"
-"Be the first to review this product","Be the first to review this product"
-"Catalog Product Review View","Catalog Product Review View"
-"Catalog Product Reviews List","Catalog Product Reviews List"
-"Created","Created"
-"Customer","Customer"
-"Customer My Account Product Reviews","Customer My Account Product Reviews"
-"Customer My Account Review Details","Customer My Account Review Details"
-"Customer Reviews","Customer Reviews"
-"Customers Reviews","Customers Reviews"
-"Delete","Delete"
+Cancel,Cancel
+Back,Back
+Product,Product
+Price,Price
+Quantity,Quantity
+ID,ID
+SKU,SKU
+Action,Action
+Edit,Edit
+Customer,Customer
+Guest,Guest
+Delete,Delete
+Name,Name
+Status,Status
+"Sort Order","Sort Order"
+Title,Title
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Type,Type
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,Visibility
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value","Default Value"
+Websites,Websites
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details","View Details"
+Created,Created
+"Product Reviews","Product Reviews"
+Pending,Pending
+Review,Review
+Reviews,Reviews
+"Save Review","Save Review"
+"Add New Review","Add New Review"
+"Review Details","Review Details"
+"Product Rating","Product Rating"
+"Visible In","Visible In"
+Nickname,Nickname
+"Summary of Review","Summary of Review"
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
"Delete Review","Delete Review"
-"Detailed Rating","Detailed Rating"
-"Edit Review '%s'","Edit Review '%s'"
-"Guest","Guest"
-"How do you rate this product?","How do you rate this product?"
-"ID","ID"
-"Manage Ratings","Manage Ratings"
-"My Product Reviews","My Product Reviews"
-"My Recent Reviews","My Recent Reviews"
-"Name","Name"
-"Name in Store","Name in Store"
+"Edit Review '%1'","Edit Review '%1'"
"New Review","New Review"
-"Nickname","Nickname"
-"Nickname can't be empty","Nickname can't be empty"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>"
-"Pending Reviews","Pending Reviews"
-"Pending Reviews of Customer `%s`","Pending Reviews of Customer `%s`"
-"Please select a product","Please select a product"
-"Please select one of each of the ratings above","Please select one of each of the ratings above"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,Administrator
"Posted By","Posted By"
-"Price","Price"
-"Product","Product"
-"Product","Product"
-"Product Rating","Product Rating"
-"Product Rating:","Product Rating:"
-"Product Review (submitted on %s):","Product Review (submitted on %s):"
-"Product Reviews","Product Reviews"
-"Product SKU","Product SKU"
-"Products Reviews","Products Reviews"
-"Quantity","Quantity"
-"Rating:","Rating:"
-"Review","Review"
-"Review (submitted on %s):","Review (submitted on %s):"
-"Review Details","Review Details"
-"Review Form Fields Before","Review Form Fields Before"
-"Review by <span>%s</span>","Review by <span>%s</span>"
-"Review can't be empty","Review can't be empty"
-"Review summary can't be empty","Review summary can't be empty"
-"Reviews and Ratings","Reviews and Ratings"
-"SKU","SKU"
-"Save Review","Save Review"
-"Status","Status"
-"Submit Review","Submit Review"
"Summary Rating","Summary Rating"
-"Summary of Review","Summary of Review"
-"Summary of Your Review","Summary of Your Review"
-"Title","Title"
-"Type","Type"
-"Unable to post the review.","Unable to post the review."
-"Update Status","Update Status"
-"View All Reviews","View All Reviews"
-"View Details","View Details"
-"Visibility","Visibility"
-"Websites","Websites"
-"Write Your Own Review","Write Your Own Review"
-"You have submitted no reviews.","You have submitted no reviews."
-"You're reviewing:","You're reviewing:"
-"Your Rating:","Your Rating:"
-"Your Review (submitted on %s):","Your Review (submitted on %s):"
-"Your review has been accepted for moderation.","Your review has been accepted for moderation."
-"An error occurred while deleting this review.","An error occurred while deleting this review."
-"An error occurred while saving this review.","An error occurred while saving this review."
-"The review has been deleted","The review has been deleted"
-"The review has been saved.","The review has been saved."
-"The review was removed by another user or does not exist.","The review was removed by another user or does not exist."
-"Customers Reviews","Customers Reviews"
+"Detailed Rating","Detailed Rating"
"Pending Reviews RSS","Pending Reviews RSS"
-"Product Reviews","Product Reviews"
-"Products Reviews","Products Reviews"
-"Reviews","Reviews"
-"1 star","1 star"
-"2 stars","2 stars"
-"3 stars","3 stars"
-"4 stars","4 stars"
-"5 stars","5 stars"
+"Update Status","Update Status"
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews","Pending Reviews"
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews","All Reviews"
+"Product Store Name","Product Store Name"
+"Manage Ratings","Manage Ratings"
"Add New Rating","Add New Rating"
-"Assigned Options","Assigned Options"
-"Be the first to review this product","Be the first to review this product"
-"Default Value","Default Value"
+"Save Rating","Save Rating"
"Delete Rating","Delete Rating"
-"Edit Rating","Edit Rating"
-"ID","ID"
-"If you do not specify a rating title for a store, the default value will be used.","If you do not specify a rating title for a store, the default value will be used."
-"Manage Ratings","Manage Ratings"
+"Edit Rating #%1","Edit Rating #%1"
"New Rating","New Rating"
-"Option Label","Option Label"
-"Option Title","Option Title"
-"Option Title:","Option Title:"
-"Please select one of each ratings above","Please select one of each ratings above"
-"Rating Information","Rating Information"
-"Rating","Rating"
-"Rating Options","Rating Options"
"Rating Title","Rating Title"
"Rating Visibility","Rating Visibility"
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information","Rating Information"
+"Customer Reviews","Customer Reviews"
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.","The review was removed by another user or does not exist."
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews","My Product Reviews"
+"Your review has been accepted for moderation.","Your review has been accepted for moderation."
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
"Rating isn't Available","Rating isn't Available"
-"Rating with the same title","Rating with the same title"
-"Save Rating","Save Rating"
-"Sort Order","Sort Order"
-"Visibility","Visibility"
+"Assigned Options","Assigned Options"
+"Option Title:","Option Title:"
+Rating,Rating
+"You have submitted no reviews.","You have submitted no reviews."
+"My Recent Reviews","My Recent Reviews"
+"View All Reviews","View All Reviews"
+"Average Customer Rating:","Average Customer Rating:"
+"Your Rating:","Your Rating:"
+Rating:,Rating:
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews","Back to My Reviews"
+"Be the first to review this product","Be the first to review this product"
+"Write Your Own Review","Write Your Own Review"
+"You're reviewing:","You're reviewing:"
+"How do you rate this product?","How do you rate this product?"
+"%1 %2","%1 %2"
+"Summary of Your Review","Summary of Your Review"
+"Submit Review","Submit Review"
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review","Add Your Review"
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info","Back to Main Product Info"
+"Average Customer Rating","Average Customer Rating"
+"Product Rating:","Product Rating:"
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews","Back to Product Reviews"
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/i18n/es_ES.csv b/app/code/Magento/Review/i18n/es_ES.csv
index d454f056076..62157fc9432 100644
--- a/app/code/Magento/Review/i18n/es_ES.csv
+++ b/app/code/Magento/Review/i18n/es_ES.csv
@@ -1,132 +1,130 @@
-"%d Review(s)","%d Revisión(es)"
-"%s Review(s)","%s Revisión(es)"
-"(Posted on %s)","(Publicado en %s)"
-"1 star","1 estrella"
-"2 stars","2 estrellas"
-"3 stars","3 estrellas"
-"4 stars","4 estrellas"
-"5 stars","5 estrellas"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","Añadir Nueva Revisión"
-"Add Your Review","Añadir Tu Revisión"
-"Administrator","Administrador"
-"All Reviews","Todas las Revisiones"
-"All Reviews of Customer `%s`","Todas las Revisiones del Clientes `%s`"
-"Allow Guests to Write Reviews","Permitir a los Invitados Escribir Revisiones"
-"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?"
"Are you sure?","¿Está seguro?"
-"Average Customer Rating","Valoración Media de Clientes"
-"Average Customer Rating:","Revisión Media de Clientes:"
-"Back","Volver"
-"Back to Main Product Info","Volver a Información Principal del Producto"
-"Back to My Reviews","Volver a Mis Revisiones"
-"Back to Product Reviews","Volver a Revisiones de Producto"
-"Be the first to review this product","Sea el primero en dejar una reseña para este producto"
-"Catalog Product Review View","Vista de Revisiones de Producto de Catálogo"
-"Catalog Product Reviews List","Lista de Revisiones de Producto de Catálogo"
-"Create","Creado En"
-"Customer","Cliente"
-"Customer My Account Product Reviews","Revisiones de Producto de Mi Cuenta de Cliente"
-"Customer My Account Review Details","Detalles de Revisión de Mi Cuenta de Cliente"
-"Customer Reviews","Revisiones de Cliente"
-"Customers Reviews","Reseñas de Clientes"
-"Delete","Eliminar"
+Cancel,Cancel
+Back,Volver
+Product,"Nombre de Producto"
+Price,Precio
+Quantity,Cantidad
+ID,ID
+SKU,"Número de referencia"
+Action,Action
+Edit,Edit
+Customer,Cliente
+Guest,Invitado
+Delete,Eliminar
+Name,Nombre
+Status,Estado
+"Sort Order","Orden de selección"
+Title,TÃtulo
+"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?"
+Type,Tipo
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,"Visible en"
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value","Valor predeterminado"
+Websites,"Páginas web"
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details","Ver detalles"
+Created,Created
+"Product Reviews","Opiniones de Producto"
+Pending,Pending
+Review,Revisión
+Reviews,Reseñas
+"Save Review","Guardar Revisión"
+"Add New Review","Añadir Nueva Revisión"
+"Review Details","Detalles de Revisión"
+"Product Rating","Valoración de Producto"
+"Visible In","Visible In"
+Nickname,Apodo
+"Summary of Review","Resumen de Revisión"
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
"Delete Review","Borrar Revisiones"
-"Detailed Rating","Valoración Detallada"
-"Edit Review '%s'","Editar Revisión '%s'"
-"Guest","Invitado"
-"How do you rate this product?","¿Cómo valoras este producto?"
-"ID","Identificación"
-"Manage Ratings","Administrar puntuaciones"
-"My Product Reviews","Revisiones de Mi Producto"
-"My Recent Reviews","Mis Revisiones Recientes"
-"Name","Nombre"
-"Name in Store","Nombre en la Tienda"
+"Edit Review '%1'","Edit Review '%1'"
"New Review","Nueva Revisión"
-"Nickname","Apodo"
-"Nickname can't be empty","El apodo no puede estar vacÃo"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Sólo usuarios registrados pueden escribir sus opiniones. <a href=""%s"">Conéctese</a> o <a href=""%s"">regÃstrese</a>"
-"Pending Reviews","Revisiones Pendientes"
-"Pending Reviews of Customer `%s`","Revisiones Pendientes del Cliente `%s`"
-"Please select a product","Por favor, selecciona un producto"
-"Please select one of each of the ratings above","Por favor, selecciona una de cada una de las revisiones que aparecen encima"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,Administrador
"Posted By","Publicado Por"
-"Price","Precio"
-"Product","Producto"
-"Product","Nombre de Producto"
-"Product Rating","Valoración de Producto"
-"Product Rating:","Valoración de Producto:"
-"Product Review (submitted on %s):","Revisión de Producto (enviada en %s):"
-"Product Reviews","Opiniones de Producto"
-"Product SKU","Unidad de Mantenimiento de Existencias de Producto"
-"Products Reviews","Reseñas de Productos"
-"Quantity","Cantidad"
-"Rating:","Valoración:"
-"Review","Revisión"
-"Review (submitted on %s):","Revisión (enviada en %s):"
-"Review Details","Detalles de Revisión"
-"Review Form Fields Before","Revisar campos del formulario antes"
-"Review by <span>%s</span>","Revisión por <span>%s</span>"
-"Review can't be empty","La opinión no puede estar vacÃa"
-"Review summary can't be empty","El resumen de la opinión no puede estar vacÃo"
-"Reviews and Ratings","Revisiones y Valoraciones"
-"SKU","Número de referencia"
-"Save Review","Guardar Revisión"
-"Status","Estado"
-"Submit Review","Enviar Revisión"
"Summary Rating","Valoración Resum"
-"Summary of Review","Resumen de Revisión"
-"Summary of Your Review","Resumen de Tu Revisión"
-"Title","TÃtulo"
-"Type","Tipo"
-"Unable to post the review.","No ha sido posible publicar la revisión."
-"Update Status","Actualizar Estado"
-"View All Reviews","Ver Todas las Revisiones"
-"View Details","Ver detalles"
-"Visibility","Visible en"
-"Websites","Páginas web"
-"Write Your Own Review","Escribir Tu Propia Revisión"
-"You have submitted no reviews.","No has enviado ninguna revisión."
-"You're reviewing:","Estás revisando:"
-"Your Rating:","Tu Valoración:"
-"Your Review (submitted on %s):","Tu Revisión (enviada en %s):"
-"Your review has been accepted for moderation.","Tu revisión se ha aceptado para ser moderada."
-"An error occurred while deleting this review.","Se produjo un error al eliminar esta revisión."
-"An error occurred while saving this review.","Se produjo un error al guardar esta revisión."
-"The review has been deleted","Se eliminó la reseña"
-"The review has been saved.","Se guardó la reseña."
-"The review was removed by another user or does not exist.","La reseña no existe o fue eliminada por otro usuario."
-"Customers Reviews","Revisiones Personalizadas"
+"Detailed Rating","Valoración Detallada"
"Pending Reviews RSS","RSS de reseñas pendientes"
-"Product Reviews","Opiniones de Producto"
-"Products Reviews","Opiniones de Productos"
-"Reviews","Reseñas"
-"1 star","1 estrella"
-"2 stars","2 estrellas"
-"3 stars","3 estrellas"
-"4 stars","4 estrellas"
-"5 stars","5 estrellas"
+"Update Status","Actualizar Estado"
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews","Revisiones Pendientes"
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews","Todas las Revisiones"
+"Product Store Name","Product Store Name"
+"Manage Ratings","Administrar puntuaciones"
"Add New Rating","Agregar nueva puntuación"
-"Assigned Options","Opciones asignadas"
-"Be the first to review this product","Sea el primero en dejar una reseña para este producto"
-"Default Value","Valor predeterminado"
+"Save Rating","Guardar puntuación"
"Delete Rating","Eliminar puntuación"
-"Edit Rating","Editar puntuación"
-"ID","ID"
-"If you do not specify a rating title for a store, the default value will be used.","Si no especifica un tÃtulo para la puntuación de una tienda, se utilizará el valor predeterminado."
-"Manage Ratings","Administrar puntuaciones"
+"Edit Rating #%1","Edit Rating #%1"
"New Rating","Nueva puntuación"
-"Option Label","Etiqueta de opciones"
-"Option Title","TÃtulo de opciones"
-"Option Title:","TÃtulo de opciones:"
-"Please select one of each ratings above","Seleccione una de las puntuaciones que aparecen más arriba"
-"Rating Information","Información sobre la puntuación"
-"Rating","Nombre de la puntuación"
-"Rating Options","Opciones de puntuación"
"Rating Title","Visibilidad de la puntuación"
"Rating Visibility","Visibilidad de la puntuación"
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information","Información sobre la puntuación"
+"Customer Reviews","Revisiones de Cliente"
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.","La reseña no existe o fue eliminada por otro usuario."
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews","Revisiones de Mi Producto"
+"Your review has been accepted for moderation.","Tu revisión se ha aceptado para ser moderada."
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
"Rating isn't Available","La puntuación no está disponible"
-"Rating with the same title","Puntuación con el mismo tÃtulo"
-"Save Rating","Guardar puntuación"
-"Sort Order","Orden de selección"
-"Visibility","Visible en"
+"Assigned Options","Opciones asignadas"
+"Option Title:","TÃtulo de opciones:"
+Rating,"Nombre de la puntuación"
+"You have submitted no reviews.","No has enviado ninguna revisión."
+"My Recent Reviews","Mis Revisiones Recientes"
+"View All Reviews","Ver Todas las Revisiones"
+"Average Customer Rating:","Revisión Media de Clientes:"
+"Your Rating:","Tu Valoración:"
+Rating:,Valoración:
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews","Volver a Mis Revisiones"
+"Be the first to review this product","Sea el primero en dejar una reseña para este producto"
+"Write Your Own Review","Escribir Tu Propia Revisión"
+"You're reviewing:","Estás revisando:"
+"How do you rate this product?","¿Cómo valoras este producto?"
+"%1 %2","%1 %2"
+"Summary of Your Review","Resumen de Tu Revisión"
+"Submit Review","Enviar Revisión"
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review","Añadir Tu Revisión"
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info","Volver a Información Principal del Producto"
+"Average Customer Rating","Valoración Media de Clientes"
+"Product Rating:","Valoración de Producto:"
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews","Volver a Revisiones de Producto"
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/i18n/fr_FR.csv b/app/code/Magento/Review/i18n/fr_FR.csv
index 6d3cb586ba0..b177608ac48 100644
--- a/app/code/Magento/Review/i18n/fr_FR.csv
+++ b/app/code/Magento/Review/i18n/fr_FR.csv
@@ -1,132 +1,130 @@
-"%d Review(s)","%d avis"
-"%s Review(s)","%s avis"
-"(Posted on %s)","(Posté le %s)"
-"1 star","1 étoile"
-"2 stars","2 étoiles"
-"3 stars","3 étoiles"
-"4 stars","4 étoiles"
-"5 stars","5 étoiles"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","Ajouter un nouvel avis"
-"Add Your Review","Ajouter votre avis"
-"Administrator","Administrateur"
-"All Reviews","Tous les avis"
-"All Reviews of Customer `%s`","Tous les avis du client `%s`"
-"Allow Guests to Write Reviews","Autoriser les invités à écrire des avis"
-"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà ?"
"Are you sure?","Etes-vous sûr ?"
-"Average Customer Rating","Note moyenne des clients"
-"Average Customer Rating:","Note moyenne des clients :"
-"Back","Retour"
-"Back to Main Product Info","Retour à la page principale du produit"
-"Back to My Reviews","Retour à Mes avis"
-"Back to Product Reviews","Retour aux avis sur le produit"
-"Be the first to review this product","Soyez le premier à évaluer ce produit"
-"Catalog Product Review View","Voir le catalogue des produits avec avis"
-"Catalog Product Reviews List","Catalogue des produits Liste des avis"
-"Create","Créé le"
-"Customer","Client"
-"Customer My Account Product Reviews","Client Mon Compte Avis sur les produits"
-"Customer My Account Review Details","Client Mon compte Détails de l'avis"
-"Customer Reviews","Avis du client"
-"Customers Reviews","Avis des clients"
-"Delete","Supprimer"
+Cancel,Cancel
+Back,Retour
+Product,"Nom produit"
+Price,Prix
+Quantity,Qté
+ID,ID
+SKU,UGS
+Action,Action
+Edit,Edit
+Customer,Client
+Guest,Invité
+Delete,Supprimer
+Name,Nom
+Status,Statut
+"Sort Order","Trier la commande"
+Title,Titre
+"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà ?"
+Type,Type
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,"Visible dans"
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value","Valeur par Défaut"
+Websites,"Site web"
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details","Voir détails"
+Created,Created
+"Product Reviews","Avis sur le produit"
+Pending,Pending
+Review,Avis
+Reviews,Commentaires
+"Save Review","Enregistrer l'avis"
+"Add New Review","Ajouter un nouvel avis"
+"Review Details","Détails de l'avis"
+"Product Rating","Évaluation du produit"
+"Visible In","Visible In"
+Nickname,Surnom
+"Summary of Review","Résumé des avis"
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
"Delete Review","Supprimer l'avis"
-"Detailed Rating","Évaluation détaillée"
-"Edit Review '%s'","Modifier l'avis '%s'"
-"Guest","Invité"
-"How do you rate this product?","Comment noter-vous ce produit ?"
-"ID","ID"
-"Manage Ratings","Gérer les Notes"
-"My Product Reviews","Mes avis sur les produits"
-"My Recent Reviews","Mes avis récents"
-"Name","Nom"
-"Name in Store","Nom dans la boutique"
+"Edit Review '%1'","Edit Review '%1'"
"New Review","Nouvel avis"
-"Nickname","Surnom"
-"Nickname can't be empty","Le pseudo doit être spécifié"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Seuls les utilisateurs qui se sont identifiés peuvent faire partager leurs remarques. Veillez vous <a href=""%s"">identifier </a> ou <a href=""%s"">vous enregistrer</a>"
-"Pending Reviews","Avis en attente"
-"Pending Reviews of Customer `%s`","Avis en attente du client `%s`"
-"Please select a product","Veuillez sélectionner un produit"
-"Please select one of each of the ratings above","Veuillez sélectionner une de chaque évaluation ci-dessus"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,Administrateur
"Posted By","Posté par"
-"Price","Prix"
-"Product","Produit"
-"Product","Nom produit"
-"Product Rating","Évaluation du produit"
-"Product Rating:","Évaluation du produit :"
-"Product Review (submitted on %s):","Avis sur le produit (envoyé le %s) :"
-"Product Reviews","Avis sur le produit"
-"Product SKU","Produit UGS"
-"Products Reviews","Avis sur les produits"
-"Quantity","Qté"
-"Rating:","Évaluation :"
-"Review","Avis"
-"Review (submitted on %s):","Avis (envoyé le %s) :"
-"Review Details","Détails de l'avis"
-"Review Form Fields Before","Vérifiez les champs du formulaire avant"
-"Review by <span>%s</span>","Avis de <span>%s</span>"
-"Review can't be empty","Le champ Visualiser doit être rempli"
-"Review summary can't be empty","Le champ Visualiser le récapitulatif doit être rempli"
-"Reviews and Ratings","Avis et évaluations"
-"SKU","UGS"
-"Save Review","Enregistrer l'avis"
-"Status","Statut"
-"Submit Review","Envoyer l'avis"
"Summary Rating","Résumé de l'évaluation"
-"Summary of Review","Résumé des avis"
-"Summary of Your Review","Résumé de votre avis"
-"Title","Titre"
-"Type","Type"
-"Unable to post the review.","Impossible de poster l'avis."
-"Update Status","Mettre à jour le statut"
-"View All Reviews","Voir tous les avis"
-"View Details","Voir détails"
-"Visibility","Visible dans"
-"Websites","Site web"
-"Write Your Own Review","Écrivez votre propre avis"
-"You have submitted no reviews.","Vous n'avez envoyé aucun avis."
-"You're reviewing:","Vous donnez votre avis sur :"
-"Your Rating:","Votre évaluation :"
-"Your Review (submitted on %s):","Votre avis (envoyé le %s) :"
-"Your review has been accepted for moderation.","Votre avis a été accepté pour la modération."
-"An error occurred while deleting this review.","Une erreur est survenue en effaçant ce commentaire"
-"An error occurred while saving this review.","Une erreur est survenue en enregistrant ce commentaire"
-"The review has been deleted","Le rapport a été supprimé"
-"The review has been saved.","Le rapport a été enregistré."
-"The review was removed by another user or does not exist.","Le rapport a été supprimé par un autre utilisateur ou n'existe pas."
-"Customers Reviews","Avis des clients"
+"Detailed Rating","Évaluation détaillée"
"Pending Reviews RSS","RSS des avis en attente"
-"Product Reviews","Avis sur le produit"
-"Products Reviews","Avis sur les produits"
-"Reviews","Commentaires"
-"1 star","1 étoile"
-"2 stars","2 étoiles"
-"3 stars","3 étoiles"
-"4 stars","4 étoiles"
-"5 stars","5 étoiles"
+"Update Status","Mettre à jour le statut"
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews","Avis en attente"
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews","Tous les avis"
+"Product Store Name","Product Store Name"
+"Manage Ratings","Gérer les Notes"
"Add New Rating","Ajouter une note"
-"Assigned Options","Options Spécifiques"
-"Be the first to review this product","Soyez le premier à évaluer ce produit"
-"Default Value","Valeur par Défaut"
+"Save Rating","Sauver la note"
"Delete Rating","Supprimer la note"
-"Edit Rating","Modifier la note"
-"ID","ID"
-"If you do not specify a rating title for a store, the default value will be used.","Si vous ne spécifiez pas de titre pour votre note dans une boutique, la valeur par défaut sera utilisée."
-"Manage Ratings","Gérer les Notes"
+"Edit Rating #%1","Edit Rating #%1"
"New Rating","Nouvelle note"
-"Option Label","Nom de l'option"
-"Option Title","Titre de l'option"
-"Option Title:","Titre de l'option:"
-"Please select one of each ratings above","Veuillez choisir une de chacune des notes au-dessus"
-"Rating Information","Informations sur la note"
-"Rating","Nom de la note"
-"Rating Options","Options de la note"
"Rating Title","Titre de la note"
"Rating Visibility","Visiblité de la note"
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information","Informations sur la note"
+"Customer Reviews","Avis du client"
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.","Le rapport a été supprimé par un autre utilisateur ou n'existe pas."
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews","Mes avis sur les produits"
+"Your review has been accepted for moderation.","Votre avis a été accepté pour la modération."
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
"Rating isn't Available","Pas de note disponible"
-"Rating with the same title","Note portant le même titre"
-"Save Rating","Sauver la note"
-"Sort Order","Trier la commande"
-"Visibility","Visible dans"
+"Assigned Options","Options Spécifiques"
+"Option Title:","Titre de l'option:"
+Rating,"Nom de la note"
+"You have submitted no reviews.","Vous n'avez envoyé aucun avis."
+"My Recent Reviews","Mes avis récents"
+"View All Reviews","Voir tous les avis"
+"Average Customer Rating:","Note moyenne des clients :"
+"Your Rating:","Votre évaluation :"
+Rating:,"Évaluation :"
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews","Retour à Mes avis"
+"Be the first to review this product","Soyez le premier à évaluer ce produit"
+"Write Your Own Review","Écrivez votre propre avis"
+"You're reviewing:","Vous donnez votre avis sur :"
+"How do you rate this product?","Comment noter-vous ce produit ?"
+"%1 %2","%1 %2"
+"Summary of Your Review","Résumé de votre avis"
+"Submit Review","Envoyer l'avis"
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review","Ajouter votre avis"
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info","Retour à la page principale du produit"
+"Average Customer Rating","Note moyenne des clients"
+"Product Rating:","Évaluation du produit :"
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews","Retour aux avis sur le produit"
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/i18n/nl_NL.csv b/app/code/Magento/Review/i18n/nl_NL.csv
index d90a17447f6..f285f4d92c2 100644
--- a/app/code/Magento/Review/i18n/nl_NL.csv
+++ b/app/code/Magento/Review/i18n/nl_NL.csv
@@ -1,132 +1,130 @@
-"%d Review(s)","%d Beoordeling(en)"
-"%s Review(s)","%s Beoordeling(en)"
-"(Posted on %s)","(Geplaatst op %s)"
-"1 star","1 ster"
-"2 stars","2 sterren"
-"3 stars","3 sterren"
-"4 stars","4 sterren"
-"5 stars","5 sterren"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","Voeg Nieuwe Beoordeling toe"
-"Add Your Review","Voeg Uw Beoordeling toe"
-"Administrator","Administrator"
-"All Reviews","Alle Recensies"
-"All Reviews of Customer `%s`","Alle Beoordelingen van Klant %s"
-"Allow Guests to Write Reviews","Sta Gasten toe om Beoordelingen te Schrijven"
-"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?"
"Are you sure?","Weet u het zeker?"
-"Average Customer Rating","Gemiddelde Waardering door Klant"
-"Average Customer Rating:","Gemiddelde Waardering door Klant:"
-"Back","Terug"
-"Back to Main Product Info","Terug naar Belangrijkste Productinformatie"
-"Back to My Reviews","Terug naar Mijn Beoordelingen"
-"Back to Product Reviews","Terug naar Productbeoordelingen"
-"Be the first to review this product","Wees de eerste om dit product te waarderen"
-"Catalog Product Review View","Catalogus Product Beoordeling Bezichtiging"
-"Catalog Product Reviews List","Catalogus Product Beoordelingenlijst"
-"Created","Gemaakt Op"
-"Customer","Klant"
-"Customer My Account Product Reviews","Klant Mijn Account Product Reviews"
-"Customer My Account Review Details","Klant Mijn Account Review Details"
-"Customer Reviews","Klantbeoordelingen"
-"Customers Reviews","Klantenrecensies"
-"Delete","Verwijderen"
+Cancel,Cancel
+Back,Terug
+Product,Productnaam
+Price,Prijs
+Quantity,Hoeveelheid
+ID,ID
+SKU,SKU
+Action,Action
+Edit,Edit
+Customer,Klant
+Guest,Gast
+Delete,Verwijderen
+Name,Naam
+Status,Status
+"Sort Order","Sorteer Bestelling"
+Title,Titel
+"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?"
+Type,Type
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,"Zichtbaar in"
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value","Vaststaande Waarde"
+Websites,Websites
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details","Details bekijken"
+Created,"Gemaakt Op"
+"Product Reviews",Productbeoordelingen
+Pending,Pending
+Review,recensie
+Reviews,Reviews
+"Save Review","Recensie opslaan"
+"Add New Review","Voeg Nieuwe Beoordeling toe"
+"Review Details","Details recensie"
+"Product Rating",Productbeoordeling
+"Visible In","Visible In"
+Nickname,Bijnaam
+"Summary of Review","Samenvatting van recensie"
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
"Delete Review","Verwijder Review"
-"Detailed Rating","Gedetailleerde Rating"
-"Edit Review '%s'","Bewerk Review '%s'"
-"Guest","Gast"
-"How do you rate this product?","Hoe heeft u dit product gewaardeerd?"
-"ID","ID"
-"Manage Ratings","Beheer Ratings"
-"My Product Reviews","Mijn Product Reviews"
-"My Recent Reviews","Mijn Recente Reviews"
-"Name","Naam"
-"Name in Store","Naam in Winkel"
+"Edit Review '%1'","Edit Review '%1'"
"New Review","Nieuwe Review"
-"Nickname","Bijnaam"
-"Nickname can't be empty","Nickname kan niet leeg zijn"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Alleen geregistreerde gebruikers kunnen beoordelingen schrijven. <a href=""%s"">Log in</a> of <a href=""%s"">registreer</a>"
-"Pending Reviews","In afwachting van beoordelingen"
-"Pending Reviews of Customer `%s`","Nog gaande zijnde Reviews van Klant `%s`"
-"Please select a product","Selecteer a.u.b. een product"
-"Please select one of each of the ratings above","Selecteer a.u.b. een van bovenstaande ratings"
-"Posted By","Door"
-"Price","Prijs"
-"Product","Product"
-"Product","Productnaam"
-"Product Rating","Productbeoordeling"
-"Product Rating:","Productbeoordeling:"
-"Product Review (submitted on %s):","Productrecensie (verzonden op %s):"
-"Product Reviews","Productbeoordelingen"
-"Product SKU","Product SKU"
-"Products Reviews","Productrecensies"
-"Quantity","Hoeveelheid"
-"Rating:","Beoordeling:"
-"Review","recensie"
-"Review (submitted on %s):","Recensie (verzonden op %s):"
-"Review Details","Details recensie"
-"Review Form Fields Before","Beoordeel formuliervelden voor"
-"Review by <span>%s</span>","Recensie door <span>%s</span>"
-"Review can't be empty","Beoordeling kan niet leeg zijn"
-"Review summary can't be empty","Overzicht kan niet leeg zijn"
-"Reviews and Ratings","Beoordelingen en waarderingen"
-"SKU","SKU"
-"Save Review","Recensie opslaan"
-"Status","Status"
-"Submit Review","Recensie insturen"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,Administrator
+"Posted By",Door
"Summary Rating","Beknopte beoordeling"
-"Summary of Review","Samenvatting van recensie"
-"Summary of Your Review","Overzicht van uw recensie"
-"Title","Titel"
-"Type","Type"
-"Unable to post the review.","Kan recensie niet publiceren."
-"Update Status","Status bijwerken"
-"View All Reviews","Alle recensies bekijken"
-"View Details","Details bekijken"
-"Visibility","Zichtbaar in"
-"Websites","Websites"
-"Write Your Own Review","Schrijf je eigen recensie"
-"You have submitted no reviews.","U heeft geen recensies ingestuurd"
-"You're reviewing:","U recenseert:"
-"Your Rating:","Uw beoordeling:"
-"Your Review (submitted on %s):","Uw recensie (verzonden op %s):"
-"Your review has been accepted for moderation.","Uw beoordeling is geaccepteerd voor evaluatie."
-"An error occurred while deleting this review.","Er is een fout opgetreden bij het verwijderen van deze recentie."
-"An error occurred while saving this review.","Er is een fout opgetreden bij het opslaan van deze recensie."
-"The review has been deleted","De beoordeling is verwijderd"
-"The review has been saved.","De beoordeling is opgeslagen."
-"The review was removed by another user or does not exist.","De beoordeling werd verwijderd door een andere gebruiker of bestaat niet."
-"Customers Reviews","Klantenrecensies"
+"Detailed Rating","Gedetailleerde Rating"
"Pending Reviews RSS","In Afwachting van Reviews RSS"
-"Product Reviews","Productbeoordelingen"
-"Products Reviews","Productrecensies"
-"Reviews","Reviews"
-"1 star","1 ster"
-"2 stars","2 sterren"
-"3 stars","3 sterren"
-"4 stars","4 sterren"
-"5 stars","5 sterren"
+"Update Status","Status bijwerken"
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews","In afwachting van beoordelingen"
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews","Alle Recensies"
+"Product Store Name","Product Store Name"
+"Manage Ratings","Beheer Ratings"
"Add New Rating","Voeg Nieuwe Rating toe"
-"Assigned Options","Toegewezen Opties"
-"Be the first to review this product","Wees de eerste om dit product te waarderen"
-"Default Value","Vaststaande Waarde"
+"Save Rating","Beoordeling opslaan"
"Delete Rating","Verwijder Rating"
-"Edit Rating","Bewerk Rating"
-"ID","ID"
-"If you do not specify a rating title for a store, the default value will be used.","Als u geen rating titel voor een winkel specificeert, zal de vaststaande waarde worden gebruikt."
-"Manage Ratings","Beheer Ratings"
+"Edit Rating #%1","Edit Rating #%1"
"New Rating","Nieuwe beoordeling"
-"Option Label","Optie Label"
-"Option Title","Optie Tiel"
-"Option Title:","Optie Titel:"
-"Please select one of each ratings above","Selecteer een van bovenstaande ratings"
-"Rating Information","Rating Informatie"
-"Rating","Rating Naam"
-"Rating Options","Rating Opties"
"Rating Title","Rating Titel"
"Rating Visibility","Rating Zichtbaarheid"
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information","Rating Informatie"
+"Customer Reviews",Klantbeoordelingen
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.","De beoordeling werd verwijderd door een andere gebruiker of bestaat niet."
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews","Mijn Product Reviews"
+"Your review has been accepted for moderation.","Uw beoordeling is geaccepteerd voor evaluatie."
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
"Rating isn't Available","Rating is niet Beschikbaar"
-"Rating with the same title","Beoordeling met dezelfde titel"
-"Save Rating","Beoordeling opslaan"
-"Sort Order","Sorteer Bestelling"
-"Visibility","Zichtbaar in"
+"Assigned Options","Toegewezen Opties"
+"Option Title:","Optie Titel:"
+Rating,"Rating Naam"
+"You have submitted no reviews.","U heeft geen recensies ingestuurd"
+"My Recent Reviews","Mijn Recente Reviews"
+"View All Reviews","Alle recensies bekijken"
+"Average Customer Rating:","Gemiddelde Waardering door Klant:"
+"Your Rating:","Uw beoordeling:"
+Rating:,Beoordeling:
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews","Terug naar Mijn Beoordelingen"
+"Be the first to review this product","Wees de eerste om dit product te waarderen"
+"Write Your Own Review","Schrijf je eigen recensie"
+"You're reviewing:","U recenseert:"
+"How do you rate this product?","Hoe heeft u dit product gewaardeerd?"
+"%1 %2","%1 %2"
+"Summary of Your Review","Overzicht van uw recensie"
+"Submit Review","Recensie insturen"
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review","Voeg Uw Beoordeling toe"
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info","Terug naar Belangrijkste Productinformatie"
+"Average Customer Rating","Gemiddelde Waardering door Klant"
+"Product Rating:",Productbeoordeling:
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews","Terug naar Productbeoordelingen"
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/i18n/pt_BR.csv b/app/code/Magento/Review/i18n/pt_BR.csv
index b9b8a779caa..26b8898090e 100644
--- a/app/code/Magento/Review/i18n/pt_BR.csv
+++ b/app/code/Magento/Review/i18n/pt_BR.csv
@@ -1,132 +1,130 @@
-"%d Review(s)","%s comentário(s)"
-"%s Review(s)","%s comentário(s)"
-"(Posted on %s)","(Publicado em %s)"
-"1 star","1 estrela"
-"2 stars","2 estrelas"
-"3 stars","3 estrelas"
-"4 stars","4 estrelas"
-"5 stars","5 estrelas"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""esta.meta='branco'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","Adicionar novo comentário"
-"Add Your Review","Adicionar seu comentário"
-"Administrator","Administrador"
-"All Reviews","Todas as Revisões"
-"All Reviews of Customer `%s`","Todos os comentários do cliente '%s'"
-"Allow Guests to Write Reviews","Permitir que os clientes escrevam comentários"
-"Are you sure you want to do this?","Tem certeza de que quer fazer isso?"
"Are you sure?","Tem certeza?"
-"Average Customer Rating","Média de avaliação do cliente"
-"Average Customer Rating:","Média de avaliação do cliente:"
-"Back","Voltar"
-"Back to Main Product Info","Voltar às principais informações do produto"
-"Back to My Reviews","Voltar para Meus comentários"
-"Back to Product Reviews","Voltar para Comentários do produto"
-"Be the first to review this product","Seja a primeira pessoa a avaliar este produto"
-"Catalog Product Review View","Visualizar Comentário do produto do catálogo"
-"Catalog Product Reviews List","Lista de comentários do produto do catálogo"
-"Created","Criado Em"
-"Customer","Cliente"
-"Customer My Account Product Reviews","Avaliação do produto da Minha Conta do cliente"
-"Customer My Account Review Details","Detalhes da avaliação da Minha Conta do cliente"
-"Customer Reviews","Resenhas de Cliente"
-"Customers Reviews","Análises dos clientes"
-"Delete","Excluir"
+Cancel,Cancel
+Back,Voltar
+Product,"Nome do produto"
+Price,Preço
+Quantity,Quant.
+ID,Identidade
+SKU,"Unidade de Manutenção de Estoque"
+Action,Action
+Edit,Edit
+Customer,Cliente
+Guest,Convidado
+Delete,Excluir
+Name,Nome
+Status,Status
+"Sort Order","Classificar pedido"
+Title,TÃtulo
+"Are you sure you want to do this?","Tem certeza de que quer fazer isso?"
+Type,Tipo
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,"VisÃvel em"
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value","Valor Predifinido"
+Websites,Sites
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details","Visualizar Detalhes"
+Created,"Criado Em"
+"Product Reviews","Comentários sobre Produto"
+Pending,Pending
+Review,Análise
+Reviews,Resenhas
+"Save Review","Salvar análise"
+"Add New Review","Adicionar novo comentário"
+"Review Details","Detalhes de análise"
+"Product Rating","Avaliação do produto"
+"Visible In","Visible In"
+Nickname,"Alcunha (Nickname)"
+"Summary of Review","Resumo de análise"
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
"Delete Review","Excluir avaliação"
-"Detailed Rating","Avaliação detalhada"
-"Edit Review '%s'","Editar avaliação '%s'"
-"Guest","Convidado"
-"How do you rate this product?","Como você avalia este produto?"
-"ID","Identidade"
-"Manage Ratings","Gerenciar Classificações"
-"My Product Reviews","Análises dos meus produtos"
-"My Recent Reviews","Minhas análises recentes"
-"Name","Nome"
-"Name in Store","Noma na loja"
+"Edit Review '%1'","Edit Review '%1'"
"New Review","Nova Resenha"
-"Nickname","Alcunha (Nickname)"
-"Nickname can't be empty","O apelido não pode estar vazio"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Apenas usuários cadastrados podem escrever avaliações. Por favor, <a href=""%s"">conecte-se</a> ou <a href=""%s"">cadastre-se</a>"
-"Pending Reviews","Comentários Pendentes"
-"Pending Reviews of Customer `%s`","Aguardando revisão do cliente '%s'"
-"Please select a product","Escolha um produto"
-"Please select one of each of the ratings above","Escolha uma das avaliações acima"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,Administrador
"Posted By","Publicado por"
-"Price","Preço"
-"Product","Produto"
-"Product","Nome do produto"
-"Product Rating","Avaliação do produto"
-"Product Rating:","Avaliação do produto:"
-"Product Review (submitted on %s):","Análise do produto (enviada em %s):"
-"Product Reviews","Comentários sobre Produto"
-"Product SKU","SKU do Produto"
-"Products Reviews","Comentários sobre Produtos"
-"Quantity","Quant."
-"Rating:","Avaliação:"
-"Review","Análise"
-"Review (submitted on %s):","Análise (enviada em %s):"
-"Review Details","Detalhes de análise"
-"Review Form Fields Before","Analisar antes os campos do formulário"
-"Review by <span>%s</span>","Analisado por <span>%s</span>"
-"Review can't be empty","Revisão não pode estar vazia"
-"Review summary can't be empty","Resumo da revisão não pode estar vazio"
-"Reviews and Ratings","Resenhas e Avaliações"
-"SKU","Unidade de Manutenção de Estoque"
-"Save Review","Salvar análise"
-"Status","Status"
-"Submit Review","Enviar análise"
"Summary Rating","Resumo de avaliação"
-"Summary of Review","Resumo de análise"
-"Summary of Your Review","Resumo da sua análise"
-"Title","TÃtulo"
-"Type","Tipo"
-"Unable to post the review.","Não foi possÃvel publicar a avaliação."
-"Update Status","Atualizar status"
-"View All Reviews","Visualizar todas as revisões"
-"View Details","Visualizar Detalhes"
-"Visibility","VisÃvel em"
-"Websites","Sites"
-"Write Your Own Review","Escrever sua própria revisão"
-"You have submitted no reviews.","Você não enviou nenhuma revisão."
-"You're reviewing:","Você está revisando:"
-"Your Rating:","Sua avaliação:"
-"Your Review (submitted on %s):","Sua revisão (enviada em %s):"
-"Your review has been accepted for moderation.","Sua avaliação foi aceita para moderação."
-"An error occurred while deleting this review.","Ocorreu um erro ao excluir essa resenha."
-"An error occurred while saving this review.","Ocorreu um erro ao salvar a resenha."
-"The review has been deleted","A análise foi apagada"
-"The review has been saved.","A análise foi salva."
-"The review was removed by another user or does not exist.","A análise foi removida por outro usuário ou não existe."
-"Customers Reviews","Análises dos clientes"
+"Detailed Rating","Avaliação detalhada"
"Pending Reviews RSS","Comentários RSS Pendentes"
-"Product Reviews","Comentários sobre Produto"
-"Products Reviews","Comentários sobre Produtos"
-"Reviews","Resenhas"
-"1 star","1 estrela"
-"2 stars","2 estrelas"
-"3 stars","3 estrelas"
-"4 stars","4 estrelas"
-"5 stars","5 estrelas"
+"Update Status","Atualizar status"
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews","Comentários Pendentes"
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews","Todas as Revisões"
+"Product Store Name","Product Store Name"
+"Manage Ratings","Gerenciar Classificações"
"Add New Rating","Adicionar nova avaliação"
-"Assigned Options","Opções especificadas"
-"Be the first to review this product","Seja a primeira pessoa a avaliar este produto"
-"Default Value","Valor Predifinido"
+"Save Rating","Salvar avaliação"
"Delete Rating","Exclui avaliação"
-"Edit Rating","Editar avaliação"
-"ID","Identidade"
-"If you do not specify a rating title for a store, the default value will be used.","Caso o tÃtulo de avaliação não seja especificado, o valor padrão será utilizado."
-"Manage Ratings","Gerenciar Classificações"
+"Edit Rating #%1","Edit Rating #%1"
"New Rating","Nova avaliação"
-"Option Label","Marca de opção"
-"Option Title","TÃtulo da opção"
-"Option Title:","TÃtulo da opção:"
-"Please select one of each ratings above","Escolha uma de cada avaliação acima"
-"Rating Information","Informações de avaliação"
-"Rating","Nome da avaliação"
-"Rating Options","Opções de avaliação"
"Rating Title","TÃtulo da avaliação"
"Rating Visibility","Visibilidade da avaliação"
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information","Informações de avaliação"
+"Customer Reviews","Resenhas de Cliente"
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.","A análise foi removida por outro usuário ou não existe."
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews","Análises dos meus produtos"
+"Your review has been accepted for moderation.","Sua avaliação foi aceita para moderação."
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
"Rating isn't Available","A avaliação não está disponÃvel"
-"Rating with the same title","Avaliar com o mesmo tÃtulo"
-"Save Rating","Salvar avaliação"
-"Sort Order","Classificar pedido"
-"Visibility","VisÃvel em"
+"Assigned Options","Opções especificadas"
+"Option Title:","TÃtulo da opção:"
+Rating,"Nome da avaliação"
+"You have submitted no reviews.","Você não enviou nenhuma revisão."
+"My Recent Reviews","Minhas análises recentes"
+"View All Reviews","Visualizar todas as revisões"
+"Average Customer Rating:","Média de avaliação do cliente:"
+"Your Rating:","Sua avaliação:"
+Rating:,Avaliação:
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews","Voltar para Meus comentários"
+"Be the first to review this product","Seja a primeira pessoa a avaliar este produto"
+"Write Your Own Review","Escrever sua própria revisão"
+"You're reviewing:","Você está revisando:"
+"How do you rate this product?","Como você avalia este produto?"
+"%1 %2","%1 %2"
+"Summary of Your Review","Resumo da sua análise"
+"Submit Review","Enviar análise"
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review","Adicionar seu comentário"
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info","Voltar às principais informações do produto"
+"Average Customer Rating","Média de avaliação do cliente"
+"Product Rating:","Avaliação do produto:"
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews","Voltar para Comentários do produto"
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/i18n/zh_CN.csv b/app/code/Magento/Review/i18n/zh_CN.csv
index c778a398ffe..0c089418d97 100644
--- a/app/code/Magento/Review/i18n/zh_CN.csv
+++ b/app/code/Magento/Review/i18n/zh_CN.csv
@@ -1,132 +1,130 @@
-"%d Review(s)","%d 个评测"
-"%s Review(s)","%s个评测"
-"(Posted on %s)","（å‘布于%s）"
-"1 star","1 星"
-"2 stars","2 星"
-"3 stars","3 星"
-"4 stars","4 星"
-"5 stars","5 星"
-"<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"Add New Review","æ·»åŠ æ–°è¯„æµ‹"
-"Add Your Review","æ·»åŠ æ‚¨çš„è¯„æµ‹"
-"Administrator","管ç†å‘˜"
-"All Reviews","所有评测"
-"All Reviews of Customer `%s`","客户 '%s' 的所有评测"
-"Allow Guests to Write Reviews","å…许æ¥å®¾æ’°å†™è¯„测"
-"Are you sure you want to do this?","您是å¦ç¡®è®¤è¦è¿™æ ·åšï¼Ÿ"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Average Customer Rating","客户平å‡åˆ†"
-"Average Customer Rating:","客户平å‡åˆ†ï¼š"
-"Back","返回"
-"Back to Main Product Info","返回产å“ä¿¡æ¯ä¸»é¡µ"
-"Back to My Reviews","返回我的评测"
-"Back to Product Reviews","返回产å“评测"
-"Be the first to review this product","作为评论该产å“的第一人"
-"Catalog Product Review View","分类产å“评测视图"
-"Catalog Product Reviews List","分类产å“评测列表"
-"Created","创建于"
-"Customer","客户"
-"Customer My Account Product Reviews","客户我的账户产å“评价"
-"Customer My Account Review Details","客户我的账户评价详情"
-"Customer Reviews","顾客评测"
-"Customers Reviews","客户评测"
-"Delete","åˆ é™¤"
-"Delete Review","åˆ é™¤è¯„ä»·"
-"Detailed Rating","详细评级"
-"Edit Review '%s'","编辑评价“%sâ€"
-"Guest","æ¥å®¾"
-"How do you rate this product?","您如何评价该产å“？"
-"ID","ID"
-"Manage Ratings","管ç†è¯„级"
-"My Product Reviews","我的产å“评价"
-"My Recent Reviews","我的最近评价"
-"Name","姓å"
-"Name in Store","商店å称"
-"New Review","新评测"
-"Nickname","昵称"
-"Nickname can't be empty","昵称ä¸èƒ½ä¸ºç©º"
-"Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","仅注册用户å¯æ’°å†™è¯„论。请<a href=""%s"">登录</a>或<a href=""%s"">注册</a>"
-"Pending Reviews","挂起的评测"
-"Pending Reviews of Customer `%s`","æ¥è‡ªå®¢æˆ·â€œ%sâ€æœªå†³çš„评论"
-"Please select a product","请选择产å“"
-"Please select one of each of the ratings above","请在上方选择æ¯ä¸ªè¯„级"
-"Posted By","å‘布者"
-"Price","ä»·æ ¼"
-"Product","产å“"
-"Product","产å“å"
-"Product Rating","产å“评分"
-"Product Rating:","产å“评分："
-"Product Review (submitted on %s):","产å“评测（æ交于 %s）"
-"Product Reviews","产å“评测"
-"Product SKU","产å“SKU"
-"Products Reviews","产å“评论"
-"Quantity","æ•°é‡"
-"Rating:","评分："
-"Review","评测"
-"Review (submitted on %s):","评测（æ交于 %s）："
-"Review Details","评测详情"
-"Review Form Fields Before","评测表å•å—段之å‰"
-"Review by <span>%s</span>","评测者 <span>%s</span>"
-"Review can't be empty","评论ä¸èƒ½ä¸ºç©º"
-"Review summary can't be empty","评论摘è¦ä¸èƒ½ä¸ºç©º"
-"Reviews and Ratings","评测与评级"
-"SKU","SKU"
-"Save Review","ä¿å˜è¯„测"
-"Status","状æ€"
-"Submit Review","æ交评测"
-"Summary Rating","评分汇总"
-"Summary of Review","评测汇总"
-"Summary of Your Review","您的评测汇总"
-"Title","æ ‡é¢˜"
-"Type","类型"
-"Unable to post the review.","æ— æ³•å‘布该评测。"
-"Update Status","更新状æ€"
-"View All Reviews","查看所有评测"
-"View Details","查看详情"
-"Visibility","å¯è§æ€§"
-"Websites","网站"
-"Write Your Own Review","撰写您自己的评测"
-"You have submitted no reviews.","您尚未æ交评测。"
-"You're reviewing:","您æ£åœ¨è¯„测："
-"Your Rating:","您的评分："
-"Your Review (submitted on %s):","您的评测（æ交于 %s）："
-"Your review has been accepted for moderation.","您的评测已被管ç†å‘˜æ‰¹å‡†ã€‚"
-"An error occurred while deleting this review.","åˆ é™¤è¯¥è¯„è®ºæ—¶å‡ºé”™ã€‚"
-"An error occurred while saving this review.","ä¿å˜è¯¥è¯„论时出错。"
-"The review has been deleted","è¯„è®ºå·²è¢«åˆ é™¤"
-"The review has been saved.","评论已ä¿å˜ã€‚"
-"The review was removed by another user or does not exist.","评论已被å¦ä¸€ç”¨æˆ·åˆ 除，或评论ä¸å˜åœ¨ã€‚"
-"Customers Reviews","客户评测"
-"Pending Reviews RSS","挂起评测RSS"
-"Product Reviews","产å“评测"
-"Products Reviews","产å“评论"
-"Reviews","评测"
-"1 star","1 星"
-"2 stars","2 星"
-"3 stars","3 星"
-"4 stars","4 星"
-"5 stars","5 星"
-"Add New Rating","æ·»åŠ æ–°è¯„çº§"
-"Assigned Options","分é…的选项"
-"Be the first to review this product","作为评论该产å“的第一人"
-"Default Value","默认值"
-"Delete Rating","åˆ é™¤è¯„çº§"
-"Edit Rating","编辑评级"
-"ID","ID"
-"If you do not specify a rating title for a store, the default value will be used.","如果您ä¸ä¸ºå•†åº—æŒ‡å®šè¯„çº§æ ‡é¢˜ï¼Œåˆ™å°†ä½¿ç”¨é»˜è®¤å€¼ã€‚"
-"Manage Ratings","管ç†è¯„级"
-"New Rating","新评级"
-"Option Label","é€‰é¡¹æ ‡ç¾"
-"Option Title","é€‰é¡¹æ ‡é¢˜"
-"Option Title:","é€‰é¡¹æ ‡é¢˜ï¼š"
-"Please select one of each ratings above","请选择上述评级"
-"Rating Information","评级信æ¯"
-"Rating","评级å称"
-"Rating Options","评级选项"
-"Rating Title","è¯„çº§æ ‡é¢˜"
-"Rating Visibility","评级能è§åº¦"
-"Rating isn't Available","评级ä¸å¯ç”¨"
-"Rating with the same title","对åŒä¸€å称打分"
-"Save Rating","ä¿å˜è¯„分"
-"Sort Order","排åºé¡ºåº"
-"Visibility","å¯è§æ€§"
+"Are you sure?",您是å¦ç¡®è®¤ï¼Ÿ
+Cancel,Cancel
+Back,返回
+Product,产å“å
+Price,ä»·æ ¼
+Quantity,æ•°é‡
+ID,ID
+SKU,SKU
+Action,Action
+Edit,Edit
+Customer,客户
+Guest,æ¥å®¾
+Delete,åˆ é™¤
+Name,姓å
+Status,状æ€
+"Sort Order",排åºé¡ºåº
+Title,æ ‡é¢˜
+"Are you sure you want to do this?",您是å¦ç¡®è®¤è¦è¿™æ ·åšï¼Ÿ
+Type,类型
+Description,Description
+Previous,Previous
+Next,Next
+Active,Active
+Visibility,å¯è§æ€§
+"* Required Fields","* Required Fields"
+Summary,Summary
+"Default Value",默认值
+Websites,网站
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"Product Name","Product Name"
+Inactive,Inactive
+"View Details",查看详情
+Created,创建于
+"Product Reviews",产å“评测
+Pending,Pending
+Review,评测
+Reviews,评测
+"Save Review",ä¿å˜è¯„测
+"Add New Review",æ·»åŠ æ–°è¯„æµ‹
+"Review Details",评测详情
+"Product Rating",产å“评分
+"Visible In","Visible In"
+Nickname,昵称
+"Summary of Review",评测汇总
+"Save and Previous","Save and Previous"
+"Save and Next","Save and Next"
+"Delete Review",åˆ é™¤è¯„ä»·
+"Edit Review '%1'","Edit Review '%1'"
+"New Review",新评测
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>"
+Administrator,管ç†å‘˜
+"Posted By",å‘布者
+"Summary Rating",评分汇总
+"Detailed Rating",详细评级
+"Pending Reviews RSS",挂起评测RSS
+"Update Status",更新状æ€
+"Pending Reviews of Customer `%1`","Pending Reviews of Customer `%1`"
+"Pending Reviews",挂起的评测
+"All Reviews of Customer `%1`","All Reviews of Customer `%1`"
+"All Reviews of Product `%1`","All Reviews of Product `%1`"
+"All Reviews",所有评测
+"Product Store Name","Product Store Name"
+"Manage Ratings",管ç†è¯„级
+"Add New Rating",æ·»åŠ æ–°è¯„çº§
+"Save Rating",ä¿å˜è¯„分
+"Delete Rating",åˆ é™¤è¯„çº§
+"Edit Rating #%1","Edit Rating #%1"
+"New Rating",新评级
+"Rating Title",è¯„çº§æ ‡é¢˜
+"Rating Visibility",评级能è§åº¦
+"Is Active","Is Active"
+"Please specify a rating title for a store, or we'll just use the default value.","Please specify a rating title for a store, or we'll just use the default value."
+"Rating Information",评级信æ¯
+"Customer Reviews",顾客评测
+"Edit Review","Edit Review"
+"The review was removed by another user or does not exist.",评论已被å¦ä¸€ç”¨æˆ·åˆ 除，或评论ä¸å˜åœ¨ã€‚
+"You saved the review.","You saved the review."
+"Something went wrong while saving this review.","Something went wrong while saving this review."
+"The review has been deleted.","The review has been deleted."
+"Something went wrong deleting this review.","Something went wrong deleting this review."
+"Please select review(s).","Please select review(s)."
+"An error occurred while deleting record(s).","An error occurred while deleting record(s)."
+"An error occurred while updating the selected review(s).","An error occurred while updating the selected review(s)."
+"We can't get the product ID.","We can't get the product ID."
+"An error occurred while saving review.","An error occurred while saving review."
+"You saved the rating.","You saved the rating."
+"You deleted the rating.","You deleted the rating."
+Ratings,Ratings
+"My Product Reviews",我的产å“评价
+"Your review has been accepted for moderation.",您的评测已被管ç†å‘˜æ‰¹å‡†ã€‚
+"We cannot post the review.","We cannot post the review."
+"Storage key was not set","Storage key was not set"
+Approved,Approved
+"Not Approved","Not Approved"
+"The review summary field can't be empty.","The review summary field can't be empty."
+"The nickname field can't be empty.","The nickname field can't be empty."
+"The review field can't be empty.","The review field can't be empty."
+"Rating isn't Available",评级ä¸å¯ç”¨
+"Assigned Options",分é…的选项
+"Option Title:",é€‰é¡¹æ ‡é¢˜ï¼š
+Rating,评级å称
+"You have submitted no reviews.",您尚未æ交评测。
+"My Recent Reviews",我的最近评价
+"View All Reviews",查看所有评测
+"Average Customer Rating:",客户平å‡åˆ†ï¼š
+"Your Rating:",您的评分：
+Rating:,评分：
+"Your Review (submitted on %1):","Your Review (submitted on %1):"
+"Review (submitted on %1):","Review (submitted on %1):"
+"Back to My Reviews",返回我的评测
+"Be the first to review this product",作为评论该产å“的第一人
+"Write Your Own Review",撰写您自己的评测
+"You're reviewing:",您æ£åœ¨è¯„测：
+"How do you rate this product?",您如何评价该产å“？
+"%1 %2","%1 %2"
+"Summary of Your Review",您的评测汇总
+"Submit Review",æ交评测
+"Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>","Only registered users can write reviews. Please, <a href=""%1"">log in</a> or <a href=""%2"">register</a>"
+Review(s),Review(s)
+"Add Your Review",æ·»åŠ æ‚¨çš„è¯„æµ‹
+"%1 Review(s)","%1 Review(s)"
+"Review by","Review by"
+"Posted on","Posted on"
+"Back to Main Product Info",返回产å“ä¿¡æ¯ä¸»é¡µ
+"Average Customer Rating",客户平å‡åˆ†
+"Product Rating:",产å“评分：
+"Product Review (submitted on %1):","Product Review (submitted on %1):"
+"Back to Product Reviews",返回产å“评测
+"Allow Guests to Write Reviews","Allow Guests to Write Reviews"
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
index 859065b609a..e4c77558dd9 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -76,7 +76,7 @@
<?php else: ?>
<div class="message info empty"><span><?php echo __('You have submitted no reviews.') ?></span></div>
<?php endif; ?>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="secondary">
<a class="action back" href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>">
<span><?php echo __('Back') ?></span>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
index eae09a2a245..79f51333349 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
@@ -69,7 +69,7 @@
<div class="review content"><?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?></div>
</div>
</div>
-<div class="actions toolbar">
+<div class="actions-toolbar">
<div class="secondary">
<a class="action back" href="<?php echo $this->getBackUrl() ?>"><span><?php echo __('Back to My Reviews') ?></span></a>
</div>
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
index 037afd2746d..5a9b51ecd1d 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -87,7 +87,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" class="action submit primary"><span><?php echo __('Submit Review') ?></span></button>
</div>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index c4e37a08168..5cdc0be511e 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -38,7 +38,7 @@
</div>
<?php endif;?>
<div class="reviews actions">
- <a class="action view" href="<?php echo $url ?>"><?php echo $this->getReviewsCount() ?><span><?php echo __('Review(s)') ?></span></a>
+ <a class="action view" href="<?php echo $url ?>"><?php echo $this->getReviewsCount() ?> <span><?php echo ($this->getReviewsCount() == 1) ? __('Review') : __('Reviews') ?></span></a>
<a class="action add" href="<?php echo $urlForm ?>"><?php echo __('Add Your Review') ?></a>
</div>
</div>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
index 383aef5fbbc..804494a3bae 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
@@ -40,7 +40,7 @@
</div>
<?php endif;?>
<div class="reviews actions">
- <a class="action view" href="<?php echo $urlForm ?>"><?php echo $this->getReviewsCount() ?><span><?php echo __('Review(s)') ?></span></a>
+ <a class="action view" href="<?php echo $urlForm ?>"><?php echo $this->getReviewsCount() ?> <span><?php echo ($this->getReviewsCount() == 1) ? __('Review') : __('Reviews') ?></span></a>
</div>
</div>
<?php elseif ($this->getDisplayIfEmpty()): ?>
diff --git a/app/code/Magento/Rss/i18n/de_DE.csv b/app/code/Magento/Rss/i18n/de_DE.csv
index 4093b2e2f80..35b6fd52bb4 100644
--- a/app/code/Magento/Rss/i18n/de_DE.csv
+++ b/app/code/Magento/Rss/i18n/de_DE.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - Rabatte und Gutscheine"
-"%s - Special Products","%s - Sonderangebote"
-"%s RSS Feed","%s RSS-Feed"
-"%s has reached a quantity of %s.","%s hat eine Menge von %s erreicht."
-"%s's Wishlist","%ss Wunschzettel"
-"Cannot retrieve the wishlist","Kann den Wunschzettel nicht abrufen."
-"Catalog","Katalog"
-"Category Feeds","Feeds aus Kategorien"
+Subtotal,Zwischensumme
+Discount,Rabatt
+"Grand Total",Gesamtbetrag
+Tax,Steuer
+Catalog,Catalog
+From:,Von:
+To:,An:
+"Gift Message",Geschenkmitteilung
+Message:,Nachricht:
"Click for price","Klicken für den Preis"
-"Comment: %s<br/>","Kommentar: %s<br/>"
-"Coupons/Discounts","Gutscheine/Rabatte"
-"Current Status: %s<br/>","Aktueller Stand: %s<br/>"
-"Customer: %s","Kundenname: %s"
-"Customer Order Status Notification","Benachrichtigung zum Stand der Kundenbestellung"
-"Details for %s #%s","Details für %s #%s"
-"Discount","Rabatt"
-"Discount (%s)","Rabatt (%s)"
-"Enable RSS","RSS-Feed aktivieren"
-"Error in processing xml. %s","Fehler bei der XML-Bearbeitung von %s"
-"From:","Von:"
-"Get Feed","RSS-Feed abonnieren"
-"Gift Message","Geschenkmitteilung"
-"Grand Total","Gesamtbetrag"
-"Low Stock Products","Produkte aud dem geringen Lagerbestand"
-"Message:","Nachricht:"
-"Miscellaneous Feeds","Verschiedene RSS-Feeds"
-"New Orders","Neue Bestellungen"
"New Products","Neue Produkte"
-"New Products from %s","Neue Produkte von %s"
-"Notified Date: %s<br/>","Benachrichtigt am: %s<br/>"
-"Order %s Notification(s)","Benachrichtigung der Bestellung # von %s"
-"Order %s created at %s","Bestellung # von %s erstellt von %s"
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products","Produkte aud dem geringen Lagerbestand"
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
"Pending product review(s)","Ausstehender Produktbericht"
-"Product: ""%s"" review By: %s","Produkt: ""%s"" Bewertung Von: %s"
-"Product: <a href=""%s"">%s</a> <br/>","Produkt: <a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","Produkte gekennzeichnet mit %s"
-"Purchased From: %s","Gekauft von: %s"
-"RSS","RSS"
-"RSS Feeds","RSS-Feeds"
-"RSS Feeds List","Liste der RSS-Feeds"
-"RSS Feeds Section","Bereich RSS-Feeds"
-"Review: %s <br/>","Bericht: %s <br/>"
-"Rss Config","RSS Konfig"
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
+"Special Products",Sonderangebote
+Coupons/Discounts,Gutscheine/Rabatte
+"New Orders","Neue Bestellungen"
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds","Verschiedene RSS-Feeds"
+"Get Feed","RSS-Feed abonnieren"
+"Category Feeds","Feeds aus Kategorien"
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
"Shipping & Handling","Versand und Abwicklung"
-"Special Products","Sonderangebote"
-"Store: %s <br/>","Geschäft: %s <br/>"
-"Subtotal","Zwischensumme"
-"Summary of review: %s <br/>","Zusammenfassung des Berichtes: %s <br/>"
-"Tags Products","Gekennzeichnete Produkte"
-"Tax","Steuer"
-"There are no Rss Feeds","Es gibt keine RSS-Feeds."
-"To:","An:"
-"Top Level Category","Kategorie auf höchster Ebene"
-"Total: %s<br/>","Summe: %s<br/>"
-"Wishlist","Wunschzettel"
-"click <a href=""%s"">here</a> to view the review","Klicken Sie <a href=""%s"">hier</a> um die Bewertung zu sehen"
+"RSS Feeds",RSS-Feeds
+"Rss Config","Rss Config"
+"Enable RSS","Enable RSS"
+"Top Level Category","Top Level Category"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rss/i18n/en_US.csv b/app/code/Magento/Rss/i18n/en_US.csv
index 2781d474864..3115697730f 100644
--- a/app/code/Magento/Rss/i18n/en_US.csv
+++ b/app/code/Magento/Rss/i18n/en_US.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - Discounts and Coupons"
-"%s - Special Products","%s - Special Products"
-"%s RSS Feed","%s RSS Feed"
-"%s has reached a quantity of %s.","%s has reached a quantity of %s."
-"%s's Wishlist","%s's Wishlist"
-"Cannot retrieve the wishlist","Cannot retrieve the wishlist"
-"Catalog","Catalog"
-"Category Feeds","Category Feeds"
-"Click for price","Click for price"
-"Comment: %s<br/>","Comment: %s<br/>"
-"Coupons/Discounts","Coupons/Discounts"
-"Current Status: %s<br/>","Current Status: %s<br/>"
-"Customer: %s","Customer: %s"
-"Customer Order Status Notification","Customer Order Status Notification"
-"Details for %s #%s","Details for %s #%s"
-"Discount","Discount"
-"Discount (%s)","Discount (%s)"
-"Enable RSS","Enable RSS"
-"Error in processing xml. %s","Error in processing xml. %s"
-"From:","From:"
-"Get Feed","Get Feed"
-"Gift Message","Gift Message"
+Subtotal,Subtotal
+Discount,Discount
"Grand Total","Grand Total"
-"Low Stock Products","Low Stock Products"
-"Message:","Message:"
-"Miscellaneous Feeds","Miscellaneous Feeds"
-"New Orders","New Orders"
+Tax,Tax
+Catalog,Catalog
+From:,From:
+To:,To:
+"Gift Message","Gift Message"
+Message:,Message:
+"Click for price","Click for price"
"New Products","New Products"
-"New Products from %s","New Products from %s"
-"Notified Date: %s<br/>","Notified Date: %s<br/>"
-"Order %s Notification(s)","Order %s Notification(s)"
-"Order %s created at %s","Order %s created at %s"
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products","Low Stock Products"
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
"Pending product review(s)","Pending product review(s)"
-"Product: ""%s"" review By: %s","Product: ""%s"" review By: %s"
-"Product: <a href=""%s"">%s</a> <br/>","Product: <a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","Products tagged with %s"
-"Purchased From: %s","Purchased From: %s"
-"RSS","RSS"
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
+"Special Products","Special Products"
+Coupons/Discounts,Coupons/Discounts
+"New Orders","New Orders"
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds","Miscellaneous Feeds"
+"Get Feed","Get Feed"
+"Category Feeds","Category Feeds"
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Shipping & Handling"
"RSS Feeds","RSS Feeds"
-"RSS Feeds List","RSS Feeds List"
-"RSS Feeds Section","RSS Feeds Section"
-"Review: %s <br/>","Review: %s <br/>"
"Rss Config","Rss Config"
-"Shipping & Handling","Shipping & Handling"
-"Special Products","Special Products"
-"Store: %s <br/>","Store: %s <br/>"
-"Subtotal","Subtotal"
-"Summary of review: %s <br/>","Summary of review: %s <br/>"
-"Tags Products","Tags Products"
-"Tax","Tax"
-"There are no Rss Feeds","There are no Rss Feeds"
-"To:","To:"
+"Enable RSS","Enable RSS"
"Top Level Category","Top Level Category"
-"Total: %s<br/>","Total: %s<br/>"
-"Wishlist","Wishlist"
-"click <a href=""%s"">here</a> to view the review","click <a href=""%s"">here</a> to view the review"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rss/i18n/es_ES.csv b/app/code/Magento/Rss/i18n/es_ES.csv
index 4bfdde6c4e3..52bce2186bd 100644
--- a/app/code/Magento/Rss/i18n/es_ES.csv
+++ b/app/code/Magento/Rss/i18n/es_ES.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - Descuentos y cupones"
-"%s - Special Products","%s - Productos especiales"
-"%s RSS Feed","Fuente RSS de %s"
-"%s has reached a quantity of %s.","%s ha alcanzado una cantidad de %s"
-"%s's Wishlist","%s's Lista"
-"Cannot retrieve the wishlist","No se puede recuperar la lista de regalos"
-"Catalog","Catálogo"
-"Category Feeds","Fuentes por categorÃa"
-"Click for price","Clic para precio"
-"Comment: %s<br/>","Comentario: %s<br/>"
-"Coupons/Discounts","Cupones/descuentos"
-"Current Status: %s<br/>","Estado actual: %s<br/>"
-"Customer: %s","Estado actual: %s"
-"Customer Order Status Notification","Notificación de estado de pedido del cliente"
-"Details for %s #%s","Detalles para %s #%s"
-"Discount","Descuento"
-"Discount (%s)","Descuento (%s)"
-"Enable RSS","Activar RSS"
-"Error in processing xml. %s","Error al procesar xml. %s"
-"From:","Desde:"
-"Get Feed","Obtener fuente"
-"Gift Message","Mensaje de Regalo"
+Subtotal,Subtotal
+Discount,Descuento
"Grand Total","Suma total"
-"Low Stock Products","Productos con baja cantidad en inventario"
-"Message:","Mensaje:"
-"Miscellaneous Feeds","Fuentes varias"
-"New Orders","Nuevos pedidos"
+Tax,Impuestos
+Catalog,Catalog
+From:,Desde:
+To:,A:
+"Gift Message","Mensaje de Regalo"
+Message:,Mensaje:
+"Click for price","Clic para precio"
"New Products","Nuevos productos"
-"New Products from %s","Nuevos pedidos de %s"
-"Notified Date: %s<br/>","Fecha de notificación: %s<br/>"
-"Order %s Notification(s)","Notificaciones del pedido n.º %s"
-"Order %s created at %s","El pedido n.º %s se creó a las %s"
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products","Productos con baja cantidad en inventario"
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
"Pending product review(s)","Reseñas pendientes para el producto"
-"Product: ""%s"" review By: %s","Producto: valoración ""%s"" De: %s"
-"Product: <a href=""%s"">%s</a> <br/>","Producto: <a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","Productos etiquetados c %s"
-"Purchased From: %s","Comprados a %s"
-"RSS","RSS"
-"RSS Feeds","Fuentes RSS"
-"RSS Feeds List","Lista de fuentes RSS"
-"RSS Feeds Section","Sección de fuentes RSS"
-"Review: %s <br/>","Reseña: %s <br/>"
-"Rss Config","Configuración de RSS"
-"Shipping & Handling","EnvÃo y preparación"
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
"Special Products","Productos especiales"
-"Store: %s <br/>","Tienda: %s <br/>"
-"Subtotal","Subtotal"
-"Summary of review: %s <br/>","Resumen de reseña: %s <br/>"
-"Tags Products","Etiquetas de productos"
-"Tax","Impuestos"
-"There are no Rss Feeds","No hay fuentes RSS"
-"To:","A:"
-"Top Level Category","CategorÃa de nivel superior"
-"Total: %s<br/>","Total: %s<br/>"
-"Wishlist","Lista de deseos"
-"click <a href=""%s"">here</a> to view the review","haga clic <a href=""%s"">aquÃ</a> para ver la valoración"
+Coupons/Discounts,Cupones/descuentos
+"New Orders","Nuevos pedidos"
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds","Fuentes varias"
+"Get Feed","Obtener fuente"
+"Category Feeds","Fuentes por categorÃa"
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","EnvÃo y preparación"
+"RSS Feeds","Fuentes RSS"
+"Rss Config","Rss Config"
+"Enable RSS","Enable RSS"
+"Top Level Category","Top Level Category"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rss/i18n/fr_FR.csv b/app/code/Magento/Rss/i18n/fr_FR.csv
index fc34750285f..24f59bcac1e 100644
--- a/app/code/Magento/Rss/i18n/fr_FR.csv
+++ b/app/code/Magento/Rss/i18n/fr_FR.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - Promotions et Coupons"
-"%s - Special Products","%s - Produits spéciaux"
-"%s RSS Feed","%s Flux RSS"
-"%s has reached a quantity of %s.","%s a atteint une quantité de %s."
-"%s's Wishlist","Liste de cadeaux de %s"
-"Cannot retrieve the wishlist","Impossible de récupérer la liste de cadeaux"
-"Catalog","Catalogue"
-"Category Feeds","Flux de catégorie"
-"Click for price","Cliquez pour le prix"
-"Comment: %s<br/>","Commentaire : %s<br/>"
-"Coupons/Discounts","Coupons/promotions"
-"Current Status: %s<br/>","Statut actuel : %s<br/>"
-"Customer: %s","Nom du client : %s"
-"Customer Order Status Notification","Notification du statut de la commande du client"
-"Details for %s #%s","Détails pour %s #%s"
-"Discount","Discount"
-"Discount (%s)","Discount (%s)"
-"Enable RSS","Activer le flux RSS"
-"Error in processing xml. %s","Erreur lors du traitement xml. %s"
-"From:","De :"
-"Get Feed","Obtenir le flux"
-"Gift Message","Message cadeau"
+Subtotal,Sous-total
+Discount,Discount
"Grand Total","Total final"
-"Low Stock Products","Produits à stock faible"
-"Message:","Message :"
-"Miscellaneous Feeds","Flux divers"
-"New Orders","Nouvelles commandes"
+Tax,Taxe
+Catalog,Catalog
+From:,"De :"
+To:,"A :"
+"Gift Message","Message cadeau"
+Message:,"Message :"
+"Click for price","Cliquez pour le prix"
"New Products","Nouveaux produits"
-"New Products from %s","Nouveaux produits de %s"
-"Notified Date: %s<br/>","Date notifiée : %s<br/>"
-"Order %s Notification(s)","Commander # %s notification(s)"
-"Order %s created at %s","Commande #%s créée à %s"
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products","Produits à stock faible"
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
"Pending product review(s)","Produits en attente de critique(s)"
-"Product: ""%s"" review By: %s","Produit : ""%s"" commenté par : %s"
-"Product: <a href=""%s"">%s</a> <br/>","Produit : <a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","Produit tagué avec %s"
-"Purchased From: %s","Acheté de : %s"
-"RSS","RSS"
-"RSS Feeds","Flux RSS"
-"RSS Feeds List","Liste des flux RSS"
-"RSS Feeds Section","Section flux RSS"
-"Review: %s <br/>","Critique : %s <br/>"
-"Rss Config","Configuration RSS"
-"Shipping & Handling","Expédition & Traitement"
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
"Special Products","Produits spéciaux"
-"Store: %s <br/>","Boutique : %s <br/>"
-"Subtotal","Sous-total"
-"Summary of review: %s <br/>","Résumé des critiques : %s <br/>"
-"Tags Products","Tags des produits"
-"Tax","Taxe"
-"There are no Rss Feeds","Il n'y a pas de flux RSS"
-"To:","A :"
-"Top Level Category","Catégorie de premier niveau"
-"Total: %s<br/>","Total : %s<br/>"
-"Wishlist","Liste de cadeaux"
-"click <a href=""%s"">here</a> to view the review","cliquez <a href=""%s"">ici</a> pour voir le commentaire"
+Coupons/Discounts,Coupons/promotions
+"New Orders","Nouvelles commandes"
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds","Flux divers"
+"Get Feed","Obtenir le flux"
+"Category Feeds","Flux de catégorie"
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Expédition & Traitement"
+"RSS Feeds","Flux RSS"
+"Rss Config","Rss Config"
+"Enable RSS","Enable RSS"
+"Top Level Category","Top Level Category"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rss/i18n/nl_NL.csv b/app/code/Magento/Rss/i18n/nl_NL.csv
index 9d26ecaaf9d..05d13dbc917 100644
--- a/app/code/Magento/Rss/i18n/nl_NL.csv
+++ b/app/code/Magento/Rss/i18n/nl_NL.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - Kortingen en Waardebonnen"
-"%s - Special Products","%s - Speciale Producten"
-"%s RSS Feed","%s RSS Feed"
-"%s has reached a quantity of %s.","%s heeft een kwantiteit van %s bereikt."
-"%s's Wishlist","%s's Wensenlijst"
-"Cannot retrieve the wishlist","Kan de wensenlijst niet ontvangen"
-"Catalog","Catalogus"
-"Category Feeds","Categorie feeds"
+Subtotal,Subtotaal
+Discount,Korting
+"Grand Total",Totaal
+Tax,Belasting
+Catalog,Catalog
+From:,Van:
+To:,Aan:
+"Gift Message",Cadeauboodschap
+Message:,Bericht:
"Click for price","Klik voor de prijs"
-"Comment: %s<br/>","Commentaar: %s<br/>"
-"Coupons/Discounts","Waardebonnen/Kortingen"
-"Current Status: %s<br/>","Huidige Status: %s<br/>"
-"Customer: %s","Klant Naam: %s"
-"Customer Order Status Notification","Klant Bestelling Status Notificatie"
-"Details for %s #%s","Details over %s #%s"
-"Discount","Korting"
-"Discount (%s)","Korting (%s)"
-"Enable RSS","Schakel RSS in"
-"Error in processing xml. %s","Fout in het verwerken van XML. %s"
-"From:","Van:"
-"Get Feed","Verkrijg Feed"
-"Gift Message","Cadeauboodschap"
-"Grand Total","Totaal"
-"Low Stock Products","Lage Voorraad Producten"
-"Message:","Bericht:"
-"Miscellaneous Feeds","Diverse Feeds"
-"New Orders","Nieuwe Bestellingen"
"New Products","Nieuwe Producten"
-"New Products from %s","Nieuwe Producten van %s"
-"Notified Date: %s<br/>","Aangekondigde Datum: %s<br/>"
-"Order %s Notification(s)","Bestelling # %s Notificatie(s)"
-"Order %s created at %s","Bestelling #%s aangemaakt op %s"
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products","Lage Voorraad Producten"
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
"Pending product review(s)","In afwachting van productbeoordeling(en)"
-"Product: ""%s"" review By: %s","Product: ""%s"" beoordeling door: %s"
-"Product: <a href=""%s"">%s</a> <br/>","Product: <a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","Producten getagd met %s"
-"Purchased From: %s","Gekocht Van: %s"
-"RSS","RSS"
-"RSS Feeds","RSS Feeds"
-"RSS Feeds List","RSS Feeds Lijst"
-"RSS Feeds Section","RSS Feeds Sectie"
-"Review: %s <br/>","Beoordeling: %s <br/>"
-"Rss Config","Rss Instellingen"
-"Shipping & Handling","Verzending & in Behandeling"
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
"Special Products","Speciale Producten"
-"Store: %s <br/>","Winkel: %s <br/>"
-"Subtotal","Subtotaal"
-"Summary of review: %s <br/>","Samenvatting van beoordeling: %s <br/>"
-"Tags Products","Tags Producten"
-"Tax","Belasting"
-"There are no Rss Feeds","Er zijn geen RSS feeds"
-"To:","Aan:"
-"Top Level Category","Hoogste niveau categorie"
-"Total: %s<br/>","Totaal: %s<br/>"
-"Wishlist","Verlanglijst"
-"click <a href=""%s"">here</a> to view the review","klik <a href=""%s"">hier</a> om de beoordeling te bekijken"
+Coupons/Discounts,Waardebonnen/Kortingen
+"New Orders","Nieuwe Bestellingen"
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds","Diverse Feeds"
+"Get Feed","Verkrijg Feed"
+"Category Feeds","Categorie feeds"
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Verzending & in Behandeling"
+"RSS Feeds","RSS Feeds"
+"Rss Config","Rss Config"
+"Enable RSS","Enable RSS"
+"Top Level Category","Top Level Category"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rss/i18n/pt_BR.csv b/app/code/Magento/Rss/i18n/pt_BR.csv
index 2c0b5c7b49b..42b90e2a5e6 100644
--- a/app/code/Magento/Rss/i18n/pt_BR.csv
+++ b/app/code/Magento/Rss/i18n/pt_BR.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - Descontos e cupons"
-"%s - Special Products","%s - Produtos especiais"
-"%s RSS Feed","%s RSS Feed"
-"%s has reached a quantity of %s.","%s atingiu a quantia de %s."
-"%s's Wishlist","Lista de presente de %s\"
-"Cannot retrieve the wishlist","Não é possÃvel recuperar a lista de presente"
-"Catalog","Catálogo"
-"Category Feeds","Feeds da categoria"
-"Click for price","Clique para o preço"
-"Comment: %s<br/>","Comentário: %s<br/>"
-"Coupons/Discounts","Cupons/Descontos"
-"Current Status: %s<br/>","Status atual: %s<br>"
-"Customer: %s","Nome do cliente: %s"
-"Customer Order Status Notification","Notificação de status do pedido do cliente"
-"Details for %s #%s","Detalhes para %s #%s"
-"Discount","Desconto"
-"Discount (%s)","Desconto (%s)"
-"Enable RSS","Habilitar RSS"
-"Error in processing xml. %s","Erro ao processar xml. %s"
-"From:","De:"
-"Get Feed","Receber Feed"
-"Gift Message","Mensagem de presente"
+Subtotal,Subtotal
+Discount,Desconto
"Grand Total","Total geral"
-"Low Stock Products","Produtos com estoque reduzido"
-"Message:","Mensagem:"
-"Miscellaneous Feeds","Feeds diversos"
-"New Orders","Novos pedidos"
+Tax,Taxas
+Catalog,Catalog
+From:,De:
+To:,Para:
+"Gift Message","Mensagem de presente"
+Message:,Mensagem:
+"Click for price","Clique para o preço"
"New Products","Novos Produtos"
-"New Products from %s","Novos produtos de %s"
-"Notified Date: %s<br/>","Data de notificação: %s<br/>"
-"Order %s Notification(s)","Notificação(ões) de pedido(s) # %s"
-"Order %s created at %s","Pedido #%s criado em %s"
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products","Produtos com estoque reduzido"
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
"Pending product review(s)","Esperando avaliação(ões) do produto"
-"Product: ""%s"" review By: %s","Produto: ""%s"" avaliado Por: %s"
-"Product: <a href=""%s"">%s</a> <br/>","Produto: <a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","Produtos marcados com %s"
-"Purchased From: %s","Comprado de: %s"
-"RSS","RSS"
-"RSS Feeds","RSS Feeds"
-"RSS Feeds List","Lista de RSS Feeds"
-"RSS Feeds Section","Seção de Feeds RSS"
-"Review: %s <br/>","Avaliação: %s <br/>"
-"Rss Config","Configuração de RSS"
-"Shipping & Handling","Transporte & Manuseio"
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
"Special Products","Produtos especiais"
-"Store: %s <br/>","Loja: %s <br/>"
-"Subtotal","Subtotal"
-"Summary of review: %s <br/>","Resumo de avaliação: %s <br/>"
-"Tags Products","Produtos com marcas"
-"Tax","Taxas"
-"There are no Rss Feeds","Não há Rss Feeds"
-"To:","Para:"
-"Top Level Category","Categoria de nÃvel máximo"
-"Total: %s<br/>","Total: %s<br/>"
-"Wishlist","Lista de presentes"
-"click <a href=""%s"">here</a> to view the review","clique <a href=""%s"">aqui</a> para visualizar a análise"
+Coupons/Discounts,Cupons/Descontos
+"New Orders","Novos pedidos"
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds","Feeds diversos"
+"Get Feed","Receber Feed"
+"Category Feeds","Feeds da categoria"
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Transporte & Manuseio"
+"RSS Feeds","RSS Feeds"
+"Rss Config","Rss Config"
+"Enable RSS","Enable RSS"
+"Top Level Category","Top Level Category"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rss/i18n/zh_CN.csv b/app/code/Magento/Rss/i18n/zh_CN.csv
index d95ecdb96ba..719163ef6a9 100644
--- a/app/code/Magento/Rss/i18n/zh_CN.csv
+++ b/app/code/Magento/Rss/i18n/zh_CN.csv
@@ -1,56 +1,56 @@
-"%s - Discounts and Coupons","%s - 折扣与代金券"
-"%s - Special Products","%s - 特价产å“"
-"%s RSS Feed","%s RSSæº"
-"%s has reached a quantity of %s.","%s å·²ç»è¾¾åˆ°äº†ä¸€äº› %s"
-"%s's Wishlist","%s 的愿望清å•"
-"Cannot retrieve the wishlist","æ— æ³•èŽ·å–愿望清å•"
-"Catalog","分类"
-"Category Feeds","分类æº"
-"Click for price","å•å‡»èŽ·å–ä»·æ ¼"
-"Comment: %s<br/>","评论：%s <br/>"
-"Coupons/Discounts","代金券/折扣"
-"Current Status: %s<br/>","当å‰çŠ¶æ€ï¼š%s <br/>"
-"Customer: %s","客户姓å：%s"
-"Customer Order Status Notification","客户订å•çŠ¶æ€é€šçŸ¥"
-"Details for %s #%s","%s #%s的详情"
-"Discount","折扣"
-"Discount (%s)","折扣（%s）"
-"Enable RSS","å¯ç”¨RSS"
-"Error in processing xml. %s","处ç†xml时出错。%s"
-"From:","æ¥è‡ªï¼š"
-"Get Feed","获å–æº"
-"Gift Message","礼å“消æ¯"
-"Grand Total","总计"
-"Low Stock Products","产å“库å˜ä½Ž"
-"Message:","ä¿¡æ¯ï¼š"
-"Miscellaneous Feeds","æ‚项æºè®¢é˜…"
-"New Orders","新订å•"
-"New Products","新产å“"
-"New Products from %s","新产å“æ¥è‡ª %s"
-"Notified Date: %s<br/>","通知日期：%s<br/>"
-"Order %s Notification(s)","è®¢å• # %s 通知"
-"Order %s created at %s","è®¢å• # %s 已于 %s 创建"
-"Pending product review(s)","未决的产å“评论"
-"Product: ""%s"" review By: %s","产å“：“%s†由 %s 评论"
-"Product: <a href=""%s"">%s</a> <br/>","产å“：<a href=""%s"">%s</a> <br/>"
-"Products tagged with %s","å·²æ ‡è®° %s 的产å“"
-"Purchased From: %s","è´ä¹°è‡ªï¼š%s"
-"RSS","RSS"
+Subtotal,å°è®¡
+Discount,折扣
+"Grand Total",总计
+Tax,ä¼ çœŸ
+Catalog,Catalog
+From:,æ¥è‡ªï¼š
+To:,至：
+"Gift Message",礼å“消æ¯
+Message:,ä¿¡æ¯ï¼š
+"Click for price",å•å‡»èŽ·å–ä»·æ ¼
+"New Products",新产å“
+Wishlist,Wishlist
+"New Products from %1","New Products from %1"
+"Low Stock Products",产å“库å˜ä½Ž
+"%1 has reached a quantity of %2.","%1 has reached a quantity of %2."
+"Pending product review(s)",未决的产å“评论
+"Product: <a href=""%1"" target=""_blank"">%2</a> <br/>","Product: <a href=""%1"" target=""_blank"">%2</a> <br/>"
+"Summary of review: %1 <br/>","Summary of review: %1 <br/>"
+"Review: %1 <br/>","Review: %1 <br/>"
+"Store: %1 <br/>","Store: %1 <br/>"
+"Click <a href=""%1"">here</a> to view the review.","Click <a href=""%1"">here</a> to view the review."
+"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2"
+"%1 - Discounts and Coupons","%1 - Discounts and Coupons"
+"%1 - Special Products","%1 - Special Products"
+"Special Expires On: %1","Special Expires On: %1"
+"Price: %1","Price: %1"
+"Special Price: %1","Special Price: %1"
+"Special Products",特殊商å“
+Coupons/Discounts,代金券/折扣
+"New Orders",新订å•
+"Order #%1 created at %2","Order #%1 created at %2"
+"Order # %1 Notification(s)","Order # %1 Notification(s)"
+"Details for %1 #%2","Details for %1 #%2"
+"Notified Date: %1<br/>","Notified Date: %1<br/>"
+"Comment: %1<br/>","Comment: %1<br/>"
+"Current Status: %1<br/>","Current Status: %1<br/>"
+"Total: %1<br/>","Total: %1<br/>"
+"%1's Wishlist","%1's Wishlist"
+Comment:,Comment:
+"We cannot retrieve the wish list.","We cannot retrieve the wish list."
+"There was no RSS feed enabled.","There was no RSS feed enabled."
+"Error in processing xml. %1","Error in processing xml. %1"
+"Subscribe to RSS Feed","Subscribe to RSS Feed"
+"Miscellaneous Feeds",æ‚项æºè®¢é˜…
+"Get Feed",获å–æº
+"Category Feeds",分类æº
+"There are no Rss Feeds.","There are no Rss Feeds."
+"Customer Name: %1","Customer Name: %1"
+"Purchased From: %1","Purchased From: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling",è¿é€ä¸Žæ‰‹ç»è´¹
"RSS Feeds","RSS 订阅æº"
-"RSS Feeds List","RSS 订阅æºåˆ—表"
-"RSS Feeds Section","RSS æºé€‰åŒº"
-"Review: %s <br/>","评价：%s <br/>"
-"Rss Config","RSS é…ç½®"
-"Shipping & Handling","è¿é€ä¸Žæ‰‹ç»è´¹"
-"Special Products","特殊商å“"
-"Store: %s <br/>","商店：%s <br/>"
-"Subtotal","å°è®¡"
-"Summary of review: %s <br/>","评论摘è¦ï¼š%s <br/>"
-"Tags Products","æ ‡è®°äº§å“"
-"Tax","ä¼ çœŸ"
-"There are no Rss Feeds","没有RSSæº"
-"To:","至："
-"Top Level Category","顶级分类"
-"Total: %s<br/>","总数：%s <br/>"
-"Wishlist","愿望清å•"
-"click <a href=""%s"">here</a> to view the review","点击 <a href=""%s"">这里</a> 查看评测"
+"Rss Config","Rss Config"
+"Enable RSS","Enable RSS"
+"Top Level Category","Top Level Category"
+"Customer Order Status Notification","Customer Order Status Notification"
diff --git a/app/code/Magento/Rule/Helper/Data.php b/app/code/Magento/Rule/Helper/Data.php
deleted file mode 100644
index 82a5ce6d860..00000000000
--- a/app/code/Magento/Rule/Helper/Data.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Rule data helper
- */
-namespace Magento\Rule\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
-{
-}
diff --git a/app/code/Magento/Rule/i18n/de_DE.csv b/app/code/Magento/Rule/i18n/de_DE.csv
index c45186c6aec..05d08f9aec3 100644
--- a/app/code/Magento/Rule/i18n/de_DE.csv
+++ b/app/code/Magento/Rule/i18n/de_DE.csv
@@ -1,39 +1,33 @@
-"ALL","ALLE"
-"ANY","JEDE"
-"Add","Hinzufügen"
-"Apply","Anwenden"
-"Conditions Combination","Bedingungenkombination"
-"Customer Groups must be specified.","Die Kundengruppen müssen angegeben werden."
-"End Date must be greater than Start Date.","Das Enddatum muss hinter dem Anfangsdatum liegen."
-"FALSE","FALSCH"
-"If %s of these conditions are %s:","Wenn %s dieser Bedingungen sind %s:"
-"Invalid discount amount.","Ungültiger Rabattbetrag:"
+Remove,Entfernen
+Apply,Anwenden
+Add,Hinzufügen
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
+"Conditions Combination",Bedingungenkombination
+contains,enthält
"Open Chooser","Auswahl öffnen"
-"Perform following actions","Folgende Aktionen ausführen"
-"Please choose a condition to add...","Bitte wählen Sie eine Bedingung, die hinzugefügt werden soll..."
-"Please choose an action to add...","Bitte wählen Sie eine Aktion, die hinzugefügt werden soll..."
-"Remove","Entfernen"
-"TRUE","WAHR"
-"Websites must be specified.","Die Webseiten müssen angegeben werden."
-"by","von"
-"contains","enthält"
-"does not contain","enthält nicht"
-"does not contains","enthält nicht"
+"is one of","ist einer von"
+"is not one of","ist nicht einer von"
"equals or greater than","gleich oder größer als"
"equals or less than","gleich oder kleiner als"
-"for","für"
-"for greater than","für größer als"
-"for or greater than","für oder größer als"
-"found","gefunden"
-"from","von"
"greater than","größer als"
-"is","ist"
-"is not","ist nicht"
-"is not one of","ist nicht einer von"
-"is one of","ist einer von"
"less than","weniger als"
-"not found","nicht gefunden"
-"not from","nicht von"
-"to","bis"
-"was","war"
-"was not","war nicht"
+is,ist
+"is not","ist nicht"
+"Invalid discount amount.","Ungültiger Rabattbetrag:"
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.","Die Webseiten müssen angegeben werden."
+"Customer Groups must be specified.","Die Kundengruppen müssen angegeben werden."
+to,bis
+by,von
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions","Folgende Aktionen ausführen"
+"does not contain","enthält nicht"
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,ALLE
+ANY,JEDE
+TRUE,WAHR
+FALSE,FALSCH
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Rule/i18n/en_US.csv b/app/code/Magento/Rule/i18n/en_US.csv
index b78a2afca06..bdbdc90e3b0 100644
--- a/app/code/Magento/Rule/i18n/en_US.csv
+++ b/app/code/Magento/Rule/i18n/en_US.csv
@@ -1,39 +1,33 @@
-"ALL","ALL"
-"ANY","ANY"
-"Add","Add"
-"Apply","Apply"
+Remove,Remove
+Apply,Apply
+Add,Add
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
"Conditions Combination","Conditions Combination"
-"Customer Groups must be specified.","Customer Groups must be specified."
-"End Date must be greater than Start Date.","End Date must be greater than Start Date."
-"FALSE","FALSE"
-"If %s of these conditions are %s:","If %s of these conditions are %s:"
-"Invalid discount amount.","Invalid discount amount."
+contains,contains
"Open Chooser","Open Chooser"
-"Perform following actions","Perform following actions"
-"Please choose a condition to add...","Please choose a condition to add..."
-"Please choose an action to add...","Please choose an action to add..."
-"Remove","Remove"
-"TRUE","TRUE"
-"Websites must be specified.","Websites must be specified."
-"by","by"
-"contains","contains"
-"does not contain","does not contain"
-"does not contains","does not contains"
+"is one of","is one of"
+"is not one of","is not one of"
"equals or greater than","equals or greater than"
"equals or less than","equals or less than"
-"for","for"
-"for greater than","for greater than"
-"for or greater than","for or greater than"
-"found","found"
-"from","from"
"greater than","greater than"
-"is","is"
-"is not","is not"
-"is not one of","is not one of"
-"is one of","is one of"
"less than","less than"
-"not found","not found"
-"not from","not from"
-"to","to"
-"was","was"
-"was not","was not"
+is,is
+"is not","is not"
+"Invalid discount amount.","Invalid discount amount."
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.","Websites must be specified."
+"Customer Groups must be specified.","Customer Groups must be specified."
+to,to
+by,by
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions","Perform following actions"
+"does not contain","does not contain"
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,ALL
+ANY,ANY
+TRUE,TRUE
+FALSE,FALSE
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Rule/i18n/es_ES.csv b/app/code/Magento/Rule/i18n/es_ES.csv
index bd99448eb2f..ad7b7b3b5c7 100644
--- a/app/code/Magento/Rule/i18n/es_ES.csv
+++ b/app/code/Magento/Rule/i18n/es_ES.csv
@@ -1,39 +1,33 @@
-"ALL","TODO"
-"ANY","ALGUNOS"
-"Add","Agregar"
-"Apply","Solicitar"
+Remove,Eliminar
+Apply,Solicitar
+Add,Agregar
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
"Conditions Combination","Combinación de condiciones"
-"Customer Groups must be specified.","Se deben especificar los grupos de clientes."
-"End Date must be greater than Start Date.","La fecha de cierre debe ser posterior a la fecha de comienzo."
-"FALSE","FALSO"
-"If %s of these conditions are %s:","Si %s de estas condiciones son %s:"
-"Invalid discount amount.","La cantidad del descuento no es válida."
+contains,contiene
"Open Chooser","Abrir selector"
-"Perform following actions","Realizar las siguientes acciones"
-"Please choose a condition to add...","Por favor, elige una condición para añadir..."
-"Please choose an action to add...","Elija una opción para añadir..."
-"Remove","Eliminar"
-"TRUE","VERDADERO"
-"Websites must be specified.","Se deben especificar las páginas web."
-"by","por"
-"contains","contiene"
-"does not contain","no contiene"
-"does not contains","no contiene"
+"is one of","es uno de"
+"is not one of","no es uno de"
"equals or greater than","igual o mayor que"
"equals or less than","igual o menor que"
-"for","para"
-"for greater than","para mayor que"
-"for or greater than","para o mayor que"
-"found","Encontrado."
-"from","desde"
"greater than","mayor que"
-"is","Es."
-"is not","No es."
-"is not one of","no es uno de"
-"is one of","es uno de"
"less than","menor que"
-"not found","No encontrado."
-"not from","no desde"
-"to","a"
-"was","fue"
-"was not","no fue"
+is,Es.
+"is not","No es."
+"Invalid discount amount.","La cantidad del descuento no es válida."
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.","Se deben especificar las páginas web."
+"Customer Groups must be specified.","Se deben especificar los grupos de clientes."
+to,a
+by,por
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions","Realizar las siguientes acciones"
+"does not contain","no contiene"
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,TODO
+ANY,ALGUNOS
+TRUE,VERDADERO
+FALSE,FALSO
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Rule/i18n/fr_FR.csv b/app/code/Magento/Rule/i18n/fr_FR.csv
index 4aa9ae058bb..cc9555df6a9 100644
--- a/app/code/Magento/Rule/i18n/fr_FR.csv
+++ b/app/code/Magento/Rule/i18n/fr_FR.csv
@@ -1,39 +1,33 @@
-"ALL","TOUS"
-"ANY","N'IMPORTE LEQUEL"
-"Add","Ajouter"
-"Apply","Appliquer"
+Remove,Supprimer
+Apply,Appliquer
+Add,Ajouter
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
"Conditions Combination","Combinaison de conditions"
-"Customer Groups must be specified.","Les groupes clients doivent être spécifiés."
-"End Date must be greater than Start Date.","La date de fin doit être supérieure à la date de début."
-"FALSE","FAUX"
-"If %s of these conditions are %s:","Si %s de ces conditions sont %s:"
-"Invalid discount amount.","Montant de réduction invalide"
+contains,contient
"Open Chooser","Ouvrir choisisseur"
-"Perform following actions","Exécuter les actions suivantes"
-"Please choose a condition to add...","Choisissez une condition à ajouter..."
-"Please choose an action to add...","Choisissez une action à ajouter..."
-"Remove","Supprimer"
-"TRUE","VRAI"
-"Websites must be specified.","Les sites internet doivent être spécifiés."
-"by","par"
-"contains","contient"
-"does not contain","ne contient pas"
-"does not contains","ne contient pas"
+"is one of","est un de"
+"is not one of","n'est pas un de"
"equals or greater than","supérieur ou égal à "
"equals or less than","inférieur ou égal à "
-"for","pour"
-"for greater than","pour supérieur à "
-"for or greater than","pour ou supérieur à "
-"found","trouvé"
-"from","de"
"greater than","plus grand que"
-"is","est"
-"is not","n'est pas"
-"is not one of","n'est pas un de"
-"is one of","est un de"
"less than","inférieur à "
-"not found","pas trouvé"
-"not from","pas un des"
-"to","Ã "
-"was","était"
-"was not","n'était pas"
+is,est
+"is not","n'est pas"
+"Invalid discount amount.","Montant de réduction invalide"
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.","Les sites internet doivent être spécifiés."
+"Customer Groups must be specified.","Les groupes clients doivent être spécifiés."
+to,Ã
+by,par
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions","Exécuter les actions suivantes"
+"does not contain","ne contient pas"
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,TOUS
+ANY,"N'IMPORTE LEQUEL"
+TRUE,VRAI
+FALSE,FAUX
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Rule/i18n/nl_NL.csv b/app/code/Magento/Rule/i18n/nl_NL.csv
index d89492b9b39..71ff4c40a6d 100644
--- a/app/code/Magento/Rule/i18n/nl_NL.csv
+++ b/app/code/Magento/Rule/i18n/nl_NL.csv
@@ -1,39 +1,33 @@
-"ALL","ALLE"
-"ANY","ELKE"
-"Add","Toevoegen"
-"Apply","Toepassen"
+Remove,Verwijderen
+Apply,Toepassen
+Add,Toevoegen
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
"Conditions Combination","Voorwaarden Combinatie"
-"Customer Groups must be specified.","Klanten groep moeten worden opgegeven."
-"End Date must be greater than Start Date.","Einddatum moet later zijn dan Begindatum."
-"FALSE","VALS"
-"If %s of these conditions are %s:","Als %s van deze conditions %s zijn:"
-"Invalid discount amount.","Ongeldige hoeveelheid korting."
+contains,bevat
"Open Chooser","Open Kiezer"
-"Perform following actions","Voer volgende acties uit"
-"Please choose a condition to add...","Kies een conditie om toe te voegen..."
-"Please choose an action to add...","Kies een actie om toe te voegen..."
-"Remove","Verwijderen"
-"TRUE","WAAR"
-"Websites must be specified.","Websites moeten worden opgegeven."
-"by","door"
-"contains","bevat"
-"does not contain","Bevat niet"
-"does not contains","Bevat niet"
+"is one of","is een van de"
+"is not one of","is niet een van de"
"equals or greater than","Gelijk aan of minder dan"
"equals or less than","Gelijk aan of minder dan"
-"for","voor"
-"for greater than","indien groter dan"
-"for or greater than","indien gelijk aan of groter dan"
-"found","gevonden"
-"from","van"
"greater than","groter dan"
-"is","is"
-"is not","is niet"
-"is not one of","is niet een van de"
-"is one of","is een van de"
"less than","minder dan"
-"not found","niet gevonden"
-"not from","niet van"
-"to","naar"
-"was","was"
-"was not","was niet"
+is,is
+"is not","is niet"
+"Invalid discount amount.","Ongeldige hoeveelheid korting."
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.","Websites moeten worden opgegeven."
+"Customer Groups must be specified.","Klanten groep moeten worden opgegeven."
+to,naar
+by,door
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions","Voer volgende acties uit"
+"does not contain","Bevat niet"
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,ALLE
+ANY,ELKE
+TRUE,WAAR
+FALSE,VALS
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Rule/i18n/pt_BR.csv b/app/code/Magento/Rule/i18n/pt_BR.csv
index a6730c55079..7a31980ab6d 100644
--- a/app/code/Magento/Rule/i18n/pt_BR.csv
+++ b/app/code/Magento/Rule/i18n/pt_BR.csv
@@ -1,39 +1,33 @@
-"ALL","TUDO"
-"ANY","QUALQUER UM"
-"Add","Adicionar"
-"Apply","Solicitar"
+Remove,Remover
+Apply,Solicitar
+Add,Adicionar
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
"Conditions Combination","Combinação de condições"
-"Customer Groups must be specified.","Os Grupos de Clientes devem ser especificados."
-"End Date must be greater than Start Date.","Data Final deve ser maior do que a Data de InÃcio."
-"FALSE","FALSO"
-"If %s of these conditions are %s:","Se %s dessas condições são %s:"
-"Invalid discount amount.","Quantidade de desconto inválida."
+contains,contém
"Open Chooser","Abrir Seletor"
-"Perform following actions","Executar seguintes ações"
-"Please choose a condition to add...","Por favor escolha uma condição para adicionar..."
-"Please choose an action to add...","Por favor, selecione uma ação para adicionar..."
-"Remove","Remover"
-"TRUE","VERDADEIRO"
-"Websites must be specified.","Os Websites devem ser especificados."
-"by","por"
-"contains","contém"
-"does not contain","não contém"
-"does not contains","não contêm"
+"is one of","é um de"
+"is not one of","não é um de"
"equals or greater than","é igual ou maior que"
"equals or less than","é igual ou menor que"
-"for","para"
-"for greater than","para mais de"
-"for or greater than","para ou superior a"
-"found","encontrado"
-"from","de"
"greater than","superior a"
-"is","é"
-"is not","não é"
-"is not one of","não é um de"
-"is one of","é um de"
"less than","menos que"
-"not found","não encontrado"
-"not from","não de"
-"to","para"
-"was","era"
-"was not","não era"
+is,é
+"is not","não é"
+"Invalid discount amount.","Quantidade de desconto inválida."
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.","Os Websites devem ser especificados."
+"Customer Groups must be specified.","Os Grupos de Clientes devem ser especificados."
+to,para
+by,por
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions","Executar seguintes ações"
+"does not contain","não contém"
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,TUDO
+ANY,"QUALQUER UM"
+TRUE,VERDADEIRO
+FALSE,FALSO
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Rule/i18n/zh_CN.csv b/app/code/Magento/Rule/i18n/zh_CN.csv
index e7721991feb..5e55eb6a759 100644
--- a/app/code/Magento/Rule/i18n/zh_CN.csv
+++ b/app/code/Magento/Rule/i18n/zh_CN.csv
@@ -1,39 +1,33 @@
-"ALL","全部"
-"ANY","ä»»æ„"
-"Add","æ·»åŠ "
-"Apply","应用"
-"Conditions Combination","æ¡ä»¶ç»„åˆ"
-"Customer Groups must be specified.","必须指定顾客群体。"
-"End Date must be greater than Start Date.","结æŸæ—¥æœŸå¿…须大于开始日期。"
-"FALSE","å¦"
-"If %s of these conditions are %s:","如果 %s 个这些æ¡ä»¶ä¸º%s："
-"Invalid discount amount.","æ— æ•ˆçš„æŠ˜æ‰£é¢ã€‚"
-"Open Chooser","打开选择器"
-"Perform following actions","执行下列æ“作"
-"Please choose a condition to add...","请选择è¦æ·»åŠ çš„æ¡ä»¶..."
-"Please choose an action to add...","请选择一个è¦æ·»åŠ çš„æ“作..."
-"Remove","åˆ é™¤"
-"TRUE","真"
-"Websites must be specified.","必须指定网站。"
-"by","ç”±"
-"contains","包å«"
-"does not contain","ä¸åŒ…å«"
-"does not contains","ä¸åŒ…å«"
-"equals or greater than","ç‰äºŽæˆ–大于"
-"equals or less than","ç‰äºŽæˆ–å°äºŽ"
-"for","为"
-"for greater than","大于"
-"for or greater than","或大于"
-"found","找到"
-"from","æ¥è‡ª"
-"greater than","大于"
-"is","是"
-"is not","éž"
-"is not one of","ä¸å±žäºŽ"
-"is one of","属于"
-"less than","å°äºŽ"
-"not found","未找到"
-"not from","éžæ¥è‡ª"
-"to","至"
-"was","曾是"
-"was not","曾ä¸æ˜¯"
+Remove,åˆ é™¤
+Apply,应用
+Add,æ·»åŠ
+"Please wait, loading...","Please wait, loading..."
+"Attribute Set","Attribute Set"
+Category,Category
+"Conditions Combination",æ¡ä»¶ç»„åˆ
+contains,包å«
+"Open Chooser",打开选择器
+"is one of",属于
+"is not one of",ä¸å±žäºŽ
+"equals or greater than",ç‰äºŽæˆ–大于
+"equals or less than",ç‰äºŽæˆ–å°äºŽ
+"greater than",大于
+"less than",å°äºŽ
+is,是
+"is not",éž
+"Invalid discount amount.",æ— æ•ˆçš„æŠ˜æ‰£é¢ã€‚
+"End Date must follow Start Date.","End Date must follow Start Date."
+"Websites must be specified.",必须指定网站。
+"Customer Groups must be specified.",必须指定顾客群体。
+to,至
+by,ç”±
+"Please choose an action to add.","Please choose an action to add."
+"Perform following actions",执行下列æ“作
+"does not contain",ä¸åŒ…å«
+"Please choose a condition to add.","Please choose a condition to add."
+ALL,全部
+ANY,ä»»æ„
+TRUE,真
+FALSE,å¦
+"If %1 of these conditions are %2:","If %1 of these conditions are %2:"
+"There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""."
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index 2becbcd9c0f..7b2a38dd403 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -72,6 +72,9 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
* Compose and get order full history.
* Consists of the status history comments as well as of invoices, shipments and creditmemos creations
*
+ * @TODO This method requires refactoring. Need to create separate model for comment history handling
+ * and avoid generating it dynamically
+ *
* @return array
*/
public function getFullHistory()
@@ -147,7 +150,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
);
}
- usort($history, array(__CLASS__, "_sortHistoryByTimestamp"));
+ usort($history, array(__CLASS__, 'sortHistoryByTimestamp'));
return $history;
}
@@ -303,7 +306,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
* @param mixed $b
* @return int
*/
- private static function _sortHistoryByTimestamp($a, $b)
+ public static function sortHistoryByTimestamp($a, $b)
{
$createdAtA = $a['created_at'];
$createdAtB = $b['created_at'];
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index f2071482109..c8abfbb376e 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1488,7 +1488,8 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
$request = $form->prepareRequest($accountData);
$data = $form->extractData($request);
$data = $form->restoreData($data);
- $this->getQuote()->updateCustomerData($this->_customerBuilder->mergeDataObjectWithArray($customer, $data));
+ $customer = $this->_customerBuilder->mergeDataObjectWithArray($customer, $data);
+ $this->getQuote()->updateCustomerData($customer);
$data = array();
$customerData = \Magento\Framework\Service\EavDataObjectConverter::toFlatArray($customer);
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
index 6bc337a6822..dc0586ab4d7 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -28,6 +28,9 @@ class Tax extends AbstractTotal
/**
* @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
* @return $this
+ *
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
{
@@ -101,11 +104,8 @@ class Tax extends AbstractTotal
} else {
$orderShippingAmount = $order->getShippingAmount();
$baseOrderShippingAmount = $order->getBaseShippingAmount();
- $orderShippingHiddenTaxAmount = $order->getShippingHiddenTaxAmount();
- $baseOrderShippingHiddenTaxAmount = $order->getBaseShippingHiddenTaxAmnt();
$baseOrderShippingRefundedAmount = $order->getBaseShippingRefunded();
- $baseOrderShippingHiddenTaxRefunded = $order->getBaseShippingHiddenTaxRefunded();
$shippingTaxAmount = 0;
$baseShippingTaxAmount = 0;
@@ -156,12 +156,11 @@ class Tax extends AbstractTotal
$totalHiddenTax = min($allowedHiddenTax, $totalHiddenTax);
$baseTotalHiddenTax = min($allowedBaseHiddenTax, $baseTotalHiddenTax);
- $creditmemo->setTaxAmount($totalTax);
- $creditmemo->setBaseTaxAmount($baseTotalTax);
+ $creditmemo->setTaxAmount($creditmemo->getTaxAmount() + $totalTax);
+ $creditmemo->setBaseTaxAmount($creditmemo->getBaseTaxAmount() + $baseTotalTax);
$creditmemo->setHiddenTaxAmount($totalHiddenTax);
$creditmemo->setBaseHiddenTaxAmount($baseTotalHiddenTax);
-
$creditmemo->setShippingTaxAmount($shippingTaxAmount);
$creditmemo->setBaseShippingTaxAmount($baseShippingTaxAmount);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
index 740d24eb6db..9fd1ab19e7b 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
@@ -58,9 +58,9 @@ class Factory
$class = $class ?: $this->_defaultTotalModel;
if (!is_a($class, 'Magento\Sales\Model\Order\Pdf\Total\DefaultTotal', true)) {
throw new \Magento\Framework\Model\Exception(
- __(
- "The PDF total model {$class} must be or extend " .
- "\\Magento\\Sales\\Model\\Order\\Pdf\\Total\\DefaultTotal."
+ sprintf(
+ 'The PDF total model %s must be or extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal.',
+ $class
)
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index baf4bcc821d..a978baab62c 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -23,6 +23,14 @@
*/
namespace Magento\Sales\Model\Order;
+use Magento\Framework\Model\Exception;
+
+/**
+ * Class Status
+ *
+ * @method string getStatus()
+ * @method string getLabel()
+ */
class Status extends \Magento\Framework\Model\AbstractModel
{
/**
@@ -82,6 +90,21 @@ class Status extends \Magento\Framework\Model\AbstractModel
return $this;
}
+ /**
+ * @param string $state
+ * @return void
+ * @throws Exception
+ */
+ protected function validateBeforeUnassign($state)
+ {
+ if ($this->getResource()->checkIsStateLast($state)) {
+ throw new Exception(__('The last status can\'t be unassigned from its current state.'));
+ }
+ if ($this->getResource()->checkIsStatusUsed($this->getStatus())) {
+ throw new Exception(__('Status can\'t be unassigned, because it is used by existing order(s).'));
+ }
+ }
+
/**
* Unassigns order status from particular state
*
@@ -91,18 +114,15 @@ class Status extends \Magento\Framework\Model\AbstractModel
*/
public function unassignState($state)
{
- /** @var \Magento\Sales\Model\Resource\Order\Status $resource */
- $resource = $this->_getResource();
- $resource->beginTransaction();
- try {
- $resource->unassignState($this->getStatus(), $state);
- $resource->commit();
- $params = ['status' => $this->getStatus(), 'state' => $state];
- $this->_eventManager->dispatch('sales_order_status_unassign', $params);
- } catch (\Exception $e) {
- $resource->rollBack();
- throw $e;
- }
+ $this->validateBeforeUnassign($state);
+ $this->getResource()->unassignState($this->getStatus(), $state);
+ $this->_eventManager->dispatch(
+ 'sales_order_status_unassign',
+ [
+ 'status' => $this->getStatus(),
+ 'state' => $state
+ ]
+ );
return $this;
}
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Status.php b/app/code/Magento/Sales/Model/Resource/Order/Status.php
index d7c855469cb..aad433b96f4 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Status.php
@@ -24,6 +24,8 @@
namespace Magento\Sales\Model\Resource\Order;
use Magento\Framework\Model\Exception;
+use Magento\Framework\App\Resource;
+use Magento\Framework\Logger;
/**
* Order status resource model
@@ -37,14 +39,33 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @var string
*/
- protected $_labelsTable;
+ protected $labelsTable;
/**
* Status state table
*
* @var string
*/
- protected $_stateTable;
+ protected $stateTable;
+
+ /**
+ * @var \Magento\Framework\Logger
+ */
+ protected $logger;
+
+ /**
+ * Class constructor
+ *
+ * @param \Magento\Framework\App\Resource $resource
+ * @param Logger $logger
+ */
+ public function __construct(
+ Resource $resource,
+ Logger $logger
+ ) {
+ $this->logger = $logger;
+ parent::__construct($resource);
+ }
/**
* Internal constructor
@@ -55,8 +76,8 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
$this->_init('sales_order_status', 'status');
$this->_isPkAutoIncrement = false;
- $this->_labelsTable = $this->getTable('sales_order_status_label');
- $this->_stateTable = $this->getTable('sales_order_status_state');
+ $this->labelsTable = $this->getTable('sales_order_status_label');
+ $this->stateTable = $this->getTable('sales_order_status_state');
}
/**
@@ -74,7 +95,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
$this->getMainTable(),
array('label')
)->join(
- array('state_table' => $this->_stateTable),
+ array('state_table' => $this->stateTable),
$this->getMainTable() . '.status = state_table.status',
'status'
)->where(
@@ -94,18 +115,18 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store labels getter
*
- * @param \Magento\Framework\Model\AbstractModel $status
+ * @param \Magento\Sales\Model\Order\Status $status
* @return array
*/
- public function getStoreLabels(\Magento\Framework\Model\AbstractModel $status)
+ public function getStoreLabels(\Magento\Sales\Model\Order\Status $status)
{
- $select = $this->_getWriteAdapter()->select()->from(
- $this->_labelsTable,
- array('store_id', 'label')
- )->where(
- 'status = ?',
- $status->getStatus()
- );
+ $select = $this->_getWriteAdapter()->select()
+ ->from(['ssl' => $this->labelsTable], [])
+ ->where('status = ?', $status->getStatus())
+ ->columns([
+ 'store_id',
+ 'label'
+ ]);
return $this->_getReadAdapter()->fetchPairs($select);
}
@@ -119,7 +140,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
if ($object->hasStoreLabels()) {
$labels = $object->getStoreLabels();
- $this->_getWriteAdapter()->delete($this->_labelsTable, array('status = ?' => $object->getStatus()));
+ $this->_getWriteAdapter()->delete($this->labelsTable, array('status = ?' => $object->getStatus()));
$data = array();
foreach ($labels as $storeId => $label) {
if (empty($label)) {
@@ -128,7 +149,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
$data[] = array('status' => $object->getStatus(), 'store_id' => $storeId, 'label' => $label);
}
if (!empty($data)) {
- $this->_getWriteAdapter()->insertMultiple($this->_labelsTable, $data);
+ $this->_getWriteAdapter()->insertMultiple($this->labelsTable, $data);
}
}
return parent::_afterSave($object);
@@ -147,13 +168,13 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
if ($isDefault) {
$this->_getWriteAdapter()->update(
- $this->_stateTable,
+ $this->stateTable,
['is_default' => 0],
['state = ?' => $state]
);
}
$this->_getWriteAdapter()->insertOnDuplicate(
- $this->_stateTable,
+ $this->stateTable,
[
'status' => $status,
'state' => $state,
@@ -174,51 +195,104 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
public function unassignState($status, $state)
{
- $select = $this->_getWriteAdapter()->select()->from(
- $this->_stateTable,
- array('qty' => new \Zend_Db_Expr('COUNT(*)'))
- )->where(
- 'state = ?',
- $state
- );
-
- if ($this->_getWriteAdapter()->fetchOne($select) == 1) {
- throw new Exception(__('The last status can\'t be unassigned from its current state.'));
- }
- $select = $this->_getWriteAdapter()->select()->from(
- $this->_stateTable,
- 'is_default'
- )->where(
- 'state = ?',
- $state
- )->where(
- 'status = ?',
- $status
- )->limit(
- 1
- );
- $isDefault = $this->_getWriteAdapter()->fetchOne($select);
- $this->_getWriteAdapter()->delete($this->_stateTable, array('state = ?' => $state, 'status = ?' => $status));
-
- if ($isDefault) {
- $select = $this->_getWriteAdapter()->select()->from(
- $this->_stateTable,
- 'status'
- )->where(
- 'state = ?',
- $state
- )->limit(
- 1
+ $this->_getWriteAdapter()->beginTransaction();
+ try {
+ $isStateDefault = $this->checkIsStateDefault($state, $status);
+ $this->_getWriteAdapter()->delete(
+ $this->stateTable,
+ [
+ 'state = ?' => $state,
+ 'status = ?' => $status
+ ]
);
- $defaultStatus = $this->_getWriteAdapter()->fetchOne($select);
- if ($defaultStatus) {
- $this->_getWriteAdapter()->update(
- $this->_stateTable,
- array('is_default' => 1),
- array('state = ?' => $state, 'status = ?' => $defaultStatus)
- );
+ if ($isStateDefault) {
+ $newDefaultStatus = $this->getStatusByState($state);
+ if ($newDefaultStatus) {
+ $this->_getWriteAdapter()->update(
+ $this->stateTable,
+ ['is_default' => 1],
+ [
+ 'state = ?' => $state,
+ 'status = ?' => $newDefaultStatus
+ ]
+ );
+ }
}
+ $this->_getWriteAdapter()->commit();
+ } catch (\Exception $e) {
+ $this->_getWriteAdapter()->rollBack();
+ throw new Exception('Cannot unassing status from state');
}
+
return $this;
}
+
+ /**
+ * Check is this state last
+ *
+ * @param string $state
+ * @return bool
+ */
+ public function checkIsStateLast($state)
+ {
+ return (1 == $this->_getWriteAdapter()->fetchOne(
+ $this->_getWriteAdapter()->select()
+ ->from(['sss' => $this->stateTable], [])
+ ->where('state = ?', $state)
+ ->columns([new\Zend_Db_Expr('COUNT(1)')])
+ ));
+ }
+
+ /**
+ * Check is this status used in orders
+ *
+ * @param string $status
+ * @return bool
+ */
+ public function checkIsStatusUsed($status)
+ {
+ return (bool)$this->_getWriteAdapter()->fetchOne(
+ $this->_getWriteAdapter()->select()
+ ->from(['sfo' => $this->getTable('sales_flat_order')], [])
+ ->where('status = ?', $status)
+ ->limit(1)
+ ->columns([new \Zend_Db_Expr(1)])
+ );
+ }
+
+ /**
+ * Check is this pair of state and status default
+ *
+ * @param string $state
+ * @param string $status
+ * @return bool
+ */
+ protected function checkIsStateDefault($state, $status)
+ {
+ return (bool)$this->_getWriteAdapter()->fetchOne(
+ $this->_getWriteAdapter()->select()
+ ->from(['sss' => $this->stateTable], [])
+ ->where('state = ?', $state)
+ ->where('status = ?', $status)
+ ->limit(1)
+ ->columns(['is_default'])
+ );
+ }
+
+ /**
+ * Returns any possible status for state
+ *
+ * @param string $state
+ * @return string
+ */
+ protected function getStatusByState($state)
+ {
+ return (string)$this->_getWriteAdapter()->fetchOne(
+ $select = $this->_getWriteAdapter()->select()
+ ->from(['sss' => $this->stateTable, []])
+ ->where('state = ?', $state)
+ ->limit(1)
+ ->columns(['status'])
+ );
+ }
}
diff --git a/app/code/Magento/Sales/etc/widget.xml b/app/code/Magento/Sales/etc/widget.xml
index 0e32f493c74..c12f829452a 100644
--- a/app/code/Magento/Sales/etc/widget.xml
+++ b/app/code/Magento/Sales/etc/widget.xml
@@ -41,10 +41,10 @@
</parameter>
</parameters>
<containers>
- <container name="left">
+ <container name="sidebar.main">
<template name="default" value="default_template" />
</container>
- <container name="right">
+ <container name="sidebar.additional">
<template name="default" value="default_template" />
</container>
</containers>
diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv
index 246eeaa16be..6cec0c16a19 100644
--- a/app/code/Magento/Sales/i18n/de_DE.csv
+++ b/app/code/Magento/Sales/i18n/de_DE.csv
@@ -1,846 +1,712 @@
-"""%s"" coupon code is not valid.","""%s"" Couponcode ist ungültig."
-"%s","%s"
-"%s / %s rate:","%s / %s Rate:"
-"%s for %s","%s für %s"
-"%s order(s) cannot be canceled","%s Bestellung(en) konnte(n) nicht storniert werden"
-"%s order(s) have been canceled.","%s Bestellung(en) wurde(n) storniert."
-"%s order(s) have been put on hold.","%s Bestellung(en) wurde(n) in Wartestellung gesetzt."
-"%s order(s) have been released from holding status.","%s Bestellung(en) wurde(n) aus der Wartestellung genommen."
-"%s order(s) were not put on hold.","%s Bestellung(en) wurde(n) nicht in Wartestellung gesetzt."
-"%s order(s) were not released from holding status.","%s Bestellung(en) wurde(n) nicht aus der Wartestellung genommen."
-"* - Enter custom price excluding tax","* - Geben Sie benutzerdefinierten Preis ohne Steuer ein"
-"* - Enter custom price including tax","* - Geben Sie benutzerdefinierten Preis inklusive Steuer ein"
-"-- Please Select --","-- Bitte auswählen --"
-"About This Order:","Ãœber diese Bestellung:"
-"About This Profile:","Ãœber dieses Profil:"
-"About Your Invoice","Informationen zu Ihrer Rechnung"
-"About Your Order","Ãœber Ihre Bestellung"
-"About Your Refund","Informationen zu Ihrer Rückerstattung"
-"About Your Shipment","Informationen zu Ihrer Sendung"
-"Accept Payment","Zahlung akzeptieren"
-"Accept or Deny Payment","Zahlung akzeptieren oder ablehnen"
-"Account Information","Kontoinformationen"
-"Action","Aktion"
-"Actions","Aktionen"
-"Activate","Aktivieren"
-"Active","Aktiv"
-"Add","Hinzufügen"
-"Add New Address","Neue Adresse hinzufügen"
-"Add Order Comments","Bestellungskommentare hinzufügen"
-"Add Package","Verpackung hinzufügen"
+Remove,Entfernen
+Close,Schließen
+Cancel,Abbrechen
+Back,Zurück
"Add Products","Produkte hinzufügen"
-"Add Selected Product(s) to Option","Ausgewählte Produkte zu Option hinzufügen"
-"Add Selected Product(s) to Order","Ausgewählte Produkte zur Bestellung hinzufügen"
-"Add Selected Product(s) to Package","Ausgewählte(s) Produkt(e) zur Verpackung hinzufügen"
-"Add To Order","Zur Bestellung hinzufügen"
-"Add Tracking Number","Trackingnummer hinzufügen"
-"Add comment to order","Kommentar zur Bestellung hinzufügen"
-"Add new comment to credit memo","Neuen Kommentar zur Gutschrift hinzufügen"
-"Add new comment to shipment","Neuen Kommentar zur Sendung hinzufügen"
-"Add new tracking number","Neue Trackingnummer hinzufügen"
-"Add to Cart","Zum Warenkobrn hinzufügen"
-"Additional Product Info","Zusätzliche Angaben zum Produkt"
-"Address","Adresse"
-"Address model is not defined.","Adressenmodell ist nicht definiert."
-"Adjustment Fee","Anpassungsgebühr"
-"Adjustment Refund","Anpassungsrückerstattung"
-"Agreement Information","Vereinbarungsinformationen"
-"Allow Reorder","Nachbestellung erlauben"
-"Amount","Summe"
-"Amount: %s.","Summe: %s."
-"An error occurred while assigning order status. Status has not been assigned.","Bei der Zuweisung des Auftragsstatus ist ein Fehler aufgetreten. Status wurde nicht zugewiesen."
-"An error occurred while creating shipping label.","Ein Fehler ist aufgetreten beim Erstellen des Versandlabels."
-"An error occurred while saving order status. The status has not been added.","Beim Speichern des Auftragsstatus ist ein Fehler aufgetreten. Der Status wurde nicht hinzugefügt."
-"An error occurred while unassigning order status.","Beim Löschen der Zuweisung für einen Auftragsstatus ist ein Fehler aufgetreten."
-"An error occurred while updating the order address. The address has not been changed.","Beim Aktualisieren der Bestelladresse ist ein Fehler aufgetreten. Die Adresse wurde nicht geändert."
-"An item option with code %s already exists.","Eine Artikeloption mit Code %s existiert bereits."
-"Anchor Custom Title","Kundenspezifischen Titel festlegen"
-"Append Comments","Kommentare anhängen"
-"Apply","Anwenden"
+"Update Items and Qty's","Artikel und Mengen aktualisieren"
+Product,Produkt
+Price,Preis
+Quantity,Quantity
+Products,Produkte
+ID,ID
+SKU,Artikelposition
+Apply,Anwenden
+Configure,Konfigurieren
+"Shopping Cart",Einkaufswagen
+"Quote item id is not received.","Die angegebene Artikelnummer wurde nicht empfangen."
+"Quote item is not loaded.","Der bestellte Artikel wird nicht geladen."
+No,Nein
"Apply Coupon Code","Coupon Code anwenden"
-"Approved the payment online.","Zahlung online akzeptiert."
-"Are you sure you want to accept this payment?","Sind Sie sicher, dass Sie diese Zahlung akzeptieren wollen?"
-"Are you sure you want to cancel this order?","Sind Sie sicher, dass Sie diese Bestellung stornieren wollen?"
-"Are you sure you want to delete all items from shopping cart?","Sind Sie sicher, dass Sie alle Artikel aus dem Einkaufswagen löschen möchten?"
-"Are you sure you want to deny this payment?","Sind Sie sicher, dass Sie diese Zahlung ablehnen wollen?"
-"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?"
-"Are you sure you want to send Creditmemo email to customer?","Sind Sie sicher, dass Sie ein Creditmemo E-Mail an den Kunden schicken wollen?"
-"Are you sure you want to send Invoice email to customer?","Sind Sie sicher, dass Sie ein Rechnungsmail an den Kunden schicken wollen?"
-"Are you sure you want to send Shipment email to customer?","Sind Sie sicher, dass Sie ein Versandmail an den Kunden schicken wollen?"
-"Are you sure you want to send order email to customer?","Sind Sie sicher, dass Sie ein Bestellungsmail an den Kunden schicken wollen?"
-"Are you sure you want to void the payment?","Sind Sie sicher, dass Sie die Zahlung ungültig machen wollen?"
-"Are you sure?","Sind Sie sicher?"
-"Are you sure? This order will be canceled and a new one will be created instead","Sind Sie sicher? Diese Bestellung wird storniert und eine neue wird stattdessen erstellt"
-"Assign Order Status to State","Staat einen Auftragsstatus zuweisen"
-"Assign Status to State","Staat einen Status zuweisen"
-"Assignment Information","Informationen zur Zuweisung"
-"At least a payment ID must be set.","Es muss mindestens eine ZahlungsID gesetzt sein."
-"Authorization","Bewilligung"
-"Authorized amount of %s.","Bewilligte Summe von %s."
-"Authorizing amount of %s is pending approval on gateway.","Bewilligungssumme von %s wartet auf Zustimmung am Gateway."
-"Back","Zurück"
-"Back to My Orders","Zurück zu Meine Bestellungen"
-"Back to Recurring Payments","Zurück zu Wiederkehrende Profile"
-"Backordered","Rückständig"
-"Bestsellers","Bestseller"
-"Bill-to Name","Rechnung auf Namen"
-"Billing","Abrechnung"
-"Billing Address","Rechnungsadresse"
-"Billing Last Name","Nachname in der Rechnung"
-"Billing ZIP Code","PLZ in der Rechnung"
-"Buy %s for price %s","Kaufen Sie %s zum Preis von %s"
-"CSV","CSV"
-"Cancel","Abbrechen"
-"Cancel credit memo","Gutschrift aufheben"
-"Cancel invoice","Rechnung abbrechen"
-"Cancel order","Bestellung abbrechen"
-"Canceled","Storniert"
-"Canceled order offline.","Bestellung offline abgebrochen."
-"Canceled order online.","Bestellung online abgebrochen."
-"Cannot add order history.","Bestellungshistorie kann nicht hinzugefügt werden."
-"Cannot create an empty shipment.","Leere Sendung kann nicht erstellt werden."
-"Cannot determine the field name.","Feldname kann nicht bestimmt werden."
-"Cannot do invoice for order.","Rechnung für Bestellung kann nicht erstellt werden."
-"Cannot do shipment for order.","Versand für Bestellung kann nicht durchgeführt werden."
-"Cannot get order instance","Bestellungsinstanz kann nicht gefunden werden."
-"Cannot get the order instance.","Die Bestellungsinstanz kann nicht gefunden werden."
-"Cannot register an existing credit memo.","Eine bereits existierende Gutschrift kann nicht nochmals registriert werden."
-"Cannot register existing invoice","Eine bereits existierende Rechnung kann nicht nochmals registriert werden."
-"Cannot register existing shipment","Eine bereits existierende Sendung kann nicht nochmals registriert werden."
-"Capture","Erfassung"
-"Capture Amount","Erfassungssumme"
-"Capture Offline","Offline Erfassung"
-"Capture Online","Online Erfassung"
-"Capture invoice","Erfassungsrechnung"
-"Captured amount of %s online.","Erfassungssumme von %s online."
-"Capturing amount of %s is pending approval on gateway.","Erfassungssumme von %s wartet auf Zustimmung am Gateway."
-"Carrier","Carrier"
-"Carrier/Method","Carrier/Methode"
-"Change status, add comments","Status ändern, Kommentare hinzufügen"
-"Changing address information will not recalculate shipping, tax or other order amount.","Durch das Ändern von Adressinformationen werden Versandkosten, Steuern oder ein sonstiger Bestellwert nicht neu berechnet."
-"Checkout Totals Sort Order","Checkout Gesamtsummen Sortierfolge"
-"City","Stadt"
+"Remove Coupon Code","Gutscheincode entfernen"
+Qty,Anzahl
+Subtotal,Zwischensumme
+Discount,Rabatt
+"Row Subtotal",Zeilengesamtsumme
+Action,Aktion
+"No ordered items","Keine bestellten Artikel"
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,Zwischensumme:
+"Excl. Tax","ohne Steuern"
+Total,Gesamt
+"Incl. Tax","Steuer inkludieren"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Auf Wunschzettel schreiben"
+Edit,Bearbeiten
+Item,Objekt
+"Add to Cart","Zum Warenkobrn hinzufügen"
+Sku,SKU
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,Aufträge
+Customer,Kunde
+Guest,Gast
+"Grand Total",Gesamtbetrag
+Tax,Steuer
+Shipping,Lieferung
+"Account Information",Kontoinformationen
+"First Name",Kundenname
+"Last Name","Nachname des Kunden"
+Email,"Kunden Email"
+Refresh,Aktualisieren
+Enable,Enable
+General,General
+Yes,Ja
+Name,Name
+Status,Status
+Enabled,Enabled
+Title,Titel
+Home,Home
+Any,Any
+From,Von
+To,An
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,Bestell-Nr.
+"Order #%1","Order #%1"
+"Shipping Amount",Lieferungsbetrag
+"Tax Amount",Steuerbetrag
+View,Ansicht
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,"Nicht verfügbar"
+Ordered,Bestellt
+Invoiced,"In Rechnung gestellt."
+Shipped,Versandt
+Refunded,Rückerstattet
+Canceled,Storniert
+From:,Von:
+To:,An:
+"Gift Message",Grußnachricht
+Message:,Nachricht:
+"Tier Pricing",Preisebene
+"Go to Home Page","Go to Home Page"
+"Customer Group",Kundengruppe
+Closed,Geschlossen
+"Product Name",Produktname
+"Discount Amount",Rabattbetrag
+Country,Land
+State/Province,Staat/Bezirk
+"Payment Information",Profilinformation
+"Shipping Information",Lieferungsinformation
+"Shipping Method",Liefermethode
"Clear Shopping Cart","Einkaufswagen leeren"
-"Click to change shipping method","Klicken Sie um die Versandart zu ändern"
-"Close","Schließen"
-"Closed","Geschlossen"
-"Comma-separated.","Durch Komma getrennt."
-"Comment","Kommentar"
-"Comment Text","Kommentartext"
-"Comments","Kommentare"
-"Comments History","Kommentarhistorie"
-"Company","Firma"
-"Complete","Vollständig"
-"Configure","Konfigurieren"
+City,Stadt
+"Zip/Postal Code",Postleitzahl
+"Email Address",E-Mail-Adresse
+Company,Firma
+Address,Address
+"Street Address","Anschrift (Straße, Hausnummer, PLZ)"
+Telephone,Telefon
+"Save in address book","Speichern im Adressbuch"
+Continue,Weiter
+"Order #","Order #"
+"No Payment Methods","Keine Zahlungsmethoden"
+"Billing Address",Rechnungsadresse
+"Shipping Address",Lieferungsadresse
+"Payment Method","Name der Bezahlungsmethode"
+Sales,Verkäufe
+Created,"Erstellte At"
+Select,Auswählen
+Comment,Kommentar
+%1,%1
+Date,Datum
+"Add New Address","Neue Adresse hinzufügen"
+"Purchase Date","Purchase Date"
+"Bill-to Name","Rechnung auf Namen"
+"Ship-to Name","Lieferung auf Namen"
+"Order Total","Gesamtsumme Bestellung"
+"Purchase Point","Erworben von (Geschäft)"
+"Recent Orders","Kürzlich aufgegebene Bestellungen"
+"Store Credit","Guthaben aufbewahren"
+Notified,Benachrichtigt
+"Notify Customer by Email","Kunde per E-Mail benachrichtigen"
+Billing,Abrechnung
+"Newsletter Subscription",Newsletter-Abonnement
+"Order Status","Status des Auftrags"
+"Wish List","Wish List"
+Pending,Ausstehend
+"View Order","Bestellung ansehen"
+Amount,Summe
+Message,Nachricht
+Information,Information
+"Gift Options",Geschenkoptionen
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,Neu
+"Custom Price",Kundenpreis
+Processing,Bearbeitung
+"Add To Order","Zur Bestellung hinzufügen"
"Configure and Add to Order","Konfigurieren und zum Auftrag hinzufügen"
-"Contents","Inhalt"
-"Continue","Weiter"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Ãœberwacht, ob die Kunden-IP in Bestellungen, Rechnungen, Sendungen und Gutschriften angezeigt wird."
-"Country","Land"
-"Coupons","Gutscheine"
-"Create","Erstellen"
-"Create New Customer","Neuen Kunden anlegen"
+"No items","Keine Artikel"
+Authorization,Bewilligung
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.","Zahlungen beinhalten nicht das Speichern der Objekte."
+"Transaction ID",TransaktionsID
+"Order ID",BestellungsID
+Void,Leer
+"Created At","Created At"
+"Payment Method:",Zahlungsweise:
+"Ship To","Lieferung an"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Grand Total (Base)","G.B. (Basis)"
+"Grand Total (Purchased)","G.T. (gekauft)"
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,CSV
+"Excel XML",Excel-XML
+"Total Refunded","Gesamtsumme rückerstattet"
+Paid,bezahlt
+Coupons,Gutscheine
+"Recently Viewed","Kürzlich angesehen"
+"Recently Compared Products","zuletzt verglichene Artikel"
+"Recently Viewed Products","Kürzlich angesehene Produkte"
+Print,Ausdrucken
+"Submit Comment","Kommentar abschicken"
+Returned,Zurückgesendet
+"Order Date",Bestelldatum
+"Order # ","Order # "
+"Order Date: ",Bestelldatum
+"Comment Text",Kommentartext
+"Visible on Frontend","Am Frontende sichtbar"
+"Not Notified","Nicht benachrichtigt"
+"Please select products.","Please select products."
+Number,Nummer
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Versand und Abwicklung"
+"Credit Memos",Gutschriften
+Invoices,Rechnungen
+"We cannot get the order instance.","We cannot get the order instance."
"Create New Order","Neue Bestellung anlegen"
-"Create New Order Status","Neuen Auftragsstatus anlegen"
-"Create New Order for %s","Neue Bestellung für %s anlegen"
-"Create New Order for %s in %s","Neue Bestellung für %s in %s anlegen"
+"Save Order Address","Bestelladresse speichern"
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
+"Order Address Information",Lieferadressen-Information
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order","Bestellung abschicken"
+"Are you sure you want to cancel this order?","Sind Sie sicher, dass Sie diese Bestellung stornieren wollen?"
+"Order Comment","Kommentar zur Bestellung"
+"Please select a customer.","Please select a customer."
+"Create New Customer","Neuen Kunden anlegen"
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
"Create New Order for New Customer","Neue Bestellung für neuen Kunden anlegen"
-"Create New Order for New Customer in %s","Neue Bestellung für neuen Kunden in %s anlegen"
+"Items Ordered","Bestellte Artikel"
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty","Bestellte Menge des Artikels"
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - Geben Sie benutzerdefinierten Preis inklusive Steuer ein"
+"* - Enter custom price excluding tax","* - Geben Sie benutzerdefinierten Preis ohne Steuer ein"
+"This product does not have any configurable options","Dieses Produkt hat keine Einstellungsmöglichkeiten."
+"Add Selected Product(s) to Order","Ausgewählte Produkte zur Bestellung hinzufügen"
+"Update Changes","Änderungen aktualisieren"
+"Are you sure you want to delete all items from shopping cart?","Sind Sie sicher, dass Sie alle Artikel aus dem Einkaufswagen löschen möchten?"
+"Products in Comparison List","Artikel in der Vergleichsliste"
+"Last Ordered Items","Zuletzte bestellte Artikel"
+"Please select a store.","Please select a store."
+"Order Totals","Gesamtbeträge Bestellung"
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)","Erstattung Versand (inkl. Steuer)"
+"Refund Shipping (Excl. Tax)","Erstattung Versand (exkl. Steuer)"
+"Refund Shipping","Erstattung Versand"
+"Update Qty's","Anzahl aktualisieren"
+Refund,Erstatten
+"Refund Offline",Offline-Rückerstattung
+"Paid Amount","Bezahlter Betrag"
+"Refund Amount",Erstattungsbetrag
+"Shipping Refund",Versanderstattung
+"Order Grand Total","Gesamtsumme Bestellung"
+"Adjustment Refund",Anpassungsrückerstattung
+"Adjustment Fee",Anpassungsgebühr
+"Send Email","E-Mail senden"
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent","die Gutschrifts-E-Mail wurde nicht gesendet"
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund",Erstattungsbetrag
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment","Rechnung und Lieferung vorlegen"
+"Submit Invoice","Rechnung einreichen"
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo",Gutschrift
+Capture,Erfassung
+"the invoice email was sent","die Rechnungs-E-Mail wurde versendet"
+"the invoice email is not sent","die Rechnungs-E-Mail ist nicht versendet"
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses",Bestellstatus
"Create New Status","Neuen Status anlegen"
-"Create Order","Bestellung anlegen"
-"Create Packages","Verpackungen erstellen"
-"Create Shipment","Lieferung erstellen"
-"Create Shipping Label","Versandlabel erstellen"
-"Create Shipping Label...","Versandlabel erstellen..."
-"Create new credit memo for order","Neue Gutschrift für Bestellung erstellen"
-"Create new invoice for order","Neue Rechnung für Bestellung anlegen"
-"Create new shipment for order","Neue Lieferung für Bestellung fertig machen"
-"Create...","...erstellen"
-"Created","Erstellte At"
-"Created:","Erstellt:"
-"Credit Memo","Gutschrift"
-"Credit Memo #","Gutschrift #"
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Gutschrift #%1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","Gutschrift Kommentar Email Sender"
-"Credit Memo Comment Email Template","Gutschrift Kommentar Email Vorlage"
-"Credit Memo Comment Email Template for Guest","Gutschrift Kommentar Email Vorlage für Gast"
-"Credit Memo Comments","Gutschrift Kommentare"
-"Credit Memo Email Sender","Gutschrift Email Sender"
-"Credit Memo Email Template","Gutschrift Email Vorlage"
-"Credit Memo Email Template for Guest","Gutschrift Email Vorlage für Gast"
-"Credit Memo Update","Gutschrift Aktualisierung"
-"Credit Memo Update for Guest","Gutschrift Aktualisierung für Gast"
-"Credit Memos","Gutschriften"
-"Credit memo canceling problem.","Problem bei Gutschriftaufhebung"
-"Credit memo cannot be canceled.","Gutschrift kann nicht aufgehoben werden."
-"Credit memo has been created automatically","Gutschriftenempfänger wurde automatisch erstellt"
-"Custom Price","Kundenpreis"
-"Custom Value","Kundenmehrwert"
-"Customer","Kunde"
-"Customer Can Define Start Date","Kunden können den Starttermin bestimmen"
-"Customer Group","Kundengruppe"
-"Customer My Account Order Creditmemo View","Kundenbestellung My Account Ansicht der Gutschrift"
-"Customer My Account Order History","Kundenbestellung My Account Historie"
-"Customer My Account Order Invoice View","Kundenbestellung My Account Ansicht der Rechnung"
-"Customer My Account Order Shipment View","Kundenbestellung My Account Ansicht der Lieferung"
-"Customer My Account Order View","Kundenbestellung My Account Ansicht"
-"Customer's Current Activities","Aktuelle Aktionen des Kunden"
-"Customs Value","Zollwert"
-"Date","Datum"
-"Default Status","Standardstatus"
-"Default Template","Standardvorlage"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png)","Vorgegebenes Logo, wird in PDF- und HTML-Dokumenten verwendet.<br />(jpeg, tiff, png)"
-"Delete","Löschen"
-"Delete Package","Verpackung löschen"
-"Denied the payment online.","Bezahlung online verweigert."
-"Deny Payment","Bezahlung verweigern"
-"Description Message","Beschreibungsmitteilung"
-"Discount","Rabatt"
-"Discount (%s)","Rabatt (%s)"
-"Discount Amount","Rabattbetrag"
-"Display Order ID in Header","Auftrags-ID in der Kopfzeile anzeigen"
-"Edit","Bearbeiten"
-"Edit Order #%s","Bestellung #%s bearbeiten"
-"Edit Order %s %s Address","Bestelladresse %s %s bearbeiten"
+"Assign Status to State","Staat einen Status zuweisen"
+"Save Status Assignment","Statuszuweisung speichern"
+"Assign Order Status to State","Staat einen Auftragsstatus zuweisen"
+"Assignment Information","Informationen zur Zuweisung"
+"Order State",Bestellstatus
+"Use Order Status As Default","Bestellstatus als Standard verwenden"
+"Visible On Frontend","Visible On Frontend"
"Edit Order Status","Auftragsstatus bearbeiten"
-"Email","Kunden Email"
-"Email Address","E-Mail-Adresse"
-"Email Copy of Credit Memo","E-Mail-Kopie der Gutschrift"
-"Email Copy of Invoice","Rechnungskopie per E-Mail senden"
-"Email Copy of Shipment","E-Mail-Kopie der Versandinformationen"
-"Email Order Confirmation","E-Mail mit Auftragsbestätigung"
-"Enable","Aktivieren"
-"Enabled","Aktiviert"
-"Enter the billing last name and email/ZIP as in the order billing address","Geben Sie den Nachnamen und die E-Mail/PLZ wie auf der Rechnungsadresse in der Bestellung ein."
-"Entered data is incorrect. Please try again.","Die eingegebenen Daten sind inkorrekt. Bitte nochmal versuchen."
-"Error to Show in Shopping Cart","Fehler beim Anzeigen im Warenkorb"
-"Excel XML","Excel-XML"
-"Excl. Tax","ohne Steuern"
-"Expired","Abgelaufen"
-"Explanation","Erklärung"
-"Failed to send the order email.","Senden der Auftrags-E-Mail fehlgeschlagen."
-"Failed to update the payment.","Aktualisieren der Bezahlung fehlgeschlagen."
-"Failed to update the profile.","Aktualisierung des Profils fehlgeschlagen."
-"Failed to void the payment.","Aufheben der Bezahlung fehlgeschlagen."
-"Fetch","Holen"
-"File extension not known or unsupported type in the following shipment: %s","Dateierweiterung ist unbekannt oder wird nicht unterstützt bei der folgenden Lieferung: %s"
-"Find Order By:","Bestellungen finden durch:"
-"First Name","Kundenname"
-"From","Von"
-"From Name","Von Name"
-"From:","Von:"
-"General","Allgemein"
-"General Information","Allgemeine Informationen"
+"Save Status","Status speichern"
+"New Order Status","Neuer Bestellstatus"
+"Order Status Information",Bestellstatus-Information
+"Status Code",Statuscode
+"Status Label",Statuslabel
+"Store View Specific Labels","Ladenansicht Spezifische Marken"
+"Total Paid","Gesamtsumme bezahlt"
+"Total Due","Gesamtsumme fällig"
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?","Sind Sie sicher, dass Sie die Zahlung ungültig machen wollen?"
+Hold,Warten
+hold,hold
+Unhold,Freigabe
+unhold,unhold
+"Are you sure you want to accept this payment?","Sind Sie sicher, dass Sie diese Zahlung akzeptieren wollen?"
+"Accept Payment","Zahlung akzeptieren"
+"Are you sure you want to deny this payment?","Sind Sie sicher, dass Sie diese Zahlung ablehnen wollen?"
+"Deny Payment","Bezahlung verweigern"
"Get Payment Update","Zahlungsaktualisierung abrufen"
-"Get Update","Update erhalten"
-"Get shipping methods and rates","Versandarten und -kosten abrufen"
-"Gift Message","Grußnachricht"
-"Gift Message for This Order","Geschenknachricht für diese Bestellung"
-"Gift Message for the Entire Order","Geschenkmitteilung für die gesamte Bestellung"
-"Gift Message for this Order","Grußnachricht für diesen Auftrag"
-"Gift Options","Geschenkoptionen"
-"Gift Wrapping for the Entire Order","Geschenkverpackung für gesamte Bestellung"
-"Girth","Umfang"
-"Grand Total","Gesamtbetrag"
-"Grand Total (Base)","G.B. (Basis)"
-"Grand Total (Purchased)","G.T. (gekauft)"
-"Grand Total to be Charged","Gesamtsumme die belastet werden soll"
-"Guest","Gast"
-"Height","Höhe"
-"Hide Customer IP","Kunden-IP verbergen"
-"Hold","Warten"
-"Hold action is not available.","Zurückstellen nicht verfügbar."
-"Hold order","Bestellung zurückstellen"
-"ID","ID Nr."
-"ID","ID"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Zurückerstattet"". Rückerstattung durch Händler erfolgt. Erhaltene Benachrichtigung über zurückerstatteten Betrag von %s. Transaktionsidentifikation: ""%s"""
-"If empty, the default description above will be used.","Wenn leer wird die Standardbeschreibung oben verwendet."
-"If empty, the default error above will be used.","Wenn leer, wird der obenstehende Standardfehler benutzt."
-"If the invoice was created offline, try creating an offline creditmemo.","Wenn Rechnung offline erstellt wurde, versuchen Sie einen Offline Gutschein zu erstellen."
-"Incl. Tax","Steuer inkludieren"
-"Information","Information"
-"Initial Fee","Erstzahlung"
-"Initial Fees","Anfängliche Gebühren"
-"Initial period payment","Anfangszahlung"
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Unzureichende Informationen um ein Versandetikett/en zu erstellen. Bitte bestätigen Sie Ihre Shop Informationen und Versandeinstellungen."
-"Invalid block: %s.","Ungültiger Block: %s."
-"Invalid carrier specified.","Ungültiger Versender angegeben."
-"Invalid draw line data. Please define ""lines"" array.","Ungültige Draw Line-Daten. Bitte ""lines""-Array definieren."
-"Invalid entity model","Ungültiges Entitätsmodell"
-"Invalid item option format.","Ungültiges Format für Artikeloption."
-"Invalid qty to invoice item ""%s""","Ungültige Anz., um Artikel ""%s"" zu fakturieren"
-"Invalid qty to refund item ""%s""","Ungültige Anz., um Artikel ""%s"" zurückzuerstatten"
-"Invalid qty to ship for item ""%s""","Ungültige Anz. bezüglich der Lieferung des Artikels ""%s"""
-"Invalid renderer model","Ungültiges Renderer-Modell"
-"Invalid request for adding product to quote.","Ungültige Anfrage, dem Angebot Produkte hinzuzufügen."
-"Invoice","Rechnung"
-"Invoice #","Rechnung #"
-"Invoice #%1$s | %2$s | %4$s (%3$s)","Rechnung Nr.%1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","Rechnung #%s"
-"Invoice Comment Email Sender","Rechnung Kommentar E-Mail Absender"
-"Invoice Comment Email Template","Rechnung Kommentar E-Mail Vorlage"
-"Invoice Comment Email Template for Guest","E-Mail-Vorlage für Rechnungszusätze für Gäste"
-"Invoice Comments","Kommentare zur Rechnung"
-"Invoice Date","Rechnungsdatum"
-"Invoice Email Sender","Rechnung an E-Mail-Versender ausstellen"
-"Invoice Email Template","Rechnung Email Vorlage"
-"Invoice Email Template for Guest","Rechnung E-Mail Vorlage für Gast"
-"Invoice Update","Aktualisierte Rechnung"
-"Invoice Update for Guest","Aktualisierte Rechnung für Gast"
-"Invoice and Packing Slip Design","Gestaltung von Rechnung und Lieferschein"
"Invoice and Ship","Rechnung und Auslieferung"
-"Invoice canceling problem.","Problem beim Annullieren der Rechnung"
-"Invoice cannot be canceled.","Rechnung kann nicht widerrufen werden."
-"Invoice cannot be captured.","Rechnung kann nicht abgefangen werden."
-"Invoice cannot be voided.","Rechnung kann nicht ungültig gemacht werden."
-"Invoice capturing problem.","Fehler bei Rechnungserfassung."
-"Invoice void problem","Problem beim Ungültigmachen der Rechnung."
-"Invoice will be created without communication with payment gateway.","Rechnung wird ohne Verbindung zur Zahlungsschnittstelle erstellt."
-"Invoiced","In Rechnung gestellt."
-"Invoices","Rechnungen"
-"Item","Objekt"
-"Item Status","Artikelstatus"
-"Item object is not specified.","Objekt des Artikels nicht näher beschrieben."
-"Item options declaration error.","Fehler bei der Angabe der Artikeloptionen."
-"Item ordered qty","Bestellte Menge des Artikels"
-"Item qty declaration error.","Fehler bei Eingabe der Artikelmenge."
-"Items","Artikel"
-"Items Invoiced","In Rechnung gestellte Artikel"
-"Items Ordered","Bestellte Artikel"
-"Items Refunded","Rückvergütete Artikel"
-"Items Shipped","Artikel versandt"
-"Items in the Package","Artikel in der Sendung"
-"Items maximum quantity or price do not allow checkout.","Nicht möglich, zur Kasse zu gehen wegen maximaler Menge oder Preis der Artikel."
-"Items options declaration error.","Fehler bei Angabe der Artikeloptionen."
-"Items to Refund","Artikel zur Rückvergütung"
-"Items to Ship","Zu versendende Artikel"
-"Key","Schlüssel"
-"Last Name","Nachname des Kunden"
-"Last Ordered Items","Zuletzte bestellte Artikel"
-"Last status can't be unassigned from state.","Letzter Status kann vom Zustand nicht entfernt werden."
-"Length","Länge"
-"Link to the New Order","Link zu neuer Bestellung"
-"Link to the Previous Order","Link zu vorheriger Bestellung"
-"Logo for HTML Print View","Logo für HTML-Druckansicht"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logo nur für HTML-Dokumente. Falls leer wird eine Standardvoreinstellung verwendet.<br />(jpeg, gif, png)"
-"Logo for PDF Print-outs (200x50)","Logo für PDF-Ausdrucke (200x50)"
-"Make Check payable to:","Scheck zur Auszahlung an:"
-"Manage","Verwalten"
-"Maximum amount available to refund is %s","Maximale Summe, die für eine Rückerstattung verfügbar ist, beträgt %s"
-"Maximum shipping amount allowed to refund is: %s","Erlaubte maximale Liefermenge zur Rückvergütung ist:%s"
-"Message","Nachricht"
-"Message:","Nachricht:"
-"Minimum Amount","Mindestmenge"
-"Minimum Order Amount","Mindestmenge für Bestellung"
-"Mixed","Gemischt"
-"Most Viewed","Am häufigsten betrachtet"
-"Most Viewed Products Report","Bericht über die am häufigsten betrachteten Produkte"
-"Move to Shopping Cart","In den Einkaufskorb legen"
-"Move to Wishlist","Auf Wunschzettel schreiben"
-"Multi-address Description Message","Nachricht für Mehrfachadressen-Beschreibung"
-"Multi-address Error to Show in Shopping Cart","Mehrfachadressen-Fehler für Anzeige im Warenkorb"
-"My Orders","Meine Bestellungen"
-"My Orders - Details","Meine Bestellungen - Details"
-"N/A","Nicht verfügbar"
-"Name","Name"
-"New","Neu"
-"New Credit Memo","Neue Gutschrift"
-"New Credit Memo for Guest","Neue Gutschrift für Gast"
-"New Credit Memo for Invoice #%s","Neue Gutschrift für Rechnung #%s"
-"New Credit Memo for Order #%s","Neue Gutschrift für Bestellung #%s"
-"New Invoice","Neue Rechnung"
-"New Invoice and Shipment for Order #%s","Neue Rechnung und Versand für Bestellung #%s"
-"New Invoice for Guest","Neue Rechnung für Gast"
-"New Invoice for Order #%s","Neue Rechnung für die Bestellung #%s"
-"New Order","Neue Bestellung"
-"New Order Confirmation Email Sender","Neue Bestellbestätigung E-Mail Absender"
-"New Order Confirmation Template","Neue Vorlage für Bestellbestätigung"
-"New Order Confirmation Template for Guest","Neue Bestellbestätigung Vorlage für Gast"
-"New Order RSS","RSS für neue Bestellung"
-"New Order Status","Neuer Bestellstatus"
-"New Order for Guest","Neue Bestellung für Gast"
-"New Shipment","Neue Lieferung"
-"New Shipment for Guest","Neue Sendung für Gast"
-"New Shipment for Order #%s","Neue Sendung für Bestellung #%s"
-"Newsletter Subscription","Newsletter-Abonnement"
-"No","Nein"
-"No Items","Keine Artikel"
-"No Items To Refund","Keine Artikel für Erstattung"
-"No Payment Methods","Keine Zahlungsmethoden"
-"No detail for number ""%s""","Keine Details zur Nummer ""%s"""
-"No information available.","Keine Informationen verfügbar."
-"No items","Keine Artikel"
-"No order(s) were put on hold.","Keine Bestellung(en) zurückgestellt."
-"No order(s) were released from holding status.","Für keine Bestellung(en) wurde der Wartestatus aufgehoben."
-"No ordered items","Keine bestellten Artikel"
-"No shipping information available","Keine Versandinformation verfügbar"
-"Nominal Items","Nominelle Artikel"
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Nominelle Artikel können nur einzeln erworben werden. Um fortzufahren, entfernen Sie bitte die übrigen Artikel aus dem Angebot."
-"Nominal order registered.","Beispielbestellung registriert."
-"Not Capture","Nicht gespeichert"
-"Not Initialized","Nicht initialisiert"
-"Not Notified","Nicht benachrichtigt"
-"Not enough valid data to save the parent transaction ID.","Nicht genügend gültige Daten, um die Transaktions-ID der Haupttransaktion zu speichern."
-"Notification Not Applicable","Benachrichtigung nicht möglich"
-"Notified","Benachrichtigt"
-"Notify Customer by Email","Kunde per E-Mail benachrichtigen"
-"Number","Nummer"
-"Number of Invoiced Orders","Anzahl der abgerechneten Bestellungen"
-"Number of Orders","Anzahl der Bestellungen"
-"Number of Refunded Orders","Anzahl der erstatteten Bestellungen"
-"OK","OK"
-"Offline Refunded","Offline rückerstattet"
-"On Hold","Zurückgestellt"
-"Online Refunded","Online erstattet"
-"Order","Bestellung"
-"Order","Bestell-Nr."
-"Order %s","Bestellung # %s"
-"Order %s","Bestellung #%s"
-"Order %s %s | %s","Bestellung # %s %s | %s"
-"Order %s - %s","Bestellung #%s - %s"
-"Order API","Auftrags-API"
-"Order Address Information","Lieferadressen-Information"
-"Order Comment","Kommentar zur Bestellung"
-"Order Comment Email Sender","Auftragskommentar vom E-Mail-Versender"
-"Order Comment Email Template","Kommentar zur Bestellung E-Mail Vorlage"
-"Order Comment Email Template for Guest","Kommentar zur Bestellung E-Mail Vorlage für Gast"
-"Order Comments","Kommentare zur Bestellung"
+Invoice,Rechnung
+Ship,Versenden
+Reorder,"Wieder bestellen"
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
"Order Credit Memos","Gutschriften anfordern"
-"Order Currency:","Währung der Bestellung:"
-"Order Date","Bestelldatum"
-"Order Date (%s)","Bestelldatum (%s)"
-"Order Date: ","Bestelldatum"
-"Order Date: %s","Bestelldatum %s"
-"Order Details","Bestellungsdetail"
-"Order Grand Total","Gesamtsumme Bestellung"
-"Order History","Bestellungshistorie"
-"Order History Info","Bestellverlaufs-Information"
-"Order ID","BestellungsID"
-"Order Information","Bestellungsinformationen"
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
+"Comments History",Kommentarhistorie
+"Order History",Bestellungshistorie
+"Order Information",Bestellungsinformationen
"Order Invoices","Rechnungen anfordern"
+Shipments,Lieferungen
"Order Shipments","Sendungen zur Bestellung"
-"Order State","Bestellstatus"
-"Order Status","Status des Auftrags"
-"Order Status Information","Bestellstatus-Information"
-"Order Statuses","Bestellstatus"
-"Order Subtotal","Zwischensumme Bestellung"
-"Order Taxes Report Grouped by Tax Rates","Bestellungssteuerbericht nach Steuersätzen gruppiert"
-"Order Total","Gesamtsumme Bestellung"
-"Order Totals","Gesamtbeträge Bestellung"
-"Order Update","Update zur Bestellung"
-"Order Update for Guest","Update zur Bestellung für Gast"
-"Order View","Bestellungsansicht"
-"Order credit memo","Gutschrift anfordern"
-"Order does not allow to be canceled.","Der Auftrag kann nicht annulliert werden."
-"Order invoice","Rechnung zur Bestellung"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","Die Bestellung wurde ausgesetzt, da die erfasste Bestellmenge %s unter dem Verdacht betrügerischer Aktivitäten steht."
-"Order object is not specified.","Bestellungsobjekt ist nicht spezifiziert."
-"Order saving error: %s","Fehler beim Speichern der Bestellung: %s"
-"Order shipments","Bestellungslieferungen"
-"Order status does not exist.","Bestellstatus existiert nicht."
-"Order status with the same status code already exist.","Es existiert schon ein Bestellstatus mit diesem Statuscode."
-"Order was placed using %s","Bestellung wurde unter Verwendung von %s durchgeführt."
-"Ordered","Bestellt"
-"Ordered amount of %s.","Bestellte Menge von %s."
-"Ordering amount of %s is pending approval on gateway.","Bestellte Menge von %s erwartet die Bestätigung vom Gateway."
-"Orders","Aufträge"
+Transactions,Transaktionen
+"Order View",Bestellungsansicht
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
+"Shipping & Handling","Lieferung und Verarbeitung"
+Fetch,Holen
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,Schlüssel
+Value,Wert
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders","Zurück zu Meine Bestellungen"
+"View Another Order","Eine andere Bestellung ansehen"
+"About Your Refund","Informationen zu Ihrer Rückerstattung"
+"My Orders","Meine Bestellungen"
+"About Your Invoice","Informationen zu Ihrer Rechnung"
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged","Gesamtsumme die belastet werden soll"
+Unassign,"Zuweisung entfernen"
+"We sent the message.","We sent the message."
+"This order no longer exists.","Diese Bestellung existiert nicht mehr."
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
+"The payment has been accepted.","Die Bezahlung ist akzeptiert worden."
+"The payment has been denied.","Die Zahlung wurde abgelehnt."
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.","Keine Bestellung(en) zurückgestellt."
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
+"There are no printable documents related to selected orders.","Es gibt keine ausdruckbaren Dokumente verbunden mit den gewählten Bestellungen."
+"The payment has been voided.","Die Zahlung wurde ungültig gemacht."
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.","Der Gutscheincode ist akzeptiert worden."
+"New Order","Neue Bestellung"
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice","Neue Rechnung"
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
+"Create New Order Status","Neuen Auftragsstatus anlegen"
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.","Bei der Zuweisung des Auftragsstatus ist ein Fehler aufgetreten. Status wurde nicht zugewiesen."
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
"Orders and Returns","Bestellungen und Retouren"
-"Orders and Returns Search Form","Suchmaske Bestellungen und Rücksendungen"
-"Original Price","Originalpreis"
-"Original order item that recurring payment corresponds to.","Ursprünglich bestellter Artikel, der dem Zahlungsprofil entspricht."
-"PDF Credit Memos","PDF Gutschriften"
-"PDF Invoices","PDF Rechnungen"
-"PDF Packing Slips","PDF Packzettel"
-"PDF Print-outs","PDF Ausdrucke"
-"PDF object is not specified.","PDF Objekt ist nicht spezifiziert."
-"PDF page object is not specified.","PDF Seitenobjekt ist nicht spezifiziert"
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","PDF Gesamtmodell sollte \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal erweitern"
-"Package","Paket"
-"Package types are disregarded for USPS domestic shipments.","Paket-Typen werden für den USPS Inlandsversand außer Acht gelassen."
-"Packages","Verpackungen"
-"Packing Slip # ","Packzettel #"
-"Paid","bezahlt"
-"Paid Amount","Bezahlter Betrag"
-"Parent Transaction ID","Ursprüngliche Transaktions-ID"
-"Parent transaction ID must have a transaction ID.","Die Transaktions-Stammkennung muss eine Transaktionskennung haben"
-"Partial","Unvollständig"
-"Payment Failed","Bezahlung fehlgeschlagen"
-"Payment Information","Information zur Zahlung"
-"Payment Method","Zahlungsart"
-"Payment Method","Name der Bezahlungsmethode"
-"Payment Method:","Zahlungsweise:"
-"Payment Review","Bezahlungsüberprüfung"
-"Payment disallow storing objects.","Die Zahlung erlaubt keine Speicherung von Objekten"
-"Payment transactions disallow storing objects.","Zahlungen beinhalten nicht das Speichern der Objekte."
-"Payment type","Zahlungsart"
-"Payment update has been made.","Update der Zahlung ist erfolgt"
-"Pending","Ausstehend"
-"Pending Payment","Ausstehende Bezahlung"
-"Period","Zeitraum"
-"Placed from IP","Bestellt von IP Nummer"
-"Please Select Products to Add","Bitte wählen Sie hinzuzufügende Produkte"
-"Please Select a Customer","Bitte wählen sie einen Kunden"
-"Please Select a Store","Bitte wählen sie ein Geschäft aus"
-"Please check billing address information. %s","Bitte überprüfen Sie die Rechnungsadresse. %s"
-"Please check shipping address information. %s","Bitte überprüfen Sie die Lieferadresse. %s"
-"Please define PDF object before using.","Bitte bestimmen sie vor Gebrauch das PDF Objekt"
-"Please enter positive number in this field.","Bitte schreiben sie in dieses Feld Pluszahlen."
-"Please select a valid payment method.","Bitte wählen Sie eine gültige Zahlungsmethode."
-"Please specify a shipping method.","Bitte geben Sie eine Versandart an."
-"Please specify a valid grid column alias name that exists in grid table.","Bitte geben sie eine gültige Reihenbezeichnung, die in der Matrix existiert, an."
-"Price","Preis"
-"Print","Ausdrucken"
-"Print All","Alles ausdrucken"
-"Print All Invoices","Alle Rechnungen drucken"
-"Print All Refunds","Alle Rückerstattungen ausdrucken"
-"Print All Shipments","Allen Versand drucken"
-"Print Credit Memos","Gutschriften ausdrucken"
-"Print Invoice","Rechnung drucken"
-"Print Invoices","Rechnungen ausdrucken"
-"Print Order","Bestellung ausdrucken"
-"Print Order # %s","Bestellung # %s ausdrucken"
-"Print Packing Slips","Packbelege ausdrucken"
-"Print Refund","Erstattung drucken"
-"Print Shipment","Lieferung ausdrucken"
-"Print Shipping Label","Versandetikett drucken"
-"Print Shipping Labels","Versandetiketten drucken"
-"Processing","Bearbeitung"
-"Product","Produkt"
-"Product Name","Produktname"
-"Products","Produkte"
-"Products Bestsellers Report","Bericht der am meisten verkauften Artikel"
-"Products in Comparison List","Artikel in der Vergleichsliste"
-"Products should be added to package(s)","Produkte sollten dem Paket/den Paketen hinzugefügt werden"
-"Payment #%s","Profil #%s"
-"Payment Information","Profilinformation"
-"Payment State","Profilstatus"
-"Profit","Ertrag"
-"Promotion Coupons Usage Report","Bericht über die Verwendung von Werbungsgutscheinen"
-"Proper payment object must be set.","Es muss ein geeignetes Bezahlungsobjekt eingestellt werden."
-"Purchase Order Number:","Bestellungsnummer:"
-"Purchase Point","Erworben von (Geschäft)"
-"Purchased Date","Gekauft am"
-"Purchased From","Gekauft von"
-"Purchased Item","Erworbener Artikel"
-"Qty","Anzahl"
-"Qty Invoiced","In Rechnung gestellte Menge"
-"Qty Ordered","Bestellte Menge"
-"Qty Shipped","Gelieferte Menge"
-"Qty To Add","Hinzuzufügende Menge"
-"Qty to Add","Hinzuzufügende Anz."
-"Qty to Invoice","Zu berechnende Menge"
-"Qty to Refund","Zu erstattende Menge"
-"Qty to Ship","Zu versendende Menge"
-"Quantity Ordered","bestellte Menge"
-"Quote item id is not received.","Die angegebene Artikelnummer wurde nicht empfangen."
-"Quote item is not loaded.","Der bestellte Artikel wird nicht geladen."
-"Rate","Steuersatz"
-"Recent Orders","Kürzlich aufgegebene Bestellungen"
-"Recently Compared Products","zuletzt verglichene Artikel"
-"Recently Viewed","Kürzlich angesehen"
-"Recently Viewed Products","Kürzlich angesehene Produkte"
-"Recurring Payment # %s","Wiederkehrendes Profil #%s"
-"Recurring Payment Initial Fee","Wiederkehrendes Profil Einrichtungsgebühr"
-"Recurring Payments","Wiederkehrende Profile"
-"Recurring Payments (beta)","Wiederkehrende Profile (Beta)"
-"Reference ID","Referenz-ID"
-"Reference ID:","Referenz-ID:"
-"Refresh","Aktualisieren"
-"Refund","Erstatten"
-"Refund #","Erstatten #"
-"Refund #%s","Rückerstattung #%s"
-"Refund Amount","Erstattungsbetrag"
-"Refund Offline","Offline-Rückerstattung"
-"Refund Shipping","Erstattung Versand"
-"Refund Shipping (Excl. Tax)","Erstattung Versand (exkl. Steuer)"
-"Refund Shipping (Incl. Tax)","Erstattung Versand (inkl. Steuer)"
-"Refund Totals","Gesamtrückerstattung"
-"Refunded","Rückerstattet"
-"Refunded amount of %s offline.","Erstatteter Betrag von %s offline."
-"Refunded amount of %s online.","Erstatteter Betrag von %s online."
-"Refunds","Gutschriften"
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State","Unbekannter Status"
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status","Unbekannter Status"
+Backordered,Rückständig
+Partial,Unvollständig
+Mixed,Gemischt
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
"Registered a Void notification.","Ungültige Benachrichtigung registriert."
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.","Zahlung online akzeptiert."
+"There is no need to approve this payment.","Diese Zahlung muss nicht bestätigt werden."
"Registered notification about approved payment.","Registrierte Benachrichtigung über akzeptierte Bezahlung."
-"Registered notification about captured amount of %s.","Benachrichtigung über begrenzten Betrag von %s registriert."
+"Denied the payment online","Denied the payment online"
+"There is no need to deny this payment.","Diese Bezahlung muss nicht verweigert werden."
"Registered notification about denied payment.","Benachrichtigung über abgelehnte Zahlung registriert."
-"Registered notification about refunded amount of %s.","Registrierte Benachrichtigung über rückerstatteten Betrag von %s."
"Registered update about approved payment.","Aktualisierung über bestätigte Zahlung registriert."
"Registered update about denied payment.","Registrierte Aktualisierung bezüglich abgelehnter Zahlung."
+"There is no update for the payment.","Es gibt kein Update zur Zahlung."
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.","Ungültige Berechtigung."
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
+"Set order for existing transactions not allowed","Die Reihenfolge für existierende Transaktionen festzulegen ist nicht gestattet"
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
+"Shipping Method:",Liefermethode:
+"Total Shipping Charges","Gesamte Versandkosten"
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
+"Total (ex)","Gesamt (ex)"
+"Total (inc)","Gesamtsumme (ink)"
+"Credit Memo # ","Credit Memo # "
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
+"Packing Slip # ","Packzettel #"
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
+"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","Das adresse total model sollte von \Magento\Sales\Model\Quote\Address\Total\AbstractTotal erweitert werden."
+"Subscription Items","Subscription Items"
"Regular Payment","Reguläre Zahlung"
-"Related Orders","Dazugehörige Bestellungen"
-"Remove","Entfernen"
-"Remove Coupon Code","Gutscheincode entfernen"
-"Remove tracking number","Tracking-Nummer entfernen"
-"Reorder","Wieder bestellen"
-"Retrieve credit memo info","Gutschrifts-Info abrufen"
-"Retrieve credit memo information","Gutschriftinformationen abrufen"
-"Retrieve credit memo list","Gutschrifts-Liste abrufen"
-"Retrieve invoice info","Rechnungsinformationen abrufen"
-"Retrieve invoice information","Rechnungsinformationen abrufen"
-"Retrieve list of credit memos by filters","Gutschrifts-Liste filtern"
-"Retrieve list of invoices by filters","Rechnungsliste nach Filtern abrufen"
-"Retrieve list of orders by filters","Bestellliste nach Filtern abrufen"
-"Retrieve list of shipments by filters","Versandliste nach Filtern abrufen"
-"Retrieve order information","Bestellinformation abrufen"
-"Retrieve orders info","Bestellungsinformationen abrufen"
-"Retrieve shipment info","Versandinformationen abrufen"
-"Retrieve shipment information","Versandinformation abrufen"
-"Return to Stock","Zurück zum Inventar"
-"Returned","Zurückgesendet"
-"Returns","Rücksendungen"
-"Revenue","Umsatz"
-"Row Subtotal","Zeilengesamtsumme"
-"Row Total","Zeilensumme"
-"SHIP TO:","LIEFERUNG AN:"
-"SKU","Artikelposition"
-"SOLD TO:","VERKAUFT AN:"
-"Sales","Verkäufe"
-"Sales Discount","Verkaufsermäßigung"
-"Sales Emails","Verkaufs-E-Mails"
-"Sales Emails Section","Verkaufsemailbereich"
-"Sales Invoice Print View","Rechnungsdruckansicht"
-"Sales Items","Verkaufsartikel"
-"Sales Order Print View","Auftrags-Druckansicht"
-"Sales Section","Verkaufsbereich"
-"Sales Shipment Print View","Versendungskauf-Druckansicht"
-"Sales Shipping","Versendungskauf"
-"Sales Tax","Umsatzsteuer"
-"Sales Total","Gesamtbetrag des Verkaufs"
-"Same As Billing Address","Identisch mit Rechnungsadresse"
-"Save Order Address","Bestelladresse speichern"
-"Save Status","Status speichern"
-"Save Status Assignment","Statuszuweisung speichern"
-"Save in address book","Speichern im Adressbuch"
-"Schedule","Planen"
-"Select","Auswählen"
-"Select All","Alle auswählen"
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.","Die angeforderte Zahlungsart ist nicht verfügbar."
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.","Bitte geben Sie eine Versandart an."
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.","Bitte wählen Sie eine gültige Zahlungsmethode."
+"Pending Payment","Ausstehende Bezahlung"
+"On Hold",Zurückgestellt
+Complete,Vollständig
+"Suspected Fraud","Betrug vermutet"
+"Payment Review",Bezahlungsüberprüfung
+"Changing address information will not recalculate shipping, tax or other order amount.","Durch das Ändern von Adressinformationen werden Versandkosten, Steuern oder ein sonstiger Bestellwert nicht neu berechnet."
+"Order Comments","Kommentare zur Bestellung"
+"Order Currency:","Währung der Bestellung:"
"Select from existing customer addresses:","Wählen Sie eine existierende Kundenadresse aus:"
-"Send Credit Memo Comment Email Copy To","Kreditkommentaremail in Kopie schicken an"
-"Send Credit Memo Comments Email Copy Method","Senden Gutschrift Kommentare E-Mail Kopie Methode"
-"Send Credit Memo Email Copy Method","Senden Gutschrift E-Mail Kopie Methode"
-"Send Credit Memo Email Copy To","Kreditkommentaremail in Kopie schicken an"
-"Send Email","E-Mail senden"
-"Send Invoice Comment Email Copy To","Rechnungskommentaremail in Kopie schicken an"
-"Send Invoice Comments Email Copy Method","Rechnung schicken Kommentare E-Mail Kopieren Methode"
-"Send Invoice Email Copy Method","Rechnung schicken E-Mail Kopieren Methode"
-"Send Invoice Email Copy To","Kopie der Rechnungs-E-Mail versenden an"
-"Send Order Comment Email Copy To","Bestellungskommentaremail in Kopie schicken an"
-"Send Order Comments Email Copy Method","Bestellung schicken Kommentare E-Mail Kopieren Methode"
-"Send Order Email","E-Mail mit der Bestellung versenden"
-"Send Order Email Copy Method","Bestellungsemail in Kopie schicken an"
-"Send Order Email Copy To","Bestellungskommentaremail in Kopie schicken an"
-"Send Sales Emails","Verkaufsemails verschicken"
-"Send Shipment Comment Email Copy To","Kopie der E-Mail mit dem Lieferungsvermerk versenden an"
-"Send Shipment Comments Email Copy Method","Senden Versand Kommentare E-Mail Kopie Methode"
-"Send Shipment Email Copy Method","Sendung schicken E-Mail Kopieren Methode"
-"Send Shipment Email Copy To","Kopie der Lieferungs-E-Mail versenden an"
-"Send Tracking Information","Rückverfolgungsinformation schicken"
-"Set order for existing transactions not allowed","Die Reihenfolge für existierende Transaktionen festzulegen ist nicht gestattet"
-"Ship","Versenden"
-"Ship Date","Versanddatum"
-"Ship To","Lieferung an"
-"Ship-to Name","Lieferung auf Namen"
-"Shipment","Lieferung #"
-"Shipment","Lieferung"
-"Shipment %1$s | %3$s (%2$s)","Lieferung #%1$s | %3$s (%2$s)"
-"Shipment %s","Lieferung #%s"
-"Shipment Comment Email Sender","Lieferungskommentaremail-Absender"
-"Shipment Comment Email Template","Lieferungskommentaremail-Vorlage"
-"Shipment Comment Email Template for Guest","Lieferungskommentaremail-Vorlage für Gast"
-"Shipment Comments","Lieferungskommentare"
-"Shipment Email Sender","Lieferungsemail-Absender"
-"Shipment Email Template","Lieferungsemail-Vorlage"
-"Shipment Email Template for Guest","Lieferungsemail-Vorlage für Gast"
-"Shipment Update","Lieferungsupdate"
-"Shipment Update for Guest","Lieferungsaktualisierung für Gast"
-"Shipments","Lieferungen"
-"Shipped","Versandt"
-"Shipped By","Geliefert von"
-"Shipping","Lieferung"
-"Shipping & Handling","Lieferung und Verarbeitung"
-"Shipping & Handling","Versand und Abwicklung"
-"Shipping & Handling Information","Versandinformationen"
-"Shipping Address","Lieferungsadresse"
-"Shipping Amount","Lieferungsbetrag"
-"Shipping Information","Lieferungsinformation"
-"Shipping Method","Liefermethode"
-"Shipping Method:","Liefermethode:"
-"Shipping Refund","Versanderstattung"
-"Shipping and Tracking Information","Lieferungs- und Rückverfolgungsinformation"
-"Shopping Cart","Einkaufswagen"
-"Show Packages","Sendungen anzeigen"
-"Signature Confirmation","Bestätigung Unterschrift"
-"Signed Up From","Angemeldet seit"
-"Size","Größe"
-"Sku","SKU"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Einige der unten angegebenen Produkte haben nicht alle benötigten Optionen. Bitte bearbeiten Sie sie und konfigurieren Sie alle benötigten Optionen."
-"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung."
-"Source object is not specified.","Quellobjekt ist nicht angegeben."
-"Specified profile does not exist.","Spezifiziertes Profil existiert nicht."
-"State Code [State Title]","Statuscode [Statustitel]"
-"State/Province","Staat/Bezirk"
-"Status","Status"
-"Status Code","Statuscode"
-"Status Label","Statuslabel"
-"Status:","Status:"
-"Store Credit","Guthaben aufbewahren"
-"Store View Specific Labels","Ladenansicht Spezifische Marken"
-"Street Address","Anschrift (Straße, Hausnummer, PLZ)"
-"Submit Comment","Kommentar abschicken"
-"Submit Credit Memo","Gutschrift übermitteln"
-"Submit Invoice","Rechnung einreichen"
-"Submit Invoice and Shipment","Rechnung und Lieferung vorlegen"
-"Submit Order","Bestellung abschicken"
-"Submit Shipment","Versand eingeben"
+"Same As Billing Address","Identisch mit Rechnungsadresse"
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order","Geschenkmitteilung für die gesamte Bestellung"
+"Move to Shopping Cart","In den Einkaufskorb legen"
"Subscribe to Newsletter","Newsletter abonnieren"
-"Subscribe to Order Status","Zum Auftragsstatus anmelden"
-"Subtotal","Zwischensumme"
-"Subtotal after discount.","Zwischensumme nach Rabatt."
-"Subtotal:","Zwischensumme:"
-"Suspected Fraud","Betrug vermutet"
-"Suspend","Aufheben"
-"Suspended","Suspendiert"
-"Tax","Steuer"
-"Tax Amount","Steuerbetrag"
+"Click to change shipping method","Klicken Sie um die Versandart zu ändern"
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates","Versandarten und -kosten abrufen"
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments","Kommentare anhängen"
+"Email Order Confirmation","E-Mail mit Auftragsbestätigung"
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund","Artikel zur Rückvergütung"
+"Return to Stock","Zurück zum Inventar"
+"Qty to Refund","Zu erstattende Menge"
+"Row Total",Zeilensumme
+"No Items To Refund","Keine Artikel für Erstattung"
+"Credit Memo Comments","Gutschrift Kommentare"
+"Refund Totals",Gesamtrückerstattung
+"Email Copy of Credit Memo","E-Mail-Kopie der Gutschrift"
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded","Rückvergütete Artikel"
+"No Items","Keine Artikel"
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment","Lieferung erstellen"
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice","Zu berechnende Menge"
+"Invoice History","Invoice History"
+"Invoice Comments","Kommentare zur Rechnung"
+"Invoice Totals","Invoice Totals"
+"Capture Amount",Erfassungssumme
+"Capture Online","Online Erfassung"
+"Capture Offline","Offline Erfassung"
+"Not Capture","Nicht gespeichert"
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
+"Email Copy of Invoice","Rechnungskopie per E-Mail senden"
+"Items Invoiced","In Rechnung gestellte Artikel"
+"Total Tax",Gesamtsteuern
+"From Name","Von Name"
+"To Name",Name
+"Add Order Comments","Bestellungskommentare hinzufügen"
+"Notification Not Applicable","Benachrichtigung nicht möglich"
+"the order confirmation email was sent","die Auftragsbestätigungs-E-Mail wurde versendet"
+"the order confirmation email is not sent","die Auftragsbestätigungs-E-Mail ist nicht versendet"
+"Order Date (%1)","Order Date (%1)"
+"Purchased From","Gekauft von"
+"Link to the New Order","Link zu neuer Bestellung"
+"Link to the Previous Order","Link zu vorheriger Bestellung"
+"Placed from IP","Bestellt von IP Nummer"
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status",Artikelstatus
+"Original Price",Originalpreis
"Tax Percent","Steuer Prozent"
-"Telephone","Telefon"
-"The Order State ""%s"" must not be set manually.","Der Auftragsstatus ""%s"" darf nicht manuell festgelegt werden."
-"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","Das adresse total model sollte von \Magento\Sales\Model\Quote\Address\Total\AbstractTotal erweitert werden."
-"The coupon code has been accepted.","Der Gutscheincode ist akzeptiert worden."
-"The message has been sent.","Die Nachricht ist gesendet."
-"The message was sent.","Die Nachricht ist gesendet worden."
-"The order address has been updated.","Die Auftragsadresse wurde aktualisiert."
-"The order email has been sent.","Die Auftrags-E-Mail ist gesendet worden."
-"The order has been cancelled.","Die Bestellung wurde storniert."
-"The order has been created.","Die Bestellung wurde erstellt."
-"The order has been put on hold.","Die Bestellung wurde auf Wartestellung gesetzt."
-"The order has been released from holding status.","Die Bestellung wurde aus der Wartestellung genommen."
-"The order has not been cancelled.","Die Bestellung wurde nicht storniert."
-"The order status has been assigned.","Der Auftragsstatus wurde festgesetzt."
-"The order status has been saved.","Der Auftragsstatus wurde gespeichert."
-"The order status has been unassigned.","Der Auftragsstatus wurde entfernt."
-"The order was not put on hold.","Die Bestellung wurde nicht auf Wartestellung gesetzt."
-"The order was not unheld.","Der Auftrag ist nicht freigegeben worden."
-"The order was placed using %s","Die Bestellung wurde unter Verwendung von %s durchgeführt"
-"The order(s) cannot be canceled","Die Bestellung(en) konnte(n) nicht storniert werden"
-"The payment has been accepted.","Die Bezahlung ist akzeptiert worden."
-"The payment has been denied.","Die Zahlung wurde abgelehnt."
-"The payment has been voided.","Die Zahlung wurde ungültig gemacht."
-"The profile has been updated.","Das Profil wurde aktualisiert."
-"The profile has no changes.","Es gibt keine Änderungen zum Profil."
-"The profile state has been updated.","Der Profilstand wurde aktualisiert."
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","Die Menge, die Sie hinzufügen möchten übersteigt die Gesamtanzahl des ausgewählten Produktes / der ausgewählten Produkte."
-"The requested Payment Method is not available.","Die angeforderte Zahlungsart ist nicht verfügbar."
-"The shipping label has been created.","Das Versandlabel wurde erstellt."
-"The transaction ""%s"" (%s) is already closed.","Die Transaktion ""%s"" (%s) ist bereits abgeschlossen."
-"The transaction ""%s"" cannot be captured yet.","Die Transaktion ""%s"" kann noch nicht erfasst werden."
-"The value that you entered is not valid.","Der von Ihnen eingegebene Wert ist ungültig."
-"There are no printable documents related to selected orders.","Es gibt keine ausdruckbaren Dokumente verbunden mit den gewählten Bestellungen."
-"There are no shipping labels related to selected %s.","Keine Versandetiketten beziehen sich auf das ausgewählte %s ."
-"There is no need to approve this payment.","Diese Zahlung muss nicht bestätigt werden."
-"There is no need to deny this payment.","Diese Bezahlung muss nicht verweigert werden."
-"There is no update for the payment.","Es gibt kein Update zur Zahlung."
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Diese Nachricht erscheint im Warenkorb, wenn Zwischensumme nach Rabatt weniger als Mindestbetrag."
-"This operation requires an existing transaction object.","Diese Operation erfordert ein existierendes Transaktionsobjekt."
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Diese Bestellung enthält (%s) Artikel und kann deshalb nicht mit der Administrator-Oberfläche bearbeitet werden. Wenn Sie fortfahren möchten, werden die (%s) Artikel entfernt, die Bestellung wird gelöscht und eine neue erstellt."
-"This product does not have any configurable options","Dieses Produkt hat keine Einstellungsmöglichkeiten."
-"This order no longer exists.","Diese Bestellung existiert nicht mehr."
-"This profile state cannot be changed to ""%s"".","Dieser Profilstatus kann nicht zu ""%s"" geändert werden."
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Dies erstellt eine Offine Rückerstattung. Um eine Online Rückerstattung zu erstellen, öffnen Sie eine Rechnung und erstellen Sie eine Gutschrift. Wollen Sie fortfahren?"
-"Tier Pricing","Preisebene"
-"Title","Titel"
-"To","An"
-"To Name","Name"
-"To:","An:"
-"Total","Gesamt"
-"Total %d product(s)","Gesamtsumme %d Produkt(e)"
-"Total (ex)","Gesamt (ex)"
-"Total (inc)","Gesamtsumme (ink)"
-"Total Due","Gesamtsumme fällig"
-"Total Invoiced","Gesamtsumme in Rechnung"
-"Total Invoiced Paid","Gesamtsumme in Rechnung, bezahlt"
-"Total Invoiced VS Paid Report","Gesamtsumme in Rechnung VS Paid Report"
-"Total Invoiced not Paid","Gesamtsumme in Rechnung, nicht bezahlt"
-"Total Ordered Report","Report Gesamtbestellvolumen"
-"Total Paid","Gesamtsumme bezahlt"
-"Total Quantity","Gesamtanzahl"
-"Total Refund","Erstattungsbetrag"
-"Total Refunded","Gesamtsumme rückerstattet"
-"Total Refunded Report","Gesamtreport zu Rückerstattungen"
-"Total Sales Shipping","Gesamtumsatz Versand"
-"Total Shipped Report","Gesamtreport versendeter Produkte"
-"Total Shipping","Gesamtsumme Versand"
-"Total Shipping Charges","Gesamte Versandkosten"
-"Total Tax","Gesamtsteuern"
-"Total Weight","Gesamtgewicht"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","Das Gesamtmodell ist um \Magento\Sales\Model\Order\Total\AbstractTotal zu erweitern."
-"Track Order","Bestellung nachverfolgen"
-"Track all shipment(s)","Alle Sendungen nachverfolgen"
-"Track all shipments","Allen Versand verfolgen"
-"Track this shipment","Diese Sendung nachverfolgen"
-"Track your order","Ihre Bestellung nachverfolgen"
-"Tracking","Tracking"
-"Tracking Number","Verfolgungsnummer"
-"Tracking Number(s):","Trackingnummer(n):"
-"Transaction ""%s"" was already processed.","Transaktion ""%s"" wurde schon bearbeitet."
-"Transaction # %s | %s","Transaktions-Nr. %s | %s"
-"Transaction ID","TransaktionsID"
-"Transaction ID must not be empty.","TransaktionsID darf nicht leer sein."
-"Transaction ID: ""%s"".","Transaktions-ID: ""%s""."
-"Transaction Type","Transaktionstyp"
-"Transactions","Transaktionen"
-"Trial ","Test"
-"Trial Payment","Probezahlung"
-"Trial Period","Testperiode"
-"Trial period payment","Probeperiodenzahlung"
-"Type","Typ"
-"Unassign","Zuweisung entfernen"
-"Unhold","Freigabe"
-"Unhold action is not available.","Freigabe der Aktion ist nicht verfügbar."
-"Unhold order","Bestellung freigeben"
-"Unknown State","Unbekannter Status"
-"Unknown Status","Unbekannter Status"
-"Unsupported transaction type ""%s"".","Nicht unterstützter Transaktionstyp ""%s""."
-"Update Changes","Änderungen aktualisieren"
-"Update Items and Qty's","Artikel und Mengen aktualisieren"
-"Update Qty's","Anzahl aktualisieren"
-"Updated","Aktualisiert am"
-"Updated:","Aktualisiert:"
-"Use Aggregated Data (beta)","Gesamtdaten (Beta) verwenden"
-"Use Order Status As Default","Bestellstatus als Standard verwenden"
-"Validate Each Address Separately in Multi-address Checkout","Jede Adresse im Multiadress-Ausgang gesondert validieren"
-"Value","Wert"
-"View","Ansicht"
-"View All","Alle ansehen"
-"View Another Order","Eine andere Bestellung ansehen"
-"View Order","Bestellung ansehen"
-"Visible on Frontend","Am Frontende sichtbar"
-"Void","Leer"
-"Void invoice","Leere Rechnung"
-"Voided authorization.","Ungültige Berechtigung."
-"Website","Website"
-"Weight","Gewicht"
-"Whether buyer can define the date when billing for the profile begins.","Ob Käufer das Datum festlegen kann, wann Abrechnung des Profils beginnt."
-"Width","Breite"
-"Wishlist","Wunschzettel"
-"Wrong quote item id to update configuration.","Falsche Angebotskennnummer zur Aktualisierung der Konfiguration."
-"Wrong state: ""%s"".","Falscher Zustand: ""%s""."
-"Yes","Ja"
-"You can leave a box blank if you don't wish to add a gift message for whole order","Sie können ein Eingabefeld leer lassen, wenn Sie keine Geschenkmitteilung für die gesamte Bestellung hinzufügen möchten."
+"Transaction Data","Transaction Data"
+"Parent Transaction ID","Ursprüngliche Transaktions-ID"
+"Transaction Type",Transaktionstyp
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
+"Gift Message for this Order","Grußnachricht für diesen Auftrag"
+"Shipped By","Geliefert von"
+"Tracking Number",Verfolgungsnummer
+"Billing Last Name","Nachname in der Rechnung"
+"Find Order By:","Bestellungen finden durch:"
+"ZIP Code","ZIP Code"
+"Billing ZIP Code","PLZ in der Rechnung"
+"Print All Refunds","Alle Rückerstattungen ausdrucken"
+"Refund #","Erstatten #"
+"Print Refund","Erstattung drucken"
"You have placed no orders.","Sie haben keine Bestellungen aufgegeben."
-"You will be redirected to the payment system website.","Sie werden zu der Zahlungssystem-Website weitergeleitet."
-"Your credit card will be charged for","Ihre Kreditkarte wird belastet mit"
-"ZIP/Post Code","Postleitzahl"
-"Zip/Postal Code","Postleitzahl"
-"cm","cm"
-"in","in"
-"kg","kg"
-"lb","US-Pfund"
-"the credit memo email is not sent","die Gutschrifts-E-Mail wurde nicht gesendet"
-"the credit memo email was sent","die Gutschrift-E-Mail wurde versendet"
-"the invoice email is not sent","die Rechnungs-E-Mail ist nicht versendet"
-"the invoice email was sent","die Rechnungs-E-Mail wurde versendet"
-"the order confirmation email is not sent","die Auftragsbestätigungs-E-Mail ist nicht versendet"
-"the order confirmation email was sent","die Auftragsbestätigungs-E-Mail wurde versendet"
-"the shipment email is not sent","die Versand-E-Mail wurde nicht gesendet"
-"the shipment email was sent","die Lieferungs-E-Mail wurde versendet"
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available","Keine Versandinformation verfügbar"
+"Print Order","Bestellung ausdrucken"
+"Subscribe to Order Status","Zum Auftragsstatus anmelden"
+"Print All Invoices","Alle Rechnungen drucken"
+"Invoice #","Rechnung #"
+"Print Invoice","Rechnung drucken"
+"Qty Invoiced","In Rechnung gestellte Menge"
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
+"Items Shipped","Artikel versandt"
+"Qty Shipped","Gelieferte Menge"
+"View All","Alle ansehen"
+"Gift Message for This Order","Geschenknachricht für diese Bestellung"
+"About Your Order","Ãœber Ihre Bestellung"
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title","Kundenspezifischen Titel festlegen"
+Phone,Phone
+"Default Template",Standardvorlage
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
+"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
+"Minimum Amount","Minimum Amount"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
+"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
+"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
+"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
+"New Order Confirmation Template","New Order Confirmation Template"
+"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
+"Order Comment Email Sender","Order Comment Email Sender"
+"Order Comment Email Template","Order Comment Email Template"
+"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,Lieferung
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
+"Orders and Returns Search Form","Suchmaske Bestellungen und Rücksendungen"
+"PDF Credit Memos","PDF Gutschriften"
+"PDF Invoices","PDF Rechnungen"
+"Invoice Date",Rechnungsdatum
+"ZIP/Post Code",Postleitzahl
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS","RSS für neue Bestellung"
+"Print Invoices","Rechnungen ausdrucken"
+"Print Packing Slips","Packbelege ausdrucken"
+"Print Credit Memos","Gutschriften ausdrucken"
+"Print All","Alles ausdrucken"
+"Print Shipping Labels","Versandetiketten drucken"
+"Ship Date",Versanddatum
+"Total Quantity",Gesamtanzahl
+"Default Status",Standardstatus
+"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)."
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index ecdf19bbfd4..d2e12e77490 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -1,849 +1,712 @@
-"""%s"" coupon code is not valid.","""%s"" coupon code is not valid."
-"%s","%s"
-"%s / %s rate:","%s / %s rate:"
-"%s for %s","%s for %s"
-"%s order(s) cannot be canceled","%s order(s) cannot be canceled"
-"%s order(s) have been canceled.","%s order(s) have been canceled."
-"%s order(s) have been put on hold.","%s order(s) have been put on hold."
-"%s order(s) have been released from holding status.","%s order(s) have been released from holding status."
-"%s order(s) were not put on hold.","%s order(s) were not put on hold."
-"%s order(s) were not released from holding status.","%s order(s) were not released from holding status."
-"* - Enter custom price excluding tax","* - Enter custom price excluding tax"
-"* - Enter custom price including tax","* - Enter custom price including tax"
-"-- Please Select --","-- Please Select --"
-"About This Order:","About This Order:"
-"About This Payment:","About This Payment:"
-"About Your Invoice","About Your Invoice"
-"About Your Order","About Your Order"
-"About Your Refund","About Your Refund"
-"About Your Shipment","About Your Shipment"
-"Accept Payment","Accept Payment"
-"Accept or Deny Payment","Accept or Deny Payment"
+Remove,Remove
+Close,Close
+Cancel,Cancel
+Back,Back
+"Add Products","Add Products"
+"Update Items and Qty's","Update Items and Qty's"
+Product,Product
+Price,Price
+Quantity,Quantity
+Products,Products
+ID,ID
+SKU,SKU
+Apply,Apply
+Configure,Configure
+"Shopping Cart","Shopping Cart"
+"Quote item id is not received.","Quote item id is not received."
+"Quote item is not loaded.","Quote item is not loaded."
+No,No
+"Apply Coupon Code","Apply Coupon Code"
+"Remove Coupon Code","Remove Coupon Code"
+Qty,Qty
+Subtotal,Subtotal
+Discount,Discount
+"Row Subtotal","Row Subtotal"
+Action,Action
+"No ordered items","No ordered items"
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,Subtotal:
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Move to Wishlist"
+Edit,Edit
+Item,Item
+"Add to Cart","Add to Cart"
+Sku,Sku
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,Orders
+Customer,Customer
+Guest,Guest
+"Grand Total","Grand Total"
+Tax,Tax
+Shipping,Shipping
"Account Information","Account Information"
-"Action","Action"
-"Actions","Actions"
-"Activate","Activate"
-"Active","Active"
-"Add","Add"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+Refresh,Refresh
+Enable,Enable
+General,General
+Yes,Yes
+Name,Name
+Status,Status
+Enabled,Enabled
+Title,Title
+Home,Home
+Any,Any
+From,From
+To,To
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,Order
+"Order #%1","Order #%1"
+"Shipping Amount","Shipping Amount"
+"Tax Amount","Tax Amount"
+View,View
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Ordered,Ordered
+Invoiced,Invoiced
+Shipped,Shipped
+Refunded,Refunded
+Canceled,Canceled
+From:,From:
+To:,To:
+"Gift Message","Gift Message"
+Message:,Message:
+"Tier Pricing","Tier Pricing"
+"Go to Home Page","Go to Home Page"
+"Customer Group","Customer Group"
+Closed,Closed
+"Product Name","Product Name"
+"Discount Amount","Discount Amount"
+Country,Country
+State/Province,State/Province
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+"Shipping Method","Shipping Method"
+"Clear Shopping Cart","Clear Shopping Cart"
+City,City
+"Zip/Postal Code","Zip/Postal Code"
+"Email Address","Email Address"
+Company,Company
+Address,Address
+"Street Address","Street Address"
+Telephone,Telephone
+"Save in address book","Save in address book"
+Continue,Continue
+"Order #","Order #"
+"No Payment Methods","No Payment Methods"
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+"Payment Method","Payment Method"
+Sales,Sales
+Created,Created
+Select,Select
+Comment,Comment
+%1,%1
+Date,Date
"Add New Address","Add New Address"
-"Add Order Comments","Add Order Comments"
-"Add Package","Add Package"
-"Add Products","Add Products"
-"Add Selected Product(s) to Option","Add Selected Product(s) to Option"
-"Add Selected Product(s) to Order","Add Selected Product(s) to Order"
-"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Purchase Date","Purchase Date"
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+"Recent Orders","Recent Orders"
+"Store Credit","Store Credit"
+Notified,Notified
+"Notify Customer by Email","Notify Customer by Email"
+Billing,Billing
+"Newsletter Subscription","Newsletter Subscription"
+"Order Status","Order Status"
+"Wish List","Wish List"
+Pending,Pending
+"View Order","View Order"
+Amount,Amount
+Message,Message
+Information,Information
+"Gift Options","Gift Options"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,New
+"Custom Price","Custom Price"
+Processing,Processing
"Add To Order","Add To Order"
-"Add Tracking Number","Add Tracking Number"
-"Add comment to order","Add comment to order"
-"Add new comment to credit memo","Add new comment to credit memo"
-"Add new comment to shipment","Add new comment to shipment"
-"Add new tracking number","Add new tracking number"
-"Add to Cart","Add to Cart"
-"Additional Product Info","Additional Product Info"
-"Address","Address"
-"Address model is not defined.","Address model is not defined."
-"Adjustment Fee","Adjustment Fee"
-"Adjustment Refund","Adjustment Refund"
-"Agreement Information","Agreement Information"
-"Allow Reorder","Allow Reorder"
-"Amount","Amount"
-"Amount: %s.","Amount: %s."
-"An error occurred while assigning order status. Status has not been assigned.","An error occurred while assigning order status. Status has not been assigned."
-"An error occurred while creating shipping label.","An error occurred while creating shipping label."
-"An error occurred while saving order status. The status has not been added.","An error occurred while saving order status. The status has not been added."
-"An error occurred while unassigning order status.","An error occurred while unassigning order status."
-"An error occurred while updating the order address. The address has not been changed.","An error occurred while updating the order address. The address has not been changed."
-"An item option with code %s already exists.","An item option with code %s already exists."
-"Anchor Custom Title","Anchor Custom Title"
-"Append Comments","Append Comments"
-"Apply","Apply"
-"Apply Coupon Code","Apply Coupon Code"
-"Approved the payment online.","Approved the payment online."
-"Are you sure you want to accept this payment?","Are you sure you want to accept this payment?"
+"Configure and Add to Order","Configure and Add to Order"
+"No items","No items"
+Authorization,Authorization
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."
+"Transaction ID","Transaction ID"
+"Order ID","Order ID"
+Void,Void
+"Created At","Created At"
+"Payment Method:","Payment Method:"
+"Ship To","Ship To"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Grand Total (Base)","Grand Total (Base)"
+"Grand Total (Purchased)","Grand Total (Purchased)"
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Refunded","Total Refunded"
+Paid,Paid
+Coupons,Coupons
+"Recently Viewed","Recently Viewed"
+"Recently Compared Products","Recently Compared Products"
+"Recently Viewed Products","Recently Viewed Products"
+Print,Print
+"Submit Comment","Submit Comment"
+Returned,Returned
+"Order Date","Order Date"
+"Order # ","Order # "
+"Order Date: ","Order Date: "
+"Comment Text","Comment Text"
+"Visible on Frontend","Visible on Frontend"
+"Not Notified","Not Notified"
+"Please select products.","Please select products."
+Number,Number
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Shipping & Handling"
+"Credit Memos","Credit Memos"
+Invoices,Invoices
+"We cannot get the order instance.","We cannot get the order instance."
+"Create New Order","Create New Order"
+"Save Order Address","Save Order Address"
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
+"Order Address Information","Order Address Information"
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order","Submit Order"
"Are you sure you want to cancel this order?","Are you sure you want to cancel this order?"
+"Order Comment","Order Comment"
+"Please select a customer.","Please select a customer."
+"Create New Customer","Create New Customer"
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
+"Create New Order for New Customer","Create New Order for New Customer"
+"Items Ordered","Items Ordered"
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty","Item ordered qty"
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - Enter custom price including tax"
+"* - Enter custom price excluding tax","* - Enter custom price excluding tax"
+"This product does not have any configurable options","This product does not have any configurable options"
+"Add Selected Product(s) to Order","Add Selected Product(s) to Order"
+"Update Changes","Update Changes"
"Are you sure you want to delete all items from shopping cart?","Are you sure you want to delete all items from shopping cart?"
-"Are you sure you want to deny this payment?","Are you sure you want to deny this payment?"
-"Are you sure you want to do this?","Are you sure you want to do this?"
-"Are you sure you want to send Creditmemo email to customer?","Are you sure you want to send Creditmemo email to customer?"
-"Are you sure you want to send Invoice email to customer?","Are you sure you want to send Invoice email to customer?"
-"Are you sure you want to send Shipment email to customer?","Are you sure you want to send Shipment email to customer?"
-"Are you sure you want to send order email to customer?","Are you sure you want to send order email to customer?"
-"Are you sure you want to void the payment?","Are you sure you want to void the payment?"
-"Are you sure?","Are you sure?"
-"Are you sure? This order will be canceled and a new one will be created instead","Are you sure? This order will be canceled and a new one will be created instead"
-"Assign Order Status to State","Assign Order Status to State"
+"Products in Comparison List","Products in Comparison List"
+"Last Ordered Items","Last Ordered Items"
+"Please select a store.","Please select a store."
+"Order Totals","Order Totals"
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)","Refund Shipping (Incl. Tax)"
+"Refund Shipping (Excl. Tax)","Refund Shipping (Excl. Tax)"
+"Refund Shipping","Refund Shipping"
+"Update Qty's","Update Qty's"
+Refund,Refund
+"Refund Offline","Refund Offline"
+"Paid Amount","Paid Amount"
+"Refund Amount","Refund Amount"
+"Shipping Refund","Shipping Refund"
+"Order Grand Total","Order Grand Total"
+"Adjustment Refund","Adjustment Refund"
+"Adjustment Fee","Adjustment Fee"
+"Send Email","Send Email"
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent","the credit memo email is not sent"
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund","Total Refund"
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment","Submit Invoice and Shipment"
+"Submit Invoice","Submit Invoice"
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo","Credit Memo"
+Capture,Capture
+"the invoice email was sent","the invoice email was sent"
+"the invoice email is not sent","the invoice email is not sent"
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses","Order Statuses"
+"Create New Status","Create New Status"
"Assign Status to State","Assign Status to State"
+"Save Status Assignment","Save Status Assignment"
+"Assign Order Status to State","Assign Order Status to State"
"Assignment Information","Assignment Information"
-"At least a payment ID must be set.","At least a payment ID must be set."
-"Authorization","Authorization"
-"Authorized amount of %s.","Authorized amount of %s."
-"Authorizing amount of %s is pending approval on gateway.","Authorizing amount of %s is pending approval on gateway."
-"Back","Back"
-"Back to My Orders","Back to My Orders"
-"Back to Recurring Payments","Back to Recurring Payments"
-"Backordered","Backordered"
-"Bestsellers","Bestsellers"
-"Bill-to Name","Bill-to Name"
-"Billing","Billing"
-"Billing Address","Billing Address"
-"Billing Last Name","Billing Last Name"
-"Billing ZIP Code","Billing ZIP Code"
-"Buy %s for price %s","Buy %s for price %s"
-"CSV","CSV"
-"Cancel","Cancel"
-"Cancel credit memo","Cancel credit memo"
-"Cancel invoice","Cancel invoice"
-"Cancel order","Cancel order"
-"Canceled","Canceled"
-"Canceled order offline.","Canceled order offline."
-"Canceled order online.","Canceled order online."
-"Cannot add order history.","Cannot add order history."
-"Cannot create an empty shipment.","Cannot create an empty shipment."
-"Cannot determine the field name.","Cannot determine the field name."
-"Cannot do invoice for order.","Cannot do invoice for order."
-"Cannot do shipment for order.","Cannot do shipment for order."
-"Cannot get order instance","Cannot get order instance"
-"Cannot get the order instance.","Cannot get the order instance."
-"Cannot register an existing credit memo.","Cannot register an existing credit memo."
-"Cannot register existing invoice","Cannot register existing invoice"
-"Cannot register existing shipment","Cannot register existing shipment"
-"Capture","Capture"
-"Capture Amount","Capture Amount"
-"Capture Offline","Capture Offline"
-"Capture Online","Capture Online"
-"Capture invoice","Capture invoice"
-"Captured amount of %s online.","Captured amount of %s online."
-"Capturing amount of %s is pending approval on gateway.","Capturing amount of %s is pending approval on gateway."
-"Carrier","Carrier"
-"Carrier/Method","Carrier/Method"
-"Change status, add comments","Change status, add comments"
-"Changing address information will not recalculate shipping, tax or other order amount.","Changing address information will not recalculate shipping, tax or other order amount."
-"Checkout Totals Sort Order","Checkout Totals Sort Order"
-"City","City"
-"Clear Shopping Cart","Clear Shopping Cart"
-"Click to change shipping method","Click to change shipping method"
-"Close","Close"
-"Closed","Closed"
-"Comma-separated.","Comma-separated."
-"Comment","Comment"
-"Comment Text","Comment Text"
-"Comments","Comments"
+"Order State","Order State"
+"Use Order Status As Default","Use Order Status As Default"
+"Visible On Frontend","Visible On Frontend"
+"Edit Order Status","Edit Order Status"
+"Save Status","Save Status"
+"New Order Status","New Order Status"
+"Order Status Information","Order Status Information"
+"Status Code","Status Code"
+"Status Label","Status Label"
+"Store View Specific Labels","Store View Specific Labels"
+"Total Paid","Total Paid"
+"Total Due","Total Due"
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?","Are you sure you want to void the payment?"
+Hold,Hold
+hold,hold
+Unhold,Unhold
+unhold,unhold
+"Are you sure you want to accept this payment?","Are you sure you want to accept this payment?"
+"Accept Payment","Accept Payment"
+"Are you sure you want to deny this payment?","Are you sure you want to deny this payment?"
+"Deny Payment","Deny Payment"
+"Get Payment Update","Get Payment Update"
+"Invoice and Ship","Invoice and Ship"
+Invoice,Invoice
+Ship,Ship
+Reorder,Reorder
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
+"Order Credit Memos","Order Credit Memos"
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
"Comments History","Comments History"
-"Company","Company"
-"Complete","Complete"
-"Configure","Configure"
-"Configure and Add to Order","Configure and Add to Order"
-"Contents","Contents"
-"Continue","Continue"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controls whether customer IP is shown in orders, invoices, shipments, credit memos."
-"Country","Country"
-"Coupons","Coupons"
-"Create","Create"
-"Create New Customer","Create New Customer"
-"Create New Order","Create New Order"
+"Order History","Order History"
+"Order Information","Order Information"
+"Order Invoices","Order Invoices"
+Shipments,Shipments
+"Order Shipments","Order Shipments"
+Transactions,Transactions
+"Order View","Order View"
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
+"Shipping & Handling","Shipping & Handling"
+Fetch,Fetch
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,Key
+Value,Value
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"About Your Refund","About Your Refund"
+"My Orders","My Orders"
+"About Your Invoice","About Your Invoice"
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged","Grand Total to be Charged"
+Unassign,Unassign
+"We sent the message.","We sent the message."
+"This order no longer exists.","This order no longer exists."
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
+"The payment has been accepted.","The payment has been accepted."
+"The payment has been denied.","The payment has been denied."
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.","No order(s) were put on hold."
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
+"There are no printable documents related to selected orders.","There are no printable documents related to selected orders."
+"The payment has been voided.","The payment has been voided."
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.","The coupon code has been accepted."
+"New Order","New Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice","New Invoice"
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
"Create New Order Status","Create New Order Status"
-"Create New Order for %s","Create New Order for %s"
-"Create New Order for %s in %s","Create New Order for %s in %s"
-"Create New Order for New Customer","Create New Order for New Customer"
-"Create New Order for New Customer in %s","Create New Order for New Customer in %s"
-"Create New Status","Create New Status"
-"Create Order","Create Order"
-"Create Packages","Create Packages"
-"Create Shipment","Create Shipment"
-"Create Shipping Label","Create Shipping Label"
-"Create Shipping Label...","Create Shipping Label..."
-"Create new credit memo for order","Create new credit memo for order"
-"Create new invoice for order","Create new invoice for order"
-"Create new shipment for order","Create new shipment for order"
-"Create...","Create..."
-"Created","Created"
-"Created:","Created:"
-"Credit Memo","Credit Memo"
-"Credit Memo #","Credit Memo #"
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.","An error occurred while assigning order status. Status has not been assigned."
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
+"Orders and Returns","Orders and Returns"
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State","Unknown State"
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status","Unknown Status"
+Backordered,Backordered
+Partial,Partial
+Mixed,Mixed
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
+"Registered a Void notification.","Registered a Void notification."
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.","Approved the payment online."
+"There is no need to approve this payment.","There is no need to approve this payment."
+"Registered notification about approved payment.","Registered notification about approved payment."
+"Denied the payment online","Denied the payment online"
+"There is no need to deny this payment.","There is no need to deny this payment."
+"Registered notification about denied payment.","Registered notification about denied payment."
+"Registered update about approved payment.","Registered update about approved payment."
+"Registered update about denied payment.","Registered update about denied payment."
+"There is no update for the payment.","There is no update for the payment."
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.","Voided authorization."
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
+"Set order for existing transactions not allowed","Set order for existing transactions not allowed"
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
+"Shipping Method:","Shipping Method:"
+"Total Shipping Charges","Total Shipping Charges"
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
+"Total (ex)","Total (ex)"
+"Total (inc)","Total (inc)"
"Credit Memo # ","Credit Memo # "
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Credit Memo #%1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
-"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
-"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
+"Packing Slip # ","Packing Slip # "
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
+"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
+"Subscription Items","Subscription Items"
+"Regular Payment","Regular Payment"
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.","The requested Payment Method is not available."
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.","Please specify a shipping method."
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.","Please select a valid payment method."
+"Pending Payment","Pending Payment"
+"On Hold","On Hold"
+Complete,Complete
+"Suspected Fraud","Suspected Fraud"
+"Payment Review","Payment Review"
+"Changing address information will not recalculate shipping, tax or other order amount.","Changing address information will not recalculate shipping, tax or other order amount."
+"Order Comments","Order Comments"
+"Order Currency:","Order Currency:"
+"Select from existing customer addresses:","Select from existing customer addresses:"
+"Same As Billing Address","Same As Billing Address"
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order","Gift Message for the Entire Order"
+"Move to Shopping Cart","Move to Shopping Cart"
+"Subscribe to Newsletter","Subscribe to Newsletter"
+"Click to change shipping method","Click to change shipping method"
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates","Get shipping methods and rates"
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments","Append Comments"
+"Email Order Confirmation","Email Order Confirmation"
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund","Items to Refund"
+"Return to Stock","Return to Stock"
+"Qty to Refund","Qty to Refund"
+"Row Total","Row Total"
+"No Items To Refund","No Items To Refund"
"Credit Memo Comments","Credit Memo Comments"
-"Credit Memo Email Sender","Credit Memo Email Sender"
-"Credit Memo Email Template","Credit Memo Email Template"
-"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
-"Credit Memo Update","Credit Memo Update"
-"Credit Memo Update for Guest","Credit Memo Update for Guest"
-"Credit Memos","Credit Memos"
-"Credit memo canceling problem.","Credit memo canceling problem."
-"Credit memo cannot be canceled.","Credit memo cannot be canceled."
-"Credit memo has been created automatically","Credit memo has been created automatically"
-"Custom Price","Custom Price"
-"Custom Value","Custom Value"
-"Customer","Customer"
-"Customer Can Define Start Date","Customer Can Define Start Date"
-"Customer Group","Customer Group"
-"Customer My Account Order Creditmemo View","Customer My Account Order Creditmemo View"
-"Customer My Account Order History","Customer My Account Order History"
-"Customer My Account Order Invoice View","Customer My Account Order Invoice View"
-"Customer My Account Order Shipment View","Customer My Account Order Shipment View"
-"Customer My Account Order View","Customer My Account Order View"
-"Customer's Current Activities","Customer's Current Activities"
-"Customs Value","Customs Value"
-"Date","Date"
-"Default Status","Default Status"
-"Default Template","Default Template"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If you see image distortion in PDF, try to use larger image"
-"Delete","Delete"
-"Delete Package","Delete Package"
-"Denied the payment online.","Denied the payment online."
-"Deny Payment","Deny Payment"
-"Description Message","Description Message"
-"Discount","Discount"
-"Discount (%s)","Discount (%s)"
-"Discount Amount","Discount Amount"
-"Display Order ID in Header","Display Order ID in Header"
-"Edit","Edit"
-"Edit Order #%s","Edit Order #%s"
-"Edit Order %s %s Address","Edit Order %s %s Address"
-"Edit Order Status","Edit Order Status"
-"Email","Email"
-"Email Address","Email Address"
+"Refund Totals","Refund Totals"
"Email Copy of Credit Memo","Email Copy of Credit Memo"
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded","Items Refunded"
+"No Items","No Items"
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment","Create Shipment"
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice","Qty to Invoice"
+"Invoice History","Invoice History"
+"Invoice Comments","Invoice Comments"
+"Invoice Totals","Invoice Totals"
+"Capture Amount","Capture Amount"
+"Capture Online","Capture Online"
+"Capture Offline","Capture Offline"
+"Not Capture","Not Capture"
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
"Email Copy of Invoice","Email Copy of Invoice"
-"Email Copy of Shipment","Email Copy of Shipment"
-"Email Order Confirmation","Email Order Confirmation"
-"Enable","Enable"
-"Enabled","Enabled"
-"Enter the billing last name and email/ZIP as in the order billing address","Enter the billing last name and email/ZIP as in the order billing address"
-"Entered data is incorrect. Please try again.","Entered data is incorrect. Please try again."
-"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
-"Excel XML","Excel XML"
-"Excl. Tax","Excl. Tax"
-"Expired","Expired"
-"Explanation","Explanation"
-"Failed to send the order email.","Failed to send the order email."
-"Failed to update the payment.","Failed to update the payment."
-"Failed to update the profile.","Failed to update the profile."
-"Failed to void the payment.","Failed to void the payment."
-"Fetch","Fetch"
-"File extension not known or unsupported type in the following shipment: %s","File extension not known or unsupported type in the following shipment: %s"
-"Find Order By:","Find Order By:"
-"First Name","First Name"
-"From","From"
+"Items Invoiced","Items Invoiced"
+"Total Tax","Total Tax"
"From Name","From Name"
-"From:","From:"
-"General","General"
-"General Information","General Information"
-"Get Payment Update","Get Payment Update"
-"Get Update","Get Update"
-"Get shipping methods and rates","Get shipping methods and rates"
-"Gift Message","Gift Message"
-"Gift Message for This Order","Gift Message for This Order"
-"Gift Message for the Entire Order","Gift Message for the Entire Order"
+"To Name","To Name"
+"Add Order Comments","Add Order Comments"
+"Notification Not Applicable","Notification Not Applicable"
+"the order confirmation email was sent","the order confirmation email was sent"
+"the order confirmation email is not sent","the order confirmation email is not sent"
+"Order Date (%1)","Order Date (%1)"
+"Purchased From","Purchased From"
+"Link to the New Order","Link to the New Order"
+"Link to the Previous Order","Link to the Previous Order"
+"Placed from IP","Placed from IP"
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status","Item Status"
+"Original Price","Original Price"
+"Tax Percent","Tax Percent"
+"Transaction Data","Transaction Data"
+"Parent Transaction ID","Parent Transaction ID"
+"Transaction Type","Transaction Type"
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
"Gift Message for this Order","Gift Message for this Order"
-"Gift Options","Gift Options"
-"Gift Wrapping for the Entire Order","Gift Wrapping for the Entire Order"
-"Girth","Girth"
-"Grand Total","Grand Total"
-"Grand Total (Base)","Grand Total (Base)"
-"Grand Total (Purchased)","Grand Total (Purchased)"
-"Grand Total to be Charged","Grand Total to be Charged"
-"Guest","Guest"
-"Height","Height"
-"Hide Customer IP","Hide Customer IP"
-"Hold","Hold"
-"Hold action is not available.","Hold action is not available."
-"Hold order","Hold order"
-"ID","ID"
-"ID","ID"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"""
-"If empty, the default description above will be used.","If empty, the default description above will be used."
-"If empty, the default error above will be used.","If empty, the default error above will be used."
-"If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo."
-"Incl. Tax","Incl. Tax"
-"Information","Information"
-"Initial Fee","Initial Fee"
-"Initial Fees","Initial Fees"
-"Initial period payment","Initial period payment"
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings."
-"Invalid block: %s.","Invalid block: %s."
-"Invalid carrier specified.","Invalid carrier specified."
-"Invalid draw line data. Please define ""lines"" array.","Invalid draw line data. Please define ""lines"" array."
-"Invalid entity model","Invalid entity model"
-"Invalid item option format.","Invalid item option format."
-"Invalid qty to invoice item ""%s""","Invalid qty to invoice item ""%s"""
-"Invalid qty to refund item ""%s""","Invalid qty to refund item ""%s"""
-"Invalid qty to ship for item ""%s""","Invalid qty to ship for item ""%s"""
-"Invalid renderer model","Invalid renderer model"
-"Invalid request for adding product to quote.","Invalid request for adding product to quote."
-"Invoice","Invoice"
+"Shipped By","Shipped By"
+"Tracking Number","Tracking Number"
+"Billing Last Name","Billing Last Name"
+"Find Order By:","Find Order By:"
+"ZIP Code","ZIP Code"
+"Billing ZIP Code","Billing ZIP Code"
+"Print All Refunds","Print All Refunds"
+"Refund #","Refund #"
+"Print Refund","Print Refund"
+"You have placed no orders.","You have placed no orders."
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available","No shipping information available"
+"Print Order","Print Order"
+"Subscribe to Order Status","Subscribe to Order Status"
+"Print All Invoices","Print All Invoices"
"Invoice #","Invoice #"
-"Invoice # ","Invoice # "
-"Invoice #%1$s | %2$s | %4$s (%3$s)","Invoice #%1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","Invoice #%s"
-"Invoice Comment Email Sender","Invoice Comment Email Sender"
-"Invoice Comment Email Template","Invoice Comment Email Template"
-"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
-"Invoice Comments","Invoice Comments"
-"Invoice Date","Invoice Date"
-"Invoice Email Sender","Invoice Email Sender"
-"Invoice Email Template","Invoice Email Template"
-"Invoice Email Template for Guest","Invoice Email Template for Guest"
-"Invoice Update","Invoice Update"
-"Invoice Update for Guest","Invoice Update for Guest"
-"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
-"Invoice and Ship","Invoice and Ship"
-"Invoice canceling problem.","Invoice canceling problem."
-"Invoice cannot be canceled.","Invoice cannot be canceled."
-"Invoice cannot be captured.","Invoice cannot be captured."
-"Invoice cannot be voided.","Invoice cannot be voided."
-"Invoice capturing problem.","Invoice capturing problem."
-"Invoice void problem","Invoice void problem"
-"Invoice will be created without communication with payment gateway.","Invoice will be created without communication with payment gateway."
-"Invoiced","Invoiced"
-"Invoices","Invoices"
-"Item","Item"
-"Item Status","Item Status"
-"Item object is not specified.","Item object is not specified."
-"Item options declaration error.","Item options declaration error."
-"Item ordered qty","Item ordered qty"
-"Item qty declaration error.","Item qty declaration error."
-"Items","Items"
-"Items Invoiced","Items Invoiced"
-"Items Ordered","Items Ordered"
-"Items Refunded","Items Refunded"
+"Print Invoice","Print Invoice"
+"Qty Invoiced","Qty Invoiced"
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
"Items Shipped","Items Shipped"
-"Items in the Package","Items in the Package"
-"Items maximum quantity or price do not allow checkout.","Items maximum quantity or price do not allow checkout."
-"Items options declaration error.","Items options declaration error."
-"Items to Refund","Items to Refund"
-"Items to Ship","Items to Ship"
-"Key","Key"
-"Last Name","Last Name"
-"Last Ordered Items","Last Ordered Items"
-"Last status can't be unassigned from state.","Last status can't be unassigned from state."
-"Length","Length"
-"Link to the New Order","Link to the New Order"
-"Link to the Previous Order","Link to the Previous Order"
-"Logo for HTML Print View","Logo for HTML Print View"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)"
+"Qty Shipped","Qty Shipped"
+"View All","View All"
+"Gift Message for This Order","Gift Message for This Order"
+"About Your Order","About Your Order"
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title","Anchor Custom Title"
+Phone,Phone
+"Default Template","Default Template"
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
-"Make Check payable to:","Make Check payable to:"
-"Manage","Manage"
-"Maximum amount available to refund is %s","Maximum amount available to refund is %s"
-"Maximum shipping amount allowed to refund is: %s","Maximum shipping amount allowed to refund is: %s"
-"Message","Message"
-"Message:","Message:"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
"Minimum Amount","Minimum Amount"
-"Minimum Order Amount","Minimum Order Amount"
-"Mixed","Mixed"
-"Most Viewed","Most Viewed"
-"Most Viewed Products Report","Most Viewed Products Report"
-"Move to Shopping Cart","Move to Shopping Cart"
-"Move to Wishlist","Move to Wishlist"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
-"My Orders","My Orders"
-"My Orders - Details","My Orders - Details"
-"N/A","N/A"
-"Name","Name"
-"New","New"
-"New Credit Memo","New Credit Memo"
-"New Credit Memo for Guest","New Credit Memo for Guest"
-"New Credit Memo for Invoice #%s","New Credit Memo for Invoice #%s"
-"New Credit Memo for Order #%s","New Credit Memo for Order #%s"
-"New Invoice","New Invoice"
-"New Invoice and Shipment for Order #%s","New Invoice and Shipment for Order #%s"
-"New Invoice for Guest","New Invoice for Guest"
-"New Invoice for Order #%s","New Invoice for Order #%s"
-"New Order","New Order"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
"New Order Confirmation Template","New Order Confirmation Template"
"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
-"New Order RSS","New Order RSS"
-"New Order Status","New Order Status"
-"New Order for Guest","New Order for Guest"
-"New Shipment","New Shipment"
-"New Shipment for Guest","New Shipment for Guest"
-"New Shipment for Order #%s","New Shipment for Order #%s"
-"Newsletter Subscription","Newsletter Subscription"
-"No","No"
-"No Items","No Items"
-"No Items To Refund","No Items To Refund"
-"No Payment Methods","No Payment Methods"
-"No detail for number ""%s""","No detail for number ""%s"""
-"No information available.","No information available."
-"No items","No items"
-"No order(s) were put on hold.","No order(s) were put on hold."
-"No order(s) were released from holding status.","No order(s) were released from holding status."
-"No ordered items","No ordered items"
-"No shipping information available","No shipping information available"
-"Nominal Items","Nominal Items"
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Nominal item can be purchased standalone only. To proceed please remove other items from the quote."
-"Nominal order registered.","Nominal order registered."
-"Not Capture","Not Capture"
-"Not Initialized","Not Initialized"
-"Not Notified","Not Notified"
-"Not enough valid data to save the parent transaction ID.","Not enough valid data to save the parent transaction ID."
-"Notification Not Applicable","Notification Not Applicable"
-"Notified","Notified"
-"Notify Customer by Email","Notify Customer by Email"
-"Number","Number"
-"Number of Invoiced Orders","Number of Invoiced Orders"
-"Number of Orders","Number of Orders"
-"Number of Refunded Orders","Number of Refunded Orders"
-"OK","OK"
-"Offline Refunded","Offline Refunded"
-"On Hold","On Hold"
-"Online Refunded","Online Refunded"
-"Order","Order"
-"Order","Order"
-"Order ","Order "
-"Order %s","Order %s"
-"Order %s","Order %s"
-"Order %s %s | %s","Order %s %s | %s"
-"Order %s - %s","Order %s - %s"
-"Order API","Order API"
-"Order Address Information","Order Address Information"
-"Order Comment","Order Comment"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
"Order Comment Email Sender","Order Comment Email Sender"
"Order Comment Email Template","Order Comment Email Template"
"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
-"Order Comments","Order Comments"
-"Order Credit Memos","Order Credit Memos"
-"Order Currency:","Order Currency:"
-"Order Date","Order Date"
-"Order Date (%s)","Order Date (%s)"
-"Order Date: ","Order Date: "
-"Order Date: %s","Order Date: %s"
-"Order Details","Order Details"
-"Order Grand Total","Order Grand Total"
-"Order History","Order History"
-"Order History Info","Order History Info"
-"Order ID","Order ID"
-"Order Information","Order Information"
-"Order Invoices","Order Invoices"
-"Order Shipments","Order Shipments"
-"Order State","Order State"
-"Order Status","Order Status"
-"Order Status Information","Order Status Information"
-"Order Statuses","Order Statuses"
-"Order Subtotal","Order Subtotal"
-"Order Taxes Report Grouped by Tax Rates","Order Taxes Report Grouped by Tax Rates"
-"Order Total","Order Total"
-"Order Totals","Order Totals"
-"Order Update","Order Update"
-"Order Update for Guest","Order Update for Guest"
-"Order View","Order View"
-"Order credit memo","Order credit memo"
-"Order does not allow to be canceled.","Order does not allow to be canceled."
-"Order invoice","Order invoice"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","Order is suspended as its capture amount %s is suspected to be fraudulent."
-"Order object is not specified.","Order object is not specified."
-"Order saving error: %s","Order saving error: %s"
-"Order shipments","Order shipments"
-"Order status does not exist.","Order status does not exist."
-"Order status with the same status code already exist.","Order status with the same status code already exist."
-"Order was placed using %s","Order was placed using %s"
-"Ordered","Ordered"
-"Ordered amount of %s.","Ordered amount of %s."
-"Ordering amount of %s is pending approval on gateway.","Ordering amount of %s is pending approval on gateway."
-"Orders","Orders"
-"Orders and Returns","Orders and Returns"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,Shipment
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
"Orders and Returns Search Form","Orders and Returns Search Form"
-"Original Price","Original Price"
-"Original order item that recurring payment corresponds to.","Original order item that recurring payment corresponds to."
"PDF Credit Memos","PDF Credit Memos"
"PDF Invoices","PDF Invoices"
-"PDF Packing Slips","PDF Packing Slips"
-"PDF Print-outs","PDF Print-outs"
-"PDF object is not specified.","PDF object is not specified."
-"PDF page object is not specified.","PDF page object is not specified."
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal"
-"Package","Package"
-"Package types are disregarded for USPS domestic shipments.","Package types are disregarded for USPS domestic shipments."
-"Packages","Packages"
-"Packing Slip # ","Packing Slip # "
-"Paid","Paid"
-"Paid Amount","Paid Amount"
-"Parent Transaction ID","Parent Transaction ID"
-"Parent transaction ID must have a transaction ID.","Parent transaction ID must have a transaction ID."
-"Partial","Partial"
-"Payment Failed","Payment Failed"
-"Payment Information","Payment Information"
-"Payment Method","Payment Method"
-"Payment Method","Payment Method"
-"Payment Method:","Payment Method:"
-"Payment Review","Payment Review"
-"Payment disallow storing objects.","Payment disallow storing objects."
-"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."
-"Payment type","Payment type"
-"Payment update has been made.","Payment update has been made."
-"Pending","Pending"
-"Pending Payment","Pending Payment"
-"Period","Period"
-"Placed from IP","Placed from IP"
-"Please Select Products to Add","Please Select Products to Add"
-"Please Select a Customer","Please Select a Customer"
-"Please Select a Store","Please Select a Store"
-"Please check billing address information. %s","Please check billing address information. %s"
-"Please check shipping address information. %s","Please check shipping address information. %s"
-"Please define PDF object before using.","Please define PDF object before using."
-"Please enter positive number in this field.","Please enter positive number in this field."
-"Please select a valid payment method.","Please select a valid payment method."
-"Please specify a shipping method.","Please specify a shipping method."
-"Please specify a valid grid column alias name that exists in grid table.","Please specify a valid grid column alias name that exists in grid table."
-"Price","Price"
-"Print","Print"
-"Print All","Print All"
-"Print All Invoices","Print All Invoices"
-"Print All Refunds","Print All Refunds"
-"Print All Shipments","Print All Shipments"
-"Print Credit Memos","Print Credit Memos"
-"Print Invoice","Print Invoice"
+"Invoice Date","Invoice Date"
+"ZIP/Post Code","ZIP/Post Code"
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS","New Order RSS"
"Print Invoices","Print Invoices"
-"Print Order","Print Order"
-"Print Order # %s","Print Order # %s"
"Print Packing Slips","Print Packing Slips"
-"Print Refund","Print Refund"
-"Print Shipment","Print Shipment"
-"Print Shipping Label","Print Shipping Label"
+"Print Credit Memos","Print Credit Memos"
+"Print All","Print All"
"Print Shipping Labels","Print Shipping Labels"
-"Processing","Processing"
-"Product","Product"
-"Product Name","Product Name"
-"Products","Products"
-"Products Bestsellers Report","Products Bestsellers Report"
-"Products in Comparison List","Products in Comparison List"
-"Products should be added to package(s)","Products should be added to package(s)"
-"Payment #%s","Payment #%s"
-"Payment Information","Payment Information"
-"Payment State","Payment State"
-"Profit","Profit"
-"Promotion Coupons Usage Report","Promotion Coupons Usage Report"
-"Proper payment object must be set.","Proper payment object must be set."
-"Purchase Order Number:","Purchase Order Number:"
-"Purchase Point","Purchase Point"
-"Purchased Date","Purchased Date"
-"Purchased From","Purchased From"
-"Purchased Item","Purchased Item"
-"Qty","Qty"
-"Qty Invoiced","Qty Invoiced"
-"Qty Ordered","Qty Ordered"
-"Qty Shipped","Qty Shipped"
-"Qty To Add","Qty To Add"
-"Qty to Add","Qty to Add"
-"Qty to Invoice","Qty to Invoice"
-"Qty to Refund","Qty to Refund"
-"Qty to Ship","Qty to Ship"
-"Quantity Ordered","Quantity Ordered"
-"Quote item id is not received.","Quote item id is not received."
-"Quote item is not loaded.","Quote item is not loaded."
-"Rate","Rate"
-"Recent Orders","Recent Orders"
-"Recently Compared Products","Recently Compared Products"
-"Recently Viewed","Recently Viewed"
-"Recently Viewed Products","Recently Viewed Products"
-"Recurring Payment # %s","Recurring Payment # %s"
-"Recurring Payment Initial Fee","Recurring Payment Initial Fee"
-"Recurring Payments","Recurring Payments"
-"Recurring Payments (beta)","Recurring Payments (beta)"
-"Reference ID","Reference ID"
-"Reference ID:","Reference ID:"
-"Refresh","Refresh"
-"Refund","Refund"
-"Refund #","Refund #"
-"Refund #%s","Refund #%s"
-"Refund Amount","Refund Amount"
-"Refund Offline","Refund Offline"
-"Refund Shipping","Refund Shipping"
-"Refund Shipping (Excl. Tax)","Refund Shipping (Excl. Tax)"
-"Refund Shipping (Incl. Tax)","Refund Shipping (Incl. Tax)"
-"Refund Totals","Refund Totals"
-"Refunded","Refunded"
-"Refunded amount of %s offline.","Refunded amount of %s offline."
-"Refunded amount of %s online.","Refunded amount of %s online."
-"Refunds","Refunds"
-"Registered a Void notification.","Registered a Void notification."
-"Registered notification about approved payment.","Registered notification about approved payment."
-"Registered notification about captured amount of %s.","Registered notification about captured amount of %s."
-"Registered notification about denied payment.","Registered notification about denied payment."
-"Registered notification about refunded amount of %s.","Registered notification about refunded amount of %s."
-"Registered update about approved payment.","Registered update about approved payment."
-"Registered update about denied payment.","Registered update about denied payment."
-"Regular Payment","Regular Payment"
-"Related Orders","Related Orders"
-"Remove","Remove"
-"Remove Coupon Code","Remove Coupon Code"
-"Remove tracking number","Remove tracking number"
-"Reorder","Reorder"
-"Retrieve credit memo info","Retrieve credit memo info"
-"Retrieve credit memo information","Retrieve credit memo information"
-"Retrieve credit memo list","Retrieve credit memo list"
-"Retrieve invoice info","Retrieve invoice info"
-"Retrieve invoice information","Retrieve invoice information"
-"Retrieve list of credit memos by filters","Retrieve list of credit memos by filters"
-"Retrieve list of invoices by filters","Retrieve list of invoices by filters"
-"Retrieve list of orders by filters","Retrieve list of orders by filters"
-"Retrieve list of shipments by filters","Retrieve list of shipments by filters"
-"Retrieve order information","Retrieve order information"
-"Retrieve orders info","Retrieve orders info"
-"Retrieve shipment info","Retrieve shipment info"
-"Retrieve shipment information","Retrieve shipment information"
-"Return to Stock","Return to Stock"
-"Returned","Returned"
-"Returns","Returns"
-"Revenue","Revenue"
-"Row Subtotal","Row Subtotal"
-"Row Total","Row Total"
-"SKU","SKU"
-"Sales","Sales"
-"Sales Discount","Sales Discount"
-"Sales Emails","Sales Emails"
-"Sales Emails Section","Sales Emails Section"
-"Sales Invoice Print View","Sales Invoice Print View"
-"Sales Items","Sales Items"
-"Sales Order Print View","Sales Order Print View"
-"Sales Section","Sales Section"
-"Sales Shipment Print View","Sales Shipment Print View"
-"Sales Shipping","Sales Shipping"
-"Sales Tax","Sales Tax"
-"Sales Total","Sales Total"
-"Same As Billing Address","Same As Billing Address"
-"Save Order Address","Save Order Address"
-"Save Status","Save Status"
-"Save Status Assignment","Save Status Assignment"
-"Save in address book","Save in address book"
-"Schedule","Schedule"
-"Select","Select"
-"Select All","Select All"
-"Select from existing customer addresses:","Select from existing customer addresses:"
-"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
-"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
-"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
-"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
-"Send Email","Send Email"
-"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
-"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
-"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
-"Send Invoice Email Copy To","Send Invoice Email Copy To"
-"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
-"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
-"Send Order Email","Send Order Email"
-"Send Order Email Copy Method","Send Order Email Copy Method"
-"Send Order Email Copy To","Send Order Email Copy To"
-"Send Sales Emails","Send Sales Emails"
-"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
-"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
-"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
-"Send Shipment Email Copy To","Send Shipment Email Copy To"
-"Send Tracking Information","Send Tracking Information"
-"Set order for existing transactions not allowed","Set order for existing transactions not allowed"
-"Ship","Ship"
"Ship Date","Ship Date"
-"Ship To","Ship To"
-"Ship to:","Ship to:"
-"Ship-to Name","Ship-to Name"
-"Shipment","Shipment"
-"Shipment","Shipment"
-"Shipment Comment Email Sender","Shipment Comment Email Sender"
-"Shipment Comment Email Template","Shipment Comment Email Template"
-"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
-"Shipment Comments","Shipment Comments"
-"Shipment Email Sender","Shipment Email Sender"
-"Shipment Email Template","Shipment Email Template"
-"Shipment Email Template for Guest","Shipment Email Template for Guest"
-"Shipment Update","Shipment Update"
-"Shipment Update for Guest","Shipment Update for Guest"
-"Shipment%1$s | %3$s (%2$s)","Shipment%1$s | %3$s (%2$s)"
-"Shipment%s","Shipment%s"
-"Shipments","Shipments"
-"Shipped","Shipped"
-"Shipped By","Shipped By"
-"Shipping","Shipping"
-"Shipping & Handling","Shipping & Handling"
-"Shipping & Handling","Shipping & Handling"
-"Shipping & Handling Information","Shipping & Handling Information"
-"Shipping Address","Shipping Address"
-"Shipping Amount","Shipping Amount"
-"Shipping Information","Shipping Information"
-"Shipping Method","Shipping Method"
-"Shipping Method:","Shipping Method:"
-"Shipping Refund","Shipping Refund"
-"Shipping and Tracking Information","Shipping and Tracking Information"
-"Shopping Cart","Shopping Cart"
-"Show Packages","Show Packages"
-"Signature Confirmation","Signature Confirmation"
-"Signed Up From","Signed Up From"
-"Size","Size"
-"Sku","Sku"
-"Sold to:","Sold to:"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Some of the products below do not have all the required options. Please edit them and configure all the required options."
-"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
-"Source object is not specified.","Source object is not specified."
-"Specified profile does not exist.","Specified profile does not exist."
-"State Code [State Title]","State Code [State Title]"
-"State/Province","State/Province"
-"Status","Status"
-"Status Code","Status Code"
-"Status Label","Status Label"
-"Status:","Status:"
-"Store Credit","Store Credit"
-"Store View Specific Labels","Store View Specific Labels"
-"Street Address","Street Address"
-"Submit Comment","Submit Comment"
-"Submit Credit Memo","Submit Credit Memo"
-"Submit Invoice","Submit Invoice"
-"Submit Invoice and Shipment","Submit Invoice and Shipment"
-"Submit Order","Submit Order"
-"Submit Shipment","Submit Shipment"
-"Subscribe to Newsletter","Subscribe to Newsletter"
-"Subscribe to Order Status","Subscribe to Order Status"
-"Subtotal","Subtotal"
-"Subtotal after discount.","Subtotal after discount."
-"Subtotal:","Subtotal:"
-"Suspected Fraud","Suspected Fraud"
-"Suspend","Suspend"
-"Suspended","Suspended"
-"Tax","Tax"
-"Tax Amount","Tax Amount"
-"Tax Percent","Tax Percent"
-"Telephone","Telephone"
-"The Order State ""%s"" must not be set manually.","The Order State ""%s"" must not be set manually."
-"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
-"The coupon code has been accepted.","The coupon code has been accepted."
-"The message has been sent.","The message has been sent."
-"The message was sent.","The message was sent."
-"The order address has been updated.","The order address has been updated."
-"The order email has been sent.","The order email has been sent."
-"The order has been cancelled.","The order has been cancelled."
-"The order has been created.","The order has been created."
-"The order has been put on hold.","The order has been put on hold."
-"The order has been released from holding status.","The order has been released from holding status."
-"The order has not been cancelled.","The order has not been cancelled."
-"The order status has been assigned.","The order status has been assigned."
-"The order status has been saved.","The order status has been saved."
-"The order status has been unassigned.","The order status has been unassigned."
-"The order was not put on hold.","The order was not put on hold."
-"The order was not unheld.","The order was not unheld."
-"The order was placed using %s","The order was placed using %s"
-"The order(s) cannot be canceled","The order(s) cannot be canceled"
-"The payment has been accepted.","The payment has been accepted."
-"The payment has been denied.","The payment has been denied."
-"The payment has been voided.","The payment has been voided."
-"The profile has been updated.","The profile has been updated."
-"The profile has no changes.","The profile has no changes."
-"The profile state has been updated.","The profile state has been updated."
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)"
-"The requested Payment Method is not available.","The requested Payment Method is not available."
-"The shipping label has been created.","The shipping label has been created."
-"The transaction ""%s"" (%s) is already closed.","The transaction ""%s"" (%s) is already closed."
-"The transaction ""%s"" cannot be captured yet.","The transaction ""%s"" cannot be captured yet."
-"The value that you entered is not valid.","The value that you entered is not valid."
-"There are no printable documents related to selected orders.","There are no printable documents related to selected orders."
-"There are no shipping labels related to selected %s.","There are no shipping labels related to selected %s."
-"There is no need to approve this payment.","There is no need to approve this payment."
-"There is no need to deny this payment.","There is no need to deny this payment."
-"There is no update for the payment.","There is no update for the payment."
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","This message will be shown in shopping cart when subtotal after discount less than minimum amount."
-"This operation requires an existing transaction object.","This operation requires an existing transaction object."
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed."
-"This order no longer exists.","This order no longer exists."
-"This product does not have any configurable options","This product does not have any configurable options"
-"This profile state cannot be changed to ""%s"".","This profile state cannot be changed to ""%s""."
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?"
-"Tier Pricing","Tier Pricing"
-"Title","Title"
-"To","To"
-"To Name","To Name"
-"To:","To:"
-"Total","Total"
-"Total %d product(s)","Total %d product(s)"
-"Total (ex)","Total (ex)"
-"Total (inc)","Total (inc)"
-"Total Due","Total Due"
-"Total Invoiced","Total Invoiced"
-"Total Invoiced Paid","Total Invoiced Paid"
-"Total Invoiced VS Paid Report","Total Invoiced VS Paid Report"
-"Total Invoiced not Paid","Total Invoiced not Paid"
-"Total Ordered Report","Total Ordered Report"
-"Total Paid","Total Paid"
"Total Quantity","Total Quantity"
-"Total Refund","Total Refund"
-"Total Refunded","Total Refunded"
-"Total Refunded Report","Total Refunded Report"
-"Total Sales Shipping","Total Sales Shipping"
-"Total Shipped Report","Total Shipped Report"
-"Total Shipping","Total Shipping"
-"Total Shipping Charges","Total Shipping Charges"
-"Total Tax","Total Tax"
-"Total Weight","Total Weight"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
-"Track Order","Track Order"
-"Track all shipment(s)","Track all shipment(s)"
-"Track all shipments","Track all shipments"
-"Track this shipment","Track this shipment"
-"Track your order","Track your order"
-"Tracking","Tracking"
-"Tracking Number","Tracking Number"
-"Tracking Number(s):","Tracking Number(s):"
-"Transaction ""%s"" was already processed.","Transaction ""%s"" was already processed."
-"Transaction # %s | %s","Transaction # %s | %s"
-"Transaction ID","Transaction ID"
-"Transaction ID must not be empty.","Transaction ID must not be empty."
-"Transaction ID: ""%s"".","Transaction ID: ""%s""."
-"Transaction Type","Transaction Type"
-"Transactions","Transactions"
-"Trial ","Trial "
-"Trial Payment","Trial Payment"
-"Trial Period","Trial Period"
-"Trial period payment","Trial period payment"
-"Type","Type"
-"Unassign","Unassign"
-"Unhold","Unhold"
-"Unhold action is not available.","Unhold action is not available."
-"Unhold order","Unhold order"
-"Unknown State","Unknown State"
-"Unknown Status","Unknown Status"
-"Unsupported transaction type ""%s"".","Unsupported transaction type ""%s""."
-"Update Changes","Update Changes"
-"Update Items and Qty's","Update Items and Qty's"
-"Update Qty's","Update Qty's"
-"Updated","Updated"
-"Updated:","Updated:"
-"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
-"Use Order Status As Default","Use Order Status As Default"
-"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
-"Value","Value"
-"View","View"
-"View All","View All"
-"View Another Order","View Another Order"
-"View Order","View Order"
-"Visible on Frontend","Visible on Frontend"
-"Void","Void"
-"Void invoice","Void invoice"
-"Voided authorization.","Voided authorization."
-"Website","Website"
-"Weight","Weight"
-"Whether buyer can define the date when billing for the profile begins.","Whether buyer can define the date when billing for the profile begins."
-"Width","Width"
-"Wishlist","Wishlist"
-"Wrong quote item id to update configuration.","Wrong quote item id to update configuration."
-"Wrong state: ""%s"".","Wrong state: ""%s""."
-"Yes","Yes"
-"You can leave a box blank if you don't wish to add a gift message for whole order","You can leave a box blank if you don't wish to add a gift message for whole order"
-"You have placed no orders.","You have placed no orders."
-"You will be redirected to the payment system website.","You will be redirected to the payment system website."
-"Your credit card will be charged for","Your credit card will be charged for"
-"ZIP/Post Code","ZIP/Post Code"
-"Zip/Postal Code","Zip/Postal Code"
-"cm","cm"
-"in","in"
-"kg","kg"
-"lb","lb"
-"the credit memo email is not sent","the credit memo email is not sent"
-"the credit memo email was sent","the credit memo email was sent"
-"the invoice email is not sent","the invoice email is not sent"
-"the invoice email was sent","the invoice email was sent"
-"the order confirmation email is not sent","the order confirmation email is not sent"
-"the order confirmation email was sent","the order confirmation email was sent"
-"the shipment email is not sent","the shipment email is not sent"
-"the shipment email was sent","the shipment email was sent"
+"Default Status","Default Status"
+"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)."
diff --git a/app/code/Magento/Sales/i18n/es_ES.csv b/app/code/Magento/Sales/i18n/es_ES.csv
index a135b92dac7..70e8f964ec6 100644
--- a/app/code/Magento/Sales/i18n/es_ES.csv
+++ b/app/code/Magento/Sales/i18n/es_ES.csv
@@ -1,847 +1,712 @@
-"""%s"" coupon code is not valid.","El código de cupón ""%s"" no es válido."
-"%s","%s"
-"%s / %s rate:","Tasa %s / %s:"
-"%s for %s","%s por %s"
-"%s order(s) cannot be canceled","El(los) pedido(s) no pueden cancelarse"
-"%s order(s) have been canceled.","Se ha(n) cancelado %s pedidos."
-"%s order(s) have been put on hold.","Se ha(n) puesto en espera %s pedido(s)."
-"%s order(s) have been released from holding status.","%s pedido(s) se ha(n) liberado de su estado de espera."
-"%s order(s) were not put on hold.","El(los) pedido(s) %s no se han puesto en espera."
-"%s order(s) were not released from holding status.","El(los) pedido(s) %s no han sido liberados del estado de espera."
-"* - Enter custom price excluding tax","* - Introduzca el precio a medida sin impuestos"
-"* - Enter custom price including tax","* - Introduzca el precio a medida con impuestos"
-"-- Please Select --","-- Seleccionar, por favor --"
-"About This Order:","En Relación con Este Pedido:"
-"About This Payment:","En Relación con Este Perfil:"
-"About Your Invoice","Acerca de su factura"
-"About Your Order","En Relación con Su Pedido"
-"About Your Refund","Acerca de su devolución"
-"About Your Shipment","Acerca de su envÃo"
-"Accept Payment","Aceptar Pago"
-"Accept or Deny Payment","Aceptar o Rechazar Pago"
-"Account Information","Información de Cuenta"
-"Action","Acción"
-"Actions","Acciones"
-"Activate","Activar"
-"Active","Activo"
-"Add","Agregar"
-"Add New Address","Añadir Nueva Dirección"
-"Add Order Comments","Añadir Comentarios al Pedido"
-"Add Package","Añadir Paquete"
+Remove,Eliminar
+Close,Cerrar
+Cancel,Cancelar
+Back,Volver
"Add Products","Añadir productos"
-"Add Selected Product(s) to Option","Añadir el(los) Producto(s) Seleccionado(s) a la Opción"
-"Add Selected Product(s) to Order","Añadir el(los) Producto(s) Seleccionado(s) al Pedido"
-"Add Selected Product(s) to Package","Añadir Producto(s) Seleccionado(s) al Paquete"
-"Add To Order","Añadir al Pedido"
-"Add Tracking Number","Añadir Código de Seguimiento"
-"Add comment to order","Añadir comentario al pedido"
-"Add new comment to credit memo","Añadir un nuevo comentario al abono"
-"Add new comment to shipment","Añadir un nuevo comentario al envÃo"
-"Add new tracking number","Añadir un nuevo código de seguimiento"
-"Add to Cart","Añadir al Carrito"
-"Additional Product Info","Información adicional del producto"
-"Address","Dirección"
-"Address model is not defined.","No se ha definido el modelo de dirección."
-"Adjustment Fee","Tarifa de Ajuste"
-"Adjustment Refund","Reembolso de Ajuste"
-"Agreement Information","Información del Acuerdo"
-"Allow Reorder","Permitir Volver a Pedir"
-"Amount","Importe"
-"Amount: %s.","Cantidad: %s."
-"An error occurred while assigning order status. Status has not been assigned.","Ha ocurrido un error al asignar el estado de su pedido. No se ha asignado estado."
-"An error occurred while creating shipping label.","Se produjo un error al crear la etiqueta de envÃo."
-"An error occurred while saving order status. The status has not been added.","Ha ocurrido un error al guardar el estado del pedido. No se ha añadido el estado."
-"An error occurred while unassigning order status.","Ha ocurrido un error al desasignar el estado del pedido."
-"An error occurred while updating the order address. The address has not been changed.","Ha ocurrido un error al actualizar la dirección del pedido. La dirección no se ha cambiado."
-"An item option with code %s already exists.","Ya existe una opción de artÃculo con el código %s."
-"Anchor Custom Title","Anclar TÃtulo Personalizado"
-"Append Comments","Agregar Comentarios"
-"Apply","Solicitar"
+"Update Items and Qty's","Actualizar artÃculos y cantidades"
+Product,Producto
+Price,Precio
+Quantity,Quantity
+Products,Productos
+ID,ID
+SKU,Sku
+Apply,Solicitar
+Configure,Configurar
+"Shopping Cart","Carro de la compra"
+"Quote item id is not received.","El artÃculo indicado no se ha recibido."
+"Quote item is not loaded.","El artÃculo indicado no está cargado."
+No,No
"Apply Coupon Code","Usar el Código del Cupón"
-"Approved the payment online.","El pago ha sido aprobado a distancia."
-"Are you sure you want to accept this payment?","¿Está seguro de que quiere aceptar este pago?"
-"Are you sure you want to cancel this order?","¿Está seguro de que quiere cancelar este pedido?"
-"Are you sure you want to delete all items from shopping cart?","¿Seguro que quiere borrar todos los artÃculos del carro de la compra?"
-"Are you sure you want to deny this payment?","¿Está seguro de que quiere rechazar este pago?"
-"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?"
-"Are you sure you want to send Creditmemo email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de nota de abono?"
-"Are you sure you want to send Invoice email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de factura?"
-"Are you sure you want to send Shipment email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de EnvÃo?"
-"Are you sure you want to send order email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de pedido?"
-"Are you sure you want to void the payment?","¿Está seguro de que quiere invalidar el pago?"
-"Are you sure?","¿Está seguro?"
-"Are you sure? This order will be canceled and a new one will be created instead","¿Está seguro? Este pedido será cancelado y se creará uno nuevo en su lugar"
-"Assign Order Status to State","Asignar estado de pedido a estado"
-"Assign Status to State","Asignar estado a estado"
-"Assignment Information","Información de asignación"
-"At least a payment ID must be set.","Debe establecerse por lo menos un número de identificación de pago."
-"Authorization","Autorización"
-"Authorized amount of %s.","Cantidad autorizada de %s."
-"Authorizing amount of %s is pending approval on gateway.","Cantidad autorizada de %s en espera de aprobación de la interfaz"
-"Back","Volver"
-"Back to My Orders","Volver a mis pedidos"
-"Back to Recurring Payments","Volver a los perfiles de suscripción"
-"Backordered","Pendientes de entrega"
-"Bestsellers","Los más vendidos"
-"Bill-to Name","Nombre de la factura"
-"Billing","Facturación"
-"Billing Address","Dirección de facturación"
-"Billing Last Name","Apellido para Facturación"
-"Billing ZIP Code","Código Postal para Facturación"
-"Buy %s for price %s","Comprar %s por precio %s"
-"CSV","CSV"
-"Cancel","Cancelar"
-"Cancel credit memo","Cancelar el abono"
-"Cancel invoice","Cancelar la factura"
-"Cancel order","Cancelar el pedido"
-"Canceled","Cancelado"
-"Canceled order offline.","Cancelar pedido offline."
-"Canceled order online.","Cancelar pedido online."
-"Cannot add order history.","No se puede añadir el historial de pedidos."
-"Cannot create an empty shipment.","No se puede crear un pedido vacÃo."
-"Cannot determine the field name.","No se puede determinar el nombre del campo."
-"Cannot do invoice for order.","No se puede hacer factura para el pedido."
-"Cannot do shipment for order.","No se puede hacer el envÃo para el pedido."
-"Cannot get order instance","No se puede obtener instancia para el pedido."
-"Cannot get the order instance.","No se puede obtener una instancia para el pedido."
-"Cannot register an existing credit memo.","No se puede registrar la nota de crédito existente."
-"Cannot register existing invoice","No se puede registrar la factura existente."
-"Cannot register existing shipment","No se puede registrar el envÃo existente."
-"Capture","Captura"
-"Capture Amount","Captura de importe"
-"Capture Offline","Captura offline"
-"Capture Online","Captura online"
-"Capture invoice","Captura de factura"
-"Captured amount of %s online.","Captura de importe de %s online."
-"Capturing amount of %s is pending approval on gateway.","La captura de importe de %s está pendiente de aprobación por la pasarela de pago."
-"Carrier","Transportista"
-"Carrier/Method","CompañÃa/Método"
-"Change status, add comments","Cambiar estatus, añadir comentarÃo"
-"Changing address information will not recalculate shipping, tax or other order amount.","Al cambiar la información de la dirección no se recalculan el envÃo, los impuestos ni el total del pedido."
-"Checkout Totals Sort Order","Verificar los totales ordenados de los pedidos"
-"City","Ciudad"
-"Clear Shopping Cart","Vaciar carro de la compra"
-"Click to change shipping method","Haz click aquà para cambiar el método de envÃo"
-"Close","Cerrar"
-"Closed","Está cerrado"
-"Comma-separated.","Separados por comas."
-"Comment","Comentario"
-"Comment Text","Comentar el texto"
-"Comments","Comentarios"
-"Comments History","Historial de comentarios"
-"Company","CompañÃa"
-"Complete","Completo"
-"Configure","Configurar"
-"Configure and Add to Order","Configurar y añadir a pedido"
-"Contents","Contenido"
-"Continue","Continuar"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controla si la IP del cliente se muestra en los pedidos, las facturas, los envÃos y los abonos."
-"Country","PaÃs"
-"Coupons","Cupones"
-"Create","Crear."
-"Create New Customer","Crear un nuevo cliente"
-"Create New Order","Crear un nuevo pedido"
-"Create New Order Status","Crear nuevo estado de pedido"
-"Create New Order for %s","Crea un nuevo pedido para %s"
-"Create New Order for %s in %s","Crear un nuevo pedido para %s en %s"
-"Create New Order for New Customer","Crear un nuevo pedido para un nuevo cliente"
-"Create New Order for New Customer in %s","Crear un nuenvo pedido para un nuevo cliente en %s"
-"Create New Status","Crear nuevo estado"
-"Create Order","Crear pedido"
-"Create Packages","Crear Paquetes"
-"Create Shipment","Crear envÃo"
-"Create Shipping Label","Crear Etiqueta de EnvÃo"
-"Create Shipping Label...","Crear Etiqueta de EnvÃo..."
-"Create new credit memo for order","Crear un nuevo abono para un pedido"
-"Create new invoice for order","Crear nueva factura para el pedido"
-"Create new shipment for order","Crear nuevo envÃo para el pedido"
-"Create...","Crear..."
-"Created","Creado en"
-"Created:","Creado:"
-"Credit Memo","Factura rectificativa"
-"Credit Memo #","Nota de Crédito #"
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Factura rectificativa nº %1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","Remitente del comentario por email de la factura rectificativa"
-"Credit Memo Comment Email Template","Plantilla de comentario por email de la factura rectificativa"
-"Credit Memo Comment Email Template for Guest","Plantilla de comentario por email de la factura rectificativa para invitados"
-"Credit Memo Comments","Comentarios de la factura rectificativa"
-"Credit Memo Email Sender","Remitente del email de la factura rectificativa"
-"Credit Memo Email Template","Plantilla para el email de la factura rectificativa"
-"Credit Memo Email Template for Guest","Plantilla para el email de la factura rectificativa para invitados"
-"Credit Memo Update","Actualización de la factura rectificativa"
-"Credit Memo Update for Guest","Actualización de la factura rectificativa para invitados"
-"Credit Memos","Facturas rectificativas"
-"Credit memo canceling problem.","Problema con la cancelación del abono."
-"Credit memo cannot be canceled.","No se puede cancelar el abono."
-"Credit memo has been created automatically","La nota de crédito se ha creado de forma automática"
-"Custom Price","Precio personalizado"
-"Custom Value","Valor personalizado"
-"Customer","Cliente"
-"Customer Can Define Start Date","El cliente puede fijar la fecha de inicio"
-"Customer Group","Grupo de Clientes"
-"Customer My Account Order Creditmemo View","Vista de la factura rectificativa del pedido de «mi cuenta» del cliente"
-"Customer My Account Order History","Historial de pedidos de «mi cuenta» del cliente"
-"Customer My Account Order Invoice View","Vista de la factura del pedido de «mi cuenta» del cliente"
-"Customer My Account Order Shipment View","Vista del envÃo del pedido de «mi cuenta» del cliente"
-"Customer My Account Order View","Vista del pedido de «mi cuenta» del cliente"
-"Customer's Current Activities","Actividades actuales del cliente"
-"Customs Value","Valor en Aduana"
-"Date","Fecha"
-"Default Status","Estado por defecto"
-"Default Template","Plantilla predeterminada"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png)","Logotipo por omisión. Se usará en documentos PDF y HTML.<br />(jpeg, tiff, png)"
-"Delete","Eliminar"
-"Delete Package","Eliminar Paquete"
-"Denied the payment online.","Denegado el pago online."
-"Deny Payment","Denegar el pago"
-"Description Message","Mensaje de descripción"
-"Discount","Descuento"
-"Discount (%s)","Descuento (%s)"
-"Discount Amount","Cantidad Descontada"
-"Display Order ID in Header","Mostrar la ID del Pedido en el Encabezado"
-"Edit","Editar"
-"Edit Order #%s","Modificar el pedido nº %s"
-"Edit Order %s %s Address","Editar la dirección del pedido %s %s"
-"Edit Order Status","Editar estado de pedido"
-"Email","Dirección de correo electrónico del cliente"
-"Email Address","Dirección de correo electrónico"
-"Email Copy of Credit Memo","Enviar una copia de la factura rectificativa por correo electrónico"
-"Email Copy of Invoice","Enviar por Email Copia de Factura"
-"Email Copy of Shipment","Enviar una copia del envÃo por correo electrónico"
-"Email Order Confirmation","Enviar por Email Confirmación de Pedido"
-"Enable","Habilitar"
-"Enabled","Habilitado"
-"Enter the billing last name and email/ZIP as in the order billing address","Introduce el apellido y correo electrónico/código postal para facturación como en la dirección de facturación del pedido"
-"Entered data is incorrect. Please try again.","Los datos introducidos son incorrectos. Por favor, inténtalo de nuevo."
-"Error to Show in Shopping Cart","Error a mostrar en la cesta de la compra"
-"Excel XML","Excel XML"
+"Remove Coupon Code","Eliminar Código de Cupón"
+Qty,Cantidad
+Subtotal,Subtotal
+Discount,Descuento
+"Row Subtotal","Fila Subtotal"
+Action,Acción
+"No ordered items","No hay pedidos de artÃculos"
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,Subtotal:
"Excl. Tax","Sin impuestos"
-"Expired","Caducado"
-"Explanation","Explicación"
-"Failed to send the order email.","No se pudo enviar el email del pedido."
-"Failed to update the payment.","No se pudo actualizar el pago."
-"Failed to update the profile.","No se ha podido actualizar el perfil."
-"Failed to void the payment.","No se pudo anular el pago."
-"Fetch","Capturar"
-"File extension not known or unsupported type in the following shipment: %s","Extensión de archivo desconocida o no se admite el tipo en el siguiente envÃo:% s"
-"Find Order By:","Buscar Pedido Por:"
+Total,Total
+"Incl. Tax","Impuestos incluidos"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Trasladar a la Lista de Deseos"
+Edit,Editar
+Item,ArtÃculo
+"Add to Cart","Añadir al Carrito"
+Sku,"Sku (número de referencia)"
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,Pedidos
+Customer,Cliente
+Guest,Invitado
+"Grand Total","Suma total"
+Tax,Impuestos
+Shipping,Transporte
+"Account Information","Información de Cuenta"
"First Name","Nombre del Cliente"
-"From","Desde"
-"From Name","Por nombre"
-"From:","De:"
-"General","General"
-"General Information","Información General"
-"Get Payment Update","Recibir la actualización de pago"
-"Get Update","Actualizar"
-"Get shipping methods and rates","Obtener métodos de envÃo y tarifas"
+"Last Name","Apellido del cliente"
+Email,"Dirección de correo electrónico del cliente"
+Refresh,Actualizar
+Enable,Enable
+General,General
+Yes,SÃ
+Name,Nombre
+Status,Estado
+Enabled,Enabled
+Title,TÃtulo
+Home,Home
+Any,Any
+From,Desde
+To,Para
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,Pedido
+"Order #%1","Order #%1"
+"Shipping Amount","Gastos de EnvÃo"
+"Tax Amount","Importe del Impuesto"
+View,Ver
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Ordered,"Pedido realizado."
+Invoiced,Facturado
+Shipped,Enviado
+Refunded,Reembolsado
+Canceled,Cancelado
+From:,De:
+To:,A:
"Gift Message","Mensaje regalo"
-"Gift Message for This Order","Mensaje de regalo para este pedido"
-"Gift Message for the Entire Order","Mensaje de Regalo por Todo el Pedido"
-"Gift Message for this Order","Mensaje de regalo para este pedido"
+Message:,Mensaje:
+"Tier Pricing","Precio de nivel"
+"Go to Home Page","Go to Home Page"
+"Customer Group","Grupo de Clientes"
+Closed,"Está cerrado"
+"Product Name","Nombre de Producto"
+"Discount Amount","Cantidad Descontada"
+Country,PaÃs
+State/Province,Estado/Provincia
+"Payment Information","Información de perfil"
+"Shipping Information","Dirección de envÃo"
+"Shipping Method","Método de EnvÃo"
+"Clear Shopping Cart","Vaciar carro de la compra"
+City,Ciudad
+"Zip/Postal Code","Código postal"
+"Email Address","Dirección de correo electrónico"
+Company,CompañÃa
+Address,Address
+"Street Address","Dirección postal"
+Telephone,Teléfono
+"Save in address book","Guardar en libreta de direcciones"
+Continue,Continuar
+"Order #","Order #"
+"No Payment Methods","Sin Formas de Pago"
+"Billing Address","Dirección de facturación"
+"Shipping Address","Dirección de EnvÃo"
+"Payment Method","Método de pago"
+Sales,Ventas
+Created,"Creado en"
+Select,Seleccionar
+Comment,Comentario
+%1,%1
+Date,Fecha
+"Add New Address","Añadir Nueva Dirección"
+"Purchase Date","Purchase Date"
+"Bill-to Name","Nombre de la factura"
+"Ship-to Name","Enviar a nombre de"
+"Order Total","Total del pedido"
+"Purchase Point","Comprado En (Tienda)"
+"Recent Orders","Pedidos Recientes"
+"Store Credit","Crédito de tienda"
+Notified,Notificado
+"Notify Customer by Email","Notificar al cliente por correo electrónico"
+Billing,Facturación
+"Newsletter Subscription","Suscripción al Newsletter"
+"Order Status","Estado del pedido"
+"Wish List","Wish List"
+Pending,Pendiente
+"View Order","Ver Pedido"
+Amount,Importe
+Message,Mensaje
+Information,Información
"Gift Options","Opciones de regalo"
-"Gift Wrapping for the Entire Order","Papel para regalo para el Pedido completo"
-"Girth","Circunferencia"
-"Grand Total","Suma total"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,Nuevo
+"Custom Price","Precio personalizado"
+Processing,Procesando
+"Add To Order","Añadir al Pedido"
+"Configure and Add to Order","Configurar y añadir a pedido"
+"No items","No hay artÃculos"
+Authorization,Autorización
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.","Las operaciones de pago no permiten almacenar objetos."
+"Transaction ID","Número de identificación de la transacción"
+"Order ID","Solicitar ID"
+Void,Nulo
+"Created At","Created At"
+"Payment Method:","Método de pago:"
+"Ship To","Enviar a"
+"Invalid parent block for this block","Invalid parent block for this block"
"Grand Total (Base)","Grand Total (Base)"
"Grand Total (Purchased)","Grand Total (Comprado)"
-"Grand Total to be Charged","Importe total a cobrar"
-"Guest","Invitado"
-"Height","Altura"
-"Hide Customer IP","Ocultar la IP del cliente"
-"Hold","Espera"
-"Hold action is not available.","La acción reservar no está disponible"
-"Hold order","Reservar pedido"
-"ID","ID"
-"ID","ID"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Reembolsado"". Reembolso emitido por el comerciante. Notificación registrada sobre cantidad reembolsada de %s. Indentificador de la transacción: ""%s"""
-"If empty, the default description above will be used.","Si está vacÃo, se utilizará la descripción predeterminada anterior."
-"If empty, the default error above will be used.","Si está vacÃo, el error por defecto superior se utilizará."
-"If the invoice was created offline, try creating an offline creditmemo.","Si la factura se creó fuera de lÃnea, intente crear un creditmemo en lÃnea."
-"Incl. Tax","Impuestos incluidos"
-"Information","Información"
-"Initial Fee","Tarifa inicial"
-"Initial Fees","Tarifas Iniciales"
-"Initial period payment","PerÃodo inicial de pago."
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Información insuficiente para crear etiquetas de envÃo. Por favor, verifique su información y sus preferencias de envÃo."
-"Invalid block: %s.","Bloque no válido: %s."
-"Invalid carrier specified.","Empresa especificada no válida."
-"Invalid draw line data. Please define ""lines"" array.","Datos de trazado de lÃnea inválidos. Por favor, define la selección de ""lÃneas""."
-"Invalid entity model","Modelo de entidad inválido"
-"Invalid item option format.","Formato de opción de artÃculo no válido."
-"Invalid qty to invoice item ""%s""","Cantidad inválida para facturar el artÃculo ""%s"""
-"Invalid qty to refund item ""%s""","Cantidad inválida para reembolsar el artÃculo ""%s"""
-"Invalid qty to ship for item ""%s""","Cantidad inválida para enviar el artÃculo ""%s"""
-"Invalid renderer model","No válido el modelo renderer"
-"Invalid request for adding product to quote.","Petición no válida para añadir el producto para presupuesto."
-"Invoice","Factura"
-"Invoice #","Factura #"
-"Invoice #%1$s | %2$s | %4$s (%3$s)","Factura #%1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","Factura #%s"
-"Invoice Comment Email Sender","Comentarios sobre la factura en el email del vendedor."
-"Invoice Comment Email Template","Plantilla de email de comentario de factura."
-"Invoice Comment Email Template for Guest","Plantilla de Email de Comentario de Factura para Huésped"
-"Invoice Comments","Comentarios de factura"
-"Invoice Date","Fecha de factura"
-"Invoice Email Sender","Remitente de Email de Factura"
-"Invoice Email Template","Plantilla de email de factura"
-"Invoice Email Template for Guest","Plantilla de email de factura para cliente"
-"Invoice Update","Actualización de factura"
-"Invoice Update for Guest","Actualización de factura para el cliente"
-"Invoice and Packing Slip Design","Diseño de Funda de Factura y Embalaje"
-"Invoice and Ship","Factura y envÃo"
-"Invoice canceling problem.","Problema de cancelación de factura."
-"Invoice cannot be canceled.","La factura no puede cancelarse."
-"Invoice cannot be captured.","La factura no puede ser capturada."
-"Invoice cannot be voided.","La factura no se puede anular."
-"Invoice capturing problem.","Problema de captura de factura."
-"Invoice void problem","Problema de factura nula"
-"Invoice will be created without communication with payment gateway.","Se creará la factura sin comunicación con la pasarela de pago."
-"Invoiced","Facturado"
-"Invoices","Facturas"
-"Item","ArtÃculo"
-"Item Status","Estado del artÃculo"
-"Item object is not specified.","Objeto del artÃculo no especificado."
-"Item options declaration error.","Error de declaración de opciones de artÃculo."
-"Item ordered qty","ArtÃculo pedido qty"
-"Item qty declaration error.","Declaración de error del artÃculo qty"
-"Items","ArtÃculos"
-"Items Invoiced","ArtÃculos facturados."
-"Items Ordered","ArtÃculos Pedidos"
-"Items Refunded","ArtÃculos devueltos"
-"Items Shipped","ArtÃculos enviados"
-"Items in the Package","ArtÃculos en el Paquete"
-"Items maximum quantity or price do not allow checkout.","Máxima cantidad de artÃculos o precio no permiten la compra."
-"Items options declaration error.","Declaración de error de opciones de artÃculos"
-"Items to Refund","ArtÃculos para devolver"
-"Items to Ship","ArtÃculos a Enviar"
-"Key","Clave"
-"Last Name","Apellido del cliente"
-"Last Ordered Items","Últimos ArtÃculos Pedidos"
-"Last status can't be unassigned from state.","El último estado no puede estar sin asignar desde estado."
-"Length","Longitud"
-"Link to the New Order","Enlace al Nuevo Pedido"
-"Link to the Previous Order","Enlace al Pedido Anterior"
-"Logo for HTML Print View","Logo para la Vista de Impresión HTML"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logotipo únicamente de documentos HTML. Si está vacÃo, se usará el logotipo por defecto. <br />(jpeg, gif, png)"
-"Logo for PDF Print-outs (200x50)","Logo para Impresiones PDF (200x500)"
-"Make Check payable to:","Extender el cheque a nombre de:"
-"Manage","Gestionar"
-"Maximum amount available to refund is %s","La cantidad máxima disponible para reembolso es %s"
-"Maximum shipping amount allowed to refund is: %s","La cantidad máxima de reembolso por envÃo permitida es: %s"
-"Message","Mensaje"
-"Message:","Mensaje:"
-"Minimum Amount","Cantidad MÃnima"
-"Minimum Order Amount","Pedido mÃnimo"
-"Mixed","Mixto"
-"Most Viewed","Más visto"
-"Most Viewed Products Report","Informe de productos más vistos"
-"Move to Shopping Cart","Mover al Carro de la Compra"
-"Move to Wishlist","Trasladar a la Lista de Deseos"
-"Multi-address Description Message","Mensaje de Descripción Multi-dirección"
-"Multi-address Error to Show in Shopping Cart","Error de Multi-dirección para Mostrar en Carro de Compra"
-"My Orders","Mis pedidos"
-"My Orders - Details","Mis Pedidos - Detalles"
-"N/A","N/A"
-"Name","Nombre"
-"New","Nuevo"
-"New Credit Memo","Nueva Factura de Abono"
-"New Credit Memo for Guest","Nueva Nota de Crédito para Huésped"
-"New Credit Memo for Invoice #%s","Nueva Nota de Crédito para Factura #%s"
-"New Credit Memo for Order #%s","Nueva Nota de Crédito para Pedido #%s"
-"New Invoice","Nueva Factura"
-"New Invoice and Shipment for Order #%s","Nueva Factura y EnvÃo de Pedido #%s"
-"New Invoice for Guest","Nueva Factura para Cliente"
-"New Invoice for Order #%s","Nueva Factura para el Pedido #%s"
-"New Order","Nuevo Pedido"
-"New Order Confirmation Email Sender","Nueva Confirmación de Pedido de correo electrónico del Remitente"
-"New Order Confirmation Template","Plantilla de Confirmación de Nuevo Pedido"
-"New Order Confirmation Template for Guest","Nueva Confirmación de Pedido de Plantilla para Cliente"
-"New Order RSS","Nuevo Pedido RSS"
-"New Order Status","Estado de los nuevos pedidos"
-"New Order for Guest","Nuevo Pedido para Cliente"
-"New Shipment","Nuevo EnvÃo"
-"New Shipment for Guest","Nuevo EnvÃo para Cliente"
-"New Shipment for Order #%s","Nuevo EnvÃo del Pedido #%s"
-"Newsletter Subscription","Suscripción al Newsletter"
-"No","No"
-"No Items","No hay ArtÃculos"
-"No Items To Refund","Sin ArtÃculos que Reembolsar"
-"No Payment Methods","Sin Formas de Pago"
-"No detail for number ""%s""","Sin detalles del número ""%s"""
-No hay etiquetas de envÃo para las %s seleccionadas. [[[if %s is feminine]]]"
-"No information available.","No hay información disponible."
-"No items","No hay artÃculos"
-"No order(s) were put on hold.","Ningún pedido fue puesto en suspenso."
-"No order(s) were released from holding status.","Ningún pedido se ha liberado del estado de espera."
-"No ordered items","No hay pedidos de artÃculos"
-"No shipping information available","No hay disponible información sobre el envÃo"
-"Nominal Items","ArtÃculos Nominales"
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Los artÃculos nominales solo pueden ser adquiridos independientemente. Para proceder, por favor, elimina otros artÃculos del presupuesto."
-"Nominal order registered.","Pedido nominal registrado."
-"Not Capture","Sin Captura"
-"Not Initialized","No Inicializado"
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Refunded","Total reembolsado"
+Paid,Pagado
+Coupons,Cupones
+"Recently Viewed","Vistos recientemente"
+"Recently Compared Products","Productos recientemente comparados"
+"Recently Viewed Products","Productos vistos recientemente"
+Print,Imprimir
+"Submit Comment","Enviar comentario"
+Returned,Devuelto
+"Order Date","Fecha del pedido"
+"Order # ","Order # "
+"Order Date: ","Fecha del pedido:"
+"Comment Text","Comentar el texto"
+"Visible on Frontend","Visible en el Panel Delantero"
"Not Notified","No Notificado"
-"Not enough valid data to save the parent transaction ID.","No existen datos suficientes para guardar la identificación de la transacción raÃz."
-"Notification Not Applicable","Notificación no Aplicable"
-"Notified","Notificado"
-"Notify Customer by Email","Notificar al cliente por correo electrónico"
-"Number","Número"
-"Number of Invoiced Orders","Número de Pedidos Facturados"
-"Number of Orders","Número de pedidos"
-"Number of Refunded Orders","Número de Pedidos Reembolsados"
-"OK","Aceptar"
-"Offline Refunded","Reembolsado Fuera de LÃnea"
-"On Hold","En pausa"
-"Online Refunded","Reembolsado online"
-"Order","Pedido"
-"Order ","Pedido #"
-"Order %s","Pedido # %s"
-"Order %s","Pedido #%s"
-"Order %s %s | %s","Pedido # %s %s | %s"
-"Order %s - %s","Pedido #%s - %s"
-"Order API","API de Pedido"
+"Please select products.","Please select products."
+Number,Número
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","EnvÃo y preparación"
+"Credit Memos","Facturas rectificativas"
+Invoices,Facturas
+"We cannot get the order instance.","We cannot get the order instance."
+"Create New Order","Crear un nuevo pedido"
+"Save Order Address","Guardar dirección del pedido"
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
"Order Address Information","Información de la Dirección del Pedido"
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order","Enviar pedido"
+"Are you sure you want to cancel this order?","¿Está seguro de que quiere cancelar este pedido?"
"Order Comment","Comentario del pedido"
-"Order Comment Email Sender","Remitente del Email de Comentario de Pedido"
-"Order Comment Email Template","Plantilla del Email del comentario del pedido"
-"Order Comment Email Template for Guest","Plantilla del Email del comentario del pedido para invitado"
-"Order Comments","Comentarios del pedido"
-"Order Credit Memos","Pedido de Nota de Créditos"
-"Order Currency:","Divisa del pedido"
-"Order Date","Fecha del pedido"
-"Order Date (%s)","Fecha del pedido (%s)"
-"Order Date: ","Fecha del pedido:"
-"Order Date: %s","Fecha del pedido: %s"
-"Order Details","Detalles del pedido"
+"Please select a customer.","Please select a customer."
+"Create New Customer","Crear un nuevo cliente"
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
+"Create New Order for New Customer","Crear un nuevo pedido para un nuevo cliente"
+"Items Ordered","ArtÃculos Pedidos"
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty","ArtÃculo pedido qty"
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - Introduzca el precio a medida con impuestos"
+"* - Enter custom price excluding tax","* - Introduzca el precio a medida sin impuestos"
+"This product does not have any configurable options","Este productor no dispone de opciones de configuración"
+"Add Selected Product(s) to Order","Añadir el(los) Producto(s) Seleccionado(s) al Pedido"
+"Update Changes","Actualizar Cambios"
+"Are you sure you want to delete all items from shopping cart?","¿Seguro que quiere borrar todos los artÃculos del carro de la compra?"
+"Products in Comparison List","Productos en la Lista de Comparación"
+"Last Ordered Items","Últimos ArtÃculos Pedidos"
+"Please select a store.","Please select a store."
+"Order Totals","Solicitar totales"
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)","Reembolso del EnvÃo (Impuestos incl.)"
+"Refund Shipping (Excl. Tax)","Reembolso del EnvÃo (Impuestos no incl.)"
+"Refund Shipping","Reembolso del EnvÃo"
+"Update Qty's","Actualizar Cantidad/es"
+Refund,Reembolso
+"Refund Offline","Reembolso Fuera de LÃnea"
+"Paid Amount","Cantidad pagada"
+"Refund Amount","Importe del Reembolso"
+"Shipping Refund","Reembolso de EnvÃo"
"Order Grand Total","Total del pedido"
+"Adjustment Refund","Reembolso de Ajuste"
+"Adjustment Fee","Tarifa de Ajuste"
+"Send Email","EnvÃar Correo electrónico"
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent","el email de nota de crédito no se ha enviado"
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund","Reembolso Total"
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment","Enviar factura y gastos de envÃo"
+"Submit Invoice","Enviar factura"
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo","Factura rectificativa"
+Capture,Captura
+"the invoice email was sent","El correo electrónico de la factura fue enviado"
+"the invoice email is not sent","El correo electrónico de la factura no se ha enviado"
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses","Estados de los Pedidos"
+"Create New Status","Crear nuevo estado"
+"Assign Status to State","Asignar estado a estado"
+"Save Status Assignment","Guardar estado de la tarea"
+"Assign Order Status to State","Asignar estado de pedido a estado"
+"Assignment Information","Información de asignación"
+"Order State","Estado del Pedido"
+"Use Order Status As Default","Usar estado de pedido por defecto"
+"Visible On Frontend","Visible On Frontend"
+"Edit Order Status","Editar estado de pedido"
+"Save Status","Guardar estado"
+"New Order Status","Estado de los nuevos pedidos"
+"Order Status Information","Información del Estado del Pedido"
+"Status Code","Código de estado"
+"Status Label","Etiqueta de estado"
+"Store View Specific Labels","Etiquetas especÃficas de la vista del almacén"
+"Total Paid","Total pagado"
+"Total Due","Total de deuda"
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?","¿Está seguro de que quiere invalidar el pago?"
+Hold,Espera
+hold,hold
+Unhold,Recuperar
+unhold,unhold
+"Are you sure you want to accept this payment?","¿Está seguro de que quiere aceptar este pago?"
+"Accept Payment","Aceptar Pago"
+"Are you sure you want to deny this payment?","¿Está seguro de que quiere rechazar este pago?"
+"Deny Payment","Denegar el pago"
+"Get Payment Update","Recibir la actualización de pago"
+"Invoice and Ship","Factura y envÃo"
+Invoice,Factura
+Ship,Enviar
+Reorder,"Volver a hacer el pedido"
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
+"Order Credit Memos","Pedido de Nota de Créditos"
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
+"Comments History","Historial de comentarios"
"Order History","Historial del pedido"
-"Order History Info","Información del Historial del Pedido"
-"Order ID","Solicitar ID"
"Order Information","Información del pedido"
"Order Invoices","Facturas de Pedido"
+Shipments,EnvÃos
"Order Shipments","EnvÃos del pedido"
-"Order State","Estado del Pedido"
-"Order Status","Estado del pedido"
-"Order Status Information","Información del Estado del Pedido"
-"Order Statuses","Estados de los Pedidos"
-"Order Subtotal","Subtotal del pedido"
-"Order Taxes Report Grouped by Tax Rates","Impuestos del pedido agrupados por tasas de impuestos"
-"Order Total","Total del pedido"
-"Order Totals","Solicitar totales"
-"Order Update","Actualización del pedido"
-"Order Update for Guest","Actualización del pedido para invitado"
+Transactions,Transacciones
"Order View","Vista del pedido"
-"Order credit memo","Pedir un abono"
-"Order does not allow to be canceled.","El pedido no puede cancelarse."
-"Order invoice","Factura del pedido"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","El pedido está suspendido porque se sospecha que su cantidad tomada %s puede ser fraudulenta."
-"Order object is not specified.","Objeto del pedido no especificado"
-"Order saving error: %s","Error de guardado del pedido: %s"
-"Order shipments","EnvÃos de pedidos"
-"Order status does not exist.","El estado del pedido no existe."
-"Order status with the same status code already exist.","El estado del pedido con el mismo código de estado ya existe."
-"Order was placed using %s","El pedido fue realizado usando %s"
-"Ordered","Pedido realizado."
-"Ordered amount of %s.","Cantidad pedida de %s."
-"Ordering amount of %s is pending approval on gateway.","El pedido de la cantidad de %s está pendiente de aprobación en el portal."
-"Orders","Pedidos"
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
+"Shipping & Handling","Manipulación y expedición"
+Fetch,Capturar
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,Clave
+Value,Valor
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders","Volver a mis pedidos"
+"View Another Order","Ver Otro Pedido"
+"About Your Refund","Acerca de su devolución"
+"My Orders","Mis pedidos"
+"About Your Invoice","Acerca de su factura"
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged","Importe total a cobrar"
+Unassign,"Sin asignar"
+"We sent the message.","We sent the message."
+"This order no longer exists.","Esta orden ya no existe."
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
+"The payment has been accepted.","El pago se ha aceptado."
+"The payment has been denied.","El pago ha sido denegado."
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.","Ningún pedido fue puesto en suspenso."
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
+"There are no printable documents related to selected orders.","No hay documentos para imprimir relacionados con los pedidos seleccionados."
+"The payment has been voided.","El pago ha sido anulado."
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.","El código del cupón se ha aceptado"
+"New Order","Nuevo Pedido"
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice","Nueva Factura"
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
+"Create New Order Status","Crear nuevo estado de pedido"
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.","Ha ocurrido un error al asignar el estado de su pedido. No se ha asignado estado."
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
"Orders and Returns","Pedidos y devoluciones"
-"Orders and Returns Search Form","Impreso de pedidos y devoluciones"
-"Original Price","Precio original"
-"Original order item that recurring payment corresponds to.","Pedido original al que corresponde el perfil de pago periódico."
-"PDF Credit Memos","Notas de cŕedito en PDF"
-"PDF Invoices","Facturas en PDF"
-"PDF Packing Slips","Albaranes en PDF"
-"PDF Print-outs","Impresos en PDF"
-"PDF object is not specified.","Objeto en PDF no especificado."
-"PDF page object is not specified.","Objeto de página en PDF no especificado."
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","Módelo total en PDF deberÃa extenderse \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal"
-"Package","Paquete"
-"Package types are disregarded for USPS domestic shipments.","Los tipos de paquetes no serán tenidos en cuenta por el servicio postal de USA para envÃos nacionales."
-"Packages","Paquetes"
-"Packing Slip # ","Albaranes #"
-"Paid","Pagado"
-"Paid Amount","Cantidad pagada"
-"Parent Transaction ID","ID de Transacción Padre"
-"Parent transaction ID must have a transaction ID.","ID de transacción principal debe tener una ID de transacción."
-"Partial","Parcial"
-"Payment Failed","Pago Fallido"
-"Payment Information","Información de pago"
-"Payment Method","Nombre del Método de Pago"
-"Payment Method","Método de pago"
-"Payment Method:","Método de pago:"
-"Payment Review","Revisión del Pago"
-"Payment disallow storing objects.","El pago no permite almacenar objetos."
-"Payment transactions disallow storing objects.","Las operaciones de pago no permiten almacenar objetos."
-"Payment type","Tipo de pago"
-"Payment update has been made.","Se ha efectuado la actualización del pago,"
-"Pending","Pendiente"
-"Pending Payment","Pago Pendiente"
-"Period","PerÃodo"
-"Placed from IP","Realizado desde IP"
-"Please Select Products to Add","Por favor, Selecciona Productos a Añadir"
-"Please Select a Customer","Seleccione un Cliente"
-"Please Select a Store","Seleccione una Tienda"
-"Please check billing address information. %s","Por favor, compruebe la dirección de facturación. %s"
-"Please check shipping address information. %s","Por favor, compruebe la dirección de envÃo. %s"
-"Please define PDF object before using.","Antes de su utilización, defina un objeto PDF"
-"Please enter positive number in this field.","Introduzca un número positivo en este campo."
-"Please select a valid payment method.","Por favor, seleccione un modo de pago válido."
-"Please specify a shipping method.","Por favor, especifique un modo de envÃo."
-"Please specify a valid grid column alias name that exists in grid table.","Especifique un nombre de alias de columna de cuadrÃcula válido que exista en la tabla de cuadrÃcula."
-"Price","Precio"
-"Print","Imprimir"
-"Print All","Imprimir todo"
-"Print All Invoices","Imprimir Todas las Facturas"
-"Print All Refunds","Imprimir Todos los Reembolsos"
-"Print All Shipments","Imprimir Todos los EnvÃos"
-"Print Credit Memos","Imprimir Todas las Facturas de Abono"
-"Print Invoice","Imprimir Factura"
-"Print Invoices","Imprimir Facturas"
-"Print Order","Imprimir Pedido"
-"Print Order # %s","Imprimir Pedido # %s"
-"Print Packing Slips","Imprimir Albaranes de Embalaje"
-"Print Refund","Imprimir Reembolso"
-"Print Shipment","Imprimir EnvÃo"
-"Print Shipping Label","Imprimir Etiqueta de EnvÃo"
-"Print Shipping Labels","Imprimir etiquetas de envÃo"
-"Processing","Procesando"
-"Product","Producto"
-"Product Name","Nombre de Producto"
-"Products","Productos"
-"Products Bestsellers Report","Informe de Productos Más Vendidos"
-"Products in Comparison List","Productos en la Lista de Comparación"
-"Products should be added to package(s)","Los productos deberÃan ser añadidos al paquete(s)"
-"Payment #%s","Perfil #%s"
-"Payment Information","Información de perfil"
-"Payment State","Estado del Perfil"
-"Profit","Beneficio"
-"Promotion Coupons Usage Report","Informe de Utilización de Cupones de Promoción"
-"Proper payment object must be set.","Debe establecerse el apropiado objeto de pago."
-"Purchase Order Number:","Número de pedido de compra:"
-"Purchase Point","Comprado En (Tienda)"
-"Purchased Date","Comprado en"
-"Purchased From","Comprado de"
-"Purchased Item","ArtÃculo Comprado"
-"Qty","Cantidad"
-"Qty Invoiced","Cantidad Facturada"
-"Qty Ordered","Cantidad Pedida"
-"Qty Shipped","Cantidad Enviada"
-"Qty To Add","Cantidad a Añadir"
-"Qty to Add","Cantidad a Añadir"
-"Qty to Invoice","Cantidad para Facturar"
-"Qty to Refund","Cantidad para Reembolsar"
-"Qty to Ship","Cantidad a Enviar"
-"Quantity Ordered","Cantidad Pedida"
-"Quote item id is not received.","El artÃculo indicado no se ha recibido."
-"Quote item is not loaded.","El artÃculo indicado no está cargado."
-"Rate","Tarifa"
-"Recent Orders","Pedidos Recientes"
-"Recently Compared Products","Productos recientemente comparados"
-"Recently Viewed","Vistos recientemente"
-"Recently Viewed Products","Productos vistos recientemente"
-"Recurring Payment # %s","Perfil Repetitivo # %s"
-"Recurring Payment Initial Fee","Tarifa Inicial de Perfil Repetitivo"
-"Recurring Payments","Perfiles Repetitivos"
-"Recurring Payments (beta)","Perfiles Repetitivos (beta)"
-"Reference ID","ID de Referencia"
-"Reference ID:","ID de Referencia:"
-"Refresh","Actualizar"
-"Refund","Reembolso"
-"Refund #","Reembolso #"
-"Refund #%s","Reembolso #%s"
-"Refund Amount","Importe del Reembolso"
-"Refund Offline","Reembolso Fuera de LÃnea"
-"Refund Shipping","Reembolso del EnvÃo"
-"Refund Shipping (Excl. Tax)","Reembolso del EnvÃo (Impuestos no incl.)"
-"Refund Shipping (Incl. Tax)","Reembolso del EnvÃo (Impuestos incl.)"
-"Refund Totals","Totales de Reembolso"
-"Refunded","Reembolsado"
-"Refunded amount of %s offline.","Importe reembolsado de %s fuera de lÃnea."
-"Refunded amount of %s online.","Importe reembolsado de %s en lÃnea."
-"Refunds","Reembolsos"
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State","Estado desconocido"
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status","Estados desconocidos"
+Backordered,"Pendientes de entrega"
+Partial,Parcial
+Mixed,Mixto
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
"Registered a Void notification.","Registrada una información anulada."
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.","El pago ha sido aprobado a distancia."
+"There is no need to approve this payment.","There is no need to approve this payment."
"Registered notification about approved payment.","Notificación certificada sobre el pago aprobado."
-"Registered notification about captured amount of %s.","Registrada notificación sobre una cantidad retenida de %s."
+"Denied the payment online","Denied the payment online"
+"There is no need to deny this payment.","No hay necesidad de negar este pago."
"Registered notification about denied payment.","Registrada notificación sobre un pago denegado."
-"Registered notification about refunded amount of %s.","Notificación certificada sobre el reembolso de la cantidad de %s."
"Registered update about approved payment.","Registrada actualización sobre un pago aprobado."
"Registered update about denied payment.","Actualización registrada sobre pago denegado."
-"Regular Payment","Pago ordinario"
-"Related Orders","Pedidos relacionados"
-"Remove","Eliminar"
-"Remove Coupon Code","Eliminar Código de Cupón"
-"Remove tracking number","Eliminar número de rastreo"
-"Reorder","Volver a hacer el pedido"
-"Retrieve credit memo info","Recuperar información de abono"
-"Retrieve credit memo information","Recuperar la información del abono"
-"Retrieve credit memo list","Recuperar lista de abonos"
-"Retrieve invoice info","Recuperar información de factura"
-"Retrieve invoice information","Recibir información de la factura"
-"Retrieve list of credit memos by filters","Recuperar lista de abonos por filtros"
-"Retrieve list of invoices by filters","Recibir lista de facturas por filtros"
-"Retrieve list of orders by filters","Recibir lista de pedidos por filtros"
-"Retrieve list of shipments by filters","Recuperar lista de envÃos por filtros"
-"Retrieve order information","Recibir información del pedido"
-"Retrieve orders info","Recibir información de los pedidos"
-"Retrieve shipment info","Recuperar información de envÃo"
-"Retrieve shipment information","Recibir información del pedido"
-"Return to Stock","Volver al Stock"
-"Returned","Devuelto"
-"Returns","Devoluciones"
-"Revenue","Ingresos"
-"Row Subtotal","Fila Subtotal"
-"Row Total","Fila Total"
-"SHIP TO:","ENVIAR A:"
-"SKU","Sku"
-"SOLD TO:","VENDIDO A:"
-"Sales","Ventas"
-"Sales Discount","Descuento de ventas"
-"Sales Emails","Emails de Ventas"
-"Sales Emails Section","Sección de Emails de ventas"
-"Sales Invoice Print View","Vista de impresión de la factura de ventas"
-"Sales Items","ArtÃculos de ventas"
-"Sales Order Print View","Vista de Impresión de Pedidos de Ventas"
-"Sales Section","Sección de ventas"
-"Sales Shipment Print View","Vista de Imprsión de envÃos de Ventas"
-"Sales Shipping","EnvÃo de Ventas"
-"Sales Tax","Impuesto sobre las ventas"
-"Sales Total","Total de ventas"
-"Same As Billing Address","La misma que la dirección de facturación"
-"Save Order Address","Guardar dirección del pedido"
-"Save Status","Guardar estado"
-"Save Status Assignment","Guardar estado de la tarea"
-"Save in address book","Guardar en libreta de direcciones"
-"Schedule","Programa"
-"Select","Seleccionar"
-"Select All","Seleccionar todo"
-"Select from existing customer addresses:","Seleccionar entre las direcciones del cliente existentes"
-"Send Credit Memo Comment Email Copy To","Enviar copia por email del comentario a la nota de crédito a:"
-"Send Credit Memo Comments Email Copy Method","Enviar comentarios sobre la nota de crédito por correo electrónico"
-"Send Credit Memo Email Copy Method","Enviar la nota de crédito por correo electrónico"
-"Send Credit Memo Email Copy To","Enviar copia por email de la nota de crédito a:"
-"Send Email","EnvÃar Correo electrónico"
-"Send Invoice Comment Email Copy To","Enviar copia por email del comentario a la factura a:"
-"Send Invoice Comments Email Copy Method","Enviar Factura Comentarios Email Copiar Método"
-"Send Invoice Email Copy Method","Enviar Factura Email Copiar Método"
-"Send Invoice Email Copy To","Enviar Copia de Email de Factura a"
-"Send Order Comment Email Copy To","Enviar copia por email del comentario al pedido a:"
-"Send Order Comments Email Copy Method","Enviar Pedido Comentarios Email Copiar Método"
-"Send Order Email","Enviar correo del pedido"
-"Send Order Email Copy Method","Método de envÃo de copia por email del pedido"
-"Send Order Email Copy To","Enviar copia por email del pedido a:"
-"Send Sales Emails","Enviar emails de ventas"
-"Send Shipment Comment Email Copy To","Enviar Copia de Email de comentario de EnvÃo a"
-"Send Shipment Comments Email Copy Method","Enviar comentarios sobre el envÃo y transporte por correo electrónico"
-"Send Shipment Email Copy Method","Enviar EnvÃo Email Copiar Método"
-"Send Shipment Email Copy To","Enviar Copia de Email de EnvÃo a"
-"Send Tracking Information","Enviar información de rastreo"
+"There is no update for the payment.","No hay actualizaciones para este pago."
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.","Autorización anulada"
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
"Set order for existing transactions not allowed","Establecer orden para las transacciones existentes no permitido"
-"Ship","Enviar"
-"Ship Date","Fecha de EnvÃo"
-"Ship To","Enviar a"
-"Ship-to Name","Enviar a nombre de"
-"Shipment","EnvÃo"
-"Shipment","EnvÃo #"
-"Shipment %1$s | %3$s (%2$s)","EnvÃo #%1$s | %3$s (%2$s)"
-"Shipment %s","EnvÃo #%s"
-"Shipment Comment Email Sender","Email del remitente del comentario al envÃo"
-"Shipment Comment Email Template","Plantilla para el email de comentario al envÃo"
-"Shipment Comment Email Template for Guest","Plantilla para el email de comentario del invitado al envÃo"
-"Shipment Comments","Comentarios de EnvÃo"
-"Shipment Email Sender","Email del remitente del envÃo"
-"Shipment Email Template","Plantilla para el email del envÃo"
-"Shipment Email Template for Guest","Plantilla para el email del envÃo para el invitado"
-"Shipment Update","Actualizar EnvÃo"
-"Shipment Update for Guest","Actualización del envión para el invitado"
-"Shipments","EnvÃos"
-"Shipped","Enviado"
-"Shipped By","Enviado por"
-"Shipping","Transporte"
-"Shipping & Handling","Manipulación y expedición"
-"Shipping & Handling","EnvÃo y preparación"
-"Shipping & Handling Information","EnvÃo & Información de Manipulación"
-"Shipping Address","Dirección de EnvÃo"
-"Shipping Amount","Gastos de EnvÃo"
-"Shipping Information","Dirección de envÃo"
-"Shipping Method","Método de EnvÃo"
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
"Shipping Method:","Método de envÃo:"
-"Shipping Refund","Reembolso de EnvÃo"
-"Shipping and Tracking Information","Información de envÃo y rastreo"
-"Shopping Cart","Carro de la compra"
-"Show Packages","Mostrar Paquetes"
-"Signature Confirmation","Confirmación con Firma"
-"Signed Up From","Inscrito de"
-"Size","Tamaño"
-"Sku","Sku (número de referencia)"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Algunos de los productos a continuación no tienen todas las opciones necesarias. Por favor, edÃtalos y configura todas las opciones necesarias."
-"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido."
-"Source object is not specified.","El objeto fuente no se ha especificado."
-"Specified profile does not exist.","El perfil especificado no existe."
-"State Code [State Title]","Código del estado [TÃtulo del estado]"
-"State/Province","Estado/Provincia"
-"Status","Estado"
-"Status Code","Código de estado"
-"Status Label","Etiqueta de estado"
-"Status:","Situación:"
-"Store Credit","Crédito de tienda"
-"Store View Specific Labels","Etiquetas especÃficas de la vista del almacén"
-"Street Address","Dirección postal"
-"Submit Comment","Enviar comentario"
-"Submit Credit Memo","Enviar Nota de Crédito"
-"Submit Invoice","Enviar factura"
-"Submit Invoice and Shipment","Enviar factura y gastos de envÃo"
-"Submit Order","Enviar pedido"
-"Submit Shipment","Enviar EnvÃo"
-"Subscribe to Newsletter","Suscribir al boletÃn informativo"
-"Subscribe to Order Status","Suscribirse al Estado de Pedido"
-"Subtotal","Subtotal"
-"Subtotal after discount.","Subtotal después del descuento."
-"Subtotal:","Subtotal:"
-"Suspected Fraud","Sospecha de fraude"
-"Suspend","Suspender"
-"Suspended","Suspendido"
-"Tax","Impuestos"
-"Tax Amount","Importe del Impuesto"
-"Tax Percent","Porcentaje de impuestos"
-"Telephone","Teléfono"
-"The Order State ""%s"" must not be set manually.","El estado del pedido ""%s"" no se debe establecer manualmente."
-"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","El modelo de dirección total deberÃa extenderse desde \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
-"The coupon code has been accepted.","El código del cupón se ha aceptado"
-"The message has been sent.","El mensaje ha sido enviado."
-"The message was sent.","El mensaje se envió."
-"The order address has been updated.","La dirección del pedido se ha actualizado."
-"The order email has been sent.","El email del pedido se ha enviado."
-"The order has been cancelled.","El pedido ha sido cancelado."
-"The order has been created.","El pedido ha sido creado."
-"The order has been put on hold.","El pedido ha sido puesto en espera."
-"The order has been released from holding status.","El pedido ha sido sacado del estado de espera."
-"The order has not been cancelled.","El pedido no ha sido cancelado."
-"The order status has been assigned.","El estado del pedido se ha asignado."
-"The order status has been saved.","El estado del pedido se ha guardado."
-"The order status has been unassigned.","El estado del pedido no se ha asignado."
-"The order was not put on hold.","El pedido no fue puesto en espera."
-"The order was not unheld.","El pedido no fue confirmado."
-"The order was placed using %s","El pedido fue realizado utilizando %s"
-"The order(s) cannot be canceled","El/los pedido(s) no puede(n) ser cancelado(s)"
-"The payment has been accepted.","El pago se ha aceptado."
-"The payment has been denied.","El pago ha sido denegado."
-"The payment has been voided.","El pago ha sido anulado."
-"The profile has been updated.","El perfil ha sido actualizado."
-"The profile has no changes.","El perfil no ha cambiado."
-"The profile state has been updated.","El estado del perfil ha sido actualizado."
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","La cantidad que desea añadir excede la cantidad total enviada de alguno de los productos seleccionados."
-"The requested Payment Method is not available.","El método de pago solicitado no está disponible."
-"The shipping label has been created.","Se ha creado la etiqueta de envÃo."
-"The transaction ""%s"" (%s) is already closed.","La transacción ""%s"" (%s) ya está cerrada."
-"The transaction ""%s"" cannot be captured yet.","La transacción ""%s"" no puede ser capturada todavÃa."
-"The value that you entered is not valid.","El valor que ha introducido no es válido."
-"There are no printable documents related to selected orders.","No hay documentos para imprimir relacionados con los pedidos seleccionados."
-"There are no shipping labels related to selected %s.","No hay etiquetas de envÃo para los %s seleccionados. [[[if %s is masculine]]]
-"There is no need to approve this payment.","No hay necesidad de aprobar este pago."
-"There is no need to deny this payment.","No hay necesidad de negar este pago."
-"There is no update for the payment.","No hay actualizaciones para este pago."
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Este mensaje aparecerá en el carro de la compra cuando el subtotal tras el descuento sea menor que la cantidad mÃnima."
-"This operation requires an existing transaction object.","Esta operación requiere la existencia de un artÃculo en transacción."
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Este pedido contiene (%s) artÃculos y por tanto no puede editarse mediante la interfaz de administración en este momento, si deseas continuar editando, los (%s) artÃculos se eliminarán, el pedido se cancelará y se creará un nuevo pedido."
-"This order no longer exists.","Esta orden ya no existe."
-"This product does not have any configurable options","Este productor no dispone de opciones de configuración"
-"This profile state cannot be changed to ""%s"".","El estado del perfil no se puede cambiar a ""%s""."
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Esto creará un reembolso en lÃnea. Para crear un reembolso en lÃnea, abra una factura y cree una nota de crédito para ella. ¿Desea continuar?"
-"Tier Pricing","Precio de nivel"
-"Title","TÃtulo"
-"To","Para"
-"To Name","A nombre de"
-"To:","A:"
-"Total","Total"
-"Total %d product(s)","%d producto(s) en total"
+"Total Shipping Charges","Total de gastos de envÃo"
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
"Total (ex)","Total (ex)"
"Total (inc)","Total (inc)"
-"Total Due","Total de deuda"
-"Total Invoiced","Total facturado"
-"Total Invoiced Paid","Total facturado pagado"
-"Total Invoiced VS Paid Report","Total facturado VS Informe de pago"
-"Total Invoiced not Paid","Total facturado no pagado"
-"Total Ordered Report","Informe del total solicitado"
-"Total Paid","Total pagado"
-"Total Quantity","Total cantidad"
-"Total Refund","Reembolso Total"
-"Total Refunded","Total reembolsado"
-"Total Refunded Report","Informe del total reembolsado"
-"Total Sales Shipping","EnvÃo de Ventas Total"
-"Total Shipped Report","Informe del total enviado"
-"Total Shipping","Total de ventas"
-"Total Shipping Charges","Total de gastos de envÃo"
+"Credit Memo # ","Credit Memo # "
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
+"Packing Slip # ","Albaranes #"
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
+"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","El modelo de dirección total deberÃa extenderse desde \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
+"Subscription Items","Subscription Items"
+"Regular Payment","Pago ordinario"
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.","El método de pago solicitado no está disponible."
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.","Por favor, especifique un modo de envÃo."
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.","Por favor, seleccione un modo de pago válido."
+"Pending Payment","Pago Pendiente"
+"On Hold","En pausa"
+Complete,Completo
+"Suspected Fraud","Sospecha de fraude"
+"Payment Review","Revisión del Pago"
+"Changing address information will not recalculate shipping, tax or other order amount.","Al cambiar la información de la dirección no se recalculan el envÃo, los impuestos ni el total del pedido."
+"Order Comments","Comentarios del pedido"
+"Order Currency:","Divisa del pedido"
+"Select from existing customer addresses:","Seleccionar entre las direcciones del cliente existentes"
+"Same As Billing Address","La misma que la dirección de facturación"
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order","Mensaje de Regalo por Todo el Pedido"
+"Move to Shopping Cart","Mover al Carro de la Compra"
+"Subscribe to Newsletter","Suscribir al boletÃn informativo"
+"Click to change shipping method","Haz click aquà para cambiar el método de envÃo"
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates","Obtener métodos de envÃo y tarifas"
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments","Agregar Comentarios"
+"Email Order Confirmation","Enviar por Email Confirmación de Pedido"
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund","ArtÃculos para devolver"
+"Return to Stock","Volver al Stock"
+"Qty to Refund","Cantidad para Reembolsar"
+"Row Total","Fila Total"
+"No Items To Refund","Sin ArtÃculos que Reembolsar"
+"Credit Memo Comments","Comentarios de la factura rectificativa"
+"Refund Totals","Totales de Reembolso"
+"Email Copy of Credit Memo","Enviar una copia de la factura rectificativa por correo electrónico"
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded","ArtÃculos devueltos"
+"No Items","No hay ArtÃculos"
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment","Crear envÃo"
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice","Cantidad para Facturar"
+"Invoice History","Invoice History"
+"Invoice Comments","Comentarios de factura"
+"Invoice Totals","Invoice Totals"
+"Capture Amount","Captura de importe"
+"Capture Online","Captura online"
+"Capture Offline","Captura offline"
+"Not Capture","Sin Captura"
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
+"Email Copy of Invoice","Enviar por Email Copia de Factura"
+"Items Invoiced","ArtÃculos facturados."
"Total Tax","Impuesto Total"
-"Total Weight","Peso total"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","El modelo total debe anpliarse desde \Magento\Sales\Model\Order\Total\AbstractTotal"
-"Track Order","Rastrear un Pedido"
-"Track all shipment(s)","Siga su envÃo(s)"
-"Track all shipments","Seguir todos los envÃos"
-"Track this shipment","Rastrear este envÃo"
-"Track your order","Siga su pedido"
-"Tracking","Seguimiento"
-"Tracking Number","Número de Seguimiento"
-"Tracking Number(s):","Número(s) de seguimiento(s)"
-"Transaction ""%s"" was already processed.","La transacción""%s"" ya fue procesada."
-"Transaction # %s | %s","Transacción # %s | %s"
-"Transaction ID","Número de identificación de la transacción"
-"Transaction ID must not be empty.","La identificación de la transacción no debe estar vacÃa."
-"Transaction ID: ""%s"".","Código identificativo de la transacción: ""%s""."
+"From Name","Por nombre"
+"To Name","A nombre de"
+"Add Order Comments","Añadir Comentarios al Pedido"
+"Notification Not Applicable","Notificación no Aplicable"
+"the order confirmation email was sent","El correo electrónico de confirmación del pedido fue enviado"
+"the order confirmation email is not sent","El correo electrónico de confirmación del pedido no se ha enviado"
+"Order Date (%1)","Order Date (%1)"
+"Purchased From","Comprado de"
+"Link to the New Order","Enlace al Nuevo Pedido"
+"Link to the Previous Order","Enlace al Pedido Anterior"
+"Placed from IP","Realizado desde IP"
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status","Estado del artÃculo"
+"Original Price","Precio original"
+"Tax Percent","Porcentaje de impuestos"
+"Transaction Data","Transaction Data"
+"Parent Transaction ID","ID de Transacción Padre"
"Transaction Type","Tipo de Transacción"
-"Transactions","Transacciones"
-"Trial ","Prueba"
-"Trial Payment","Prueba de Pago"
-"Trial Period","Periodo de Prueba"
-"Trial period payment","PerÃodo de prueba de pago"
-"Type","Tipo"
-"Unassign","Sin asignar"
-"Unhold","Recuperar"
-"Unhold action is not available.","Acción de recuperación no disponible."
-"Unhold order","Recuperar pedido"
-"Unknown State","Estado desconocido"
-"Unknown Status","Estados desconocidos"
-"Unsupported transaction type ""%s"".","Tipo de transacción no admitida""%s""."
-"Update Changes","Actualizar Cambios"
-"Update Items and Qty's","Actualizar artÃculos y cantidades"
-"Update Qty's","Actualizar Cantidad/es"
-"Updated","Hora de actualización"
-"Updated:","Actualizado:"
-"Use Aggregated Data (beta)","Utilizar datos agregados (beta)"
-"Use Order Status As Default","Usar estado de pedido por defecto"
-"Validate Each Address Separately in Multi-address Checkout","Validar cada dirección por separado en la salida de direcciones múltiples"
-"Value","Valor"
-"View","Ver"
-"View All","Ver todos/as"
-"View Another Order","Ver Otro Pedido"
-"View Order","Ver Pedido"
-"Visible on Frontend","Visible en el Panel Delantero"
-"Void","Nulo"
-"Void invoice","Factura inválida"
-"Voided authorization.","Autorización anulada"
-"Website","Sitio web"
-"Weight","Peso"
-"Whether buyer can define the date when billing for the profile begins.","Si el comprador puede definir la fecha en que la facturación comienza para el perfil."
-"Width","Ancho"
-"Wishlist","Lista de deseos"
-"Wrong quote item id to update configuration.","Número identificativo del artÃculo incorrecto para actualizar la configuración."
-"Wrong state: ""%s"".","Estado incorrecto: ""%s""."
-"Yes","SÃ"
-"You can leave a box blank if you don't wish to add a gift message for whole order","Puedes dejar un campo en blanco si no deseas añadir un mensaje de regalo con el pedido"
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
+"Gift Message for this Order","Mensaje de regalo para este pedido"
+"Shipped By","Enviado por"
+"Tracking Number","Número de Seguimiento"
+"Billing Last Name","Apellido para Facturación"
+"Find Order By:","Buscar Pedido Por:"
+"ZIP Code","ZIP Code"
+"Billing ZIP Code","Código Postal para Facturación"
+"Print All Refunds","Imprimir Todos los Reembolsos"
+"Refund #","Reembolso #"
+"Print Refund","Imprimir Reembolso"
"You have placed no orders.","No has hecho ningún pedido."
-"You will be redirected to the payment system website.","Usted será redirigido a la página web del sistema de pago."
-"Your credit card will be charged for","Se cargará en tu tarjeta de crédito"
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available","No hay disponible información sobre el envÃo"
+"Print Order","Imprimir Pedido"
+"Subscribe to Order Status","Suscribirse al Estado de Pedido"
+"Print All Invoices","Imprimir Todas las Facturas"
+"Invoice #","Factura #"
+"Print Invoice","Imprimir Factura"
+"Qty Invoiced","Cantidad Facturada"
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
+"Items Shipped","ArtÃculos enviados"
+"Qty Shipped","Cantidad Enviada"
+"View All","Ver todos/as"
+"Gift Message for This Order","Mensaje de regalo para este pedido"
+"About Your Order","En Relación con Su Pedido"
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title","Anclar TÃtulo Personalizado"
+Phone,Phone
+"Default Template","Plantilla predeterminada"
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
+"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
+"Minimum Amount","Minimum Amount"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
+"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
+"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
+"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
+"New Order Confirmation Template","New Order Confirmation Template"
+"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
+"Order Comment Email Sender","Order Comment Email Sender"
+"Order Comment Email Template","Order Comment Email Template"
+"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,"EnvÃo #"
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
+"Orders and Returns Search Form","Impreso de pedidos y devoluciones"
+"PDF Credit Memos","Notas de cŕedito en PDF"
+"PDF Invoices","Facturas en PDF"
+"Invoice Date","Fecha de factura"
"ZIP/Post Code","Código postal"
-"Zip/Postal Code","Código postal"
-"cm","cm"
-"in","en"
-"kg","kg"
-"lb","lb"
-"the credit memo email is not sent","el email de nota de crédito no se ha enviado"
-"the credit memo email was sent","El correo electrónico de la factura de abono fue enviado"
-"the invoice email is not sent","El correo electrónico de la factura no se ha enviado"
-"the invoice email was sent","El correo electrónico de la factura fue enviado"
-"the order confirmation email is not sent","El correo electrónico de confirmación del pedido no se ha enviado"
-"the order confirmation email was sent","El correo electrónico de confirmación del pedido fue enviado"
-"the shipment email is not sent","el email de envÃo no se ha enviado"
-"the shipment email was sent","El correo electrónico del envÃo fue enviado"
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS","Nuevo Pedido RSS"
+"Print Invoices","Imprimir Facturas"
+"Print Packing Slips","Imprimir Albaranes de Embalaje"
+"Print Credit Memos","Imprimir Todas las Facturas de Abono"
+"Print All","Imprimir todo"
+"Print Shipping Labels","Imprimir etiquetas de envÃo"
+"Ship Date","Fecha de EnvÃo"
+"Total Quantity","Total cantidad"
+"Default Status","Estado por defecto"
+"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)."
diff --git a/app/code/Magento/Sales/i18n/fr_FR.csv b/app/code/Magento/Sales/i18n/fr_FR.csv
index ecac1203026..86aaeb5ec98 100644
--- a/app/code/Magento/Sales/i18n/fr_FR.csv
+++ b/app/code/Magento/Sales/i18n/fr_FR.csv
@@ -1,846 +1,712 @@
-"""%s"" coupon code is not valid.","Le code du coupon ""%s"" n'est pas valable."
-"%s","%s"
-"%s / %s rate:","%s / %s taux :"
-"%s for %s","%s pour %s"
-"%s order(s) cannot be canceled","%s commande(s) ne peuvent pas être annulées"
-"%s order(s) have been canceled.","%s commande(s) ont été annulées."
-"%s order(s) have been put on hold.","%s commande(s) ont été mise(s) en attente."
-"%s order(s) have been released from holding status.","%s commande(s) n'a (n'ont) plus le statut ""En attente""."
-"%s order(s) were not put on hold.","%s commande(s) n'ont pas été mises en attente."
-"%s order(s) were not released from holding status.","%s commande(s) a (ont) toujours le statut ""En attente""."
-"* - Enter custom price excluding tax","* - Entrez le prix personnalisé sans les taxes"
-"* - Enter custom price including tax","* - Entrez le prix personnalisé avec les taxes"
-"-- Please Select --","-- Veuillez sélectionner --"
-"About This Order:","A propos de cette commande :"
-"About This Payment:","A propos de ce profil :"
-"About Your Invoice","Au sujet de votre facture"
-"About Your Order","A propos de votre commande"
-"About Your Refund","Au sujet de votre remboursement"
-"About Your Shipment","Au sujet de votre expédition"
-"Accept Payment","Accepter le paiement"
-"Accept or Deny Payment","Accepter ou refuser le paiement"
-"Account Information","Informations du compte"
-"Action","Action"
-"Actions","Action"
-"Activate","Activer"
-"Active","Actif"
-"Add","Ajouter"
-"Add New Address","Ajouter une nouvelle adresse"
-"Add Order Comments","Ajouter commentaires de commande"
-"Add Package","Ajouter colis"
+Remove,Supprimer
+Close,Fermer
+Cancel,Annuler
+Back,Retour
"Add Products","Ajouter produits"
-"Add Selected Product(s) to Option","Ajouter le(s) produit(s) sélectionné(s) à l'option"
-"Add Selected Product(s) to Order","Ajouter le(s) produit(s) sélectionné(s) à la commande"
-"Add Selected Product(s) to Package","Ajouter le(s) produits(s) sélectionné(s) au colis"
-"Add To Order","Ajouter à la commande"
-"Add Tracking Number","Ajouter un numéro de suivi"
-"Add comment to order","Ajouter un commentaire à la commande"
-"Add new comment to credit memo","Ajouter un nouveau commentaire à la note de crédit"
-"Add new comment to shipment","Ajouter un commentaire à l'expédition"
-"Add new tracking number","Ajouter un nouveau numéro de suivi"
-"Add to Cart","Ajouter au panier"
-"Additional Product Info","Informations supplémentaires sur le produit"
-"Address","Adresse"
-"Address model is not defined.","Le modèle de l'adresse n'est pas défini."
-"Adjustment Fee","Ajustement des taxes"
-"Adjustment Refund","Ajustement de remboursement"
-"Agreement Information","Information sur l'accord"
-"Allow Reorder","Autoriser la nouvelle commande"
-"Amount","Montant"
-"Amount: %s.","Montant : %s."
-"An error occurred while assigning order status. Status has not been assigned.","Une erreur s'est produite lors de la détermination de l'état de la commande. L'état n'a pas été déterminé."
-"An error occurred while creating shipping label.","Une erreur s'est produite lors de la création de l'étiquette d'expédition."
-"An error occurred while saving order status. The status has not been added.","Une erreur s'est produite lors de la sauvegarde de l'état de la commande. L'état n'a pas été ajouté."
-"An error occurred while unassigning order status.","Une erreur s'est produite lors du changement d'attribution de l'état de la commande."
-"An error occurred while updating the order address. The address has not been changed.","Une erreur s'est produite lors de la mise à jour de l'adresse de la commande. L'adresse n'a pas été modifiée."
-"An item option with code %s already exists.","Une option avec le code %s existe déjà ."
-"Anchor Custom Title","Titre personnalisé"
-"Append Comments","Ajouter commentaires"
-"Apply","Appliquer"
+"Update Items and Qty's","Mettre à jour les articles et quantités"
+Product,Produit
+Price,Prix
+Quantity,Quantity
+Products,Produits
+ID,ID
+SKU,UGK
+Apply,Appliquer
+Configure,Configurer
+"Shopping Cart",Panier
+"Quote item id is not received.","L'identifiant de l'article évalué n'a pas été reçu."
+"Quote item is not loaded.","L'article évalué n'a pas été chargé."
+No,Non
"Apply Coupon Code","Appliquer code coupon"
-"Approved the payment online.","A approuvé le paiement en ligne."
-"Are you sure you want to accept this payment?","Voulez-vous vraiment accepter ce paiement ?"
-"Are you sure you want to cancel this order?","Voulez-vous vraiment annuler cette commande ?"
-"Are you sure you want to delete all items from shopping cart?","Etes-vous certain(e) de vouloir effacer tous les articles du panier?"
-"Are you sure you want to deny this payment?","Voulez-vous vraiment refuser ce paiement ?"
-"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà ?"
-"Are you sure you want to send Creditmemo email to customer?","Voulez-vous vraiment envoyer une note de crédit au client par e-mail ?"
-"Are you sure you want to send Invoice email to customer?","Voulez-vous vraiment envoyer une facture au client par e-mail ?"
-"Are you sure you want to send Shipment email to customer?","Voulez-vous vraiment envoyer l'e-mail d'expédition au client ?"
-"Are you sure you want to send order email to customer?","Voulez-vous vraiment envoyer l'e-mail de commande au client ?"
-"Are you sure you want to void the payment?","Voulez-vous vraiment annuler le paiement ?"
-"Are you sure?","Etes-vous sûr ?"
-"Are you sure? This order will be canceled and a new one will be created instead","Êtes-vous sûr ? Cette commande sera supprimée et une nouvelle sera créée à la place."
-"Assign Order Status to State","Attribuer l'état de la commande à un État"
-"Assign Status to State","Attribuer l'état à un État"
-"Assignment Information","Information sur l'attribution"
-"At least a payment ID must be set.","Au moins un ID de paiement doit être défini."
-"Authorization","Autorisation"
-"Authorized amount of %s.","Montant de %s autorisé."
-"Authorizing amount of %s is pending approval on gateway.","L'autorisation du paiement de %s est attente d'accord de la passerelle."
-"Back","Retour"
-"Back to My Orders","Retour à Mes commandes"
-"Back to Recurring Payments","Retour aux profils récurrents"
-"Backordered","Rupture de stock"
-"Bestsellers","Meilleures ventes"
-"Bill-to Name","Facture au nom"
-"Billing","Facturation"
-"Billing Address","Adresse de facturation"
-"Billing Last Name","Nom facturation"
-"Billing ZIP Code","Code postal facturation"
-"Buy %s for price %s","Acheter %s pour le prix de %s"
-"CSV","CSV (valeurs séparées par des virgules)"
-"Cancel","Annuler"
-"Cancel credit memo","Annuler la note de crédit"
-"Cancel invoice","Annuler la facture"
-"Cancel order","Annuler la commande"
-"Canceled","Annulé"
-"Canceled order offline.","Commande annulée hors ligne."
-"Canceled order online.","Commande annulée en ligne."
-"Cannot add order history.","Impossible d'ajouter l'historique des commandes."
-"Cannot create an empty shipment.","Impossible de créer un envoi vide."
-"Cannot determine the field name.","Impossible de déterminer le nom du champ."
-"Cannot do invoice for order.","Impossible d'émettre la facture pour la commande."
-"Cannot do shipment for order.","Impossible de procéder à l'expédition pour la commande."
-"Cannot get order instance","Ne peut pas obtenir les informations de commande"
-"Cannot get the order instance.","Ne peut pas obtenir les informations de commande."
-"Cannot register an existing credit memo.","Impossible d'enregistrer une note de crédit existante."
-"Cannot register existing invoice","Impossible d'enregistrer une facture existante"
-"Cannot register existing shipment","Impossible d'enregistrer un envoi existant"
-"Capture","Sauvegarder"
-"Capture Amount","Sauvegarder le montant"
-"Capture Offline","Sauvegarder hors ligne"
-"Capture Online","Sauvegarder en ligne"
-"Capture invoice","Sauvegarder facture"
-"Captured amount of %s online.","Montant sauvegardé de %s en ligne."
-"Capturing amount of %s is pending approval on gateway.","Sauvegarde de %s en attente de vérification par la passerelle."
-"Carrier","Transporteur"
-"Carrier/Method","Transporteur/méthode"
-"Change status, add comments","Changer le statut, ajouter des commentaires"
-"Changing address information will not recalculate shipping, tax or other order amount.","Changer les données de l'adresse ne changera pas les coûts d'expédition, les taxes ou les autres frais applicables à la commande."
-"Checkout Totals Sort Order","Ordre de tri des totaux de paiements"
-"City","Ville"
-"Clear Shopping Cart","Vider le panier"
-"Click to change shipping method","Cliquez pour changer la méthode d'envoi"
-"Close","Fermer"
-"Closed","Est fermé"
-"Comma-separated.","Séparé(es) par des virgules."
-"Comment","Commenter"
-"Comment Text","Commenter texte"
-"Comments","Commentaires"
-"Comments History","Historique des commentaires"
-"Company","Société"
-"Complete","Terminer"
-"Configure","Configurer"
-"Configure and Add to Order","Configurer et ajouter à la commande"
-"Contents","Contenu"
-"Continue","Continuer"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Détermine le l'IP du client est affichée dans les commandes, factures, expédition et notes de crédit."
-"Country","Pays"
-"Coupons","Coupons"
-"Create","Créer"
-"Create New Customer","Créer nouveau client"
-"Create New Order","Créer une nouvelle commande"
-"Create New Order Status","Créer un nouvel état de commande"
-"Create New Order for %s","Créer une nouvelle commande pour %s"
-"Create New Order for %s in %s","Créer une nouvelle commande pour %s dans %s"
-"Create New Order for New Customer","Créer une nouvelle commande pour un nouveau client"
-"Create New Order for New Customer in %s","Créer une nouvelle commande pour un nouveau client dans %s"
-"Create New Status","Créer un nouvel état"
-"Create Order","Créer une commande"
-"Create Packages","Créer colis"
-"Create Shipment","Créer une livraison"
-"Create Shipping Label","Créer label d'expédition"
-"Create Shipping Label...","Créer étiquette d'expédition..."
-"Create new credit memo for order","Créer une nouvelle note de crédit pour la commande"
-"Create new invoice for order","Créer une nouvelle facture pour une commande"
-"Create new shipment for order","Créer une nouvelle livraison pour la commande"
-"Create...","Créer..."
-"Created","Créé à "
-"Created:","Créé:"
-"Credit Memo","Avoir"
-"Credit Memo #","N° de note de crédit"
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Avoir #%1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","Avoir Commentaire Expediteur"
-"Credit Memo Comment Email Template","Avoir Commentaire Modèle d'e-mail"
-"Credit Memo Comment Email Template for Guest","Avoir Commentaire"
-"Credit Memo Comments","Avoir Commentaires"
-"Credit Memo Email Sender","Avoir Expediteur"
-"Credit Memo Email Template","Avoir Modèle d'e-mail"
-"Credit Memo Email Template for Guest","Avoir Modèle d'e-mail pour Invités"
-"Credit Memo Update","Avoir Mise à jour"
-"Credit Memo Update for Guest","Avoir Mise à jour pour Invités"
-"Credit Memos","Avoirs"
-"Credit memo canceling problem.","Problème d'annulation de la note de crédit."
-"Credit memo cannot be canceled.","La note de crédit ne peut pas être annulée."
-"Credit memo has been created automatically","Mémo de crédit a été créé automatiquement."
-"Custom Price","Personnaliser le prix"
-"Custom Value","Personnaliser la valeur"
-"Customer","Client"
-"Customer Can Define Start Date","Le client peut définir la date de début"
+"Remove Coupon Code","Retirer le code de promotion"
+Qty,Qté
+Subtotal,Sous-total
+Discount,Discount
+"Row Subtotal","Sous-Total de la ligne"
+Action,Action
+"No ordered items","Aucun article commandé"
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,"Sous-total :"
+"Excl. Tax",H.T.
+Total,Total
+"Incl. Tax","Taxe comprise"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Déplacer dans la liste de souhaits"
+Edit,Modifier
+Item,Article
+"Add to Cart","Ajouter au panier"
+Sku,Sku
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,Commandes
+Customer,Client
+Guest,Invité
+"Grand Total","Total final"
+Tax,Taxe
+Shipping,Envoi
+"Account Information","Informations du compte"
+"First Name",Prénom
+"Last Name","Nom du client"
+Email,"Email du client"
+Refresh,Rafraîchir
+Enable,Enable
+General,General
+Yes,oui
+Name,Nom
+Status,Statut
+Enabled,Enabled
+Title,Titre
+Home,Home
+Any,Any
+From,De
+To,A
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,Commande
+"Order #%1","Order #%1"
+"Shipping Amount","Montant de la livraison"
+"Tax Amount","Montant de la taxe"
+View,Vue
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Ordered,Commandé
+Invoiced,Facturé
+Shipped,Envoyé
+Refunded,Remboursé
+Canceled,Annulé
+From:,De:
+To:,"A :"
+"Gift Message","Message du cadeau"
+Message:,Message:
+"Tier Pricing","Catégorie de prix"
+"Go to Home Page","Go to Home Page"
"Customer Group","Groupe du client"
-"Customer My Account Order Creditmemo View","Client Mon Compte Commande Avoir Affichage"
-"Customer My Account Order History","Client Mon Compte Commande Historique"
-"Customer My Account Order Invoice View","Client Mon Compte Commande Facture Affichage"
-"Customer My Account Order Shipment View","Client Mon Compte Commande Livraison Affichage"
-"Customer My Account Order View","Client Mon Compte Commande Affichage"
-"Customer's Current Activities","Activités en cours du client"
-"Customs Value","Valeurs personnalisées"
-"Date","Date"
-"Default Status","État pas défaut"
-"Default Template","Modèle par défaut"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png)","Logo par défaut, sera utilisé dans les documents PDF et HTML.<br />(jpeg, tiff, png)"
-"Delete","Supprimer"
-"Delete Package","Supprimer le colis"
-"Denied the payment online.","A refusé le paiement en ligne"
-"Deny Payment","Refuser le paiement"
-"Description Message","Message descriptif"
-"Discount","Discount"
-"Discount (%s)","Discount (%s)"
+Closed,"Est fermé"
+"Product Name","Nom produit"
"Discount Amount","Montant de la remise"
-"Display Order ID in Header","Afficher l’ID de la commande dans l'en-tête"
-"Edit","Modifier"
-"Edit Order #%s","Modifier la commande #%s"
-"Edit Order %s %s Address","Éditer l'adresse de la commande"
-"Edit Order Status","Éditer l'état de la commande"
-"Email","Email du client"
+Country,Pays
+State/Province,"Etat / région"
+"Payment Information","Information sur le profil"
+"Shipping Information","Informations d'expédition"
+"Shipping Method","Méthode d'expédition"
+"Clear Shopping Cart","Vider le panier"
+City,Ville
+"Zip/Postal Code","Code postal"
"Email Address","Adresse email"
-"Email Copy of Credit Memo","Copie de l'e-mail de la note de crédit"
-"Email Copy of Invoice","Copie email de la facture"
-"Email Copy of Shipment","Copie de l'e-mail d'expédition"
-"Email Order Confirmation","Confirmation de la demande d'email"
-"Enable","Activer"
-"Enabled","Activé"
-"Enter the billing last name and email/ZIP as in the order billing address","Entrer le nom d'expédition et le code postal / email comme dans l'adresse de facturation"
-"Entered data is incorrect. Please try again.","Les données saisies sont incorrectes. Veuillez réessayer."
-"Error to Show in Shopping Cart","Erreur à afficher dans le panier"
-"Excel XML","Excel XML"
-"Excl. Tax","H.T."
-"Expired","Expiré"
-"Explanation","Explication"
-"Failed to send the order email.","A échoué d'envoyer la demande d'email"
-"Failed to update the payment.","Échec de la mise à jour du paiement."
-"Failed to update the profile.","Échec de la mise à jour du profil."
-"Failed to void the payment.","Impossible d'annuler le paiement."
-"Fetch","Chercher"
-"File extension not known or unsupported type in the following shipment: %s","Extension de fichier inconnue ou type non pris en charge dans l'expédition suivante : %s"
-"Find Order By:","Trouver la commande par:"
-"First Name","Prénom"
-"From","De"
-"From Name","De Nom"
-"From:","De:"
-"General","Général"
-"General Information","Informations générales."
-"Get Payment Update","Obtenir la mise à jour du paiement"
-"Get Update","Obtenir la mise à jour"
-"Get shipping methods and rates","Obtenir la méthode d'expédition et les taux"
-"Gift Message","Message du cadeau"
-"Gift Message for This Order","Message cadeau pour cette commande"
-"Gift Message for the Entire Order","Message de cadeau pour l'ensemble de la commande"
-"Gift Message for this Order","Message personnalisé pour cette commande"
+Company,Société
+Address,Address
+"Street Address","Adresse de la rue"
+Telephone,Téléphone
+"Save in address book","Sauvegarder dans le carnet d'adresses"
+Continue,Continuer
+"Order #","Order #"
+"No Payment Methods","Aucun mode de paiement"
+"Billing Address","Adresse de facturation"
+"Shipping Address","Adresse d'expédition"
+"Payment Method","Nom de la méthode de payement"
+Sales,Ventes
+Created,"Créé à "
+Select,Sélectionner
+Comment,Commenter
+%1,%1
+Date,Date
+"Add New Address","Ajouter une nouvelle adresse"
+"Purchase Date","Purchase Date"
+"Bill-to Name","Facture au nom"
+"Ship-to Name","Expédier à Nom"
+"Order Total","Total Commande"
+"Purchase Point","Acheté chez (Boutique)"
+"Recent Orders","Commandes récentes"
+"Store Credit","Crédits de la boutique"
+Notified,Notifié
+"Notify Customer by Email","Notifier le Client par Email"
+Billing,Facturation
+"Newsletter Subscription","Abonnement à la lettre d'information"
+"Order Status","Statut de la Commande"
+"Wish List","Wish List"
+Pending,"En cours"
+"View Order","Voir la commande"
+Amount,Montant
+Message,Message
+Information,Renseignements
"Gift Options","Options de cadeau"
-"Gift Wrapping for the Entire Order","Emballage cadeau pour l'ensemble de la commande"
-"Girth","circonférence"
-"Grand Total","Total final"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,Nouveau
+"Custom Price","Personnaliser le prix"
+Processing,Traitement
+"Add To Order","Ajouter à la commande"
+"Configure and Add to Order","Configurer et ajouter à la commande"
+"No items","Aucun article"
+Authorization,Autorisation
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.","Les transactions de paiement ne permettent pas le stockage d'objets."
+"Transaction ID","ID de la transaction"
+"Order ID","Identifiant de la Commande"
+Void,Annuler
+"Created At","Created At"
+"Payment Method:","Méthode de paiement :"
+"Ship To","Expédier à "
+"Invalid parent block for this block","Invalid parent block for this block"
"Grand Total (Base)","G. T. (Base)"
"Grand Total (Purchased)","Total général (acheté)"
-"Grand Total to be Charged","Grand total à payer"
-"Guest","Invité"
-"Height","Hauteur"
-"Hide Customer IP","Masquer l'IP du client"
-"Hold","Mise en attente"
-"Hold action is not available.","Le blocage n'est pas disponible."
-"Hold order","Bloquer commande."
-"ID","Identifiant #"
-"ID","ID"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Remboursé"". Remboursement effectué par le vendeur. Notification enregistrée pour le montant remboursé de %s. ID de la transaction : ""%s"""
-"If empty, the default description above will be used.","Si laissé vide, la description par défaut ci-dessus sera utilisée."
-"If empty, the default error above will be used.","Si vide, l'erreur par défaut ci-dessus sera affichée."
-"If the invoice was created offline, try creating an offline creditmemo.","Si la facture a été créée hors ligne, essayez de créer une note de crédit hors ligne."
-"Incl. Tax","Taxe comprise"
-"Information","Renseignements"
-"Initial Fee","Frais initiaux."
-"Initial Fees","Frais initiaux"
-"Initial period payment","Période de paiement initiale"
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Les informations fournies ne sont pas suffisantes pour créer l'(les) étiquette(s) d'expédition. Veuillez vérifier les informations de votre boutique et les paramètres d'expédition."
-"Invalid block: %s.","Bloc invalide : %s."
-"Invalid carrier specified.","Le transporteur spécifié est invalide."
-"Invalid draw line data. Please define ""lines"" array.","Ligne de données invalide. Veuillez définir un ordre des ""lignes""."
-"Invalid entity model","Modèle d'entité invalide"
-"Invalid item option format.","Format d'option d'objet invalide."
-"Invalid qty to invoice item ""%s""","Qté invalide pour facturer l'article ""%s"""
-"Invalid qty to refund item ""%s""","Qté invalide pourrembourser l'article ""%s"""
-"Invalid qty to ship for item ""%s""","Qté invalide pour expédier l'article ""%s"""
-"Invalid renderer model","Modèle de rendu invalide"
-"Invalid request for adding product to quote.","Requête non valide pour l'ajout du produit au devis."
-"Invoice","Facture"
-"Invoice #","Facture nËš"
-"Invoice #%1$s | %2$s | %4$s (%3$s)","Numéro de facture%1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","Factures nËš%s"
-"Invoice Comment Email Sender","Facture Commentaire Expediteur"
-"Invoice Comment Email Template","Facture Commentaire Modèle d'email"
-"Invoice Comment Email Template for Guest","Modèle de courriel de commentaire de facture pour les clients"
-"Invoice Comments","Facture Commentaires"
-"Invoice Date","Date de la facture"
-"Invoice Email Sender","Expéditeur du courriel de facture"
-"Invoice Email Template","Modèle d'email de la facture"
-"Invoice Email Template for Guest","Facture Modèle d'email pour invité"
-"Invoice Update","Mise à jour facture"
-"Invoice Update for Guest","Mise à jour facture pour invité"
-"Invoice and Packing Slip Design","Conception de la facture et du bordereau de marchandises"
-"Invoice and Ship","Facture et Courrier"
-"Invoice canceling problem.","Problème d'annulation de la facture"
-"Invoice cannot be canceled.","La facture ne peut être annulée."
-"Invoice cannot be captured.","La facture ne peut pas être saisie."
-"Invoice cannot be voided.","La facture ne peut pas être annulée"
-"Invoice capturing problem.","Problème de saisie de la facture."
-"Invoice void problem","Problème d'annulation de la facture"
-"Invoice will be created without communication with payment gateway.","La facture va être créée sans communication avec une passerelle de payement"
-"Invoiced","Facturé"
-"Invoices","Factures"
-"Item","Article"
-"Item Status","Statut article"
-"Item object is not specified.","L'objet de l'article n'est pas spécifié."
-"Item options declaration error.","Erreur de déclaration pour les options de l'article."
-"Item ordered qty","Qté d'articles commandés"
-"Item qty declaration error.","Erreur de déclaration de la qté d'articles"
-"Items","Objets"
-"Items Invoiced","Articles facturés"
-"Items Ordered","Articles commandés"
-"Items Refunded","Articles remboursés"
-"Items Shipped","Articles expédiés"
-"Items in the Package","Objets dans le colis"
-"Items maximum quantity or price do not allow checkout.","La quantité maximale d'articles ou le prix n'autorise pas le règlement."
-"Items options declaration error.","Erreur de déclaration des options d'articles."
-"Items to Refund","Articles à rembourser"
-"Items to Ship","Articles à expédier"
-"Key","Clé"
-"Last Name","Nom du client"
-"Last Ordered Items","Derniers articles commandés"
-"Last status can't be unassigned from state.","Le dernier statut ne peut pas être retiré de l'État."
-"Length","Longueur"
-"Link to the New Order","Lien vers la nouvelle commande"
-"Link to the Previous Order","Lien vers la commande précédente"
-"Logo for HTML Print View","Logo pour la vue d'impression HTML"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logo pour les documents HTML seulement. Si vide, le logo par défaut sera utilisé.<br />(jpeg, gif, png)"
-"Logo for PDF Print-outs (200x50)","Logo pour les impressions PDF (200 x 50)"
-"Make Check payable to:","Adresser le chèque à :"
-"Manage","Gérer"
-"Maximum amount available to refund is %s","Le montant maximal disponible à rembourser est %s"
-"Maximum shipping amount allowed to refund is: %s","Plafond de remboursement des frais d'expédition: %s"
-"Message","Message"
-"Message:","Message:"
-"Minimum Amount","Montant minimum"
-"Minimum Order Amount","Montant minimum de la commande"
-"Mixed","Mélangé"
-"Most Viewed","Le plus vu"
-"Most Viewed Products Report","Rapport de produits les plus vus"
-"Move to Shopping Cart","Mettre dans votre panier"
-"Move to Wishlist","Déplacer dans la liste de souhaits"
-"Multi-address Description Message","Message de description multi-adresses"
-"Multi-address Error to Show in Shopping Cart","Erreur multi-adresses affichée dans votre panier"
-"My Orders","Mes commandes"
-"My Orders - Details","Mes commandes - Détails"
-"N/A","N/A"
-"Name","Nom"
-"New","Nouveau"
-"New Credit Memo","Nouvel Avoir"
-"New Credit Memo for Guest","Nouvelle note de crédit pour le client"
-"New Credit Memo for Invoice #%s","Nouveau Credit Memo pour la facture #%s"
-"New Credit Memo for Order #%s","Nouveau Credit Memo pour la commande #%s"
-"New Invoice","Nouvelle facture"
-"New Invoice and Shipment for Order #%s","Nouvelle Facture et Expédition pour la Commande #%s"
-"New Invoice for Guest","Nouvelle Facture pour Invité"
-"New Invoice for Order #%s","Nouvelle facture pour la commande #%s"
-"New Order","Nouvelle Commande"
-"New Order Confirmation Email Sender","Expéditeur Email de Confirmation Nouvelle Commande"
-"New Order Confirmation Template","Nouveau modèle de confirmation de commande"
-"New Order Confirmation Template for Guest","Modèle de Confirmation Nouvelle Commande pour Invité"
-"New Order RSS","Nouvelle commande RSS"
-"New Order Status","Nouveau statut commande"
-"New Order for Guest","Nouvelle Commande pour Invité"
-"New Shipment","Nouvelle expédition"
-"New Shipment for Guest","Nouvelle expédition pour Invité"
-"New Shipment for Order #%s","Nouvelle Expédition pour la Commande #%s"
-"Newsletter Subscription","Abonnement à la lettre d'information"
-"No","Non"
-"No Items","Pas d'article"
-"No Items To Refund","Aucun article à rembourser"
-"No Payment Methods","Aucun mode de paiement"
-"No detail for number ""%s""","Aucune information pour le numéro ""%s"""
-"No information available.","Pas d'information disponible"
-"No items","Aucun article"
-"No order(s) were put on hold.","Aucune commande en attente."
-"No order(s) were released from holding status.","Aucune commande n'a été libérée du statut de mise en attente."
-"No ordered items","Aucun article commandé"
-"No shipping information available","Aucune information d'expédition disponible"
-"Nominal Items","Articles individuels."
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Les articles individuels doivent être commandés à part. Pour continuer, veuillez retirer les autres articles."
-"Nominal order registered.","Commande nominale enregistrée."
-"Not Capture","Non saisi"
-"Not Initialized","Non initialisé"
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,"CSV (valeurs séparées par des virgules)"
+"Excel XML","Excel XML"
+"Total Refunded","Total remboursé"
+Paid,Payé
+Coupons,Coupons
+"Recently Viewed","Récemment vus"
+"Recently Compared Products","Produits récemment comparés"
+"Recently Viewed Products","Produits récemment vus"
+Print,Imprimer
+"Submit Comment","Envoyer commentaire"
+Returned,Retourné
+"Order Date","Date de la Commande"
+"Order # ","Order # "
+"Order Date: ","Date de la commande :"
+"Comment Text","Commenter texte"
+"Visible on Frontend","Visible sur le Frontend"
"Not Notified","Non notifié"
-"Not enough valid data to save the parent transaction ID.","Pas suffisamment de données valides pour sauvegarder l'identifiant de transaction parent."
-"Notification Not Applicable","La notification ne s'applique pas"
-"Notified","Notifié"
-"Notify Customer by Email","Notifier le Client par Email"
-"Number","Nombre"
-"Number of Invoiced Orders","Nombre de Commandes Facturées"
-"Number of Orders","Nombre de commandes"
-"Number of Refunded Orders","Nombre de Commandes Remboursées"
-"OK","OK"
-"Offline Refunded","Remboursé hors connexion"
-"On Hold","En Attente"
-"Online Refunded","Remboursé en ligne"
-"Order","Commande"
-"Order ","Commande #"
-"Order %s","Commande #%s"
-"Order %s","Commande #%s"
-"Order %s %s | %s","Commande nËš %s %s | %s"
-"Order %s - %s","Commande #%s - %s"
-"Order API","Commander API"
+"Please select products.","Please select products."
+Number,Nombre
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Expédition & Traitement"
+"Credit Memos",Avoirs
+Invoices,Factures
+"We cannot get the order instance.","We cannot get the order instance."
+"Create New Order","Créer une nouvelle commande"
+"Save Order Address","Sauvegarder l'adresse de la commande"
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
"Order Address Information","Informations sur l'adresse de la commande"
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order","Envoyer Commande"
+"Are you sure you want to cancel this order?","Voulez-vous vraiment annuler cette commande ?"
"Order Comment","Commentaire Commande"
-"Order Comment Email Sender","Emetteur de courriel de commentaires des commandes"
-"Order Comment Email Template","Modèle Email Commentaire Commande"
-"Order Comment Email Template for Guest","Modèle Email Commentaire Commande pour Invité"
-"Order Comments","Commentaires Commande"
-"Order Credit Memos","Commander des notes de crédit"
-"Order Currency:","Devise de la Commande"
-"Order Date","Date de la Commande"
-"Order Date (%s)","Date de la Commande (%s)"
-"Order Date: ","Date de la commande :"
-"Order Date: %s","Date de la Commande: %s"
-"Order Details","Détails de la Commande"
+"Please select a customer.","Please select a customer."
+"Create New Customer","Créer nouveau client"
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
+"Create New Order for New Customer","Créer une nouvelle commande pour un nouveau client"
+"Items Ordered","Articles commandés"
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty","Qté d'articles commandés"
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - Entrez le prix personnalisé avec les taxes"
+"* - Enter custom price excluding tax","* - Entrez le prix personnalisé sans les taxes"
+"This product does not have any configurable options","Le produit n'a pas d'options configurables."
+"Add Selected Product(s) to Order","Ajouter le(s) produit(s) sélectionné(s) à la commande"
+"Update Changes","Mettre à jour les changements"
+"Are you sure you want to delete all items from shopping cart?","Etes-vous certain(e) de vouloir effacer tous les articles du panier?"
+"Products in Comparison List","Produits dans la liste de comparaison"
+"Last Ordered Items","Derniers articles commandés"
+"Please select a store.","Please select a store."
+"Order Totals","Totaux Commande"
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)","Remboursement de la Livraison (T.T.C.)"
+"Refund Shipping (Excl. Tax)","Remboursement de la Livraison (H.T.)"
+"Refund Shipping","Remboursement de la Livraison"
+"Update Qty's","Mettre à jour la/les Qté(s)"
+Refund,Rembourser
+"Refund Offline","Remboursement hors connexion"
+"Paid Amount","Montant payé"
+"Refund Amount","Montant du Remboursement"
+"Shipping Refund","Remboursement de l'expédition"
"Order Grand Total","Total Commande"
+"Adjustment Refund","Ajustement de remboursement"
+"Adjustment Fee","Ajustement des taxes"
+"Send Email","Envoyer l'email"
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent","Le courriel de note de crédit n'a pas été envoyé"
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund","Total du remboursement"
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment","Soumettre facture et expédition"
+"Submit Invoice","Soumettre facture"
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo",Avoir
+Capture,Sauvegarder
+"the invoice email was sent","l'e-mail de facture a été envoyé"
+"the invoice email is not sent","l'e-mail de facture n'est pas envoyé"
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses","Statuts de la commande"
+"Create New Status","Créer un nouvel état"
+"Assign Status to State","Attribuer l'état à un État"
+"Save Status Assignment","Sauvegarder l'attribution du statut"
+"Assign Order Status to State","Attribuer l'état de la commande à un État"
+"Assignment Information","Information sur l'attribution"
+"Order State","État de la commande"
+"Use Order Status As Default","Utiliser l'état de la commande comme référence par défaut"
+"Visible On Frontend","Visible On Frontend"
+"Edit Order Status","Éditer l'état de la commande"
+"Save Status","Sauvegarder le statut"
+"New Order Status","Nouveau statut commande"
+"Order Status Information","Informations sur le statut de la commande"
+"Status Code","Code statut"
+"Status Label","Étiquette statut"
+"Store View Specific Labels","Vue boutique Étiquettes spécifiques"
+"Total Paid","Total payé"
+"Total Due","Total dû"
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?","Voulez-vous vraiment annuler le paiement ?"
+Hold,"Mise en attente"
+hold,hold
+Unhold,"Ne plus retenir"
+unhold,unhold
+"Are you sure you want to accept this payment?","Voulez-vous vraiment accepter ce paiement ?"
+"Accept Payment","Accepter le paiement"
+"Are you sure you want to deny this payment?","Voulez-vous vraiment refuser ce paiement ?"
+"Deny Payment","Refuser le paiement"
+"Get Payment Update","Obtenir la mise à jour du paiement"
+"Invoice and Ship","Facture et Courrier"
+Invoice,Facture
+Ship,Expédier
+Reorder,"Commander à nouveau"
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
+"Order Credit Memos","Commander des notes de crédit"
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
+"Comments History","Historique des commentaires"
"Order History","Historique des Commandes"
-"Order History Info","Informations sur l'historique de la commande"
-"Order ID","Identifiant de la Commande"
"Order Information","Informations Commande"
"Order Invoices","Commander les factures"
+Shipments,Expéditions
"Order Shipments","Expéditions Commandes"
-"Order State","État de la commande"
-"Order Status","Statut de la Commande"
-"Order Status Information","Informations sur le statut de la commande"
-"Order Statuses","Statuts de la commande"
-"Order Subtotal","Sous-total Commande"
-"Order Taxes Report Grouped by Tax Rates","Rapport des Taxes sur les Commandes classé par niveau de taxes"
-"Order Total","Total Commande"
-"Order Totals","Totaux Commande"
-"Order Update","Mise à jour de la Commande"
-"Order Update for Guest","Mise à jour de la Commande pour Invité"
+Transactions,Transactions
"Order View","Vue Commande"
-"Order credit memo","Note de crédit de la commande"
-"Order does not allow to be canceled.","La commande ne peut être annulée"
-"Order invoice","Facture Commande"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","La commande est suspendue car son montant %s est soupçonné d'être frauduleux."
-"Order object is not specified.","L'objet de la commande n'est pas spécifié."
-"Order saving error: %s","Erreur de sauvegarde de la Commande: %s"
-"Order shipments","Autres expéditions"
-"Order status does not exist.","Le statut de la commande n'existe pas."
-"Order status with the same status code already exist.","Un statut de commande avec le même code statut existe déjà ."
-"Order was placed using %s","La commande a été passée en utilisant %s"
-"Ordered","Commandé"
-"Ordered amount of %s.","Montant commandé de %s"
-"Ordering amount of %s is pending approval on gateway.","Le montant commandé de %s est en cours d'approbation sur la passerelle."
-"Orders","Commandes"
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
+"Shipping & Handling","Expédition et traitement"
+Fetch,Chercher
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,Clé
+Value,Valeur
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders","Retour à Mes commandes"
+"View Another Order","Voir autre commande"
+"About Your Refund","Au sujet de votre remboursement"
+"My Orders","Mes commandes"
+"About Your Invoice","Au sujet de votre facture"
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged","Grand total à payer"
+Unassign,"Modifier l'attribution"
+"We sent the message.","We sent the message."
+"This order no longer exists.","Cette commande n'existe plus."
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
+"The payment has been accepted.","Le payement a été accepté"
+"The payment has been denied.","Le paiement a été refusé."
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.","Aucune commande en attente."
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
+"There are no printable documents related to selected orders.","Il n'exsite pas de documents imprimables concernant ces commandes."
+"The payment has been voided.","Le paiement a été invalidé."
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.","Le code de coupon a été accepté"
+"New Order","Nouvelle Commande"
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice","Nouvelle facture"
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
+"Create New Order Status","Créer un nouvel état de commande"
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.","Une erreur s'est produite lors de la détermination de l'état de la commande. L'état n'a pas été déterminé."
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
"Orders and Returns","Commandes et Retours"
-"Orders and Returns Search Form","Formulaire de recherche des Commandes et Retours"
-"Original Price","Prix d'origine"
-"Original order item that recurring payment corresponds to.","Article de la Commande d'origine qui correspond au profil de paiement récurrent"
-"PDF Credit Memos","Notes de crédit PDF"
-"PDF Invoices","Factures PDF"
-"PDF Packing Slips","Bons de livraison PDF"
-"PDF Print-outs","Impressions de PDF"
-"PDF object is not specified.","L'objet PDF n'est pas spécifié."
-"PDF page object is not specified.","La page de l'objet PDF n'est pas spécifiée."
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","Modèle total de PDF devrait étendre \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal"
-"Package","Colis"
-"Package types are disregarded for USPS domestic shipments.","Il n'est pas tenu compte du type de paquet pour les expéditions nationales par UPS."
-"Packages","Paquets"
-"Packing Slip # ","Bon de livraison #"
-"Paid","Payé"
-"Paid Amount","Montant payé"
-"Parent Transaction ID","ID de la transaction mère"
-"Parent transaction ID must have a transaction ID.","La transaction parente doit avoir un identifiant."
-"Partial","Partiel"
-"Payment Failed","Le payement a échoué"
-"Payment Information","Information paiement"
-"Payment Method","Méthode de paiement"
-"Payment Method","Nom de la méthode de payement"
-"Payment Method:","Méthode de paiement :"
-"Payment Review","Contrôle du paiement"
-"Payment disallow storing objects.","Paiement, ne pas autoriser le stockage d'objets."
-"Payment transactions disallow storing objects.","Les transactions de paiement ne permettent pas le stockage d'objets."
-"Payment type","Type de paiement"
-"Payment update has been made.","La mise à jour du paiement a été effectuée."
-"Pending","En cours"
-"Pending Payment","Paiement en attente"
-"Period","Période"
-"Placed from IP","Placé depuis l'IP"
-"Please Select Products to Add","Sélectionner les produits à acheter"
-"Please Select a Customer","Veuillez sélectionner un client"
-"Please Select a Store","Veuillez sélectionner une boutique"
-"Please check billing address information. %s","Veuillez vérifier l'adresse de facturation. %s"
-"Please check shipping address information. %s","Veuillez vérifier l'adresse d'expédition. %s"
-"Please define PDF object before using.","Veuillez définir un objet PDF avant usage."
-"Please enter positive number in this field.","Veuillez entrer un nombre positif dans ce champ."
-"Please select a valid payment method.","Veuillez sélectionner une méthode de paiement valide."
-"Please specify a shipping method.","Veuillez spécifier une méthode d'expédition."
-"Please specify a valid grid column alias name that exists in grid table.","Veuillez spécifier un nom d'utilisateur qui existe dans le tableau."
-"Price","Prix"
-"Print","Imprimer"
-"Print All","Tout imprimer"
-"Print All Invoices","Imprimer toutes les factures"
-"Print All Refunds","Imprimer tous les remboursements"
-"Print All Shipments","Imprimer toutes les livraisons"
-"Print Credit Memos","Imprimer les notes de crédit"
-"Print Invoice","Imprimer la facture"
-"Print Invoices","Imprimer factures"
-"Print Order","Imprimer commande"
-"Print Order # %s","Imprimer la commande # %s"
-"Print Packing Slips","Imprimer les bons de livraison"
-"Print Refund","Imprimer le remboursement"
-"Print Shipment","Imprimer envoi"
-"Print Shipping Label","Imprimer l'étiquette d'expédition"
-"Print Shipping Labels","Labels d'expédition"
-"Processing","Traitement"
-"Product","Produit"
-"Product Name","Nom produit"
-"Products","Produits"
-"Products Bestsellers Report","Rapport des meilleures ventes"
-"Products in Comparison List","Produits dans la liste de comparaison"
-"Products should be added to package(s)","Les produits doivent être ajoutés au colis"
-"Payment #%s","Profil #%s"
-"Payment Information","Information sur le profil"
-"Payment State","État du profil"
-"Profit","Bénéfice"
-"Promotion Coupons Usage Report","Rapport sur l'Utilisation des Coupons de Promotions"
-"Proper payment object must be set.","Un objet de paiement approprié doit être défini."
-"Purchase Order Number:","Numéro de commande :"
-"Purchase Point","Acheté chez (Boutique)"
-"Purchased Date","Acheté sur"
-"Purchased From","Acheté à "
-"Purchased Item","Article acheté"
-"Qty","Qté"
-"Qty Invoiced","Qté facturée"
-"Qty Ordered","Quantité commandée"
-"Qty Shipped","Quantité expédiée"
-"Qty To Add","Qté à ajouter"
-"Qty to Add","Qté à ajouter"
-"Qty to Invoice","Quantité à facturer"
-"Qty to Refund","Quantité à rembourser"
-"Qty to Ship","Qté à envoyer"
-"Quantity Ordered","Quantité commandée"
-"Quote item id is not received.","L'identifiant de l'article évalué n'a pas été reçu."
-"Quote item is not loaded.","L'article évalué n'a pas été chargé."
-"Rate","Taux"
-"Recent Orders","Commandes récentes"
-"Recently Compared Products","Produits récemment comparés"
-"Recently Viewed","Récemment vus"
-"Recently Viewed Products","Produits récemment vus"
-"Recurring Payment # %s","Profil récurrent # %s"
-"Recurring Payment Initial Fee","Profil récurrent Frais initial"
-"Recurring Payments","Profils récurrents"
-"Recurring Payments (beta)","Profils récurrents (beta)"
-"Reference ID","ID de référence"
-"Reference ID:","Identifiant Référence:"
-"Refresh","Rafraîchir"
-"Refund","Rembourser"
-"Refund #","Remboursement #"
-"Refund #%s","NËš%s du/des remboursement(s)"
-"Refund Amount","Montant du Remboursement"
-"Refund Offline","Remboursement hors connexion"
-"Refund Shipping","Remboursement de la Livraison"
-"Refund Shipping (Excl. Tax)","Remboursement de la Livraison (H.T.)"
-"Refund Shipping (Incl. Tax)","Remboursement de la Livraison (T.T.C.)"
-"Refund Totals","Remboursement total"
-"Refunded","Remboursé"
-"Refunded amount of %s offline.","Montant du remboursement de %s hors ligne"
-"Refunded amount of %s online.","Montant du remboursement de %s en ligne"
-"Refunds","Remboursements"
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State","État inconnu"
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status","Statut inconnu"
+Backordered,"Rupture de stock"
+Partial,Partiel
+Mixed,Mélangé
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
"Registered a Void notification.","A enregistré une notification nulle."
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.","A approuvé le paiement en ligne."
+"There is no need to approve this payment.","Ce paiement ne requiert pas d'accord."
"Registered notification about approved payment.","Notification enregistrée pour le paiement approuvé."
-"Registered notification about captured amount of %s.","A enregistré une notification à propos du montant saisi de %s."
+"Denied the payment online","Denied the payment online"
+"There is no need to deny this payment.","Il n'y a pas de raison de refuser ce payement"
"Registered notification about denied payment.","A enregistré une notification à propos du paiement refusé."
-"Registered notification about refunded amount of %s.","Notification enregistrée pour le montant remboursé de %s"
"Registered update about approved payment.","A déclaré une mise à jour à propos du paiement accepté."
"Registered update about denied payment.","Mise à jour enregistrée sur le paiement refusé."
-"Regular Payment","Paiement régulier"
-"Related Orders","Commandes liées"
-"Remove","Supprimer"
-"Remove Coupon Code","Retirer le code de promotion"
-"Remove tracking number","Retirer le numéro de suivi"
-"Reorder","Commander à nouveau"
-"Retrieve credit memo info","Récupérer les informations sur les notes de crédit"
-"Retrieve credit memo information","Récupérer les informations de la note de crédit"
-"Retrieve credit memo list","Récupérer la liste des notes de crédit"
-"Retrieve invoice info","Récupérer les infos sur la facture"
-"Retrieve invoice information","Récupérer les informations de la commande"
-"Retrieve list of credit memos by filters","Récupérer la liste des notes de crédit par filtre"
-"Retrieve list of invoices by filters","Récupérer la liste des commandes par filtres"
-"Retrieve list of orders by filters","Récupérer la liste des commandes par filtres"
-"Retrieve list of shipments by filters","Récupérer la liste des expéditions par filtres"
-"Retrieve order information","Récupérer les informations de la commande"
-"Retrieve orders info","Récupérer les infos de la commande"
-"Retrieve shipment info","Récupérer les informations de livraison"
-"Retrieve shipment information","Récupérer les informations de l'envoi"
-"Return to Stock","Retourner au Stock"
-"Returned","Retourné"
-"Returns","Retours"
-"Revenue","Revenu"
-"Row Subtotal","Sous-Total de la ligne"
-"Row Total","Total de la Ligne"
-"SHIP TO:","LIVRER A:"
-"SKU","UGK"
-"SOLD TO:","VENDU À :"
-"Sales","Ventes"
-"Sales Discount","Remise sur les ventes"
-"Sales Emails","Courriels de ventes"
-"Sales Emails Section","Ventes Emails Section"
-"Sales Invoice Print View","Ventes Facture Vue avant impression"
-"Sales Items","Articles de ventes"
-"Sales Order Print View","Vue d'impression de la commande"
-"Sales Section","Ventes Section"
-"Sales Shipment Print View","Vue d'impression de l'expédition des ventes"
-"Sales Shipping","Expédition des ventes"
-"Sales Tax","Taxes sur les ventes"
-"Sales Total","Total des ventes"
-"Same As Billing Address","(identique à l'adresse de facturation)"
-"Save Order Address","Sauvegarder l'adresse de la commande"
-"Save Status","Sauvegarder le statut"
-"Save Status Assignment","Sauvegarder l'attribution du statut"
-"Save in address book","Sauvegarder dans le carnet d'adresses"
-"Schedule","Programme"
-"Select","Sélectionner"
-"Select All","Sélectionner tout"
-"Select from existing customer addresses:","Sélectionner à partir d'adresses client existantes:"
-"Send Credit Memo Comment Email Copy To","Envoyer un avoir Commentaire Copie de l'email à "
-"Send Credit Memo Comments Email Copy Method","Envoyer une copie du mail des commentaires des crédits Memo"
-"Send Credit Memo Email Copy Method","Envoyer une copie du mail des crédits Memo"
-"Send Credit Memo Email Copy To","Envoyer un avoir Copie de l'email à "
-"Send Email","Envoyer l'email"
-"Send Invoice Comment Email Copy To","Envoyer une facture Commentaire Copie de l'email à "
-"Send Invoice Comments Email Copy Method","Méthode copie envoi email commentaires facture"
-"Send Invoice Email Copy Method","Méthode copie envoi email facture"
-"Send Invoice Email Copy To","Envoyer une copie de l'email de la facture à "
-"Send Order Comment Email Copy To","Envoyer une commande Commentaire Copie de l'email à "
-"Send Order Comments Email Copy Method","Méthode copie envoi email commentaires commande"
-"Send Order Email","Envoyer un email de commande"
-"Send Order Email Copy Method","Envoyer une commande Copie de l'email à "
-"Send Order Email Copy To","Envoyer une commande Copie de l'email à "
-"Send Sales Emails","Envoyer les ventes Emails"
-"Send Shipment Comment Email Copy To","Envoyer une copie du commentaire d'expédition à "
-"Send Shipment Comments Email Copy Method","Envoyer une copie du mail des commentaires d'expédition"
-"Send Shipment Email Copy Method","Méthode copie envoi email expédition"
-"Send Shipment Email Copy To","Envoyer une copie du courriel d'expédition à "
-"Send Tracking Information","Envoyer une information de suivi"
+"There is no update for the payment.","Il n'existe pas de mise à jour pour ce paiement."
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.","Autorisation annulée"
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
"Set order for existing transactions not allowed","Le passage de commande pour des transactions existantes n'est pas autorisé"
-"Ship","Expédier"
-"Ship Date","Date d'envoi"
-"Ship To","Expédier à "
-"Ship-to Name","Expédier à Nom"
-"Shipment","N° d'envoi"
-"Shipment","Expédition"
-"Shipment %1$s | %3$s (%2$s)","Expédition #%1$s | %3$s (%2$s)"
-"Shipment %s","Expédition n˚%s"
-"Shipment Comment Email Sender","Livraison Expéditeur du Commentaire"
-"Shipment Comment Email Template","Livraison Modèle d'E-mail de Commentaire"
-"Shipment Comment Email Template for Guest","Livraison Modèle d'E-mail de Commentaire pour Invité"
-"Shipment Comments","Commentaires sur l'expédition"
-"Shipment Email Sender","Livraison Expéditeur du Mail"
-"Shipment Email Template","Modèle de l'e-mail d'expédition"
-"Shipment Email Template for Guest","Modèle de l'e-mail d'expédition pour invité"
-"Shipment Update","Mise à jour de l'expédition"
-"Shipment Update for Guest","Mise à jour de l'expédition pour invité"
-"Shipments","Expéditions"
-"Shipped","Envoyé"
-"Shipped By","Expédié par"
-"Shipping","Envoi"
-"Shipping & Handling","Expédition et traitement"
-"Shipping & Handling","Expédition & Traitement"
-"Shipping & Handling Information","Expédition et manutention"
-"Shipping Address","Adresse d'expédition"
-"Shipping Amount","Montant de la livraison"
-"Shipping Information","Informations d'expédition"
-"Shipping Method","Méthode d'expédition"
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
"Shipping Method:","Méthode d'expédition :"
-"Shipping Refund","Remboursement de l'expédition"
-"Shipping and Tracking Information","Information sur l'expédition et le suivi"
-"Shopping Cart","Panier"
-"Show Packages","Afficher les colis"
-"Signature Confirmation","Confirmation signature"
-"Signed Up From","Inscrit à partir de"
-"Size","Taille"
-"Sku","Sku"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Certains de produits ci-dessous n'ont pas toutes les options requises. Veuillez les éditer et configurer toutes les options requises."
-"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande."
-"Source object is not specified.","L'objet source n'est pas spécifié."
-"Specified profile does not exist.","Le profil spécifié n'existe pas."
-"State Code [State Title]","Code État [Titre État]"
-"State/Province","Etat / région"
-"Status","Statut"
-"Status Code","Code statut"
-"Status Label","Étiquette statut"
-"Status:","Statut"
-"Store Credit","Crédits de la boutique"
-"Store View Specific Labels","Vue boutique Étiquettes spécifiques"
-"Street Address","Adresse de la rue"
-"Submit Comment","Envoyer commentaire"
-"Submit Credit Memo","Présenter la note de crédit"
-"Submit Invoice","Soumettre facture"
-"Submit Invoice and Shipment","Soumettre facture et expédition"
-"Submit Order","Envoyer Commande"
-"Submit Shipment","Soumettre la livraison"
-"Subscribe to Newsletter","S'inscrire à la newsletter"
-"Subscribe to Order Status","S'abonner au statut de la commande"
-"Subtotal","Sous-total"
-"Subtotal after discount.","Sous-total après remise."
-"Subtotal:","Sous-total :"
-"Suspected Fraud","Fraude supposée"
-"Suspend","Suspendre"
-"Suspended","Suspendu"
-"Tax","Taxe"
-"Tax Amount","Montant de la taxe"
-"Tax Percent","Pourcentage de taxe"
-"Telephone","Téléphone"
-"The Order State ""%s"" must not be set manually.","L’État de la commande ""%s"" ne doit pas être défini manuellement."
-"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","Le modèle total de l'adresse devrait être étendu à partir de \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
-"The coupon code has been accepted.","Le code de coupon a été accepté"
-"The message has been sent.","Le message a été envoyé."
-"The message was sent.","Le message a été envoyé"
-"The order address has been updated.","L'adresse de la commande a été mise à jour."
-"The order email has been sent.","L'email de la commande a été envoyé"
-"The order has been cancelled.","La commande a été annulée."
-"The order has been created.","La commande a été créée."
-"The order has been put on hold.","La commande a été mise en attente."
-"The order has been released from holding status.","La commande n'est plus en attente."
-"The order has not been cancelled.","La commande n'a pas été annulée."
-"The order status has been assigned.","Le statut de la commande a été assigné."
-"The order status has been saved.","Le statut de la commande a été sauvegardé."
-"The order status has been unassigned.","Le statut de la commande a été retiré."
-"The order was not put on hold.","La commande n'a pas été mise en attente."
-"The order was not unheld.","La commande n'a pas été libérée."
-"The order was placed using %s","La commande a été passée à partir de %s"
-"The order(s) cannot be canceled","La/les commande(s) ne peut/peuvent être annulée(s)"
-"The payment has been accepted.","Le payement a été accepté"
-"The payment has been denied.","Le paiement a été refusé."
-"The payment has been voided.","Le paiement a été invalidé."
-"The profile has been updated.","Le profil a été mis à jour."
-"The profile has no changes.","Le profil ne comporte aucune modification."
-"The profile state has been updated.","L'état du profil a été mis à jour."
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","La quantité que vous souhaitez ajouter dépasse la quantité totale expédiée d'un ou plusieurs produit(s) sélectionné(s)"
-"The requested Payment Method is not available.","La méthode de paiement demandée n'est pas disponible."
-"The shipping label has been created.","L'étiquette d'expédition a été créée."
-"The transaction ""%s"" (%s) is already closed.","La transaction ""%s"" (%s) est déjà clôturée."
-"The transaction ""%s"" cannot be captured yet.","La transaction ""%s"" ne peut pas encore être saisie."
-"The value that you entered is not valid.","La valeur que vous avez saisie n'est pas valide."
-"There are no printable documents related to selected orders.","Il n'exsite pas de documents imprimables concernant ces commandes."
-"There are no shipping labels related to selected %s.","Il n'y a pas de labels d'expédition liés à %s."
-"There is no need to approve this payment.","Ce paiement ne requiert pas d'accord."
-"There is no need to deny this payment.","Il n'y a pas de raison de refuser ce payement"
-"There is no update for the payment.","Il n'existe pas de mise à jour pour ce paiement."
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Ce message s'affichera dans le panier d'achat lorsque le sous-total après réduction sera inférieur au montant minimal."
-"This operation requires an existing transaction object.","Cette opération requiert un objet de transaction existant."
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Cette commande contient (%s) articles et ne peut donc pas être modifiée par l'interface d'administration en ce moment, si vous souhaitez continuer à éditer, les (%s) articles seront retirés, la commande sera annulée et une nouvelle commande sera placée."
-"This order no longer exists.","Cette commande n'existe plus."
-"This product does not have any configurable options","Le produit n'a pas d'options configurables."
-"This profile state cannot be changed to ""%s"".","Le profil de peut être changé en ""%s""."
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Ceci créera un remboursement hors ligne. Pour créer un remboursement en ligne, ouvrez une facture et créez un mémo crédit. Souhaitez-vous continuer?"
-"Tier Pricing","Catégorie de prix"
-"Title","Titre"
-"To","A"
-"To Name","Vers nom"
-"To:","A :"
-"Total","Total"
-"Total %d product(s)","Total %d produit(s)"
+"Total Shipping Charges","Charges totales expédition"
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
"Total (ex)","Total (ex)"
"Total (inc)","Total (inc)"
-"Total Due","Total dû"
-"Total Invoiced","Total facturé"
-"Total Invoiced Paid","Total facturé payé"
-"Total Invoiced VS Paid Report","Total facturé contre rapport paiement"
-"Total Invoiced not Paid","Total facturé non payé"
-"Total Ordered Report","Rapport du total commandé"
-"Total Paid","Total payé"
-"Total Quantity","Quantité totale"
-"Total Refund","Total du remboursement"
-"Total Refunded","Total remboursé"
-"Total Refunded Report","Rapport du total remboursé"
-"Total Sales Shipping","Ventes totales expédiées"
-"Total Shipped Report","Rapport du total envoyé"
-"Total Shipping","Total expédition"
-"Total Shipping Charges","Charges totales expédition"
+"Credit Memo # ","Credit Memo # "
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
+"Packing Slip # ","Bon de livraison #"
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
+"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","Le modèle total de l'adresse devrait être étendu à partir de \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
+"Subscription Items","Subscription Items"
+"Regular Payment","Paiement régulier"
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.","La méthode de paiement demandée n'est pas disponible."
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.","Veuillez spécifier une méthode d'expédition."
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.","Veuillez sélectionner une méthode de paiement valide."
+"Pending Payment","Paiement en attente"
+"On Hold","En Attente"
+Complete,Terminer
+"Suspected Fraud","Fraude supposée"
+"Payment Review","Contrôle du paiement"
+"Changing address information will not recalculate shipping, tax or other order amount.","Changer les données de l'adresse ne changera pas les coûts d'expédition, les taxes ou les autres frais applicables à la commande."
+"Order Comments","Commentaires Commande"
+"Order Currency:","Devise de la Commande"
+"Select from existing customer addresses:","Sélectionner à partir d'adresses client existantes:"
+"Same As Billing Address","(identique à l'adresse de facturation)"
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order","Message de cadeau pour l'ensemble de la commande"
+"Move to Shopping Cart","Mettre dans votre panier"
+"Subscribe to Newsletter","S'inscrire à la newsletter"
+"Click to change shipping method","Cliquez pour changer la méthode d'envoi"
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates","Obtenir la méthode d'expédition et les taux"
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments","Ajouter commentaires"
+"Email Order Confirmation","Confirmation de la demande d'email"
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund","Articles à rembourser"
+"Return to Stock","Retourner au Stock"
+"Qty to Refund","Quantité à rembourser"
+"Row Total","Total de la Ligne"
+"No Items To Refund","Aucun article à rembourser"
+"Credit Memo Comments","Avoir Commentaires"
+"Refund Totals","Remboursement total"
+"Email Copy of Credit Memo","Copie de l'e-mail de la note de crédit"
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded","Articles remboursés"
+"No Items","Pas d'article"
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment","Créer une livraison"
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice","Quantité à facturer"
+"Invoice History","Invoice History"
+"Invoice Comments","Facture Commentaires"
+"Invoice Totals","Invoice Totals"
+"Capture Amount","Sauvegarder le montant"
+"Capture Online","Sauvegarder en ligne"
+"Capture Offline","Sauvegarder hors ligne"
+"Not Capture","Non saisi"
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
+"Email Copy of Invoice","Copie email de la facture"
+"Items Invoiced","Articles facturés"
"Total Tax","Taxe totale"
-"Total Weight","Poids total"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","Le modèle complet devrait étendu à partir de \Magento\Sales\Model\Order\Total\AbstractTotal."
-"Track Order","Suivre la commande"
-"Track all shipment(s)","Suivre toutes les commandes"
-"Track all shipments","Suivre toutes les livraisons"
-"Track this shipment","Suivre cette expédition"
-"Track your order","Suivez votre commande"
-"Tracking","Suivi"
-"Tracking Number","Numéro de suivi"
-"Tracking Number(s):","Numéro(s) de suivi :"
-"Transaction ""%s"" was already processed.","La transaction ""%s"" a déjà été traitée."
-"Transaction # %s | %s","Transaction # %s | %s"
-"Transaction ID","ID de la transaction"
-"Transaction ID must not be empty.","L'ID de la transaction ne doit pas être vide."
-"Transaction ID: ""%s"".","ID de la Transaction : ""%s""."
+"From Name","De Nom"
+"To Name","Vers nom"
+"Add Order Comments","Ajouter commentaires de commande"
+"Notification Not Applicable","La notification ne s'applique pas"
+"the order confirmation email was sent","l'e-mail de confirmation de commande a été envoyé"
+"the order confirmation email is not sent","l'e-mail de confirmation de commande n'est pas envoyé"
+"Order Date (%1)","Order Date (%1)"
+"Purchased From","Acheté à "
+"Link to the New Order","Lien vers la nouvelle commande"
+"Link to the Previous Order","Lien vers la commande précédente"
+"Placed from IP","Placé depuis l'IP"
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status","Statut article"
+"Original Price","Prix d'origine"
+"Tax Percent","Pourcentage de taxe"
+"Transaction Data","Transaction Data"
+"Parent Transaction ID","ID de la transaction mère"
"Transaction Type","Type de transaction"
-"Transactions","Transactions"
-"Trial ","Essai"
-"Trial Payment","Paiement d'essai"
-"Trial Period","Période d'essai"
-"Trial period payment","Paiement de la version d'essai"
-"Type","Type"
-"Unassign","Modifier l'attribution"
-"Unhold","Ne plus retenir"
-"Unhold action is not available.","Impossible de libérer l'action."
-"Unhold order","Annuler le contrôle de la commande."
-"Unknown State","État inconnu"
-"Unknown Status","Statut inconnu"
-"Unsupported transaction type ""%s"".","Type de transaction inconnu ""%s""."
-"Update Changes","Mettre à jour les changements"
-"Update Items and Qty's","Mettre à jour les articles et quantités"
-"Update Qty's","Mettre à jour la/les Qté(s)"
-"Updated","Mis à jour à "
-"Updated:","Mis à jour :"
-"Use Aggregated Data (beta)","Utiliser données agrégées (beta)"
-"Use Order Status As Default","Utiliser l'état de la commande comme référence par défaut"
-"Validate Each Address Separately in Multi-address Checkout","Valider chaque adresse séparément en utilisant le paiement multi-adresses."
-"Value","Valeur"
-"View","Vue"
-"View All","Voir tout"
-"View Another Order","Voir autre commande"
-"View Order","Voir la commande"
-"Visible on Frontend","Visible sur le Frontend"
-"Void","Annuler"
-"Void invoice","Annuler la facture"
-"Voided authorization.","Autorisation annulée"
-"Website","Site"
-"Weight","Poids"
-"Whether buyer can define the date when billing for the profile begins.","Si l'acheteur peut définir la date de début de facturation"
-"Width","Largeur"
-"Wishlist","Souhaits"
-"Wrong quote item id to update configuration.","L'identification du produit sélectionné est incorrecte et la configuration ne peut pas être mise à jour."
-"Wrong state: ""%s"".","État incorrect : ""%s""."
-"Yes","oui"
-"You can leave a box blank if you don't wish to add a gift message for whole order","Vous pouvez laisser une case vide si vous ne voulez pas ajouter un message de cadeau pour l'ensemble de la commande"
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
+"Gift Message for this Order","Message personnalisé pour cette commande"
+"Shipped By","Expédié par"
+"Tracking Number","Numéro de suivi"
+"Billing Last Name","Nom facturation"
+"Find Order By:","Trouver la commande par:"
+"ZIP Code","ZIP Code"
+"Billing ZIP Code","Code postal facturation"
+"Print All Refunds","Imprimer tous les remboursements"
+"Refund #","Remboursement #"
+"Print Refund","Imprimer le remboursement"
"You have placed no orders.","Vous n'avez pas de commande."
-"You will be redirected to the payment system website.","Vous allez être redirigé vers le site de paiement en ligne."
-"Your credit card will be charged for","Votre carte de crédit sera débitée pour"
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available","Aucune information d'expédition disponible"
+"Print Order","Imprimer commande"
+"Subscribe to Order Status","S'abonner au statut de la commande"
+"Print All Invoices","Imprimer toutes les factures"
+"Invoice #","Facture nËš"
+"Print Invoice","Imprimer la facture"
+"Qty Invoiced","Qté facturée"
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
+"Items Shipped","Articles expédiés"
+"Qty Shipped","Quantité expédiée"
+"View All","Voir tout"
+"Gift Message for This Order","Message cadeau pour cette commande"
+"About Your Order","A propos de votre commande"
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title","Titre personnalisé"
+Phone,Phone
+"Default Template","Modèle par défaut"
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
+"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
+"Minimum Amount","Minimum Amount"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
+"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
+"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
+"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
+"New Order Confirmation Template","New Order Confirmation Template"
+"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
+"Order Comment Email Sender","Order Comment Email Sender"
+"Order Comment Email Template","Order Comment Email Template"
+"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,Expédition
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
+"Orders and Returns Search Form","Formulaire de recherche des Commandes et Retours"
+"PDF Credit Memos","Notes de crédit PDF"
+"PDF Invoices","Factures PDF"
+"Invoice Date","Date de la facture"
"ZIP/Post Code","Code postal"
-"Zip/Postal Code","Code postal"
-"cm","cm"
-"in","dans"
-"kg","kg"
-"lb","lb"
-"the credit memo email is not sent","Le courriel de note de crédit n'a pas été envoyé"
-"the credit memo email was sent","la note de crédit a été envoyée"
-"the invoice email is not sent","l'e-mail de facture n'est pas envoyé"
-"the invoice email was sent","l'e-mail de facture a été envoyé"
-"the order confirmation email is not sent","l'e-mail de confirmation de commande n'est pas envoyé"
-"the order confirmation email was sent","l'e-mail de confirmation de commande a été envoyé"
-"the shipment email is not sent","Le courriel d'expédition n'a pas été envoyé"
-"the shipment email was sent","l'e-mail d'expédition a été envoyé"
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS","Nouvelle commande RSS"
+"Print Invoices","Imprimer factures"
+"Print Packing Slips","Imprimer les bons de livraison"
+"Print Credit Memos","Imprimer les notes de crédit"
+"Print All","Tout imprimer"
+"Print Shipping Labels","Labels d'expédition"
+"Ship Date","Date d'envoi"
+"Total Quantity","Quantité totale"
+"Default Status","État pas défaut"
+"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)."
diff --git a/app/code/Magento/Sales/i18n/nl_NL.csv b/app/code/Magento/Sales/i18n/nl_NL.csv
index 911605baa80..5298f4a60a7 100644
--- a/app/code/Magento/Sales/i18n/nl_NL.csv
+++ b/app/code/Magento/Sales/i18n/nl_NL.csv
@@ -1,846 +1,712 @@
-"""%s"" coupon code is not valid.","""%s"" coupon code is niet geldig."
-"%s","%s"
-"%s / %s rate:","%s / %s ratio:"
-"%s for %s","%s voor %s"
-"%s order(s) cannot be canceled","%s bestelling(en) kunnen niet geannuleerd worden"
-"%s order(s) have been canceled.","%s order(s) zijn geannuleerd."
-"%s order(s) have been put on hold.","%s order(s) zijn in de wachtstand gezet."
-"%s order(s) have been released from holding status.","%s order(s) zijn vrijgelaten uit wacht status."
-"%s order(s) were not put on hold.","%s bestelling(en) zijn uitgesteld"
-"%s order(s) were not released from holding status.","%s bestelling(en) zijn niet vrijgemaakt uit uitgestelde status"
-"* - Enter custom price excluding tax","* - Voer aangepaste prijs exclusief belasting in"
-"* - Enter custom price including tax","* - Voer aangepaste prijs inclusief belasting in"
-"-- Please Select --","-- Selecteer Alstublieft --"
-"About This Order:","Over deze bestelling:"
-"About This Payment:","Over dit profiel:"
-"About Your Invoice","Over Uw Factuur"
-"About Your Order","Over uw bestelling"
-"About Your Refund","Over Uw Terugbetaling"
-"About Your Shipment","Over Uw Zending"
-"Accept Payment","Accepteer betaling"
-"Accept or Deny Payment","Accepteer of weiger betaling"
-"Account Information","Account Gegevens"
-"Action","actie"
-"Actions","acties"
-"Activate","Activeer"
-"Active","Actief"
-"Add","Toevoegen"
-"Add New Address","Adres Toevoegen"
-"Add Order Comments","Voeg bestelcommentaar toe"
-"Add Package","Pakket toevoegen"
+Remove,weghalen
+Close,Sluiten
+Cancel,annuleren
+Back,Terug
"Add Products","producten toevoegen"
-"Add Selected Product(s) to Option","Voeg geselecteerde product(en) toe aan optie"
-"Add Selected Product(s) to Order","Voeg geselecteerde product(en) toe aan bestelling"
-"Add Selected Product(s) to Package","Geselecteerde product(en) aan pakket toevoegen"
-"Add To Order","Voeg toe aan bestelling"
-"Add Tracking Number","Voeg traceernummer toe"
-"Add comment to order","Voeg commentaar toe aan bestelling."
-"Add new comment to credit memo","Voeg een nieuwe reactie toe aan de creditnota"
-"Add new comment to shipment","Voeg nieuw commentaar toe aan verzending."
-"Add new tracking number","Voeg nieuw traceernummer toe."
-"Add to Cart","Voeg toe aan winkelwagen"
-"Additional Product Info","Verdere productinformatie"
-"Address","Adres"
-"Address model is not defined.","Adresmodel is niet gedefinieerd"
-"Adjustment Fee","Aanpassingstoeslag"
-"Adjustment Refund","Aanpassingsbetaling"
-"Agreement Information","Overeenkomst informatie"
-"Allow Reorder","Sta nabestelling toe"
-"Amount","Aantal"
-"Amount: %s.","Hoeveelheid: %s."
-"An error occurred while assigning order status. Status has not been assigned.","Er is een fout opgetreden tijdens het toewijzen van uw orderstatus. Status is niet toegewezen."
-"An error occurred while creating shipping label.","Er heeft zich een fout voorgedaan bij het aanmaken van het verzendingslabel."
-"An error occurred while saving order status. The status has not been added.","Er is een fout opgetreden tijdens het opslaan van uw orderstatus. Status is niet toegevoegd."
-"An error occurred while unassigning order status.","Er is een fout opgetreden tijdens het ongedaan maken van uw orderstatus."
-"An error occurred while updating the order address. The address has not been changed.","Er is een fout opgetreden tijdens het bijwerken van het bestellingsadres. Het adres is niet veranderd."
-"An item option with code %s already exists.","Er bestaat reeds een item optie met de code %s."
-"Anchor Custom Title","Anker Custom Titel"
-"Append Comments","Voeg commentaar toe"
-"Apply","Invullen"
+"Update Items and Qty's","aanpassen items en hoeveelheden"
+Product,Product
+Price,prijs
+Quantity,Quantity
+Products,producten
+ID,identiteit
+SKU,Sku
+Apply,Invullen
+Configure,Configureren
+"Shopping Cart",Winkelmandje
+"Quote item id is not received.","I.D. van het quote product is niet ontvangen."
+"Quote item is not loaded.","Quote product is niet geladen."
+No,Nee
"Apply Coupon Code","Vul couponcode in"
-"Approved the payment online.","De betaling is online goedgekeurd"
-"Are you sure you want to accept this payment?","Weet u zeker dat u deze betaling wilt accepteren?"
-"Are you sure you want to cancel this order?","Weet u zeker dat u deze bestelling wilt annuleren?"
-"Are you sure you want to delete all items from shopping cart?","Bent u er zeker van om alle producten te verwijderen uit de winkelwagen?"
-"Are you sure you want to deny this payment?","Weet u zeker dat u deze betaling wilt weigeren?"
-"Are you sure you want to do this?","Weet u zeker dat u dit wilt doen?"
-"Are you sure you want to send Creditmemo email to customer?","Weet u zeker dat u een credietmemo-mail naar de klant wilt sturen?"
-"Are you sure you want to send Invoice email to customer?","Weet u zeker dat u een factuur-mail naar de klant wilt sturen?"
-"Are you sure you want to send Shipment email to customer?","Weet u zeker dat u een verzendings-mail naar de klant wilt sturen?"
-"Are you sure you want to send order email to customer?","Weet u zeker dat u een bestellings-mail naar de klant wilt sturen?"
-"Are you sure you want to void the payment?","Weet u zeker dat u de betaling wilt leegmaken?"
-"Are you sure?","Weet u het zeker?"
-"Are you sure? This order will be canceled and a new one will be created instead","Weet u het zeker? Deze bestelling zal geannuleerd worden en er zal een nieuwe worden gemaakt."
-"Assign Order Status to State","Zet Orderstatus als Staat"
-"Assign Status to State","Zet Status als Staat"
-"Assignment Information","Opdracht Informatie"
-"At least a payment ID must be set.","Tenminste moet er een betaal-ID worden ingesteld."
-"Authorization","Autorisatie"
-"Authorized amount of %s.","Geautoriseerd bedrag van %s."
-"Authorizing amount of %s is pending approval on gateway.","Te autoriseren bedrag van %s wacht op goedkeuring op toegangspoort."
-"Back","Terug"
-"Back to My Orders","Terug naar Mijn Bestellingen"
-"Back to Recurring Payments","Terug naar Terugkomende Profielen"
-"Backordered","Nabesteld"
-"Bestsellers","Bestsellers"
-"Bill-to Name","Rekening op naam"
-"Billing","Facturatie"
-"Billing Address","Factuuradres"
-"Billing Last Name","Rekening Achternaam"
-"Billing ZIP Code","Postcode betaling"
-"Buy %s for price %s","Koop %s voor een prijs van %s"
-"CSV","CSV"
-"Cancel","annuleren"
-"Cancel credit memo","Annuleer creditnota"
-"Cancel invoice","Annuleren factuur"
-"Cancel order","Annuleren bestelling"
-"Canceled","Geannuleerd"
-"Canceled order offline.","Geannuleerde bestelling offline"
-"Canceled order online.","Geannuleerde bestelling online."
-"Cannot add order history.","Kan bestellingsgeschiedenis niet toevoegen."
-"Cannot create an empty shipment.","Kan geen lege zending aanmaken."
-"Cannot determine the field name.","Kan de veldnaam niet bepalen."
-"Cannot do invoice for order.","Kan geen factuur maken voor bestelling."
-"Cannot do shipment for order.","Kan geen zending maken voor bestelling."
-"Cannot get order instance","Kan bestelling instantie niet ophalen"
-"Cannot get the order instance.","Kan de bestelling instantie niet ophalen."
-"Cannot register an existing credit memo.","Kan een bestaande creditnota niet registeren."
-"Cannot register existing invoice","Kan een bestaande factuur niet registreren"
-"Cannot register existing shipment","Kan een bestaande zending niet registreren"
-"Capture","Vastleggen"
-"Capture Amount","Vastleggen Bedrag"
-"Capture Offline","Offline Vastleggen"
-"Capture Online","Online Vastleggen"
-"Capture invoice","Vastleggen factuur"
-"Captured amount of %s online.","Online vastgelegd bedrag van %s."
-"Capturing amount of %s is pending approval on gateway.","Vast te leggen bedrag van %s wacht op goedkeuring op toegangspoort."
-"Carrier","Drager"
-"Carrier/Method","Vervoerder/Methode"
-"Change status, add comments","Wijzig status, toevoegen opmerkingen"
-"Changing address information will not recalculate shipping, tax or other order amount.","Bij het veranderen van adres informatie worden de verzendkosten, belastingskosten of andere bestellings hoeveelheden niet aangepast."
-"Checkout Totals Sort Order","Kassa Totaalbedragen Sort Order"
-"City","Stad"
-"Clear Shopping Cart","Maak winkelwagen leeg"
-"Click to change shipping method","Klik om verzendwijze te wijzigen"
-"Close","Sluiten"
-"Closed","Gesloten"
-"Comma-separated.","Door komma's gescheiden."
-"Comment","Commentaar"
-"Comment Text","Opmerking Tekst"
-"Comments","Opmerkingen"
-"Comments History","Commentaargeschiedenis"
-"Company","Bedrijf"
-"Complete","Gereed"
-"Configure","Configureren"
-"Configure and Add to Order","Pas uw Order aan of Voeg een Order toe"
-"Contents","Inhoud"
-"Continue","Doorgaan"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controleer of de klant IP te zien is op de bestellingen, facturen, leveringen, creditnota's."
-"Country","Land"
-"Coupons","Waardebonnen"
-"Create","Creëren"
-"Create New Customer","Maak nieuwe klant aan"
-"Create New Order","Maak nieuwe bestelling aan"
-"Create New Order Status","Maak een Nieuwe Orderstatus"
-"Create New Order for %s","Maak nieuwe bestelling aan voor %s"
-"Create New Order for %s in %s","Maak nieuwe bestelling aan voor %s in %"
-"Create New Order for New Customer","Maak nieuwe bestelling aan voor klant"
-"Create New Order for New Customer in %s","Maar nieuwe bestelling aan voor nieuwe klant in %s"
-"Create New Status","Stel een Nieuwe Status in"
-"Create Order","Aanmaken Bestelling"
-"Create Packages","Maak Pakketjes"
-"Create Shipment","Maak verzending aan"
-"Create Shipping Label","Maak Verschepingslabel"
-"Create Shipping Label...","Maak Verschepingslabel..."
-"Create new credit memo for order","Maak nieuwe creditnota voor bestelling aan"
-"Create new invoice for order","Maak nieuw factuur aan voor bestelling"
-"Create new shipment for order","Maak nieuwe verzending aan voor bestelling"
-"Create...","Creëer..."
-"Created","Gemaakt op"
-"Created:","Gemaakt:"
-"Credit Memo","Credietmemo"
-"Credit Memo #","Kredietnota #"
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Credietmemo #%1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","Credietmemo commentaar e-mail afzender"
-"Credit Memo Comment Email Template","Credietmemo commentaar e-mail template"
-"Credit Memo Comment Email Template for Guest","Credietmemo commentaar e-mail template voor gast"
-"Credit Memo Comments","Credietmemo commentaar"
-"Credit Memo Email Sender","Credietmemo e"
-"Credit Memo Email Template","Credietmemo e-mail template"
-"Credit Memo Email Template for Guest","Credietmemo e-mail template voor gast"
-"Credit Memo Update","Credietmemo update"
-"Credit Memo Update for Guest","Credietmemo update voor gast"
-"Credit Memos","Creditnota's"
-"Credit memo canceling problem.","Probleem bij annuleren van creditnota"
-"Credit memo cannot be canceled.","Creditnota kan niet geannuleerd worden"
-"Credit memo has been created automatically","Notitie van krediet is automatisch gemaakt"
-"Custom Price","Aangepaste prijs"
-"Custom Value","Aangepaste waarde"
-"Customer","Klant"
-"Customer Can Define Start Date","Klant kan begindatum definieren"
-"Customer Group","Klantgroep"
-"Customer My Account Order Creditmemo View","Klant mijn rekening bestelling credietmemo weergave"
-"Customer My Account Order History","Klant mijn rekening betellingsgeschiedenis"
-"Customer My Account Order Invoice View","Klant mijn rekening bestelling factuur weergave"
-"Customer My Account Order Shipment View","Klant mijn rekening bestelling verzending weergave"
-"Customer My Account Order View","Klant mijn rekening bestelling weergave"
-"Customer's Current Activities","Recente bezigheden van de klant"
-"Customs Value","Douanewaarde"
-"Date","Datum"
-"Default Status","Standaard Status"
-"Default Template","Vaststaand Sjabloon"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png)","Standaard logo, zal in PDF en HTML documenten worden gebruikt. <br />(jpeg, tiff, png)"
-"Delete","Verwijderen"
-"Delete Package","Verwijder Pakket"
-"Denied the payment online.","De betaling is online geweigerd."
-"Deny Payment","Weiger betaling"
-"Description Message","Omschrijvingsbericht"
-"Discount","korting"
-"Discount (%s)","Korting (%s)"
-"Discount Amount","Kortingsbedrag"
-"Display Order ID in Header","Toon Bestelling ID in Koptekst"
-"Edit","Bewerk"
-"Edit Order #%s","Bewerk bestelling #%s"
-"Edit Order %s %s Address","Verander Order %s %s Adres"
-"Edit Order Status","Verander Orderstatus"
-"Email","Klant e-mail"
-"Email Address","e-mailadres"
-"Email Copy of Credit Memo","E-mail een kopie van de credietmemo"
-"Email Copy of Invoice","Kopie van factuur emailen"
-"Email Copy of Shipment","E-mail een kopie van de verzending"
-"Email Order Confirmation","Bevestiging van bestelling emailen"
-"Enable","Stel in werking"
-"Enabled","Ingeschakeld"
-"Enter the billing last name and email/ZIP as in the order billing address","Voer de achternaam en email/postcode voor betaling in als het betalingsadres bij de bestelling"
-"Entered data is incorrect. Please try again.","Ingevoerde gegevens zijn onjuist. Probeer het opnieuw."
-"Error to Show in Shopping Cart","Fout om te laten zien in winkelwagen"
-"Excel XML","Excel XML"
+"Remove Coupon Code","haal couponcode weg"
+Qty,hoeveelheid
+Subtotal,subtotaal
+Discount,korting
+"Row Subtotal","rij van het subtotaal"
+Action,actie
+"No ordered items","geen bestelde items"
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,subtotaal
"Excl. Tax","Excl. BTW"
-"Expired","Verlopen"
-"Explanation","Verklaring"
-"Failed to send the order email.","Kon de bestellings-e-mail niet versturen."
-"Failed to update the payment.","Kon de betaling niet updaten."
-"Failed to update the profile.","Is er niet in geslaagd het profiel te updaten."
-"Failed to void the payment.","Was niet in staat de betaling te vernietigen."
-"Fetch","Halen"
-"File extension not known or unsupported type in the following shipment: %s","Bestandsextensie niet bekend of niet ondersteund in de volgende bestelling: %s"
-"Find Order By:","Vind een bestelling door:"
-"First Name","Klant Naam"
-"From","Van"
-"From Name","Vanaf naam"
-"From:","Van:"
-"General","Algemeen"
-"General Information","Algemene informatie"
-"Get Payment Update","Verkrijg betalings-update"
-"Get Update","Update verkrijgen"
-"Get shipping methods and rates","Verkrijg verzendmethodes en verhoudingen"
-"Gift Message","Cadeauboodschap"
-"Gift Message for This Order","Cadeau-bericht voor deze bestelling"
-"Gift Message for the Entire Order","Cadeauboodschap voor de gehele bestelling"
-"Gift Message for this Order","Cadeau bericht voor deze Order"
-"Gift Options","Cadeauopties"
-"Gift Wrapping for the Entire Order","Cadeauverpakking voor gehele bestelling"
-"Girth","Omtrek"
-"Grand Total","Groot Totaal"
-"Grand Total (Base)","G.T. (basis)"
-"Grand Total (Purchased)","Bruto totaal (gekocht)"
-"Grand Total to be Charged","Totaalbedrag dat zal worden gefactureerd"
-"Guest","Gast"
-"Height","Hoogte"
-"Hide Customer IP","Verberg klant IP"
-"Hold","In de wacht"
-"Hold action is not available.","Vasthoud-actie is niet beschikbaar"
-"Hold order","Houd bestelling vast"
-"ID","ID"
-"ID","identiteit"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Terugbetaald"". Terugbetaling door verkoper. Geregistreerde melding over terugbetaald bedrag van %s. Transactie ID: ""%s"""
-"If empty, the default description above will be used.","Indien leeg, zal de bovenstaande standaard omschrijving worden gebruikt."
-"If empty, the default error above will be used.","Als het leeg is zal de standaard fout hierboven gebruikt worden."
-"If the invoice was created offline, try creating an offline creditmemo.","Indien de factuur offline is aangemaakt, probeert u een offline credietmemo te maken."
+Total,Totaal
"Incl. Tax","inclusief btw"
-"Information","Informatie"
-"Initial Fee","Initiële Kosten"
-"Initial Fees","Initiële kosten"
-"Initial period payment","Beginnende periode betaling"
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Onvoldoende informatie om verzendetiket(ten) te maken. Controleer uw Winkelgegevens en Verzendinstellingen."
-"Invalid block: %s.","Ongeldig blok: %s"
-"Invalid carrier specified.","Onjuiste drager gespecificeerd"
-"Invalid draw line data. Please define ""lines"" array.","Ongeldige draw line data. Definieer ""lines"" collectie."
-"Invalid entity model","Ongeldig eenheidsmodel"
-"Invalid item option format.","Ongeldig artikelkeuze formaat."
-"Invalid qty to invoice item ""%s""","Ongeldige qty om artikel ""%s"" te factureren"
-"Invalid qty to refund item ""%s""","Ongeldige qty om artikel ""%s"" terug te betalen"
-"Invalid qty to ship for item ""%s""","Ongeldige qty om artikel ""%s"" te verzenden"
-"Invalid renderer model","Onjuist verkrijgsmodel"
-"Invalid request for adding product to quote.","Ongeldig verzoek voor toevoegen van product aan quote."
-"Invoice","Factuur"
-"Invoice #","Factuur #"
-"Invoice #%1$s | %2$s | %4$s (%3$s)","Factuur #%1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","Factuur #%s"
-"Invoice Comment Email Sender","Factuur commentaar e-mail afzender"
-"Invoice Comment Email Template","Factuur commentaar e-mail template"
-"Invoice Comment Email Template for Guest","Factuur Opmerking E-mail Sjabloon voor Gast"
-"Invoice Comments","Factuurcommentaar"
-"Invoice Date","Factuurdatum"
-"Invoice Email Sender","Facturatie E-mail Verzender"
-"Invoice Email Template","Factuur e-mail template"
-"Invoice Email Template for Guest","Factuur e-mail template voor gast"
-"Invoice Update","Factuur-update"
-"Invoice Update for Guest","Factuur-update voor gast"
-"Invoice and Packing Slip Design","Facturatie en Verpakking Ontwerp"
-"Invoice and Ship","Factureer en verzend"
-"Invoice canceling problem.","Factuur annuleringsprobleem"
-"Invoice cannot be canceled.","Facturatie kan niet geannuleerd worden."
-"Invoice cannot be captured.","Factuur kan niet gevangen worden"
-"Invoice cannot be voided.","Factuur kan niet leeggemaakt worden"
-"Invoice capturing problem.","Facturatie opvraag probleem."
-"Invoice void problem","Factuur leegmaak-probleem"
-"Invoice will be created without communication with payment gateway.","Facturatie zal worden aangemaakt zonder communicatie met de betalingspoort."
-"Invoiced","Gefactureerd."
-"Invoices","Facturen"
-"Item","item"
-"Item Status","Artikel Status"
-"Item object is not specified.","item object is niet gespecificeerd"
-"Item options declaration error.","Artikel opties verklaring fout."
-"Item ordered qty","item bestelde hoeveelheid"
-"Item qty declaration error.","item hoeveelheidsdeclaratiefout"
-"Items","Artikelen"
-"Items Invoiced","items gefactureerd"
-"Items Ordered","items besteld"
-"Items Refunded","items geretourneerd"
-"Items Shipped","Verzonden artikelen"
-"Items in the Package","Items in het Pakket"
-"Items maximum quantity or price do not allow checkout.","maximale hoeveelheid items of prijs staan afrekenen niet toe"
-"Items options declaration error.","items optie declaratiefout"
-"Items to Refund","items om te retourneren"
-"Items to Ship","Items te Verzenden"
-"Key","sleutel"
-"Last Name","Klant Achternaam"
-"Last Ordered Items","laatst bestelde items"
-"Last status can't be unassigned from state.","Laatste status kan niet vanuit staat herbenoemd worden."
-"Length","Lengte"
-"Link to the New Order","link naar de nieuwe bestelling"
-"Link to the Previous Order","link naar de vorige bestelling"
-"Logo for HTML Print View","Logo voor HTML Print Weergave"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logo uitsluitend voor HTML documenten. Indien leeg, zal de standaardwaarde gebruikt worden. <br />(jpeg, gif, png)"
-"Logo for PDF Print-outs (200x50)","Logo voor PDF Print-outs (200x50)"
-"Make Check payable to:","Maak de Check betaalbaar aan:"
-"Manage","Beheer"
-"Maximum amount available to refund is %s","Maximale bedrag voor terugbetaling is %s"
-"Maximum shipping amount allowed to refund is: %s","Maximale verzendhoeveelheid toegestaan om te retourneren is: %s"
-"Message","Boodschap"
-"Message:","Bericht:"
-"Minimum Amount","Minimale hoeveelheid"
-"Minimum Order Amount","Minimale bestel-hoeveelheid"
-"Mixed","Gemengd"
-"Most Viewed","Meest bekeken"
-"Most Viewed Products Report","Meest bekeken product verslag"
-"Move to Shopping Cart","Verplaats naar Winkelwagen"
+"Total incl. tax","Total incl. tax"
"Move to Wishlist","ga naar verlanglijstje"
-"Multi-address Description Message","Meerdere adres Beschrijving Bericht"
-"Multi-address Error to Show in Shopping Cart","Meerdere adres Fout te tonen in Winkelwagen"
-"My Orders","Mijn Bestellingen"
-"My Orders - Details","Mijn bestellingen - details"
-"N/A","n.v.t."
-"Name","Naam"
-"New","Nieuw"
-"New Credit Memo","Nieuwe credietmemo"
-"New Credit Memo for Guest","Nieuwe creditnota voor Gast"
-"New Credit Memo for Invoice #%s","Nieuwe Credit Memo voor Factuur #%s"
-"New Credit Memo for Order #%s","Nieuwe Credit Memo voor Bestelling #%s"
-"New Invoice","Nieuwe Factuur"
-"New Invoice and Shipment for Order #%s","Nieuw factuur en verzending voor bestelling #%s"
-"New Invoice for Guest","Nieuw factuur voor gast"
-"New Invoice for Order #%s","Nieuwe factuur voor Order #%s"
-"New Order","Nieuwe bestelling"
-"New Order Confirmation Email Sender","Nieuwe bestelling confirmatie e-mail afzender"
-"New Order Confirmation Template","New Order Bevestiging Sjabloon"
-"New Order Confirmation Template for Guest","Nieuwe bestellingsconfirmatie template voor gast"
-"New Order RSS","Nieuwe bestelling RSS"
-"New Order Status","Nieuwe Status van de Bestelling"
-"New Order for Guest","Nieuwe bestelling voor gast"
-"New Shipment","Nieuwe Verzending"
-"New Shipment for Guest","Nieuwe verzending voor gast"
-"New Shipment for Order #%s","Nieuwe verzending voor bestelling #%s"
-"Newsletter Subscription","Nieuwsbrief abonnement"
-"No","Nee"
-"No Items","Geen items"
-"No Items To Refund","Geen items om te retourneren."
+Edit,Bewerk
+Item,item
+"Add to Cart","Voeg toe aan winkelwagen"
+Sku,Sku
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,Bestellingen
+Customer,Klant
+Guest,Gast
+"Grand Total","Groot Totaal"
+Tax,Belasting
+Shipping,Transport
+"Account Information","Account Gegevens"
+"First Name","Klant Naam"
+"Last Name","Klant Achternaam"
+Email,"Klant e-mail"
+Refresh,Ververs
+Enable,Enable
+General,General
+Yes,Ja
+Name,Naam
+Status,status
+Enabled,Enabled
+Title,Titel
+Home,Home
+Any,Any
+From,Van
+To,Aan
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,Bestelling
+"Order #%1","Order #%1"
+"Shipping Amount",Verzendingskosten
+"Tax Amount","BTW Bedrag"
+View,Bekijk
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,n.v.t.
+Ordered,Besteld
+Invoiced,Gefactureerd.
+Shipped,Verscheept
+Refunded,Geretourneerd.
+Canceled,Geannuleerd
+From:,Van:
+To:,Aan:
+"Gift Message",Cadeauboodschap
+Message:,Bericht:
+"Tier Pricing","Niveau Prijsstelling"
+"Go to Home Page","Go to Home Page"
+"Customer Group",Klantgroep
+Closed,Gesloten
+"Product Name","Product Naam"
+"Discount Amount",Kortingsbedrag
+Country,Land
+State/Province,Staat/Provincie
+"Payment Information","Profiel informatie"
+"Shipping Information",Verzendinformatie
+"Shipping Method",Verzendingsmethode
+"Clear Shopping Cart","Maak winkelwagen leeg"
+City,Stad
+"Zip/Postal Code",Zip/Postcode
+"Email Address",e-mailadres
+Company,Bedrijf
+Address,Address
+"Street Address","Adres straat"
+Telephone,telefoon
+"Save in address book","Opslaan in adresboek"
+Continue,Doorgaan
+"Order #","Order #"
"No Payment Methods","Geen betalingsmethoden"
-"No detail for number ""%s""","Geen details voor nummer ""%s"""
-"No information available.","Geen informatie beschikbaar."
+"Billing Address",Factuuradres
+"Shipping Address","Ontvangst Adres"
+"Payment Method","Naam betalingsmethode"
+Sales,Verkoop
+Created,"Gemaakt op"
+Select,Selecteren
+Comment,Commentaar
+%1,%1
+Date,Datum
+"Add New Address","Adres Toevoegen"
+"Purchase Date","Purchase Date"
+"Bill-to Name","Rekening op naam"
+"Ship-to Name","Verzenden naar Naam"
+"Order Total","Bestelling Totaalbedrag"
+"Purchase Point","Gekocht van (winkel)"
+"Recent Orders","Recente Bestellingen"
+"Store Credit","Sla Krediet op"
+Notified,Ingelicht
+"Notify Customer by Email","Licht klant in via e-mail"
+Billing,Facturatie
+"Newsletter Subscription","Nieuwsbrief abonnement"
+"Order Status","Bestelling Status"
+"Wish List","Wish List"
+Pending,"In behandeling"
+"View Order","Inzien Bestelling"
+Amount,Aantal
+Message,Boodschap
+Information,Informatie
+"Gift Options",Cadeauopties
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,Nieuw
+"Custom Price","Aangepaste prijs"
+Processing,Verwerken
+"Add To Order","Voeg toe aan bestelling"
+"Configure and Add to Order","Pas uw Order aan of Voeg een Order toe"
"No items","Geen artikelen"
-"No order(s) were put on hold.","Er zijn geen beselling(en) uitgesteld."
-"No order(s) were released from holding status.","Geen bestelling(en) zijn uit de wacht genomen."
-"No ordered items","geen bestelde items"
-"No shipping information available","Er is geen verzendinformatie beschikbaar"
-"Nominal Items","Nominale items"
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Nominaal item kan alleen door standalone worden gekocht. Om door te gaan, verwijder a.u.b. andere items uit de quota."
-"Nominal order registered.","Nominale bestelling geregistreerd."
-"Not Capture","Niet vastleggen"
-"Not Initialized","Niet geïnitialiseerd"
+Authorization,Autorisatie
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.","Betalingstransacties staan het opslaan van objecten niet toe."
+"Transaction ID",Transactie-ID
+"Order ID",Bestelnummer
+Void,Leeg
+"Created At","Created At"
+"Payment Method:",Betaalmethode:
+"Ship To","Verzenden naar"
+"Invalid parent block for this block","Invalid parent block for this block"
+"Grand Total (Base)","G.T. (basis)"
+"Grand Total (Purchased)","Bruto totaal (gekocht)"
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Refunded","Totaal Terugbetaalde"
+Paid,Betaald
+Coupons,Waardebonnen
+"Recently Viewed","Recent bekeken"
+"Recently Compared Products","Recent vergeleken producten"
+"Recently Viewed Products","Recent bekeken producten"
+Print,Print
+"Submit Comment","Verwerken Opmerking"
+Returned,Teruggestuurd
+"Order Date","Datum van de Bestelling"
+"Order # ","Order # "
+"Order Date: ","Datum bestelling:"
+"Comment Text","Opmerking Tekst"
+"Visible on Frontend","Zichtbaar op Voorkant"
"Not Notified","Niet gemeld"
-"Not enough valid data to save the parent transaction ID.","Niet genoeg geldige gegevens om de bovenliggende transactie-ID op te slaan."
-"Notification Not Applicable","Kennisgeving Niet van Toepassing"
-"Notified","Ingelicht"
-"Notify Customer by Email","Licht klant in via e-mail"
-"Number","Aantal"
-"Number of Invoiced Orders","Aantal gefactureerde bestellingen"
-"Number of Orders","Aantal Orders"
-"Number of Refunded Orders","Aantal Terugbetaalde Bestellingen"
-"OK","OK"
-"Offline Refunded","Offline Teruggegeven"
-"On Hold","In de wacht"
-"Online Refunded","Online Terugbetaalde"
-"Order","Bestelling"
-"Order ","Bestelling #"
-"Order %s","Bestelling # %s"
-"Order %s","Bestelling #%s"
-"Order %s %s | %s","Bestelling # %s %s | %s"
-"Order %s - %s","Bestelling #%s - %s"
-"Order API","Bestel API"
+"Please select products.","Please select products."
+Number,Aantal
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Verzending & behandeling"
+"Credit Memos",Creditnota's
+Invoices,Facturen
+"We cannot get the order instance.","We cannot get the order instance."
+"Create New Order","Maak nieuwe bestelling aan"
+"Save Order Address","Adres bestelling opslaan"
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
"Order Address Information","Bestelling Adres Informatie"
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order","Verwerken Bestelling"
+"Are you sure you want to cancel this order?","Weet u zeker dat u deze bestelling wilt annuleren?"
"Order Comment","Reactie op Bestelling"
-"Order Comment Email Sender","Bestelling Opmerking E-mail Verzender"
-"Order Comment Email Template","Bestelling opmerking over Email Template"
-"Order Comment Email Template for Guest","Bestelling opmerking van Email verzender Template voor de gast"
-"Order Comments","Opmerkingen over de Bestellingen"
-"Order Credit Memos","Kredietmemo's bestelling"
-"Order Currency:","Valuta van de bestelling:"
-"Order Date","Datum van de Bestelling"
-"Order Date (%s)","Datum van de Bestelling (%s)"
-"Order Date: ","Datum bestelling:"
-"Order Date: %s","Datum van de Bestelling: %s"
-"Order Details","Details van de Bestelling"
+"Please select a customer.","Please select a customer."
+"Create New Customer","Maak nieuwe klant aan"
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
+"Create New Order for New Customer","Maak nieuwe bestelling aan voor klant"
+"Items Ordered","items besteld"
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty","item bestelde hoeveelheid"
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - Voer aangepaste prijs inclusief belasting in"
+"* - Enter custom price excluding tax","* - Voer aangepaste prijs exclusief belasting in"
+"This product does not have any configurable options","Dit product heeft geen configureerbare opties"
+"Add Selected Product(s) to Order","Voeg geselecteerde product(en) toe aan bestelling"
+"Update Changes","Bijwerken Veranderingen"
+"Are you sure you want to delete all items from shopping cart?","Bent u er zeker van om alle producten te verwijderen uit de winkelwagen?"
+"Products in Comparison List","Producten in vergelijking Lijst"
+"Last Ordered Items","laatst bestelde items"
+"Please select a store.","Please select a store."
+"Order Totals",Subtotaal
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)","Terugbetaling Verzendkosten (incl. BTW)"
+"Refund Shipping (Excl. Tax)","Terugbetaling Verzendkosten (excl. BTW)"
+"Refund Shipping","Terugbetaling Verzendkosten"
+"Update Qty's","Aantal(en) bijwerken"
+Refund,Terugbetaling
+"Refund Offline","Offline restitutie"
+"Paid Amount","Betaald bedrag"
+"Refund Amount","Terugbetaling Bedrag"
+"Shipping Refund","Terugbetaling Verzendkosten"
"Order Grand Total","Algemeen totaal van de Bestelling"
+"Adjustment Refund",Aanpassingsbetaling
+"Adjustment Fee",Aanpassingstoeslag
+"Send Email","Stuur E-mail"
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent","De creditnota e-mail is niet verzonden"
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund","Totaal restitutie"
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment","Factuur en verzending indienen"
+"Submit Invoice","Factuur indienen"
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo",Credietmemo
+Capture,Vastleggen
+"the invoice email was sent","De factureringsmail is verzonden"
+"the invoice email is not sent","De factureringsmail is niet verzonden"
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses","Bestelling Statussen"
+"Create New Status","Stel een Nieuwe Status in"
+"Assign Status to State","Zet Status als Staat"
+"Save Status Assignment","Opdracht status opslaan"
+"Assign Order Status to State","Zet Orderstatus als Staat"
+"Assignment Information","Opdracht Informatie"
+"Order State","Status Bestelling"
+"Use Order Status As Default","Gebruik Order Status Als Standaard"
+"Visible On Frontend","Visible On Frontend"
+"Edit Order Status","Verander Orderstatus"
+"Save Status","Status opslaan"
+"New Order Status","Nieuwe Status van de Bestelling"
+"Order Status Information","Bestelling Status Informatie"
+"Status Code","Code status"
+"Status Label","Label status"
+"Store View Specific Labels","Winkel toon specifieke labels"
+"Total Paid","Totaal Betaald"
+"Total Due","Totaalbedrag verwacht"
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?","Weet u zeker dat u de betaling wilt leegmaken?"
+Hold,"In de wacht"
+hold,hold
+Unhold,Vrijgeven
+unhold,unhold
+"Are you sure you want to accept this payment?","Weet u zeker dat u deze betaling wilt accepteren?"
+"Accept Payment","Accepteer betaling"
+"Are you sure you want to deny this payment?","Weet u zeker dat u deze betaling wilt weigeren?"
+"Deny Payment","Weiger betaling"
+"Get Payment Update","Verkrijg betalings-update"
+"Invoice and Ship","Factureer en verzend"
+Invoice,Factuur
+Ship,Verstuur
+Reorder,Nabestelling
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
+"Order Credit Memos","Kredietmemo's bestelling"
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
+"Comments History",Commentaargeschiedenis
"Order History","Geschiedenis van de Bestelling"
-"Order History Info","Bestelling Geschiedenis Info"
-"Order ID","Bestelnummer"
"Order Information","Informatie over de Bestelling"
"Order Invoices","Facturen bestelling"
+Shipments,Zendingen
"Order Shipments","Verzendingen van de Bestelling"
-"Order State","Status Bestelling"
-"Order Status","Bestelling Status"
-"Order Status Information","Bestelling Status Informatie"
-"Order Statuses","Bestelling Statussen"
-"Order Subtotal","Subtotaal van de Bestelling"
-"Order Taxes Report Grouped by Tax Rates","Verzendingen Belastingen Verslag Gegroepeerd per Belastingtarieven"
-"Order Total","Bestelling Totaalbedrag"
-"Order Totals","Subtotaal"
-"Order Update","Verzendings Update"
-"Order Update for Guest","Verzendings Update voor gasten"
+Transactions,Transacties
"Order View","Kijk naar de bestelling"
-"Order credit memo","Creditnota van bestelling"
-"Order does not allow to be canceled.","Niet mogelijk om bestelling the annuleren."
-"Order invoice","Factuur van de bestelling"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","Bestelling is opgeschort omdat er waarschijnlijk is gefraudeerd."
-"Order object is not specified.","Bestellings object wordt niet gespecificeerd."
-"Order saving error: %s","Fout bij het opslaan van bestelling: %s"
-"Order shipments","Bestelling verschepingen"
-"Order status does not exist.","Status bestelling bestaat niet."
-"Order status with the same status code already exist.","Status bestelling bestaat al met dezelfde status code."
-"Order was placed using %s","Bestelling werd geplaatst met behulp van %s"
-"Ordered","Besteld"
-"Ordered amount of %s.","Bestelde hoeveelheid van %s."
-"Ordering amount of %s is pending approval on gateway.","In afwachting van goedkeuring bestelde hoeveelheid van %s."
-"Orders","Bestellingen"
-"Orders and Returns","Bestellingen en Teruggaven"
-"Orders and Returns Search Form","Bestellingen en Teruggaven Zoekscherm"
-"Original Price","Originele prijs"
-"Original order item that recurring payment corresponds to.","Oorspronkelijke volgorde van item waar een terugkerend betalings profiel mee overeenkomt."
-"PDF Credit Memos","PDF Kredietmemo's"
-"PDF Invoices","PDF-facturen"
-"PDF Packing Slips","PDF Packing Slips"
-"PDF Print-outs","PDF Print-outs"
-"PDF object is not specified.","PDF-object is niet gespecificeerd."
-"PDF page object is not specified.","PDF-pagina object wordt niet gespecificeerd."
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","PDF totaal model moet het volgende uitbreiden: \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal"
-"Package","Pakket"
-"Package types are disregarded for USPS domestic shipments.","Pakketten worden buiten beschouwing gelaten voor binnenlandse zendingen van USPS."
-"Packages","Pakketen"
-"Packing Slip # ","Packing Slip #"
-"Paid","Betaald"
-"Paid Amount","Betaald bedrag"
-"Parent Transaction ID","Ouder transactie ID"
-"Parent transaction ID must have a transaction ID.","Bovenliggende transactie-ID moeten beschikken over een transactie-ID."
-"Partial","Gedeeltelijke"
-"Payment Failed","Betaling Mislukt"
-"Payment Information","Betaalinformatie"
-"Payment Method","Betaalwijze"
-"Payment Method","Naam betalingsmethode"
-"Payment Method:","Betaalmethode:"
-"Payment Review","Betalings Review"
-"Payment disallow storing objects.","Betaling weigert opslag van objecten."
-"Payment transactions disallow storing objects.","Betalingstransacties staan het opslaan van objecten niet toe."
-"Payment type","Type betaling"
-"Payment update has been made.","Betaling actualisering heeft plaatsgevonden."
-"Pending","In behandeling"
-"Pending Payment","In afwachting van betaling"
-"Period","Periode"
-"Placed from IP","Geplaatst van IP"
-"Please Select Products to Add","Selecteer producten om toe te voegen alstublieft"
-"Please Select a Customer","Selecteer een klant"
-"Please Select a Store","Selecteer een winkel"
-"Please check billing address information. %s","Gelieve rekeningadres informatie te controleren. %s"
-"Please check shipping address information. %s","Gelieve bezorgingsadres informatie te controleren, %s"
-"Please define PDF object before using.","Gelieve PDF-object nader te omschrijven voor gebruik."
-"Please enter positive number in this field.","Gelieve positief getal invullen in dit veld."
-"Please select a valid payment method.","Gelieve een geldige betalingsmethode te selecteren."
-"Please specify a shipping method.","Gelieve een bezorgingsmethode te specificeren."
-"Please specify a valid grid column alias name that exists in grid table.","Geef een geldige rasterkolom alias naam die bestaat in raster tabel."
-"Price","prijs"
-"Print","Print"
-"Print All","Alles afdrukken"
-"Print All Invoices","Alle facturen printen"
-"Print All Refunds","Print Alle restituties"
-"Print All Shipments","Print alle zendingen"
-"Print Credit Memos","Print Kredietmemo's"
-"Print Invoice","Print Factuur"
-"Print Invoices","Facturen afdrukken"
-"Print Order","Print Order"
-"Print Order # %s","Print Order # %s"
-"Print Packing Slips","Print Packing Slips"
-"Print Refund","Print Refund"
-"Print Shipment","Print Zending"
-"Print Shipping Label","Verzendingslabel printen"
-"Print Shipping Labels","Print Verscheping Labels"
-"Processing","Verwerken"
-"Product","Product"
-"Product Name","Product Naam"
-"Products","producten"
-"Products Bestsellers Report","Producten Bestsellers Verslag"
-"Products in Comparison List","Producten in vergelijking Lijst"
-"Products should be added to package(s)","Product moet worden toegevoegd aan het pakket/de pakketjes"
-"Payment #%s","Profiel #%s"
-"Payment Information","Profiel informatie"
-"Payment State","Profiel Staat"
-"Profit","Winst"
-"Promotion Coupons Usage Report","Promotie Coupons Gebruiksrapport"
-"Proper payment object must be set.","Correct betalingsobject moet worden ingesteld."
-"Purchase Order Number:","Aankoop Bestellingsnummer:"
-"Purchase Point","Gekocht van (winkel)"
-"Purchased Date","Gekocht Op"
-"Purchased From","Gekocht Van"
-"Purchased Item","Gekocht artikel"
-"Qty","hoeveelheid"
-"Qty Invoiced","Aantal Gefactureerd"
-"Qty Ordered","Aantal Besteld"
-"Qty Shipped","Aantal verzonden"
-"Qty To Add","Aantal om toe te voegen"
-"Qty to Add","Qty toe te voegen"
-"Qty to Invoice","Aantal op Factuur"
-"Qty to Refund","Aantal om restitutie te geven"
-"Qty to Ship","Hoeveelheid om te verzenden"
-"Quantity Ordered","Bestelde hoeveelheid"
-"Quote item id is not received.","I.D. van het quote product is niet ontvangen."
-"Quote item is not loaded.","Quote product is niet geladen."
-"Rate","Verhouding"
-"Recent Orders","Recente Bestellingen"
-"Recently Compared Products","Recent vergeleken producten"
-"Recently Viewed","Recent bekeken"
-"Recently Viewed Products","Recent bekeken producten"
-"Recurring Payment # %s","Terugkerend Profiel # %s"
-"Recurring Payment Initial Fee","Terugkerend Profiel Aanvangstarief"
-"Recurring Payments","Terugkerende Profielen"
-"Recurring Payments (beta)","Terugkerende Profielen (beta)"
-"Reference ID","Referentie ID"
-"Reference ID:","Referentie ID:"
-"Refresh","Ververs"
-"Refund","Terugbetaling"
-"Refund #","Terugbetaling #"
-"Refund #%s","Restitutie #%s"
-"Refund Amount","Terugbetaling Bedrag"
-"Refund Offline","Offline restitutie"
-"Refund Shipping","Terugbetaling Verzendkosten"
-"Refund Shipping (Excl. Tax)","Terugbetaling Verzendkosten (excl. BTW)"
-"Refund Shipping (Incl. Tax)","Terugbetaling Verzendkosten (incl. BTW)"
-"Refund Totals","Totale Terugbetalingen"
-"Refunded","Geretourneerd."
-"Refunded amount of %s offline.","Terugbetaald bedrag van %s offline."
-"Refunded amount of %s online.","Terugbetaald bedrag van %s online."
-"Refunds","Restituties"
-"Registered a Void notification.","Geregistreerd als Leeg bericht."
-"Registered notification about approved payment.","Notificatie over goedgekeurde betaling is opgeslagen."
-"Registered notification about captured amount of %s.","Geregistreerde mededeling over bemachtigd bedrag van %s."
-"Registered notification about denied payment.","Geregistreerde mededeling over geweigerde betaling."
-"Registered notification about refunded amount of %s.","Geregistreerd bericht over terugbetaalde bedrag van %s."
-"Registered update about approved payment.","Geregistreerde bijwerking over goedgekeurde betaling."
-"Registered update about denied payment.","Update over geweigerde betaling."
-"Regular Payment","Overboeking"
-"Related Orders","Gerelateerde Bestellingen"
-"Remove","weghalen"
-"Remove Coupon Code","haal couponcode weg"
-"Remove tracking number","Verwijder volgnummer"
-"Reorder","Nabestelling"
-"Retrieve credit memo info","Ophalen creditnota info"
-"Retrieve credit memo information","Haal creditnota informatie op"
-"Retrieve credit memo list","Ophalen creditnota lijst"
-"Retrieve invoice info","Factuur informatie ohpalen"
-"Retrieve invoice information","Ophalen factuur informatie"
-"Retrieve list of credit memos by filters","Ophalen lijst van creditnota's door filters"
-"Retrieve list of invoices by filters","Ophalen lijst van facturen gesorteerd op filters"
-"Retrieve list of orders by filters","Ophalen lijst van bestellingen gesorteerd op filters"
-"Retrieve list of shipments by filters","Lijst van verzendingen via filters ophalen"
-"Retrieve order information","Ophalen bestelling informatie"
-"Retrieve orders info","Ophalen bestellingen info"
-"Retrieve shipment info","Ophalen info verzending"
-"Retrieve shipment information","Ophalen zending informatie"
-"Return to Stock","Keer terug naar Voorraad"
-"Returned","Teruggestuurd"
-"Returns","Teruggaven"
-"Revenue","Inkomsten"
-"Row Subtotal","rij van het subtotaal"
-"Row Total","Rij Totaal"
-"SHIP TO:","VERZENDEN NAAR:"
-"SKU","Sku"
-"SOLD TO:","VERKOCHT AAN:"
-"Sales","Verkoop"
-"Sales Discount","Uitverkoop Korting"
-"Sales Emails","Verkoopemails"
-"Sales Emails Section","Uitverkoop E-mails Sectie"
-"Sales Invoice Print View","Uitverkoop Factuur Print Weergave"
-"Sales Items","Verkopen Artikelen"
-"Sales Order Print View","Verkooporder afdrukweergave"
-"Sales Section","Verkopen Sectie"
-"Sales Shipment Print View","Verkoop verzending print aanblik"
-"Sales Shipping","Verzend Verkoop"
-"Sales Tax","Verkopen BTW"
-"Sales Total","Verkopen Totaalbedrag"
-"Same As Billing Address","Zelfde als Factuuradres"
-"Save Order Address","Adres bestelling opslaan"
-"Save Status","Status opslaan"
-"Save Status Assignment","Opdracht status opslaan"
-"Save in address book","Opslaan in adresboek"
-"Schedule","Schema"
-"Select","Selecteren"
-"Select All","Selecteer Alles"
-"Select from existing customer addresses:","Selecteer van bestaande klantadressen:"
-"Send Credit Memo Comment Email Copy To","Stuur Creditnota Opmerking E-mail Kopie naar"
-"Send Credit Memo Comments Email Copy Method","Stuur Kredietnota Commentaar E-mail Kopieer Methode"
-"Send Credit Memo Email Copy Method","Stuur Kredietnota E-mail Kopieer Methode"
-"Send Credit Memo Email Copy To","Stuur Creditnota E-mail Kopie Naar"
-"Send Email","Stuur E-mail"
-"Send Invoice Comment Email Copy To","Stuur Factuur Opmerking E-mail Kopie Naar"
-"Send Invoice Comments Email Copy Method","Verstuur factuur commentaren email kopieer methode"
-"Send Invoice Email Copy Method","Verstuur factuur email kopieer methode"
-"Send Invoice Email Copy To","Verstuur factuur email kopie naar"
-"Send Order Comment Email Copy To","Stuur Bestelling Opmerking E-mail Kopie Naar"
-"Send Order Comments Email Copy Method","Verstuur bestelling commentaar email kopie methode"
-"Send Order Email","Verzend email over bestelling"
-"Send Order Email Copy Method","Stuur Bestelling E-mail Kopie Methode"
-"Send Order Email Copy To","Stuur Bestelling E-mail Kopie Naar"
-"Send Sales Emails","Stuur Sales E-mails"
-"Send Shipment Comment Email Copy To","Stuur Kopie van Verzendingsreactie-Email naar"
-"Send Shipment Comments Email Copy Method","Stuur Verzending Commentaar E-mail Kopieer Methode"
-"Send Shipment Email Copy Method","Verstuur verzending email kopie methode"
-"Send Shipment Email Copy To","Verstuur verzending email kopie naar"
-"Send Tracking Information","Stuur Volginformatie"
-"Set order for existing transactions not allowed","Volgorde voor bestaande transactie niet toegestaan"
-"Ship","Verstuur"
-"Ship Date","Datum waarop Verstuurd"
-"Ship To","Verzenden naar"
-"Ship-to Name","Verzenden naar Naam"
-"Shipment","Zending #"
-"Shipment","Verzending"
-"Shipment %1$s | %3$s (%2$s)","Zending #%1$s | %3$s (%2$s)"
-"Shipment %s","Zending #%s"
-"Shipment Comment Email Sender","Zending Opmerking E-mail Verzender"
-"Shipment Comment Email Template","Zending Opmerking E-mail Sjabloon"
-"Shipment Comment Email Template for Guest","Zending Opmerking E-mail Sjabloon voor Gast"
-"Shipment Comments","Verzendings Reacties"
-"Shipment Email Sender","Zending E-mail Verzender"
-"Shipment Email Template","Zending E-mail Sjabloon"
-"Shipment Email Template for Guest","Zending E-mail Sjabloon voor Gast"
-"Shipment Update","Verzending update"
-"Shipment Update for Guest","Zending Bijwerking voor Gast"
-"Shipments","Zendingen"
-"Shipped","Verscheept"
-"Shipped By","Verzonden door"
-"Shipping","Transport"
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
"Shipping & Handling","Verzending & Transport"
-"Shipping & Handling","Verzending & behandeling"
-"Shipping & Handling Information","Verzending & administratie informatie"
-"Shipping Address","Ontvangst Adres"
-"Shipping Amount","Verzendingskosten"
-"Shipping Information","Verzendinformatie"
-"Shipping Method","Verzendingsmethode"
-"Shipping Method:","Verzendmethode:"
-"Shipping Refund","Terugbetaling Verzendkosten"
-"Shipping and Tracking Information","Zending en Volg Informatie"
-"Shopping Cart","Winkelmandje"
-"Show Packages","Pakketten tonen"
-"Signature Confirmation","Bevestiging handtekening"
-"Signed Up From","Aangemeld vanaf"
-"Size","Grote"
-"Sku","Sku"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Sommige van onderstaande produkten hebben niet alle benodigde opties. Pas ze aan en configureer alle benodigde opties."
-"Sorry, no quotes are available for this order at this time.","Sorry, op dit moment zijn er geen offertes beschikbaar voor deze bestelling."
-"Source object is not specified.","Bron object is niet gespecificeerd"
-"Specified profile does not exist.","Opgegeven profiel bestaat niet."
-"State Code [State Title]","Code staat [Titel staat]"
-"State/Province","Staat/Provincie"
-"Status","status"
-"Status Code","Code status"
-"Status Label","Label status"
-"Status:","Status:"
-"Store Credit","Sla Krediet op"
-"Store View Specific Labels","Winkel toon specifieke labels"
-"Street Address","Adres straat"
-"Submit Comment","Verwerken Opmerking"
-"Submit Credit Memo","Stuur creditnota"
-"Submit Invoice","Factuur indienen"
-"Submit Invoice and Shipment","Factuur en verzending indienen"
-"Submit Order","Verwerken Bestelling"
-"Submit Shipment","Stuur Verzending"
-"Subscribe to Newsletter","Inschrijven voor nieuwsbrief"
-"Subscribe to Order Status","Abonneren op Status van bestelling"
-"Subtotal","subtotaal"
-"Subtotal after discount.","Subtotaal na korting"
-"Subtotal:","subtotaal"
-"Suspected Fraud","Verdacht tot fraude"
-"Suspend","Schorsen"
-"Suspended","Uitgesteld"
-"Tax","Belasting"
-"Tax Amount","BTW Bedrag"
-"Tax Percent","Belastingspercentage"
-"Telephone","telefoon"
-"The Order State ""%s"" must not be set manually.","De bestellingsstaat ""%s"" moet niet handmatig ingesteld worden."
-"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","Het totale adresmodel moet uitgebreid worden van \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
-"The coupon code has been accepted.","De kortingsboncode is geaccepteerd."
-"The message has been sent.","Het bericht is verzonden"
-"The message was sent.","Het bericht is verzonden."
-"The order address has been updated.","Het bestellingsadres is bijgewerkt."
-"The order email has been sent.","De bestellingsemail is verzonden."
-"The order has been cancelled.","De bestelling is geannuleerd"
-"The order has been created.","De bestelling is aangemaakt"
-"The order has been put on hold.","De bestelling is uitgesteld"
-"The order has been released from holding status.","De bestelling is vrijgemaakt uit uitgestelde status."
-"The order has not been cancelled.","De bestelling is niet geannuleerd."
-"The order status has been assigned.","De bestellingsstatus is toegewezen."
-"The order status has been saved.","De bestellingsstatus is opgeslagen."
-"The order status has been unassigned.","De toewijzing van de bestellingsstatus is ongedaan gemaakt."
-"The order was not put on hold.","De bestelling is niet uitgesteld."
-"The order was not unheld.","De bestelling is niet uit de wacht gehaald."
-"The order was placed using %s","De bestelling is geplaatst, gebruik makende van %s"
-"The order(s) cannot be canceled","De bestelling(en) kunnen niet geannuleerd worden."
+Fetch,Halen
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,sleutel
+Value,Waarde
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders","Terug naar Mijn Bestellingen"
+"View Another Order","Andere bestelling bekijken"
+"About Your Refund","Over Uw Terugbetaling"
+"My Orders","Mijn Bestellingen"
+"About Your Invoice","Over Uw Factuur"
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged","Totaalbedrag dat zal worden gefactureerd"
+Unassign,"Wijs niet toe"
+"We sent the message.","We sent the message."
+"This order no longer exists.","Deze bestelling bestaat niet meer."
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
"The payment has been accepted.","De betaling is geaccepteerd."
"The payment has been denied.","De betaling is geweigerd"
-"The payment has been voided.","De betaling is leeggemaakt."
-"The profile has been updated.","Het profiel is geüpdate."
-"The profile has no changes.","Het profiel is niet veranderd."
-"The profile state has been updated.","De profielstatus is geüpdate."
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","De hoeveelheid die u wilt toevoegen is groter dan de totale verzonden hoeveelheid van een aantal van de geselecteerde producten."
-"The requested Payment Method is not available.","De aangevraagde betaalmethode is niet beschikbaar."
-"The shipping label has been created.","Het verzendingslabel is aangemaakt."
-"The transaction ""%s"" (%s) is already closed.","De transactie ""%s"" (%s) is al gesloten."
-"The transaction ""%s"" cannot be captured yet.","De transactie ""%s"" kan nog niet opgenomen worden."
-"The value that you entered is not valid.","De door u ingevoerde waarde is niet juist."
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.","Er zijn geen beselling(en) uitgesteld."
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
"There are no printable documents related to selected orders.","Er zijn geen printbare documenten gerelateerd aan de geselecteerde bestellingen."
-"There are no shipping labels related to selected %s.","Er zijn geen verschepingslabels gerelateerd aan de geselecteerde %s."
+"The payment has been voided.","De betaling is leeggemaakt."
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.","De kortingsboncode is geaccepteerd."
+"New Order","Nieuwe bestelling"
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice","Nieuwe Factuur"
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
+"Create New Order Status","Maak een Nieuwe Orderstatus"
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.","Er is een fout opgetreden tijdens het toewijzen van uw orderstatus. Status is niet toegewezen."
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
+"Orders and Returns","Bestellingen en Teruggaven"
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State","Onbekende Staat"
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status","Onbekende Status"
+Backordered,Nabesteld
+Partial,Gedeeltelijke
+Mixed,Gemengd
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
+"Registered a Void notification.","Geregistreerd als Leeg bericht."
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.","De betaling is online goedgekeurd"
"There is no need to approve this payment.","Er is geen nood om deze betaling te accepteren."
+"Registered notification about approved payment.","Notificatie over goedgekeurde betaling is opgeslagen."
+"Denied the payment online","Denied the payment online"
"There is no need to deny this payment.","Het is niet nodig om deze betaling te weigeren."
+"Registered notification about denied payment.","Geregistreerde mededeling over geweigerde betaling."
+"Registered update about approved payment.","Geregistreerde bijwerking over goedgekeurde betaling."
+"Registered update about denied payment.","Update over geweigerde betaling."
"There is no update for the payment.","Er is geen update voor de betaling."
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Dit bericht zal worden laten zien in de winkelwagen, wanneer het subtotaal na kortingen lager is dan de minimale hoeveelheid."
-"This operation requires an existing transaction object.","Deze handeling vereist een bestaand transactie object"
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Deze order bevat (%s) items en kan daarom op dit moment niet bewerkt worden met de admin interface, als u door wilt gaan met bewerken worden de (%s) items verwijderd, de bestelling zal geannuleerd worden en een nieuwe bestelling zal worden geplaatst."
-"This order no longer exists.","Deze bestelling bestaat niet meer."
-"This product does not have any configurable options","Dit product heeft geen configureerbare opties"
-"This profile state cannot be changed to ""%s"".","De profielstaat kan niet veranderd worden naar ""%s""."
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Dit zal een offline teruggaaf maken. Om een online teruggaaf te maken opent u een factuur en maakt u daar een credietmemo voor. Wilt u doorgaan?"
-"Tier Pricing","Niveau Prijsstelling"
-"Title","Titel"
-"To","Aan"
-"To Name","Te benoemen"
-"To:","Aan:"
-"Total","Totaal"
-"Total %d product(s)","totaal ... producten"
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.","Nietig verklaarde autorisatie."
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
+"Set order for existing transactions not allowed","Volgorde voor bestaande transactie niet toegestaan"
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
+"Shipping Method:",Verzendmethode:
+"Total Shipping Charges","Totaal Verzendkosten"
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
"Total (ex)","Totaal (ex)"
"Total (inc)","Totaalbedrag (incl.)"
-"Total Due","Totaalbedrag verwacht"
-"Total Invoiced","Totale Gefactureerde"
-"Total Invoiced Paid","Totaal Gefactureerd Betaald"
-"Total Invoiced VS Paid Report","Totaal Gefactureerd VS Betaald Rapport"
-"Total Invoiced not Paid","Totaal Gefactureerd niet Betaald"
-"Total Ordered Report","Totaal besteld rapport"
-"Total Paid","Totaal Betaald"
-"Total Quantity","Totaal Aant."
-"Total Refund","Totaal restitutie"
-"Total Refunded","Totaal Terugbetaalde"
-"Total Refunded Report","Totaal geretourneerd rapport"
-"Total Sales Shipping","De Totale Verzendings verkopen"
-"Total Shipped Report","Totaal verzonden rapport"
-"Total Shipping","Totaal Verzonden"
-"Total Shipping Charges","Totaal Verzendkosten"
+"Credit Memo # ","Credit Memo # "
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
+"Packing Slip # ","Packing Slip #"
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
+"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","Het totale adresmodel moet uitgebreid worden van \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
+"Subscription Items","Subscription Items"
+"Regular Payment",Overboeking
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.","De aangevraagde betaalmethode is niet beschikbaar."
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.","Gelieve een bezorgingsmethode te specificeren."
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.","Gelieve een geldige betalingsmethode te selecteren."
+"Pending Payment","In afwachting van betaling"
+"On Hold","In de wacht"
+Complete,Gereed
+"Suspected Fraud","Verdacht tot fraude"
+"Payment Review","Betalings Review"
+"Changing address information will not recalculate shipping, tax or other order amount.","Bij het veranderen van adres informatie worden de verzendkosten, belastingskosten of andere bestellings hoeveelheden niet aangepast."
+"Order Comments","Opmerkingen over de Bestellingen"
+"Order Currency:","Valuta van de bestelling:"
+"Select from existing customer addresses:","Selecteer van bestaande klantadressen:"
+"Same As Billing Address","Zelfde als Factuuradres"
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order","Cadeauboodschap voor de gehele bestelling"
+"Move to Shopping Cart","Verplaats naar Winkelwagen"
+"Subscribe to Newsletter","Inschrijven voor nieuwsbrief"
+"Click to change shipping method","Klik om verzendwijze te wijzigen"
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates","Verkrijg verzendmethodes en verhoudingen"
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments","Voeg commentaar toe"
+"Email Order Confirmation","Bevestiging van bestelling emailen"
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund","items om te retourneren"
+"Return to Stock","Keer terug naar Voorraad"
+"Qty to Refund","Aantal om restitutie te geven"
+"Row Total","Rij Totaal"
+"No Items To Refund","Geen items om te retourneren."
+"Credit Memo Comments","Credietmemo commentaar"
+"Refund Totals","Totale Terugbetalingen"
+"Email Copy of Credit Memo","E-mail een kopie van de credietmemo"
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded","items geretourneerd"
+"No Items","Geen items"
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment","Maak verzending aan"
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice","Aantal op Factuur"
+"Invoice History","Invoice History"
+"Invoice Comments",Factuurcommentaar
+"Invoice Totals","Invoice Totals"
+"Capture Amount","Vastleggen Bedrag"
+"Capture Online","Online Vastleggen"
+"Capture Offline","Offline Vastleggen"
+"Not Capture","Niet vastleggen"
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
+"Email Copy of Invoice","Kopie van factuur emailen"
+"Items Invoiced","items gefactureerd"
"Total Tax","Totale Belasting"
-"Total Weight","Totaal Gewicht"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","Totaal model moet worden uitgebreid van \Magento\Sales\Model\Order\Total\AbstractTotal."
-"Track Order","Track zending"
-"Track all shipment(s)","Volg alle zending(en)"
-"Track all shipments","Alle verzendingen volgen"
-"Track this shipment","Track deze zending"
-"Track your order","Volg uw bestelling"
-"Tracking","Volgen"
-"Tracking Number","Volgnummer"
-"Tracking Number(s):","Volgnummer(s):"
-"Transaction ""%s"" was already processed.","Transactie ""%s"" was al verwerkt."
-"Transaction # %s | %s","Transactie # %s | %s"
-"Transaction ID","Transactie-ID"
-"Transaction ID must not be empty.","Transactie ID mag niet leeg zijn."
-"Transaction ID: ""%s"".","Transactie ID: ""%s""."
+"From Name","Vanaf naam"
+"To Name","Te benoemen"
+"Add Order Comments","Voeg bestelcommentaar toe"
+"Notification Not Applicable","Kennisgeving Niet van Toepassing"
+"the order confirmation email was sent","De bestellingsbevestiging-mail is verzonden"
+"the order confirmation email is not sent","De bestellingsbevestiging-mail is niet verzonden"
+"Order Date (%1)","Order Date (%1)"
+"Purchased From","Gekocht Van"
+"Link to the New Order","link naar de nieuwe bestelling"
+"Link to the Previous Order","link naar de vorige bestelling"
+"Placed from IP","Geplaatst van IP"
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status","Artikel Status"
+"Original Price","Originele prijs"
+"Tax Percent",Belastingspercentage
+"Transaction Data","Transaction Data"
+"Parent Transaction ID","Ouder transactie ID"
"Transaction Type","Type transactie"
-"Transactions","Transacties"
-"Trial ","Proef"
-"Trial Payment","Proefbetaling"
-"Trial Period","Trial Periode"
-"Trial period payment","Proefperiode betaling"
-"Type","Type"
-"Unassign","Wijs niet toe"
-"Unhold","Vrijgeven"
-"Unhold action is not available.","Standby actie is niet beschikbaar."
-"Unhold order","Vrijgeven bestelling"
-"Unknown State","Onbekende Staat"
-"Unknown Status","Onbekende Status"
-"Unsupported transaction type ""%s"".","Niet ondersteund transactie type ""%s""."
-"Update Changes","Bijwerken Veranderingen"
-"Update Items and Qty's","aanpassen items en hoeveelheden"
-"Update Qty's","Aantal(en) bijwerken"
-"Updated","Geüpdate op"
-"Updated:","Bijgewerkt:"
-"Use Aggregated Data (beta)","Gebruik Verzamelde Data (beta)"
-"Use Order Status As Default","Gebruik Order Status Als Standaard"
-"Validate Each Address Separately in Multi-address Checkout","Valideer Ieder Adress Apart in Multi-Adres Afrekening"
-"Value","Waarde"
-"View","Bekijk"
-"View All","Bekijk Alles"
-"View Another Order","Andere bestelling bekijken"
-"View Order","Inzien Bestelling"
-"Visible on Frontend","Zichtbaar op Voorkant"
-"Void","Leeg"
-"Void invoice","Lege Factuur"
-"Voided authorization.","Nietig verklaarde autorisatie."
-"Website","Website"
-"Weight","Gewicht"
-"Whether buyer can define the date when billing for the profile begins.","Of koper kan de datum kan bepalen wanneer de facturering voor het profiel begint."
-"Width","Breedte"
-"Wishlist","Verlanglijst"
-"Wrong quote item id to update configuration.","Verkeerde quote artikel id voor update configuratie."
-"Wrong state: ""%s"".","Verkeerde status: ""%s""."
-"Yes","Ja"
-"You can leave a box blank if you don't wish to add a gift message for whole order","U kunt een doos leeg laten als u geen cadeauboodschap voor de hele bestelling wilt toevoegen"
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
+"Gift Message for this Order","Cadeau bericht voor deze Order"
+"Shipped By","Verzonden door"
+"Tracking Number",Volgnummer
+"Billing Last Name","Rekening Achternaam"
+"Find Order By:","Vind een bestelling door:"
+"ZIP Code","ZIP Code"
+"Billing ZIP Code","Postcode betaling"
+"Print All Refunds","Print Alle restituties"
+"Refund #","Terugbetaling #"
+"Print Refund","Print Refund"
"You have placed no orders.","U heeft geen bestellingen geplaatst."
-"You will be redirected to the payment system website.","U zal worden omgeleid naar de website van het betalingssysteem."
-"Your credit card will be charged for","Uw creditcard zal in rekening gebracht worden voor"
-"ZIP/Post Code","Postcode"
-"Zip/Postal Code","Zip/Postcode"
-"cm","cm"
-"in","in"
-"kg","KG"
-"lb","Pond"
-"the credit memo email is not sent","De creditnota e-mail is niet verzonden"
-"the credit memo email was sent","De credietmemo e-mail is verzonden"
-"the invoice email is not sent","De factureringsmail is niet verzonden"
-"the invoice email was sent","De factureringsmail is verzonden"
-"the order confirmation email is not sent","De bestellingsbevestiging-mail is niet verzonden"
-"the order confirmation email was sent","De bestellingsbevestiging-mail is verzonden"
-"the shipment email is not sent","de verzendbevestiging is niet verstuurd"
-"the shipment email was sent","De verzendingsmail is verzonden"
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available","Er is geen verzendinformatie beschikbaar"
+"Print Order","Print Order"
+"Subscribe to Order Status","Abonneren op Status van bestelling"
+"Print All Invoices","Alle facturen printen"
+"Invoice #","Factuur #"
+"Print Invoice","Print Factuur"
+"Qty Invoiced","Aantal Gefactureerd"
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
+"Items Shipped","Verzonden artikelen"
+"Qty Shipped","Aantal verzonden"
+"View All","Bekijk Alles"
+"Gift Message for This Order","Cadeau-bericht voor deze bestelling"
+"About Your Order","Over uw bestelling"
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title","Anker Custom Titel"
+Phone,Phone
+"Default Template","Vaststaand Sjabloon"
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
+"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
+"Minimum Amount","Minimum Amount"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
+"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
+"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
+"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
+"New Order Confirmation Template","New Order Confirmation Template"
+"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
+"Order Comment Email Sender","Order Comment Email Sender"
+"Order Comment Email Template","Order Comment Email Template"
+"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,Verzending
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
+"Orders and Returns Search Form","Bestellingen en Teruggaven Zoekscherm"
+"PDF Credit Memos","PDF Kredietmemo's"
+"PDF Invoices",PDF-facturen
+"Invoice Date",Factuurdatum
+"ZIP/Post Code",Postcode
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS","Nieuwe bestelling RSS"
+"Print Invoices","Facturen afdrukken"
+"Print Packing Slips","Print Packing Slips"
+"Print Credit Memos","Print Kredietmemo's"
+"Print All","Alles afdrukken"
+"Print Shipping Labels","Print Verscheping Labels"
+"Ship Date","Datum waarop Verstuurd"
+"Total Quantity","Totaal Aant."
+"Default Status","Standaard Status"
+"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)."
diff --git a/app/code/Magento/Sales/i18n/pt_BR.csv b/app/code/Magento/Sales/i18n/pt_BR.csv
index cc7d518eb5f..cd9b7f88ce0 100644
--- a/app/code/Magento/Sales/i18n/pt_BR.csv
+++ b/app/code/Magento/Sales/i18n/pt_BR.csv
@@ -1,846 +1,712 @@
-"""%s"" coupon code is not valid.","""%s"" o código do cupom não é válido"
-"%s","%s"
-"%s / %s rate:","%s / %s preço:"
-"%s for %s","%s por %s"
-"%s order(s) cannot be canceled","%s pedido(s) não pode ser cancelado"
-"%s order(s) have been canceled.","%s ordens foram canceladas."
-"%s order(s) have been put on hold.","%s ordens foram colocadas em espera."
-"%s order(s) have been released from holding status.","%s ordens foram liberadas do estado de espera."
-"%s order(s) were not put on hold.","%s pedido(s) não foi colocado em espera"
-"%s order(s) were not released from holding status.","%s pedido(s) não foi tirado do estado de espera"
-"* - Enter custom price excluding tax","* - Insira preço personalizado sem imposto"
-"* - Enter custom price including tax","* - Insira preço personalizado com imposto"
-"-- Please Select --","- Por Favor Selecione -"
-"About This Order:","Sobre Este Pedido:"
-"About This Payment:","Sobre Este Perfil:"
-"About Your Invoice","Sobre Sua Fatura"
-"About Your Order","Sobre Seu Pedido"
-"About Your Refund","Sobre Sua Restituição"
-"About Your Shipment","Sobre Seu Pagamento"
-"Accept Payment","Pagamento Aceito"
-"Accept or Deny Payment","Aceitar ou Recusar Pagamento"
-"Account Information","Informações da Conta"
-"Action","Ação"
-"Actions","Ações"
-"Activate","Ativar"
-"Active","Ativo"
-"Add","Adicionar"
-"Add New Address","Adicionar Novo Endereço"
-"Add Order Comments","Adicionar Comentários ao Pedido"
-"Add Package","Adicionar Pacote"
+Remove,Remover
+Close,Fechar
+Cancel,Cancelar
+Back,Voltar
"Add Products","Adicionar produtos"
-"Add Selected Product(s) to Option","Adicionar Produto(s) Selecionado para Opção"
-"Add Selected Product(s) to Order","Adicionar Produto(s) Selecionado ao Pedido"
-"Add Selected Product(s) to Package","Adicionar Produto(s) Selecionado ao Pacote"
-"Add To Order","Adicionar ao Pedido"
-"Add Tracking Number","Adicionar Número de Rastreio"
-"Add comment to order","Adicionar comentário ao pedido"
-"Add new comment to credit memo","Adicionar novo comentário a memorando de crédito"
-"Add new comment to shipment","Adicionar novo comentário para pagamento"
-"Add new tracking number","Adicionar novo número de rastreio"
-"Add to Cart","Adicionar ao carrinho"
-"Additional Product Info","Informação Adicional do Produto"
-"Address","Endereço"
-"Address model is not defined.","Modelo de endereço não definido"
-"Adjustment Fee","Taxa de ajustamento"
-"Adjustment Refund","Restituição de ajustamento"
-"Agreement Information","Informações do acordo"
-"Allow Reorder","Permitir rearranjo"
-"Amount","Valor"
-"Amount: %s.","Total: %s."
-"An error occurred while assigning order status. Status has not been assigned.","Ocorreu um erro ao atribuir status da ordem. Status não foi atribuÃdo."
-"An error occurred while creating shipping label.","Ocorreu um erro ao criar etiqueta de remessa."
-"An error occurred while saving order status. The status has not been added.","Ocorreu um erro ao salvar o estado da encomenda. O status não foi adicionado."
-"An error occurred while unassigning order status.","Ocorreu um erro ao remover a atribuição de status do pedido."
-"An error occurred while updating the order address. The address has not been changed.","Ocorreu um erro durante a atualização do endereço da ordem. O endereço não foi alterado."
-"An item option with code %s already exists.","Uma opção de item com o código %s já existe."
-"Anchor Custom Title","TÃtulo âncora personalizado"
-"Append Comments","Anexar Comentários"
-"Apply","Solicitar"
+"Update Items and Qty's","Atualizar Itens e Quantidades"
+Product,Produto
+Price,Preço
+Quantity,Quantity
+Products,Produtos
+ID,Identidade
+SKU,"Unidade de Manutenção de Estoque"
+Apply,Solicitar
+Configure,Configurar
+"Shopping Cart","Carrinho de compras"
+"Quote item id is not received.","A identidade do item cotado não foi recebida."
+"Quote item is not loaded.","O item cotado não foi carregado."
+No,Não
"Apply Coupon Code","Solicitar código do cupom"
-"Approved the payment online.","Aprovou o pagamento on-line."
-"Are you sure you want to accept this payment?","Tem certeza de que deseja aceitar este pagamento?"
-"Are you sure you want to cancel this order?","Tem certeza de que deseja cancelar esta ordem?"
-"Are you sure you want to delete all items from shopping cart?","Você tem certeza que quer excluir todos os itens do carrinho de compras?"
-"Are you sure you want to deny this payment?","Tem certeza que quer negar este pagamento?"
-"Are you sure you want to do this?","Tem certeza de que quer fazer isso?"
-"Are you sure you want to send Creditmemo email to customer?","Tem certeza de que quer enviar e-mail Creditmemo ao cliente?"
-"Are you sure you want to send Invoice email to customer?","Tem certeza de que deseja enviar e-mail fatura ao cliente?"
-"Are you sure you want to send Shipment email to customer?","Tem certeza de que deseja enviar e-mail de Remessa ao cliente?"
-"Are you sure you want to send order email to customer?","Tem certeza de que deseja enviar e-mail de encomenda ao cliente?"
-"Are you sure you want to void the payment?","Tem certeza de que deseja cancelar o pagamento?"
-"Are you sure?","Tem certeza?"
-"Are you sure? This order will be canceled and a new one will be created instead","Você tem certeza? Este pedido será cancelado e ao invés um novo será criado"
-"Assign Order Status to State","Atribuir Status do Pedido para o Estado"
-"Assign Status to State","Atribuir Status para o Estado"
-"Assignment Information","Informação de Atribuição"
-"At least a payment ID must be set.","Ao menos uma identificação de pagamento deve ser configurada."
-"Authorization","Autorização"
-"Authorized amount of %s.","Valor autorizado de %s."
-"Authorizing amount of %s is pending approval on gateway.","Autorização de valor %s está pendente de aprovação no portal."
-"Back","Voltar"
-"Back to My Orders","Voltar para Minhas Compras"
-"Back to Recurring Payments","Voltar para Perfis Recorrentes"
-"Backordered","Pendente"
-"Bestsellers","Mais vendidos"
-"Bill-to Name","Faturar para Nome"
-"Billing","Faturamento"
-"Billing Address","Endereço de faturamento"
-"Billing Last Name","Último Nome do Faturamento"
-"Billing ZIP Code","Código Postal do Faturamento"
-"Buy %s for price %s","Comprar %s pelo preço %s"
-"CSV","CSV"
-"Cancel","Cancelar"
-"Cancel credit memo","Cancelar memorando de crédito"
-"Cancel invoice","Cancelar fatura"
-"Cancel order","Cancelar compra"
-"Canceled","Cancelado"
-"Canceled order offline.","Pedido cancelado offline."
-"Canceled order online.","Pedido cancelado online."
-"Cannot add order history.","Não é possÃvel adicionar o histórico de pedidos."
-"Cannot create an empty shipment.","Não é possÃvel criar uma remessa vazia."
-"Cannot determine the field name.","Não é possÃvel determinar o nome do campo."
-"Cannot do invoice for order.","Não é possÃvel fazer a fatura para o pedido."
-"Cannot do shipment for order.","Não é possÃvel fazer a remessa para o pedido."
-"Cannot get order instance","Não é possÃvel obter a instância do pedido"
-"Cannot get the order instance.","Não é possÃvel obter a instância do pedido."
-"Cannot register an existing credit memo.","Não é possÃvel registrar uma nota de crédito existente."
-"Cannot register existing invoice","Não é possÃvel registrar fatura existente"
-"Cannot register existing shipment","Não é possÃvel registrar remessa existente"
-"Capture","Captura"
-"Capture Amount","Captura de Valor"
-"Capture Offline","Captura Offline"
-"Capture Online","Captura Online"
-"Capture invoice","Captura de fatura"
-"Captured amount of %s online.","Quantidade capturada de %s online."
-"Capturing amount of %s is pending approval on gateway.","Captura de valor de %s está pendente de aprovação no portal."
-"Carrier","Portador"
-"Carrier/Method","Transportador/Método"
-"Change status, add comments","Mudança de status, adicionar comentários"
-"Changing address information will not recalculate shipping, tax or other order amount.","Mudança de informações de endereço não recalculará o transporte, taxa ou outro valor do pedido."
-"Checkout Totals Sort Order","Verificação dos Totais de Ordem do Pedido"
-"City","Cidade"
-"Clear Shopping Cart","Limpar Carrinho de Compras"
-"Click to change shipping method","Clique para alterar método de remessa"
-"Close","Fechar"
-"Closed","Está Fechado"
-"Comma-separated.","Separados por vÃrgula."
-"Comment","Comentário"
-"Comment Text","Texto do comentário"
-"Comments","Comentários"
-"Comments History","Histórico de comentários"
-"Company","Companhia"
-"Complete","Completar"
-"Configure","Configurar"
-"Configure and Add to Order","Configurar e adicionar ao pedido"
-"Contents","Conteúdos"
-"Continue","Continue"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controlar se o IP do cliente é exibido nos pedidos, faturas, remessas e memorandos de crédito."
-"Country","PaÃs"
-"Coupons","Cupons"
-"Create","Criar"
-"Create New Customer","Criar novo cliente"
-"Create New Order","Criar novo pedido"
-"Create New Order Status","Criar novo status de pedido"
-"Create New Order for %s","Criar novo pedido para %s"
-"Create New Order for %s in %s","Criar novo pedido para %s em %s"
-"Create New Order for New Customer","Criar novo pedido para novo cliente"
-"Create New Order for New Customer in %s","Criar novo pedido para novo cliente em %s"
-"Create New Status","Criar novo status"
-"Create Order","Criar Pedido"
-"Create Packages","Criar Pacotes"
-"Create Shipment","Criar Frete"
-"Create Shipping Label","Criar Rótulo de Frete"
-"Create Shipping Label...","Criar Rótulo de Frete..."
-"Create new credit memo for order","Criar novo memorando de crédito para o pedido"
-"Create new invoice for order","Criar nova fatura para pedido"
-"Create new shipment for order","Criar novo frete para pedido"
-"Create...","Criar..."
-"Created","Criada Em"
-"Created:","Criada:"
-"Credit Memo","Criar Memorando"
-"Credit Memo #","Memorando de Crédito Nº"
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Criar Memorando Nº %1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","Criar Comentário de Memorando - Enviar E-mail"
-"Credit Memo Comment Email Template","Criar Comentário de Memorando - Modelo de E-mail"
-"Credit Memo Comment Email Template for Guest","Criar Comentário de Memorando - Modelo de E-mail para Convidado"
-"Credit Memo Comments","Criar Comentários de Memorando"
-"Credit Memo Email Sender","Comentário de Memorando de Crédito - Enviar E-mail"
-"Credit Memo Email Template","Comentário de Memorando de Crédito - Modelo de E-mail"
-"Credit Memo Email Template for Guest","Comentário de Memorando de Crédito - Modelo de E-mail para Convidado"
-"Credit Memo Update","Memorando de Crédito: Atualizar"
-"Credit Memo Update for Guest","Memorando de Crédito: Atualizar para Convidado"
-"Credit Memos","Notas de Crédito"
-"Credit memo canceling problem.","Problema de cancelamento do memorando de crédito."
-"Credit memo cannot be canceled.","Memorando de crédito não pode ser cancelado."
-"Credit memo has been created automatically","O memorando de crédito foi criado automaticamente"
-"Custom Price","Preço Aduaneiro"
-"Custom Value","Valor Aduaneiro"
-"Customer","Cliente"
-"Customer Can Define Start Date","O cliente pode definir a data de inÃcio"
-"Customer Group","Grupo de Clientes"
-"Customer My Account Order Creditmemo View","Ver Pedido Creditmemo da Minha Conta do Cliente"
-"Customer My Account Order History","Histórico de Pedido do Cliente"
-"Customer My Account Order Invoice View","Ver Faturamento do Pedido do Cliente"
-"Customer My Account Order Shipment View","Ver Pedidos Pagos do Cliente"
-"Customer My Account Order View","Ver Pedido do Cliente"
-"Customer's Current Activities","Atividades Atuais do Cliente"
-"Customs Value","Valores Aduaneiros"
-"Date","Data"
-"Default Status","Status Padrão"
-"Default Template","Modelo padrão"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png)","Logotipo padrão, será usado em documentos PDF e HTML. <br />(jpeg, tiff, png)"
-"Delete","Excluir"
-"Delete Package","Apagar Pacote"
-"Denied the payment online.","Pagamento on-line recusado"
-"Deny Payment","Recusar o Pagamento"
-"Description Message","Mensagem de Descrição"
-"Discount","Desconto"
-"Discount (%s)","Desconto (%s)"
-"Discount Amount","Quantia de Desconto"
-"Display Order ID in Header","Mostrar ID da Ordem (Pedido) no Cabeçalho"
-"Edit","Editar"
-"Edit Order #%s","Editar Ordem (Pedido) #%s"
-"Edit Order %s %s Address","Editar Endereço da Ordem (Pedido) %s %s"
-"Edit Order Status","Editar Status da Ordem (Pedido)"
-"Email","E-mail do Cliente"
-"Email Address","Endereço de e-mail"
-"Email Copy of Credit Memo","Enviar Email Cópia da Nota de Crédito"
-"Email Copy of Invoice","Enviar Email Cópia da Fatura"
-"Email Copy of Shipment","Enviar Email Cópia da Expedição"
-"Email Order Confirmation","Enviar EMail da Confirmação da Ordem (Pedido)"
-"Enable","Ativar"
-"Enabled","Ativado"
-"Enter the billing last name and email/ZIP as in the order billing address","Insira o último nome do faturamento e email/CEP como no endereço de cobrança da ordem (pedido)"
-"Entered data is incorrect. Please try again.","Dados inseridos incorretos. Por favor tente novamente."
-"Error to Show in Shopping Cart","Erro ao Mostrar no Carrinho de Compras"
-"Excel XML","Excel XML"
+"Remove Coupon Code","Remover código do cupom"
+Qty,Quant.
+Subtotal,Subtotal
+Discount,Desconto
+"Row Subtotal","Coluna de subtotal"
+Action,Ação
+"No ordered items","Nenhum item solicitado"
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,Subtotal:
"Excl. Tax","Excluir taxas"
-"Expired","Expirado"
-"Explanation","Explicação"
-"Failed to send the order email.","Falha ao enviar e-mail do pedido."
-"Failed to update the payment.","Falha ao atualizar o pagamento."
-"Failed to update the profile.","Falha ao atualizar o perfil."
-"Failed to void the payment.","Falha ao anular o pagamento."
-"Fetch","Buscar"
-"File extension not known or unsupported type in the following shipment: %s","Extensão de arquivo desconhecida ou tipo incompatÃvel no seguinte frete: %s"
-"Find Order By:","Encontrar Pedido Por:"
+Total,Total
+"Incl. Tax","Incluir taxas"
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist","Mover para lista de presentes"
+Edit,Editar
+Item,Item
+"Add to Cart","Adicionar ao carrinho"
+Sku,SKU
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,Ordens
+Customer,Cliente
+Guest,Convidado
+"Grand Total","Total geral"
+Tax,Taxas
+Shipping,Remessa
+"Account Information","Informações da Conta"
"First Name","Nome do Cliente"
-"From","De"
-"From Name","Nome do Remetente"
-"From:","De:"
-"General","Geral"
-"General Information","Informações gerais"
-"Get Payment Update","Obter Atualização de Pagamento"
-"Get Update","Obter Atualização"
-"Get shipping methods and rates","Obter tipos e taxas de frete"
+"Last Name","Último Nome do Cliente"
+Email,"E-mail do Cliente"
+Refresh,Atualizar
+Enable,Enable
+General,General
+Yes,Sim
+Name,Nome
+Status,Status
+Enabled,Enabled
+Title,TÃtulo
+Home,Home
+Any,Any
+From,De
+To,Para
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,Pedido
+"Order #%1","Order #%1"
+"Shipping Amount","Valor do Frete"
+"Tax Amount","Valor do Imposto"
+View,Ver
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,IndisponÃvel
+Ordered,Solicitado
+Invoiced,Faturado
+Shipped,Enviado
+Refunded,Reembolsado
+Canceled,Cancelado
+From:,De:
+To:,Para:
"Gift Message","Mensagem de presente"
-"Gift Message for This Order","Mensagem de Presente para Este Pedido"
-"Gift Message for the Entire Order","Mensagem de Presente para o Pedido Completo"
-"Gift Message for this Order","Mensagem de Presente para Este Pedido"
+Message:,Mensagem:
+"Tier Pricing","Preços por NÃvel"
+"Go to Home Page","Go to Home Page"
+"Customer Group","Grupo de Clientes"
+Closed,"Está Fechado"
+"Product Name","Nome do produto"
+"Discount Amount","Quantia de Desconto"
+Country,PaÃs
+State/Province,Estado/ProvÃncia
+"Payment Information","Informação do Perfil"
+"Shipping Information","Dados de Frete"
+"Shipping Method","Tipo de Frete"
+"Clear Shopping Cart","Limpar Carrinho de Compras"
+City,Cidade
+"Zip/Postal Code","Zip/Código Postal"
+"Email Address","Endereço de e-mail"
+Company,Companhia
+Address,Address
+"Street Address","Endereço da Rua"
+Telephone,Telefone
+"Save in address book","Salvar no catálogo de endereços"
+Continue,Continue
+"Order #","Order #"
+"No Payment Methods","Nenhuma Forma de Pagamento"
+"Billing Address","Endereço de faturamento"
+"Shipping Address","Endereço de Envio"
+"Payment Method","Nome do método de pagamento"
+Sales,Vendas
+Created,"Criada Em"
+Select,Selecione
+Comment,Comentário
+%1,%1
+Date,Data
+"Add New Address","Adicionar Novo Endereço"
+"Purchase Date","Purchase Date"
+"Bill-to Name","Faturar para Nome"
+"Ship-to Name","Enviar em nome de"
+"Order Total","Total do Pedido"
+"Purchase Point","Comprado de (Loja)"
+"Recent Orders","Pedidos Recentes"
+"Store Credit","Credito da loja"
+Notified,Notificado
+"Notify Customer by Email","Notificar cliente por e-mail"
+Billing,Faturamento
+"Newsletter Subscription","Assinatura do boletim informativo"
+"Order Status","Status do pedido"
+"Wish List","Wish List"
+Pending,Pendente
+"View Order","Ver Solicitação"
+Amount,Valor
+Message,Mensagem
+Information,Informações
"Gift Options","Opções de presente"
-"Gift Wrapping for the Entire Order","Embrulho para o Pedido Total"
-"Girth","Circunferência"
-"Grand Total","Total geral"
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,Novo
+"Custom Price","Preço Aduaneiro"
+Processing,Processando
+"Add To Order","Adicionar ao Pedido"
+"Configure and Add to Order","Configurar e adicionar ao pedido"
+"No items","Nenhum item"
+Authorization,Autorização
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.","Transações de pagamento não permitem armazenar objetos."
+"Transaction ID","ID da Transação"
+"Order ID","ID da Ordem"
+Void,Anular
+"Created At","Created At"
+"Payment Method:","Método de pagamento"
+"Ship To","Enviar para"
+"Invalid parent block for this block","Invalid parent block for this block"
"Grand Total (Base)","Total Geral (Moeda-Base)"
"Grand Total (Purchased)","Total Geral (Moeda da Compra)"
-"Grand Total to be Charged","Total a ser Cobrado"
-"Guest","Convidado"
-"Height","Altura"
-"Hide Customer IP","Ocultar IP do Cliente"
-"Hold","Suspender"
-"Hold action is not available.","Ação de suspender não está disponÃvel."
-"Hold order","Suspender compra"
-"ID","Identificação #"
-"ID","Identidade"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN de ""RestituÃdo"". Restituição emitida por comerciante. Notificação registrada sobre a quantidade restituÃda de %s. Identificação da transação: ""%s"""
-"If empty, the default description above will be used.","Se estiver em branco, a descrição-padrão acima será usada."
-"If empty, the default error above will be used.","Se estiver em branco, o erro-padrão acima será usado."
-"If the invoice was created offline, try creating an offline creditmemo.","Se a fatura foi criada offline, tente criar uma nota de crédito offline."
-"Incl. Tax","Incluir taxas"
-"Information","Informações"
-"Initial Fee","Taxa inicial"
-"Initial Fees","Taxas Iniciais"
-"Initial period payment","PerÃodo Inicial de Pagamento"
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Informações insuficientes para criar etiqueta(s) de envio. Por favor verifique suas Informações de Loja e Configurações de Envio"
-"Invalid block: %s.","Bloco inválido: %s."
-"Invalid carrier specified.","Transportador especificado inválido."
-"Invalid draw line data. Please define ""lines"" array.","Dados inválidos de linha de retirada. Por favor, defina matriz de ""linhas""."
-"Invalid entity model","Modelo de entidade inválido"
-"Invalid item option format.","Formato de opção de item inválido."
-"Invalid qty to invoice item ""%s""","Qtde. inválida para faturar item ""%s"""
-"Invalid qty to refund item ""%s""","Qtde. inválida para reembolsar item ""%s"""
-"Invalid qty to ship for item ""%s""","Qtde. inválida para entregar item ""%s"""
-"Invalid renderer model","Modelo de renderização inválido"
-"Invalid request for adding product to quote.","Solicitação inválida para adicionar produto a orçamento."
-"Invoice","Fatura"
-"Invoice #","Fatura Nº "
-"Invoice #%1$s | %2$s | %4$s (%3$s)","Fatura Nº %1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","Fatura Nº %s"
-"Invoice Comment Email Sender","Comentário sobre Fatura - Enviar E-mail"
-"Invoice Comment Email Template","Comentário sobre Fatura - Modelo de E-mail"
-"Invoice Comment Email Template for Guest","Comentário sobre Fatura - Modelo de E-mail para Convidado"
-"Invoice Comments","Comentários sobre Fatura"
-"Invoice Date","Data da Fatura"
-"Invoice Email Sender","Enviar Fatura por E-mail"
-"Invoice Email Template","Modelo de E-mail para Fatura"
-"Invoice Email Template for Guest","Modelo de E-mail de Fatura para Convidado"
-"Invoice Update","Atualizar Fatura"
-"Invoice Update for Guest","Atualizar Fatura para Convidado"
-"Invoice and Packing Slip Design","Design para Fatura e Guia de Remessa"
-"Invoice and Ship","Fatura e Frete"
-"Invoice canceling problem.","Problema no cancelamento da fatura."
-"Invoice cannot be canceled.","A fatura não pode ser cancelada."
-"Invoice cannot be captured.","A fatura não pode ser captada."
-"Invoice cannot be voided.","A fatura não pode ser anulada."
-"Invoice capturing problem.","Problema no recebimento da fatura"
-"Invoice void problem","Problema na anulação da fatura"
-"Invoice will be created without communication with payment gateway.","A fatura será criada sem comunicação com o gateway de pagamentos"
-"Invoiced","Faturado"
-"Invoices","Faturas"
-"Item","Item"
-"Item Status","Status do item"
-"Item object is not specified.","Objeto do item não especificado."
-"Item options declaration error.","Erro na declaração de opções do item."
-"Item ordered qty","Quantidade solicitada do item"
-"Item qty declaration error.","Erro na declaração da quantidade do item"
-"Items","Itens"
-"Items Invoiced","Itens faturados"
-"Items Ordered","Itens pedidos"
-"Items Refunded","Itens reembolsados"
-"Items Shipped","Itens remetidos"
-"Items in the Package","Itens no pacote"
-"Items maximum quantity or price do not allow checkout.","Quantidade máxima de itens ou preço não permitem o fechamento da compra."
-"Items options declaration error.","Erro na declaração de opções dos itens."
-"Items to Refund","Itens para reembolso"
-"Items to Ship","Itens para remessa"
-"Key","Senha"
-"Last Name","Último Nome do Cliente"
-"Last Ordered Items","Últimos itens pedidos"
-"Last status can't be unassigned from state.","O último estado não pode ser revertido."
-"Length","Comprimento"
-"Link to the New Order","Link para o Novo Pedido"
-"Link to the Previous Order","Link para o Pedido Anterior"
-"Logo for HTML Print View","Logotipo para Visualização em HTML"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logotipo exclusivo para documentos HTML. Se vazio, será usado o padrão. <br />(jpeg, gif, png)"
-"Logo for PDF Print-outs (200x50)","Logotipo para Impressões em PDF (200x50)"
-"Make Check payable to:","Faça Cheque nominal a:"
-"Manage","Gerenciar"
-"Maximum amount available to refund is %s","Quantia máxima a ser reembolsada: %s"
-"Maximum shipping amount allowed to refund is: %s","Valor máximo do frete passÃvel de reembolso: %s"
-"Message","Mensagem"
-"Message:","Mensagem:"
-"Minimum Amount","Valor MÃnimo"
-"Minimum Order Amount","Valor MÃnimo do Pedido"
-"Mixed","Misto"
-"Most Viewed","Mais vistos"
-"Most Viewed Products Report","Relatório dos Produtos mais Vistos"
-"Move to Shopping Cart","Mover para Carrinho de Compras"
-"Move to Wishlist","Mover para lista de presentes"
-"Multi-address Description Message","Mensagem Descritiva para Vários Endereços"
-"Multi-address Error to Show in Shopping Cart","Erro Relativo a Vários Endereços Exibido no Carrinho"
-"My Orders","Meus Pedidos"
-"My Orders - Details","Meus Pedidos - Detalhes"
-"N/A","IndisponÃvel"
-"Name","Nome"
-"New","Novo"
-"New Credit Memo","Novo Memorando de Crédito"
-"New Credit Memo for Guest","Novo Memorando de Crédito para Convidado"
-"New Credit Memo for Invoice #%s","Novo Memorando de Crédito para Fatura #%s"
-"New Credit Memo for Order #%s","Nota de Novo Crédito para Pedido nº %s"
-"New Invoice","Nova Fatura"
-"New Invoice and Shipment for Order #%s","Nova Fatura e Frete para Pedido Nº %s"
-"New Invoice for Guest","Nova Fatura para Convidado"
-"New Invoice for Order #%s","Nova Fatura para Pedido Nº %s"
-"New Order","Novo Pedido"
-"New Order Confirmation Email Sender","Novo Pedido - Enviar E-mail de Confirmação"
-"New Order Confirmation Template","Novo Pedido - Modelo de Confirmação"
-"New Order Confirmation Template for Guest","Novo Pedido - Modelo de Confirmação para Convidado"
-"New Order RSS","Novo Pedido - RSS"
-"New Order Status","Status do Novo Pedido"
-"New Order for Guest","Novo Pedido para Convidado"
-"New Shipment","Nova Remessa"
-"New Shipment for Guest","Novo Frete para Convidado"
-"New Shipment for Order #%s","Novo Frete para Pedido Nº %s"
-"Newsletter Subscription","Assinatura do boletim informativo"
-"No","Não"
-"No Items","Nenhum Item"
-"No Items To Refund","Nenhum Item para Reembolso"
-"No Payment Methods","Nenhuma Forma de Pagamento"
-"No detail for number ""%s""","Nenhum detalhe para número ""%s"""
-"No information available.","Nenhuma informação disponÃvel"
-"No items","Nenhum item"
-"No order(s) were put on hold.","Nenhum pedido suspenso temporariamente."
-"No order(s) were released from holding status.","Nenhum pedido liberado do estado de espera."
-"No ordered items","Nenhum item solicitado"
-"No shipping information available","Não há informações de remessa"
-"Nominal Items","Itens nominais"
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","O item nominal deve ser comprado individualmente. Para continuar, remova os outros itens da cotação."
-"Nominal order registered.","Pedido nominal registrado."
-"Not Capture","Não capturado"
-"Not Initialized","Não inicializado"
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Refunded","Total Reembolsado"
+Paid,Pago
+Coupons,Cupons
+"Recently Viewed","Recentemente Visto"
+"Recently Compared Products","Produtos Recentemente Comparados"
+"Recently Viewed Products","Produtos Recentemente Vistos"
+Print,Imprimir
+"Submit Comment","Enviar Comentário"
+Returned,Retornado
+"Order Date","Data do pedido"
+"Order # ","Order # "
+"Order Date: ","Data do pedido:"
+"Comment Text","Texto do comentário"
+"Visible on Frontend","VisÃvel no Frontend"
"Not Notified","Não notificado"
-"Not enough valid data to save the parent transaction ID.","Não há dados válidos suficientes para salvar a ID de transação principal."
-"Notification Not Applicable","Notificação não aplicável"
-"Notified","Notificado"
-"Notify Customer by Email","Notificar cliente por e-mail"
-"Number","Número"
-"Number of Invoiced Orders","Número de pedidos faturados"
-"Number of Orders","Número de pedidos"
-"Number of Refunded Orders","Número de pedidos reembolsados"
-"OK","OK"
-"Offline Refunded","Reembolsado offline"
-"On Hold","Em espera"
-"Online Refunded","Reembolsado online"
-"Order","Pedido"
-"Order ","Pedido nº"
-"Order %s","Pedido nº %s"
-"Order %s","Pedido #%s"
-"Order %s %s | %s","Order nº %s %s | %s"
-"Order %s - %s","Pedido nº %s - %s"
-"Order API","API do pedido"
+"Please select products.","Please select products."
+Number,Número
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling","Transporte & Manuseio"
+"Credit Memos","Notas de Crédito"
+Invoices,Faturas
+"We cannot get the order instance.","We cannot get the order instance."
+"Create New Order","Criar novo pedido"
+"Save Order Address","Salvar Endereço do Pedido"
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
"Order Address Information","Informação de endereço do pedido"
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order","Enviar Pedido"
+"Are you sure you want to cancel this order?","Tem certeza de que deseja cancelar esta ordem?"
"Order Comment","Comentário do pedido"
-"Order Comment Email Sender","Comentário do pedido para remetente de email"
-"Order Comment Email Template","Comentário do pedido para modelo de email"
-"Order Comment Email Template for Guest","Comentário do pedido para modelo de email para convidado"
-"Order Comments","Comentários do pedido"
-"Order Credit Memos","Aviso de crédito do pedido"
-"Order Currency:","Moeda do pedido:"
-"Order Date","Data do pedido"
-"Order Date (%s)","Data do pedido (%s)"
-"Order Date: ","Data do pedido:"
-"Order Date: %s","Data do pedido: %s"
-"Order Details","Detalhes do pedido"
+"Please select a customer.","Please select a customer."
+"Create New Customer","Criar novo cliente"
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
+"Create New Order for New Customer","Criar novo pedido para novo cliente"
+"Items Ordered","Itens pedidos"
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty","Quantidade solicitada do item"
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - Insira preço personalizado com imposto"
+"* - Enter custom price excluding tax","* - Insira preço personalizado sem imposto"
+"This product does not have any configurable options","Este produto não tem quaisquer opções configuráveis"
+"Add Selected Product(s) to Order","Adicionar Produto(s) Selecionado ao Pedido"
+"Update Changes","Atualizar alterações"
+"Are you sure you want to delete all items from shopping cart?","Você tem certeza que quer excluir todos os itens do carrinho de compras?"
+"Products in Comparison List","Produtos na Lista de Comparação"
+"Last Ordered Items","Últimos itens pedidos"
+"Please select a store.","Please select a store."
+"Order Totals","Totais da Ordem"
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)","Reembolso do Envio (Imp. Incl.)"
+"Refund Shipping (Excl. Tax)","Reembolso do Envio (Imp. Excl.)"
+"Refund Shipping","Reembolso do Envio"
+"Update Qty's","Atualizar qtde."
+Refund,Reembolso
+"Refund Offline","Reembolso Offline"
+"Paid Amount","Valor pago"
+"Refund Amount","Valor do Reembolso"
+"Shipping Refund","Reembolso da entrega"
"Order Grand Total","Total geral do pedido"
+"Adjustment Refund","Restituição de ajustamento"
+"Adjustment Fee","Taxa de ajustamento"
+"Send Email","Enviar email"
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent","o email de aviso de crédito não foi enviado"
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund","Total do Reembolso"
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment","Enviar fatura e remessa"
+"Submit Invoice","Enviar fatura"
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo","Criar Memorando"
+Capture,Captura
+"the invoice email was sent","o email de fatura não foi enviado"
+"the invoice email is not sent","o email de fatura não é enviado"
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses","Estados Atuais de Pedidos"
+"Create New Status","Criar novo status"
+"Assign Status to State","Atribuir Status para o Estado"
+"Save Status Assignment","Salvar atribuição de status"
+"Assign Order Status to State","Atribuir Status do Pedido para o Estado"
+"Assignment Information","Informação de Atribuição"
+"Order State","Situação do pedido"
+"Use Order Status As Default","Usar status do pedido como padrão"
+"Visible On Frontend","Visible On Frontend"
+"Edit Order Status","Editar Status da Ordem (Pedido)"
+"Save Status","Salvar status"
+"New Order Status","Status do Novo Pedido"
+"Order Status Information","Informação do status do pedido"
+"Status Code","Código do status"
+"Status Label","Etiqueta de status"
+"Store View Specific Labels","Vista das Marcas EspecÃficas da Loja"
+"Total Paid","Total Pago"
+"Total Due","Total Devido"
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?","Tem certeza de que deseja cancelar o pagamento?"
+Hold,Suspender
+hold,hold
+Unhold,Liberar
+unhold,unhold
+"Are you sure you want to accept this payment?","Tem certeza de que deseja aceitar este pagamento?"
+"Accept Payment","Pagamento Aceito"
+"Are you sure you want to deny this payment?","Tem certeza que quer negar este pagamento?"
+"Deny Payment","Recusar o Pagamento"
+"Get Payment Update","Obter Atualização de Pagamento"
+"Invoice and Ship","Fatura e Frete"
+Invoice,Fatura
+Ship,Envio
+Reorder,Rearranjar
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
+"Order Credit Memos","Aviso de crédito do pedido"
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
+"Comments History","Histórico de comentários"
"Order History","Histórico do pedido"
-"Order History Info","Informação do histórico do pedido"
-"Order ID","ID da Ordem"
"Order Information","Informação do pedido"
"Order Invoices","Faturas do pedido"
+Shipments,Envios
"Order Shipments","Remessas de pedidos"
-"Order State","Situação do pedido"
-"Order Status","Status do pedido"
-"Order Status Information","Informação do status do pedido"
-"Order Statuses","Estados Atuais de Pedidos"
-"Order Subtotal","Subtotal do Pedido"
-"Order Taxes Report Grouped by Tax Rates","Relação de Impostos do Pedido Agrupados por AlÃquotas"
-"Order Total","Total do Pedido"
-"Order Totals","Totais da Ordem"
-"Order Update","Atualização do Pedido"
-"Order Update for Guest","Atualização do Pedido para Convidado"
+Transactions,Transações
"Order View","Visualizar Pedido"
-"Order credit memo","Pedir memorando de crédito"
-"Order does not allow to be canceled.","O pedido não permite ser cancelado."
-"Order invoice","Fatura do pedido"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","O pedido está suspenso devido à suspeita de seu valor processado %s ser fraudulento."
-"Order object is not specified.","O objeto do pedido não está especificado."
-"Order saving error: %s","Erro na gravação do pedido: %s"
-"Order shipments","Fretes do pedido"
-"Order status does not exist.","Não existe estado atual para o pedido."
-"Order status with the same status code already exist.","Já existe estado atual de pedido com o mesmo código."
-"Order was placed using %s","O pedido foi realizado com o uso de %s"
-"Ordered","Solicitado"
-"Ordered amount of %s.","Valor ordenado de %s."
-"Ordering amount of %s is pending approval on gateway.","Valor ordenado de %s está pendente de aprovação no gateway."
-"Orders","Ordens"
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
+"Shipping & Handling","Transporte & Manuseio"
+Fetch,Buscar
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,Senha
+Value,Valor
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders","Voltar para Minhas Compras"
+"View Another Order","Visualizar outro pedido"
+"About Your Refund","Sobre Sua Restituição"
+"My Orders","Meus Pedidos"
+"About Your Invoice","Sobre Sua Fatura"
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged","Total a ser Cobrado"
+Unassign,Desconsiderar
+"We sent the message.","We sent the message."
+"This order no longer exists.","Esta ordem não existe mais."
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
+"The payment has been accepted.","O pagamento foi aceite."
+"The payment has been denied.","O pagamento foi negado."
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.","Nenhum pedido suspenso temporariamente."
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
+"There are no printable documents related to selected orders.","Não existem documentos imprimÃveis relacionados com as ordens selecionadas."
+"The payment has been voided.","O pagamento foi declarado nulo."
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.","O código do cupão foi aceite."
+"New Order","Novo Pedido"
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice","Nova Fatura"
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
+"Create New Order Status","Criar novo status de pedido"
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.","Ocorreu um erro ao atribuir status da ordem. Status não foi atribuÃdo."
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
"Orders and Returns","Pedidos e Devoluções"
-"Orders and Returns Search Form","Busca de Pedidos e Devoluções"
-"Original Price","Preço Original"
-"Original order item that recurring payment corresponds to.","Item de pedido original a que corresponde perfil de pagamento recorrente."
-"PDF Credit Memos","Avisos de crédito em PDF"
-"PDF Invoices","Faturas em PDF"
-"PDF Packing Slips","Guias de remessas em PDF"
-"PDF Print-outs","Impressões de PDF"
-"PDF object is not specified.","Objeto de PDF não especificado."
-"PDF page object is not specified.","Página do objeto em PDF não especificado."
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","A extensão total do modelo de PDF deve ser \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal"
-"Package","Embalagem"
-"Package types are disregarded for USPS domestic shipments.","Desconsidera-se o tipo de encomenda para frete doméstico do correio dos EUA."
-"Packages","Embalagens"
-"Packing Slip # ","Guia de remessa nº"
-"Paid","Pago"
-"Paid Amount","Valor pago"
-"Parent Transaction ID","ID da Transação Parental"
-"Parent transaction ID must have a transaction ID.","ID de transação principal deve ter uma ID de transação."
-"Partial","Parcial"
-"Payment Failed","Falha no pagamento"
-"Payment Information","Informação de Pagamento"
-"Payment Method","Método de Pagamento"
-"Payment Method","Nome do método de pagamento"
-"Payment Method:","Método de pagamento"
-"Payment Review","Revisão do pagamento"
-"Payment disallow storing objects.","Pagamento não permite armazenar objetos."
-"Payment transactions disallow storing objects.","Transações de pagamento não permitem armazenar objetos."
-"Payment type","Tipo de pagamento"
-"Payment update has been made.","Atualizações no pagamento foram feitas."
-"Pending","Pendente"
-"Pending Payment","Pagamento Pendente"
-"Period","PerÃodo"
-"Placed from IP","Situado no IP"
-"Please Select Products to Add","Escolha os produtos a serem adicionados"
-"Please Select a Customer","Selecione um Cliente"
-"Please Select a Store","Selecione uma loja"
-"Please check billing address information. %s","Verifique os dados do endereço de cobrança. %s"
-"Please check shipping address information. %s","Verifique os dados do endereço de envio. %s"
-"Please define PDF object before using.","Defina o objeto PDF antes do uso"
-"Please enter positive number in this field.","Insira um número positivo neste campo."
-"Please select a valid payment method.","Por favor selecione um método de pagamento válido."
-"Please specify a shipping method.","Especifique um método de envio."
-"Please specify a valid grid column alias name that exists in grid table.","Especifique um nome na coluna válida que exista na tabela."
-"Price","Preço"
-"Print","Imprimir"
-"Print All","Imprimir tudo"
-"Print All Invoices","Imprimir todas as faturas"
-"Print All Refunds","Imprimir todos os reembolsos"
-"Print All Shipments","Imprima todos os Envios"
-"Print Credit Memos","Imprima Crédito Memos"
-"Print Invoice","Imprima Faturamento"
-"Print Invoices","Imprimir faturas"
-"Print Order","Imprimir pedido"
-"Print Order # %s","Imprimir pedido nº %s"
-"Print Packing Slips","Imprima Packinglips"
-"Print Refund","Imprima Reembolso"
-"Print Shipment","Imprimir expedição"
-"Print Shipping Label","Imprima a Etiqueta de Envio"
-"Print Shipping Labels","Imprimir Etiquetas de Envio"
-"Processing","Processando"
-"Product","Produto"
-"Product Name","Nome do produto"
-"Products","Produtos"
-"Products Bestsellers Report","Relatório dos Produtos Mais Vendidos"
-"Products in Comparison List","Produtos na Lista de Comparação"
-"Products should be added to package(s)","Produtos devem ser adicionados ao(s) pacote(s)"
-"Payment #%s","Perfil #%s"
-"Payment Information","Informação do Perfil"
-"Payment State","Estado do perfil"
-"Profit","Lucro"
-"Promotion Coupons Usage Report","Relatório de uso dos cupons promocionais"
-"Proper payment object must be set.","O pagamento adequado deve ser definido"
-"Purchase Order Number:","Número de Ordem de Compra:"
-"Purchase Point","Comprado de (Loja)"
-"Purchased Date","Comprado Em"
-"Purchased From","Comprado de"
-"Purchased Item","Item Comprado"
-"Qty","Quant."
-"Qty Invoiced","Quant. faturada"
-"Qty Ordered","Qtde Pedida"
-"Qty Shipped","Quantidade remessada"
-"Qty To Add","Quant. a adicionar"
-"Qty to Add","Quantidade para adicionar"
-"Qty to Invoice","Qtde para Fatura"
-"Qty to Refund","Quant. para reembolso"
-"Qty to Ship","Qtde para Envio"
-"Quantity Ordered","Quantidade pedida"
-"Quote item id is not received.","A identidade do item cotado não foi recebida."
-"Quote item is not loaded.","O item cotado não foi carregado."
-"Rate","Taxa"
-"Recent Orders","Pedidos Recentes"
-"Recently Compared Products","Produtos Recentemente Comparados"
-"Recently Viewed","Recentemente Visto"
-"Recently Viewed Products","Produtos Recentemente Vistos"
-"Recurring Payment # %s","Perfil Recorrente # %s"
-"Recurring Payment Initial Fee","Taxa Inicial de Perfil Recorrente"
-"Recurring Payments","Perfis Recorrentes"
-"Recurring Payments (beta)","Perfis Recorrentes (beta)"
-"Reference ID","Identificação de Referência"
-"Reference ID:","ID de Referência:"
-"Refresh","Atualizar"
-"Refund","Reembolso"
-"Refund #","Reembolso #"
-"Refund #%s","Reembolso #%s"
-"Refund Amount","Valor do Reembolso"
-"Refund Offline","Reembolso Offline"
-"Refund Shipping","Reembolso do Envio"
-"Refund Shipping (Excl. Tax)","Reembolso do Envio (Imp. Excl.)"
-"Refund Shipping (Incl. Tax)","Reembolso do Envio (Imp. Incl.)"
-"Refund Totals","Totais de Reembolso"
-"Refunded","Reembolsado"
-"Refunded amount of %s offline.","Valor reembolsado de %s offline."
-"Refunded amount of %s online.","Total de reembolso de %s on-line"
-"Refunds","Reembolsos"
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State","Estado desconhecido"
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status","Status desconhecido"
+Backordered,Pendente
+Partial,Parcial
+Mixed,Misto
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
"Registered a Void notification.","Registrada uma notificação Void."
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.","Aprovou o pagamento on-line."
+"There is no need to approve this payment.","Não há necessidade de aprovar esse pagamento."
"Registered notification about approved payment.","Notificação registrada sobre pagamento aprovado"
-"Registered notification about captured amount of %s.","Notificação registrada sobre quantia capturada de %s."
+"Denied the payment online","Denied the payment online"
+"There is no need to deny this payment.","Não há necessidade de negar esse pagamento."
"Registered notification about denied payment.","Aviso sobre pagamento recusado registrado."
-"Registered notification about refunded amount of %s.","Notificação registrada sobre quantia reembolsada de %s."
"Registered update about approved payment.","Atualização registrada sobre pagamento aprovado"
"Registered update about denied payment.","Atualização registrada sobre pagamento recusado."
-"Regular Payment","Pagamento Regular"
-"Related Orders","Pedidos Relacionados"
-"Remove","Remover"
-"Remove Coupon Code","Remover código do cupom"
-"Remove tracking number","Remova número de rastreio"
-"Reorder","Rearranjar"
-"Retrieve credit memo info","Recuperar dados da nota de crédito"
-"Retrieve credit memo information","Recuperar informações de memorando de crédito"
-"Retrieve credit memo list","Recuperar lista de notas de crédito"
-"Retrieve invoice info","Recuperar informações de fatura"
-"Retrieve invoice information","Recuperar informações de fatura"
-"Retrieve list of credit memos by filters","Recuperar lista de notas de crédito por filtros"
-"Retrieve list of invoices by filters","Recuperar lista de fatura por filtros"
-"Retrieve list of orders by filters","Recuperar lista de pedidos por filtros"
-"Retrieve list of shipments by filters","Recuperar lista de envios por filtros"
-"Retrieve order information","Recuperar informação de pedidos"
-"Retrieve orders info","Recuperar informação de pedidos"
-"Retrieve shipment info","Recuperar informação de envios"
-"Retrieve shipment information","Recuperar informação de envios"
-"Return to Stock","Retornar ao Estoque"
-"Returned","Retornado"
-"Returns","Receita"
-"Revenue","Receita"
-"Row Subtotal","Coluna de subtotal"
-"Row Total","Total de Linha"
-"SHIP TO:","ENVIAR PARA:"
-"SKU","Unidade de Manutenção de Estoque"
-"SOLD TO:","VENDIDO PARA:"
-"Sales","Vendas"
-"Sales Discount","Desconto Sobre Vendas"
-"Sales Emails","E-mails de Vendas"
-"Sales Emails Section","Seção de E-mails Comerciais"
-"Sales Invoice Print View","Vista de Impressão da Fatura de Venda"
-"Sales Items","Itens d e Vendas"
-"Sales Order Print View","Vista de Impressão da Ordem de Venda"
-"Sales Section","Seção de vendas"
-"Sales Shipment Print View","Modo de exibição da remessa das vendas"
-"Sales Shipping","Remessa de vendas"
-"Sales Tax","Imposto sobre vendas"
-"Sales Total","Total de vendas"
-"Same As Billing Address","Mesmo endereço que o de cobrança"
-"Save Order Address","Salvar Endereço do Pedido"
-"Save Status","Salvar status"
-"Save Status Assignment","Salvar atribuição de status"
-"Save in address book","Salvar no catálogo de endereços"
-"Schedule","Programa"
-"Select","Selecione"
-"Select All","Selecionar Tudo"
-"Select from existing customer addresses:","Selecionar um endereço de cliente existente"
-"Send Credit Memo Comment Email Copy To","Enviar cópia do email de comentário de Aviso de Crédito para"
-"Send Credit Memo Comments Email Copy Method","Método para enviar cópia do email de comentários de Aviso de Crédito"
-"Send Credit Memo Email Copy Method","Método para enviar cópia de email de Aviso de Crédito"
-"Send Credit Memo Email Copy To","Enviar cópia do email de Aviso de Crédito para"
-"Send Email","Enviar email"
-"Send Invoice Comment Email Copy To","Enviar cópia do email do comentário da fatura para"
-"Send Invoice Comments Email Copy Method","Enviar cópia dos comentários da fatura por e-mail"
-"Send Invoice Email Copy Method","Método para enviar cópia do email da fatura"
-"Send Invoice Email Copy To","Enviar cópia da fatura por e-mail para"
-"Send Order Comment Email Copy To","Enviar cópia do email de comentários do pedido para"
-"Send Order Comments Email Copy Method","Método de envio do email de comentários do pedido"
-"Send Order Email","Enviar email de pedido"
-"Send Order Email Copy Method","Enviar cópia do pedido por e-mail"
-"Send Order Email Copy To","Enviar Cópia do Pedido por e-mail para"
-"Send Sales Emails","Enviar e-mail de vendas"
-"Send Shipment Comment Email Copy To","Enviar Cópia dos Comentários de Envio para"
-"Send Shipment Comments Email Copy Method","Método de envio da cópia do email de comentários de remessa"
-"Send Shipment Email Copy Method","Método de envio da cópia do email de remessas"
-"Send Shipment Email Copy To","Enviar Cópia do e-mail de envio para"
-"Send Tracking Information","Enviar informações para rastreamento"
+"There is no update for the payment.","Não há nenhuma atualização para o pagamento."
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.","Autorização anulada."
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
"Set order for existing transactions not allowed","Definir ordem de transações não permitidas existentes"
-"Ship","Envio"
-"Ship Date","Enviado dia"
-"Ship To","Enviar para"
-"Ship-to Name","Enviar em nome de"
-"Shipment","Remessa #"
-"Shipment","Remessa"
-"Shipment %1$s | %3$s (%2$s)","Remessa #%1$s | %3$s (%2$s)"
-"Shipment %s","Remessa #%s"
-"Shipment Comment Email Sender","Remetente do E-mail de Comentários de Remessa"
-"Shipment Comment Email Template","Modelo de E-mail de Comentários de Remessa"
-"Shipment Comment Email Template for Guest","Modelo de email para comentário de remessas para convidado"
-"Shipment Comments","Comentários de Envio"
-"Shipment Email Sender","Remetente do email da remessa"
-"Shipment Email Template","Modelo de E-mail de remessa"
-"Shipment Email Template for Guest","Modelo de e-mail de remessa para convidado"
-"Shipment Update","Atualização de Remessa"
-"Shipment Update for Guest","Atualização de remessa para convidado"
-"Shipments","Envios"
-"Shipped","Enviado"
-"Shipped By","Enviado por"
-"Shipping","Remessa"
-"Shipping & Handling","Transporte & Manuseio"
-"Shipping & Handling","Transporte & Manuseio"
-"Shipping & Handling Information","Informações sobre remessa e manuseio"
-"Shipping Address","Endereço de Envio"
-"Shipping Amount","Valor do Frete"
-"Shipping Information","Dados de Frete"
-"Shipping Method","Tipo de Frete"
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
"Shipping Method:","Método de Envio:"
-"Shipping Refund","Reembolso da entrega"
-"Shipping and Tracking Information","Informações de Envio e Rastreio"
-"Shopping Cart","Carrinho de compras"
-"Show Packages","Mostrar pacotes"
-"Signature Confirmation","Confirmação de Assinatura"
-"Signed Up From","Inscrição de"
-"Size","Tamanho"
-"Sku","SKU"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Alguns dos produtos abaixo não têm todas as opções necessárias. Por favor edite-os e configure todas as opções necessárias."
-"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponÃveis neste momento para esta ordem."
-"Source object is not specified.","Objeto de origem não está especificado."
-"Specified profile does not exist.","O perfil especificado não existe."
-"State Code [State Title]","Código do Estado [State Title]"
-"State/Province","Estado/ProvÃncia"
-"Status","Status"
-"Status Code","Código do status"
-"Status Label","Etiqueta de status"
-"Status:","Estado atual:"
-"Store Credit","Credito da loja"
-"Store View Specific Labels","Vista das Marcas EspecÃficas da Loja"
-"Street Address","Endereço da Rua"
-"Submit Comment","Enviar Comentário"
-"Submit Credit Memo","Enviar Nota de Crédito"
-"Submit Invoice","Enviar fatura"
-"Submit Invoice and Shipment","Enviar fatura e remessa"
-"Submit Order","Enviar Pedido"
-"Submit Shipment","Enviar Remessa"
-"Subscribe to Newsletter","Assinar o Boletim Informativo"
-"Subscribe to Order Status","Assinar status do pedido"
-"Subtotal","Subtotal"
-"Subtotal after discount.","Subtotal depois do desconto"
-"Subtotal:","Subtotal:"
-"Suspected Fraud","Suspeita de Fraude"
-"Suspend","Suspenso"
-"Suspended","Suspenso"
-"Tax","Taxas"
-"Tax Amount","Valor do Imposto"
-"Tax Percent","Porcentagem de Imposto"
-"Telephone","Telefone"
-"The Order State ""%s"" must not be set manually.","O Estado do Pedido ""%s"" não pode ser alterado manualmente"
-"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","O modelo de endereço total deve ser alargado de \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
-"The coupon code has been accepted.","O código do cupão foi aceite."
-"The message has been sent.","A mensagem foi enviada."
-"The message was sent.","A mensagem foi enviada."
-"The order address has been updated.","O endereço da ordem foi atualizado."
-"The order email has been sent.","O e-mail de pedido foi enviado."
-"The order has been cancelled.","A ordem foi cancelada."
-"The order has been created.","A ordem foi criada."
-"The order has been put on hold.","A ordem foi colocada em espera."
-"The order has been released from holding status.","A ordem foi libertada do status de espera."
-"The order has not been cancelled.","A ordem não foi cancelada."
-"The order status has been assigned.","O status da ordem foi atribuÃdo."
-"The order status has been saved.","O status da ordem foi salvo."
-"The order status has been unassigned.","O status da ordem foi atribuÃdo."
-"The order was not put on hold.","O pedido não foi suspenso."
-"The order was not unheld.","O pedido não foi liberado."
-"The order was placed using %s","A ordem foi feita usando %s"
-"The order(s) cannot be canceled","A ordem(s) não pode ser cancelada"
-"The payment has been accepted.","O pagamento foi aceite."
-"The payment has been denied.","O pagamento foi negado."
-"The payment has been voided.","O pagamento foi declarado nulo."
-"The profile has been updated.","O perfil foi atualizado."
-"The profile has no changes.","O perfil não tem alterações."
-"The profile state has been updated.","O estado do perfil foi atualizado."
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","A quantidade que você quer adicionar excede a quantidade total enviada de algum(ns) dos produtos selecionados"
-"The requested Payment Method is not available.","O Método de Pagamento solicitado não está disponÃvel."
-"The shipping label has been created.","A etiqueta de envio foi criada."
-"The transaction ""%s"" (%s) is already closed.","A transação ""%s"" (%s) já está fechada."
-"The transaction ""%s"" cannot be captured yet.","A transação ""%s"" ainda não pode ser capturada."
-"The value that you entered is not valid.","O valor informado não é válido."
-"There are no printable documents related to selected orders.","Não existem documentos imprimÃveis relacionados com as ordens selecionadas."
-"There are no shipping labels related to selected %s.","Não há etiquetas de envio relacionadas com %s selecionados."
-"There is no need to approve this payment.","Não há necessidade de aprovar esse pagamento."
-"There is no need to deny this payment.","Não há necessidade de negar esse pagamento."
-"There is no update for the payment.","Não há nenhuma atualização para o pagamento."
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Esta mensagem será mostrada no carrinho de compras quando subtotal após os descontos seja inferior a quantidade mÃnima."
-"This operation requires an existing transaction object.","Esta operação requer um objeto existente de transação."
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Esta ordem contém (%s) itens e portanto não podem ser editados através da interface de administração neste momento, se você quiser continuar a editar os (%s) itens serão removidos, a ordem será cancelada e uma nova ordem será colocada."
-"This order no longer exists.","Esta ordem não existe mais."
-"This product does not have any configurable options","Este produto não tem quaisquer opções configuráveis"
-"This profile state cannot be changed to ""%s"".","Este estado de perfil não pode ser alterado para ""%s""."
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Isso irá criar um reembolso offline. Para criar um reembolso online, abra uma fatura e crie uma nota de crédito para ela. Você deseja continuar?"
-"Tier Pricing","Preços por NÃvel"
-"Title","TÃtulo"
-"To","Para"
-"To Name","Para Nome"
-"To:","Para:"
-"Total","Total"
-"Total %d product(s)","Total %d produto(s)"
+"Total Shipping Charges","Total dos Gastos de Envio"
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
"Total (ex)","Total (ex)"
"Total (inc)","Total (inc)"
-"Total Due","Total Devido"
-"Total Invoiced","Total Faturado"
-"Total Invoiced Paid","Total Faturado Pago"
-"Total Invoiced VS Paid Report","Total Faturado VS. Relatório Pago"
-"Total Invoiced not Paid","Total Faturado não Pago"
-"Total Ordered Report","Relatório do Total Encomendado"
-"Total Paid","Total Pago"
-"Total Quantity","Quantidade Total"
-"Total Refund","Total do Reembolso"
-"Total Refunded","Total Reembolsado"
-"Total Refunded Report","Relatório do total reembolsado"
-"Total Sales Shipping","Remessa do total de vendas"
-"Total Shipped Report","Relatório do total remessado"
-"Total Shipping","Envio Total"
-"Total Shipping Charges","Total dos Gastos de Envio"
+"Credit Memo # ","Credit Memo # "
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
+"Packing Slip # ","Guia de remessa nº"
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
+"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","O modelo de endereço total deve ser alargado de \Magento\Sales\Model\Quote\Address\Total\AbstractTotal."
+"Subscription Items","Subscription Items"
+"Regular Payment","Pagamento Regular"
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.","O Método de Pagamento solicitado não está disponÃvel."
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.","Especifique um método de envio."
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.","Por favor selecione um método de pagamento válido."
+"Pending Payment","Pagamento Pendente"
+"On Hold","Em espera"
+Complete,Completar
+"Suspected Fraud","Suspeita de Fraude"
+"Payment Review","Revisão do pagamento"
+"Changing address information will not recalculate shipping, tax or other order amount.","Mudança de informações de endereço não recalculará o transporte, taxa ou outro valor do pedido."
+"Order Comments","Comentários do pedido"
+"Order Currency:","Moeda do pedido:"
+"Select from existing customer addresses:","Selecionar um endereço de cliente existente"
+"Same As Billing Address","Mesmo endereço que o de cobrança"
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order","Mensagem de Presente para o Pedido Completo"
+"Move to Shopping Cart","Mover para Carrinho de Compras"
+"Subscribe to Newsletter","Assinar o Boletim Informativo"
+"Click to change shipping method","Clique para alterar método de remessa"
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates","Obter tipos e taxas de frete"
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments","Anexar Comentários"
+"Email Order Confirmation","Enviar EMail da Confirmação da Ordem (Pedido)"
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund","Itens para reembolso"
+"Return to Stock","Retornar ao Estoque"
+"Qty to Refund","Quant. para reembolso"
+"Row Total","Total de Linha"
+"No Items To Refund","Nenhum Item para Reembolso"
+"Credit Memo Comments","Criar Comentários de Memorando"
+"Refund Totals","Totais de Reembolso"
+"Email Copy of Credit Memo","Enviar Email Cópia da Nota de Crédito"
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded","Itens reembolsados"
+"No Items","Nenhum Item"
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment","Criar Frete"
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice","Qtde para Fatura"
+"Invoice History","Invoice History"
+"Invoice Comments","Comentários sobre Fatura"
+"Invoice Totals","Invoice Totals"
+"Capture Amount","Captura de Valor"
+"Capture Online","Captura Online"
+"Capture Offline","Captura Offline"
+"Not Capture","Não capturado"
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
+"Email Copy of Invoice","Enviar Email Cópia da Fatura"
+"Items Invoiced","Itens faturados"
"Total Tax","Total dos Impostos"
-"Total Weight","Peso Total"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","O modelo de total deve ser ampliado a partir de \Magento\Sales\Model\Order\Total\AbstractTotal."
-"Track Order","Rastrear Ordem"
-"Track all shipment(s)","Rastrear todas as remessas"
-"Track all shipments","Rastrear todos os envios"
-"Track this shipment","Acompanhar este envio"
-"Track your order","Rastrear o seu pedido"
-"Tracking","Rastreamento"
-"Tracking Number","Número de Rastreamento"
-"Tracking Number(s):","Número(s) de rastreamento:"
-"Transaction ""%s"" was already processed.","A transação ""%s"" já foi processada."
-"Transaction # %s | %s","Transação # %s | %s"
-"Transaction ID","ID da Transação"
-"Transaction ID must not be empty.","A ID da transação não pode estar vazia."
-"Transaction ID: ""%s"".","Nº da Transação: ""%s""."
+"From Name","Nome do Remetente"
+"To Name","Para Nome"
+"Add Order Comments","Adicionar Comentários ao Pedido"
+"Notification Not Applicable","Notificação não aplicável"
+"the order confirmation email was sent","o email de confirmação de pedido foi enviado"
+"the order confirmation email is not sent","o email de confirmação de pedido não é enviado"
+"Order Date (%1)","Order Date (%1)"
+"Purchased From","Comprado de"
+"Link to the New Order","Link para o Novo Pedido"
+"Link to the Previous Order","Link para o Pedido Anterior"
+"Placed from IP","Situado no IP"
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status","Status do item"
+"Original Price","Preço Original"
+"Tax Percent","Porcentagem de Imposto"
+"Transaction Data","Transaction Data"
+"Parent Transaction ID","ID da Transação Parental"
"Transaction Type","Tipo de Transação"
-"Transactions","Transações"
-"Trial ","Teste"
-"Trial Payment","Pagamento do Teste"
-"Trial Period","PerÃodo Experimental"
-"Trial period payment","Pagamento do perÃodo de avaliação"
-"Type","Tipo"
-"Unassign","Desconsiderar"
-"Unhold","Liberar"
-"Unhold action is not available.","A ação suspender não está disponÃvel."
-"Unhold order","Liberar pedido"
-"Unknown State","Estado desconhecido"
-"Unknown Status","Status desconhecido"
-"Unsupported transaction type ""%s"".","O tipo de transação ""%s"" não é suportado."
-"Update Changes","Atualizar alterações"
-"Update Items and Qty's","Atualizar Itens e Quantidades"
-"Update Qty's","Atualizar qtde."
-"Updated","Atualizado Em"
-"Updated:","Atualizado:"
-"Use Aggregated Data (beta)","Usar dados agregados (beta)"
-"Use Order Status As Default","Usar status do pedido como padrão"
-"Validate Each Address Separately in Multi-address Checkout","Validar cada endereço separadamente em verificações de vários endereços"
-"Value","Valor"
-"View","Ver"
-"View All","Visualizar todos"
-"View Another Order","Visualizar outro pedido"
-"View Order","Ver Solicitação"
-"Visible on Frontend","VisÃvel no Frontend"
-"Void","Anular"
-"Void invoice","Fatura vazia"
-"Voided authorization.","Autorização anulada."
-"Website","Website"
-"Weight","Peso"
-"Whether buyer can define the date when billing for the profile begins.","Se o comprador pode definir a data para começar o faturamento do perfil."
-"Width","Largura"
-"Wishlist","Lista de presentes"
-"Wrong quote item id to update configuration.","ID da cotação do item errada para atualizar configuração."
-"Wrong state: ""%s"".","Estado inadequado: ""%s""."
-"Yes","Sim"
-"You can leave a box blank if you don't wish to add a gift message for whole order","Você pode deixar um quadro em branco se não desejar adicionar uma mensagem pessoal para todo o pedido"
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
+"Gift Message for this Order","Mensagem de Presente para Este Pedido"
+"Shipped By","Enviado por"
+"Tracking Number","Número de Rastreamento"
+"Billing Last Name","Último Nome do Faturamento"
+"Find Order By:","Encontrar Pedido Por:"
+"ZIP Code","ZIP Code"
+"Billing ZIP Code","Código Postal do Faturamento"
+"Print All Refunds","Imprimir todos os reembolsos"
+"Refund #","Reembolso #"
+"Print Refund","Imprima Reembolso"
"You have placed no orders.","Não há pedidos feitos."
-"You will be redirected to the payment system website.","Você será redirecionado para o site de sistema de pagamentos."
-"Your credit card will be charged for","O seu cartão de crédito será cobrado por"
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available","Não há informações de remessa"
+"Print Order","Imprimir pedido"
+"Subscribe to Order Status","Assinar status do pedido"
+"Print All Invoices","Imprimir todas as faturas"
+"Invoice #","Fatura Nº "
+"Print Invoice","Imprima Faturamento"
+"Qty Invoiced","Quant. faturada"
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
+"Items Shipped","Itens remetidos"
+"Qty Shipped","Quantidade remessada"
+"View All","Visualizar todos"
+"Gift Message for This Order","Mensagem de Presente para Este Pedido"
+"About Your Order","Sobre Seu Pedido"
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title","TÃtulo âncora personalizado"
+Phone,Phone
+"Default Template","Modelo padrão"
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
+"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
+"Minimum Amount","Minimum Amount"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
+"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
+"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
+"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
+"New Order Confirmation Template","New Order Confirmation Template"
+"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
+"Order Comment Email Sender","Order Comment Email Sender"
+"Order Comment Email Template","Order Comment Email Template"
+"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,Remessa
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
+"Orders and Returns Search Form","Busca de Pedidos e Devoluções"
+"PDF Credit Memos","Avisos de crédito em PDF"
+"PDF Invoices","Faturas em PDF"
+"Invoice Date","Data da Fatura"
"ZIP/Post Code","Código Postal"
-"Zip/Postal Code","Zip/Código Postal"
-"cm","cm"
-"in","pol"
-"kg","kg"
-"lb","libras"
-"the credit memo email is not sent","o email de aviso de crédito não foi enviado"
-"the credit memo email was sent","o email de aviso de crédito não foi enviado"
-"the invoice email is not sent","o email de fatura não é enviado"
-"the invoice email was sent","o email de fatura não foi enviado"
-"the order confirmation email is not sent","o email de confirmação de pedido não é enviado"
-"the order confirmation email was sent","o email de confirmação de pedido foi enviado"
-"the shipment email is not sent","o e-mail de expedição não foi enviado"
-"the shipment email was sent","o e-mail de expedição foi enviado"
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS","Novo Pedido - RSS"
+"Print Invoices","Imprimir faturas"
+"Print Packing Slips","Imprima Packinglips"
+"Print Credit Memos","Imprima Crédito Memos"
+"Print All","Imprimir tudo"
+"Print Shipping Labels","Imprimir Etiquetas de Envio"
+"Ship Date","Enviado dia"
+"Total Quantity","Quantidade Total"
+"Default Status","Status Padrão"
+"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)."
diff --git a/app/code/Magento/Sales/i18n/zh_CN.csv b/app/code/Magento/Sales/i18n/zh_CN.csv
index 7b5c764e056..a807eb8ffd5 100644
--- a/app/code/Magento/Sales/i18n/zh_CN.csv
+++ b/app/code/Magento/Sales/i18n/zh_CN.csv
@@ -1,846 +1,712 @@
-"""%s"" coupon code is not valid.","“%sâ€ä¼˜æƒ 券代ç æ— æ•ˆã€‚"
-"%s","%s"
-"%s / %s rate:","%s / %s 比率："
-"%s for %s","%s 对 %s"
-"%s order(s) cannot be canceled","%s 个订å•æ— 法被å–消"
-"%s order(s) have been canceled.","%s个订å•å·²å–消。"
-"%s order(s) have been put on hold.","%s个订å•å·²æŒ‚起。"
-"%s order(s) have been released from holding status.","%s个订å•å·²ä»ŽæŒ‚起状æ€æ¢å¤ã€‚"
-"%s order(s) were not put on hold.","%s 个订å•æ²¡æœ‰è¢«ä¿æŒã€‚"
-"%s order(s) were not released from holding status.","%s 个订å•æ²¡æœ‰ä»Žä¿æŒçŠ¶æ€æ¢å¤ã€‚"
-"* - Enter custom price excluding tax","* - 输入ä¸å«ç¨Žçš„è‡ªå®šä¹‰ä»·æ ¼"
-"* - Enter custom price including tax","* - 输入å«ç¨Žçš„è‡ªå®šä¹‰ä»·æ ¼"
-"-- Please Select --","-- 请选择 --"
-"About This Order:","关于æ¤è®¢å•ï¼š"
-"About This Payment:","关于æ¤èµ„料："
-"About Your Invoice","关于您的å‘票"
-"About Your Order","关于您的订å•"
-"About Your Refund","关于您的退款"
-"About Your Shipment","关于您的è¿é€"
-"Accept Payment","接å—付款"
-"Accept or Deny Payment","接å—或拒ç»ä»˜æ¬¾"
-"Account Information","å¸æˆ·ä¿¡æ¯"
-"Action","æ“作"
-"Actions","æ“作"
-"Activate","激活"
-"Active","活动"
-"Add","æ·»åŠ "
-"Add New Address","æ·»åŠ æ–°åœ°å€"
-"Add Order Comments","æ·»åŠ è®¢å•è¯„论"
-"Add Package","æ·»åŠ åŒ…"
-"Add Products","æ·»åŠ äº§å“"
-"Add Selected Product(s) to Option","æ·»åŠ æ‰€é€‰äº§å“到选项"
-"Add Selected Product(s) to Order","æ·»åŠ æ‰€é€‰äº§å“到订å•"
-"Add Selected Product(s) to Package","æ·»åŠ æ‰€é€‰äº§å“到包"
-"Add To Order","æ·»åŠ åˆ°è®¢å•"
-"Add Tracking Number","æ·»åŠ è¿½è¸ªç¼–å·"
-"Add comment to order","æ·»åŠ è¯„è®ºåˆ°è®¢å•"
-"Add new comment to credit memo","ä¸ºä¿¡ç”¨è®°å½•æ·»åŠ è¯„è®º"
-"Add new comment to shipment","æ·»åŠ æ–°è¯„è®ºåˆ°é€è´§"
-"Add new tracking number","æ·»åŠ æ–°çš„è¿½è¸ªç¼–å·"
-"Add to Cart","æ·»åŠ åˆ°è´ç‰©è½¦"
-"Additional Product Info","é¢å¤–产å“ä¿¡æ¯"
-"Address","地å€"
-"Address model is not defined.","地å€æ¨¡å—未定义"
-"Adjustment Fee","调整费"
-"Adjustment Refund","调整退款"
-"Agreement Information","å议信æ¯"
-"Allow Reorder","å…许记录"
-"Amount","æ•°é‡"
-"Amount: %s.","æ•°é‡ï¼š%s。"
-"An error occurred while assigning order status. Status has not been assigned.","分é…订å•çŠ¶æ€æ—¶å‘生错误。状æ€æœªè¢«åˆ†é…。"
-"An error occurred while creating shipping label.","创建è¿é€æ ‡ç¾æ—¶å‘生错误。"
-"An error occurred while saving order status. The status has not been added.","ä¿å˜è®¢å•çŠ¶æ€æ—¶å‘生错误。状æ€æœªè¢«æ·»åŠ 。"
-"An error occurred while unassigning order status.","å–消分é…订å•çŠ¶æ€æ—¶å‘生错误。"
-"An error occurred while updating the order address. The address has not been changed.","更新订å•åœ°å€æ—¶å‘生错误。地å€æœªæ›´æ”¹ã€‚"
-"An item option with code %s already exists.","代ç 为 %s 的项已ç»å˜åœ¨ã€‚"
-"Anchor Custom Title","è‡ªå®šä¹‰æ ‡é¢˜é”šç‚¹"
-"Append Comments","é™„åŠ è¯„è®º"
-"Apply","应用"
-"Apply Coupon Code","应用折价券"
-"Approved the payment online.","å·²åœ¨çº¿å®¡æ ¸æ”¯ä»˜ã€‚"
-"Are you sure you want to accept this payment?","您确认è¦æŽ¥å—该支付å—？"
-"Are you sure you want to cancel this order?","您确认è¦å–消该订å•å—？"
-"Are you sure you want to delete all items from shopping cart?","ä½ æ˜¯å¦ç¡®å®šè¦åˆ 除è´ç‰©è½¦ä¸çš„所有内容？"
-"Are you sure you want to deny this payment?","您确认è¦æ‹’ç»è¯¥æ”¯ä»˜å—？"
-"Are you sure you want to do this?","您是å¦ç¡®è®¤è¦è¿™æ ·åšï¼Ÿ"
-"Are you sure you want to send Creditmemo email to customer?","您确认è¦å‘é€ä¿¡ç”¨å¤‡å¿˜å½•ç”µå邮件给客户å—？"
-"Are you sure you want to send Invoice email to customer?","您确认è¦å‘é€å‘票电å邮件给客户å—？"
-"Are you sure you want to send Shipment email to customer?","您确认è¦å‘é€è¿é€ç”µå邮件给客户å—？"
-"Are you sure you want to send order email to customer?","您确认è¦å‘é€è®¢å•ç”µå邮件给客户å—？"
-"Are you sure you want to void the payment?","您确认è¦ä½¿æ”¯ä»˜æ— 效å—？"
-"Are you sure?","您是å¦ç¡®è®¤ï¼Ÿ"
-"Are you sure? This order will be canceled and a new one will be created instead","您确认å—？该订å•ä¼šè¢«å–消，并创建一个全新订å•"
-"Assign Order Status to State","按国家分é…订å•çŠ¶æ€"
-"Assign Status to State","按国家分é…状æ€"
-"Assignment Information","分é…ä¿¡æ¯"
-"At least a payment ID must be set.","必须至少设置一个付款ID。"
-"Authorization","授æƒ"
-"Authorized amount of %s.","授æƒé¢åº¦ %s"
-"Authorizing amount of %s is pending approval on gateway.","授æƒé¢åº¦ %s æ£ç‰å¾…网关的审批。"
-"Back","返回"
-"Back to My Orders","返回我的订å•"
-"Back to Recurring Payments","返回循环é…置文件"
-"Backordered","延期"
-"Bestsellers","最佳销é‡"
-"Bill-to Name","记账姓å"
-"Billing","è´¦å•"
-"Billing Address","è´¦å•åœ°å€"
-"Billing Last Name","按姓æ°è®°è´¦"
-"Billing ZIP Code","按邮编记账"
-"Buy %s for price %s","以 %s ä»·æ ¼è´ä¹° %s"
-"CSV","CSV"
-"Cancel","å–消"
-"Cancel credit memo","å–消信用记录"
-"Cancel invoice","å–消å‘票"
-"Cancel order","å–消订å•"
-"Canceled","å·²å–消"
-"Canceled order offline.","å–消的订å•å·²ç¦»çº¿ã€‚"
-"Canceled order online.","å–消的订å•åœ¨çº¿ã€‚"
-"Cannot add order history.","æ— æ³•æ·»åŠ è®¢å•åŽ†å²ã€‚"
-"Cannot create an empty shipment.","æ— æ³•åˆ›å»ºç©ºè¿å•ã€‚"
-"Cannot determine the field name.","æ— æ³•ç¡®å®šå—段å称。"
-"Cannot do invoice for order.","æ— æ³•ä¸ºè®¢å•åˆ›å»ºå‘票。"
-"Cannot do shipment for order.","æ— æ³•ä¸ºè¯¥è®¢å•å‘货。"
-"Cannot get order instance","æ— æ³•èŽ·å¾—è®¢å•å®žä¾‹"
-"Cannot get the order instance.","æ— æ³•èŽ·å¾—è®¢å•å®žä¾‹ã€‚"
-"Cannot register an existing credit memo.","æ— æ³•æ³¨å†ŒçŽ°æœ‰ä¿¡ç”¨è®°å½•ã€‚"
-"Cannot register existing invoice","æ— æ³•æ³¨å†ŒçŽ°æœ‰å‘票"
-"Cannot register existing shipment","æ— æ³•æ³¨å†ŒçŽ°æœ‰è¿å•"
-"Capture","获å–"
-"Capture Amount","获å–é¢åº¦"
-"Capture Offline","离线获å–"
-"Capture Online","在线获å–"
-"Capture invoice","获å–å‘票"
-"Captured amount of %s online.","åœ¨çº¿èŽ·å– %s çš„æ•°é‡ã€‚"
-"Capturing amount of %s is pending approval on gateway.","获å–çš„ %s æ•°é‡è¢«æŒ‚èµ·ç‰å¾…网关审批。"
-"Carrier","è¿è¥å•†"
-"Carrier/Method","è¿è¥å•†/方法"
-"Change status, add comments","更改状æ€ï¼Œæ·»åŠ 评论"
-"Changing address information will not recalculate shipping, tax or other order amount.","更改地å€ä¿¡æ¯ä¸ä¼šå¯¼è‡´é‡æ–°è®¡ç®—å‘è´§ã€ç¨Žé‡‘，或其他金é¢ã€‚"
-"Checkout Totals Sort Order","按结账总数对订å•æŽ’åº"
-"City","城市"
-"Clear Shopping Cart","清空è´ç‰©è½¦"
-"Click to change shipping method","点击更改é€è´§æ–¹æ³•"
-"Close","å…³é—"
-"Closed","已关é—"
-"Comma-separated.","逗å·åˆ†éš”。"
-"Comment","评论"
-"Comment Text","评论文å—"
-"Comments","评论"
-"Comments History","评论历å²"
-"Company","å…¬å¸"
-"Complete","完æˆ"
-"Configure","é…ç½®"
-"Configure and Add to Order","é…ç½®å¹¶æ·»åŠ åˆ°è®¢å•"
-"Contents","内容"
-"Continue","继ç»"
-"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","控制是å¦åœ¨è®¢å•ã€æ”¶æ®ã€å‘è´§å•ï¼Œä»¥åŠä¿¡ç”¨è®°å½•ä¸Šæ˜¾ç¤ºé¡¾å®¢ IP地å€ã€‚"
-"Country","国家"
-"Coupons","折价券"
-"Create","创建"
-"Create New Customer","创建新客户"
-"Create New Order","创建新订å•"
-"Create New Order Status","创建新订å•çŠ¶æ€"
-"Create New Order for %s","为 %s 创建新订å•"
-"Create New Order for %s in %s","为 %s 在 %s ä¸åˆ›å»ºæ–°è®¢å•"
-"Create New Order for New Customer","为新客户创建新订å•"
-"Create New Order for New Customer in %s","为新客户在 %s ä¸åˆ›å»ºæ–°è®¢å•"
-"Create New Status","创建新状æ€"
-"Create Order","创建订å•"
-"Create Packages","创建包"
-"Create Shipment","创建è¿å•"
-"Create Shipping Label","创建è¿é€æ ‡ç¾"
-"Create Shipping Label...","创建è¿é€æ ‡ç¾..."
-"Create new credit memo for order","为订å•æ–°å»ºä¿¡ç”¨è®°å½•"
-"Create new invoice for order","为订å•åˆ›å»ºæ–°å‘票"
-"Create new shipment for order","为订å•åˆ›å»ºæ–°è¿å•"
-"Create...","创建..."
-"Created","创建于"
-"Created:","创建："
-"Credit Memo","信用记录"
-"Credit Memo #","信用记录 #"
-"Credit Memo #%1$s | %3$s | %2$s (%4$s)","信用记录 #%1$s | %3$s | %2$s (%4$s)"
-"Credit Memo Comment Email Sender","信用记录评论电å邮件å‘é€ç¨‹åº"
-"Credit Memo Comment Email Template","信用记录评论电å邮件模æ¿"
-"Credit Memo Comment Email Template for Guest","针对æ¥å®¾çš„信用记录评论电å邮件模æ¿"
-"Credit Memo Comments","信用记录评论"
-"Credit Memo Email Sender","信用记录电å邮件å‘é€ç¨‹åº"
-"Credit Memo Email Template","信用记录电å邮件模æ¿"
-"Credit Memo Email Template for Guest","针对æ¥å®¾çš„信用记录电å邮件模æ¿"
-"Credit Memo Update","信用记录更新"
-"Credit Memo Update for Guest","针对æ¥å®¾çš„信用记录更新"
-"Credit Memos","信用记录"
-"Credit memo canceling problem.","信用记录å–消出错。"
-"Credit memo cannot be canceled.","ä¿¡ç”¨è®°å½•æ— æ³•å–消。"
-"Credit memo has been created automatically","信用备忘录已自动创建"
-"Custom Price","è‡ªå®šä¹‰ä»·æ ¼"
-"Custom Value","自定义值"
-"Customer","客户"
-"Customer Can Define Start Date","客户å¯ä»¥å®šä¹‰å¼€å§‹æ—¥æœŸ"
-"Customer Group","客户组"
-"Customer My Account Order Creditmemo View","客户我的å¸æˆ·è®¢å•ä¿¡ç”¨è®°å½•è§†å›¾"
-"Customer My Account Order History","客户我的å¸æˆ·è®¢å•åŽ†å²"
-"Customer My Account Order Invoice View","客户我的å¸æˆ·è®¢å•å‘票视图"
-"Customer My Account Order Shipment View","客户我的å¸æˆ·è®¢å•å‘货视图"
-"Customer My Account Order View","客户我的å¸æˆ·è®¢å•è§†å›¾"
-"Customer's Current Activities","客户的当å‰æ´»åŠ¨"
-"Customs Value","自定义值"
-"Date","日期"
-"Default Status","默认状æ€"
-"Default Template","默认模æ¿"
-"Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png)","é»˜è®¤å¾½æ ‡ï¼Œå°†ç”¨åœ¨PDF与HTML文档ä¸ã€‚<br />(jpeg, tiff, png)"
-"Delete","åˆ é™¤"
-"Delete Package","åˆ é™¤åŒ…"
-"Denied the payment online.","æ‹’ç»çš„在线支付。"
-"Deny Payment","æ‹’ç»æ”¯ä»˜"
-"Description Message","æè¿°ä¿¡æ¯"
-"Discount","折扣"
-"Discount (%s)","折扣（%s）"
-"Discount Amount","折扣å¸æˆ·"
-"Display Order ID in Header","在头部显示订å•ID"
-"Edit","编辑"
-"Edit Order #%s","ç¼–è¾‘è®¢å• #%s"
-"Edit Order %s %s Address","ç¼–è¾‘è®¢å• %s %s地å€"
-"Edit Order Status","编辑订å•çŠ¶æ€"
-"Email","客户邮件"
-"Email Address","编辑电å邮件地å€"
-"Email Copy of Credit Memo","信用记录副本用邮件å‘é€"
-"Email Copy of Invoice","å‘票副本用邮件å‘é€"
-"Email Copy of Shipment","è¿å•å‰¯æœ¬ç”¨é‚®ä»¶å‘é€"
-"Email Order Confirmation","订å•ç¡®è®¤ç”¨é‚®ä»¶å‘é€"
-"Enable","å¯ç”¨"
-"Enabled","å·²å¯ç”¨"
-"Enter the billing last name and email/ZIP as in the order billing address","在订å•è®°è´¦åœ°å€ä¸å…许对姓æ°å’Œé‚®ä»¶/邮编记账"
-"Entered data is incorrect. Please try again.","输入的数æ®æœ‰è¯¯ã€‚请é‡è¯•ã€‚"
-"Error to Show in Shopping Cart","在è´ç‰©è½¦ä¸æ˜¾ç¤ºæ—¶å‡ºé”™"
-"Excel XML","Excel XML"
-"Excl. Tax","ä¸å«ç¨Ž"
-"Expired","已过期"
-"Explanation","解释"
-"Failed to send the order email.","å‘é€è®¢å•é‚®ä»¶å‡ºé”™ã€‚"
-"Failed to update the payment.","更新支付时出错。"
-"Failed to update the profile.","æ›´æ–°é…置文件时出错。"
-"Failed to void the payment.","å–消支付时出错。"
-"Fetch","获å–"
-"File extension not known or unsupported type in the following shipment: %s","ä¸‹åˆ—è®¢å• %s ä¸å˜åœ¨æœªçŸ¥æ–‡ä»¶æ‰©å±•ï¼Œæˆ–ä¸æ”¯æŒçš„类型"
-"Find Order By:","订å•æŸ¥æ‰¾æ¡ä»¶ï¼š"
-"First Name","顾客姓å"
-"From","æ¥è‡ª"
-"From Name","通过å称"
-"From:","æ¥è‡ªï¼š"
-"General","常规"
-"General Information","常规信æ¯"
-"Get Payment Update","获得支付更新"
-"Get Update","获得更新"
-"Get shipping methods and rates","获得å‘货方法和费率"
-"Gift Message","礼å“消æ¯"
-"Gift Message for This Order","该订å•çš„礼å“ä¿¡æ¯"
-"Gift Message for the Entire Order","整个订å•çš„礼å“ä¿¡æ¯"
-"Gift Message for this Order","该订å•çš„礼å“ä¿¡æ¯"
-"Gift Options","礼å“选项"
-"Gift Wrapping for the Entire Order","整个订å•çš„礼å“包装"
-"Girth","周长"
-"Grand Total","总计"
-"Grand Total (Base)","G.T.（基本）"
-"Grand Total (Purchased)","G.T.（已è´ä¹°ï¼‰"
-"Grand Total to be Charged","需è¦æ”¶å–的总费用"
-"Guest","æ¥å®¾"
-"Height","高度"
-"Hide Customer IP","éšè—顾客 IP 地å€"
-"Hold","暂挂"
-"Hold action is not available.","暂挂æ“作ä¸å¯ç”¨ã€‚"
-"Hold order","暂挂订å•"
-"ID","ID#"
-"ID","ID"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""已退款""。 商家å‘起的退款。%s 退款数é‡å·²æ³¨å†Œé€šçŸ¥ã€‚交易ID： ""%s"""
-"If empty, the default description above will be used.","如果为空，将使用上述默认æ述。"
-"If empty, the default error above will be used.","如果为空，将使用上述默认错误。"
-"If the invoice was created offline, try creating an offline creditmemo.","如果离线创建å‘票，请å°è¯•ç¦»çº¿åˆ›å»ºä¿¡ç”¨è®°å½•ã€‚"
-"Incl. Tax","å«ç¨Ž"
-"Information","ä¿¡æ¯"
-"Initial Fee","åˆå§‹è´¹ç”¨"
-"Initial Fees","èµ·æ¥è´¹ç”¨"
-"Initial period payment","åˆå§‹ä»˜æ¬¾å‘¨æœŸ"
-"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","创建å‘è´§æ ‡ç¾æ‰€éœ€çš„ä¿¡æ¯ä¸è¶³ã€‚è¯·ç¡®è®¤ä½ çš„åº—é“ºä¿¡æ¯ä¸Žå‘货设置。"
-"Invalid block: %s.","æ— æ•ˆçš„å—： %s。"
-"Invalid carrier specified.","指定的è¿è¥å•†æ— 效。"
-"Invalid draw line data. Please define ""lines"" array.","行数æ®æ— 效。请定义“行â€é˜µåˆ—。"
-"Invalid entity model","æ— æ•ˆçš„å®žä½“æ¨¡åž‹ã€‚"
-"Invalid item option format.","é¡¹ç›®é€‰é¡¹æ ¼å¼æ— 效。"
-"Invalid qty to invoice item ""%s""","å•†å“ ""%s""çš„å‘票数é‡æ— 效"
-"Invalid qty to refund item ""%s""","商å“""%s""的退款数é‡æ— 效"
-"Invalid qty to ship for item ""%s""","商å“""%s""çš„å‘货数é‡æ— 效"
-"Invalid renderer model","æ— æ•ˆçš„æ¸²æŸ“æ¨¡åž‹"
-"Invalid request for adding product to quote.","æ·»åŠ äº§å“ä¾›å¼•ç”¨çš„è¯·æ±‚æ— æ•ˆã€‚"
-"Invoice","å‘票"
-"Invoice #","å‘票 #"
-"Invoice #%1$s | %2$s | %4$s (%3$s)","å‘票 #%1$s | %2$s | %4$s (%3$s)"
-"Invoice #%s","å‘票 #%s"
-"Invoice Comment Email Sender","å‘票评论电å邮件å‘é€ç¨‹åº"
-"Invoice Comment Email Template","å‘票评论电å邮件模æ¿"
-"Invoice Comment Email Template for Guest","针对æ¥å®¾çš„å‘票评论电å邮件模æ¿"
-"Invoice Comments","å‘票评论"
-"Invoice Date","å‘票日期"
-"Invoice Email Sender","å‘票邮件å‘é€ç¨‹åº"
-"Invoice Email Template","å‘票邮件模æ¿"
-"Invoice Email Template for Guest","针对æ¥å®¾çš„å‘票邮件模æ¿"
-"Invoice Update","å‘票更新"
-"Invoice Update for Guest","针对æ¥å®¾çš„å‘票更新"
-"Invoice and Packing Slip Design","å‘ç¥¨ä¸ŽåŒ…è£…æ ‡ç¾è®¾è®¡"
-"Invoice and Ship","å‘票与å‘è´§"
-"Invoice canceling problem.","å‘票å–消问题。"
-"Invoice cannot be canceled.","å‘ç¥¨æ— æ³•è¢«å–消。"
-"Invoice cannot be captured.","å‘ç¥¨æ— æ³•è¢«èŽ·å–。"
-"Invoice cannot be voided.","å‘ç¥¨æ— æ³•è¢«æ’¤é”€ã€‚"
-"Invoice capturing problem.","å‘票获å–问题。"
-"Invoice void problem","å‘票撤销问题"
-"Invoice will be created without communication with payment gateway.","å‘票会在ä¸ä¸Žæ”¯ä»˜ç½‘关沟通的情况下创建。"
-"Invoiced","已出å‘票"
-"Invoices","å‘票"
-"Item","商å“"
-"Item Status","商å“状æ€"
-"Item object is not specified.","商å“对象未指定。"
-"Item options declaration error.","商å“选项声明有误。"
-"Item ordered qty","下å•å•†å“çš„æ•°é‡"
-"Item qty declaration error.","商å“æ•°é‡å£°æ˜Žæœ‰è¯¯"
-"Items","项目"
-"Items Invoiced","商å“移开å‘票"
-"Items Ordered","商å“已下å•"
-"Items Refunded","商å“已退款"
-"Items Shipped","商å“å·²å‘è´§"
-"Items in the Package","包裹ä¸çš„商å“"
-"Items maximum quantity or price do not allow checkout.","商å“最大数é‡æˆ–ä»·æ ¼ä¸å…许结账。"
-"Items options declaration error.","商å“选项声明有误。"
-"Items to Refund","è¦é€€è´§çš„商å“"
-"Items to Ship","è¦å‘货的商å“"
-"Key","密钥"
-"Last Name","客户姓æ°"
-"Last Ordered Items","上次订è´çš„商å“"
-"Last status can't be unassigned from state.","上次状æ€æ— 法被å–消分é…。"
-"Length","长度"
-"Link to the New Order","链接到新订å•"
-"Link to the Previous Order","连接到å‰ä¸€è®¢å•"
-"Logo for HTML Print View","HTML 打å°è§†å›¾æ ‡å¿—"
-"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","ä»…ä¾› HTML æ–‡æ¡£ä½¿ç”¨çš„æ ‡å¿—ã€‚å¦‚æžœä¸ºç©ºï¼Œåˆ™ä½¿ç”¨é»˜è®¤æ ‡å¿—ã€‚<br />(jpeg, gif, png)"
-"Logo for PDF Print-outs (200x50)","适用于 PDF 打å°çš„æ ‡å¿— (200x50)"
-"Make Check payable to:","通过支票付款给："
-"Manage","管ç†"
-"Maximum amount available to refund is %s","å¯é€€æ¬¾çš„最高金é¢ä¸º ï¼…s"
-"Maximum shipping amount allowed to refund is: %s","å…许退款的最大è¿é€æ•°é‡ä¸ºï¼š%s"
-"Message","ä¿¡æ¯"
-"Message:","ä¿¡æ¯ï¼š"
-"Minimum Amount","最å°æ•°é‡"
-"Minimum Order Amount","最å°è®¢å•æ•°é‡"
-"Mixed","æ··åˆ"
-"Most Viewed","最å—欢迎"
-"Most Viewed Products Report","最å—欢迎的产å“报告"
-"Move to Shopping Cart","移动到è´ç‰©è½¦"
-"Move to Wishlist","移动到愿望清å•"
-"Multi-address Description Message","多个地å€æ述消æ¯"
-"Multi-address Error to Show in Shopping Cart","è´ç‰©è½¦ä¸å¤šä¸ªåœ°å€æ˜¾ç¤ºé”™è¯¯"
-"My Orders","我的订å•"
-"My Orders - Details","æˆ‘çš„è®¢å• - 详情"
-"N/A","N/A"
-"Name","姓å"
-"New","新建"
-"New Credit Memo","新建信用记录"
-"New Credit Memo for Guest","为æ¥å®¾æ–°å»ºä¿¡ç”¨è®°å½•"
-"New Credit Memo for Invoice #%s","ä¸ºæ”¶æ® #%s 新建信用记录"
-"New Credit Memo for Order #%s","æ–°è®¢å• #%s 的贷项å‡å•"
-"New Invoice","æ–°å‘票"
-"New Invoice and Shipment for Order #%s","è®¢å• #%s çš„æ–°å‘票和è¿å•"
-"New Invoice for Guest","针对æ¥å®¾çš„æ–°å‘票"
-"New Invoice for Order #%s","è®¢å• #%s çš„æ–°å‘票"
-"New Order","新订å•"
-"New Order Confirmation Email Sender","新订å•ç¡®è®¤é‚®ä»¶å‘é€ç¨‹åº"
-"New Order Confirmation Template","新订å•ç¡®è®¤æ¨¡æ¿"
-"New Order Confirmation Template for Guest","针对æ¥å®¾çš„新订å•ç¡®è®¤æ¨¡æ¿"
-"New Order RSS","新订å•RSS"
-"New Order Status","新订å•çŠ¶æ€"
-"New Order for Guest","针对æ¥å®¾çš„新订å•"
-"New Shipment","æ–°è¿å•"
-"New Shipment for Guest","针对æ¥å®¾çš„æ–°è¿å•"
-"New Shipment for Order #%s","è®¢å• #%s çš„æ–°è¿å•"
-"Newsletter Subscription","新闻邮件订阅"
-"No","å¦"
-"No Items","æ— é¡¹ç›®"
-"No Items To Refund","æ— å¯é€€æ¬¾é¡¹ç›®"
-"No Payment Methods","æ— æ”¯ä»˜æ–¹æ³•"
-"No detail for number ""%s""","ç¼–å· ""%s"" æ— è¯¦æƒ…"
-"No information available.","æ— å¯ç”¨ä¿¡æ¯ã€‚"
-"No items","æ— é¡¹ç›®"
-"No order(s) were put on hold.","没有被暂挂的订å•ã€‚"
-"No order(s) were released from holding status.","没有脱离暂挂状æ€çš„订å•ã€‚"
-"No ordered items","æ— è®¢å•é¡¹"
-"No shipping information available","æ— å¯ç”¨å‘货信æ¯"
-"Nominal Items","å义上的产å“"
-"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","å义上的产å“åªèƒ½å•ç‹¬è´ä¹°ã€‚è¦ç»§ç»å¤„ç†ï¼Œè¯·ä»Žè®¢å•ä¸åˆ 除其他产å“。"
-"Nominal order registered.","定义上的订å•å·²æ³¨å†Œã€‚"
-"Not Capture","æ— èŽ·å–"
-"Not Initialized","未åˆå§‹åŒ–"
-"Not Notified","未通知"
-"Not enough valid data to save the parent transaction ID.","没有ä¿å˜çˆ¶äº¤æ˜“ID所需的足够数æ®ã€‚"
-"Notification Not Applicable","通知ä¸å¯ç”¨"
-"Notified","已通知。"
-"Notify Customer by Email","通过电å邮件通知客户"
-"Number","æ•°å—"
-"Number of Invoiced Orders","已开å‘票订å•çš„æ•°é‡"
-"Number of Orders","订å•æ•°é‡"
-"Number of Refunded Orders","已退款订å•çš„æ•°é‡"
-"OK","确定"
-"Offline Refunded","离线退款"
-"On Hold","暂挂"
-"Online Refunded","在线退款"
-"Order","订å•"
-"Order ","è®¢å• #"
-"Order %s","è®¢å• #%s"
-"Order %s","订å•# %s"
-"Order %s %s | %s","è®¢å• # %s %s | %s"
-"Order %s - %s","è®¢å• #%s - %s"
-"Order API","订å•API"
-"Order Address Information","订å•åœ°å€ä¿¡æ¯"
-"Order Comment","订å•è¯„论"
-"Order Comment Email Sender","订å•è¯„论邮件å‘é€ç¨‹åº"
-"Order Comment Email Template","订å•è¯„论邮件模æ¿"
-"Order Comment Email Template for Guest","针对æ¥å®¾çš„订å•è¯„论邮件模æ¿"
-"Order Comments","订å•è¯„论"
-"Order Credit Memos","订å•ä¿¡ç”¨è®°å½•"
-"Order Currency:","订å•å¸ç§ï¼š"
-"Order Date","订å•æ—¥æœŸ"
-"Order Date (%s)","订å•æ—¥æœŸï¼ˆ%s）"
-"Order Date: ","订å•æ—¥æœŸï¼š"
-"Order Date: %s","订å•æ—¥æœŸï¼š%s"
-"Order Details","订å•è¯¦æƒ…"
-"Order Grand Total","订å•æ€»æ•°"
-"Order History","订å•åŽ†å²"
-"Order History Info","订å•åŽ†å²ä¿¡æ¯"
+Remove,åˆ é™¤
+Close,å…³é—
+Cancel,å–消
+Back,返回
+"Add Products",æ·»åŠ äº§å“
+"Update Items and Qty's",更新项目与数é‡
+Product,产å“
+Price,ä»·æ ¼
+Quantity,Quantity
+Products,产å“
+ID,ID
+SKU,SKU
+Apply,应用
+Configure,é…ç½®
+"Shopping Cart",è´ç‰©è½¦
+"Quote item id is not received.",报价项编å·æ— 法接å—。
+"Quote item is not loaded.",æŠ¥ä»·é¡¹æœªè¢«åŠ è½½ã€‚
+No,å¦
+"Apply Coupon Code",应用折价券
+"Remove Coupon Code",åˆ é™¤æŠ˜ä»·åˆ¸
+Qty,æ•°é‡
+Subtotal,å°è®¡
+Discount,折扣
+"Row Subtotal",è¡Œå°è®¡
+Action,æ“作
+"No ordered items",æ— è®¢å•é¡¹
+"Total %1 product(s)","Total %1 product(s)"
+Subtotal:,å°è®¡ï¼š
+"Excl. Tax",ä¸å«ç¨Ž
+Total,总数
+"Incl. Tax",å«ç¨Ž
+"Total incl. tax","Total incl. tax"
+"Move to Wishlist",移动到愿望清å•
+Edit,编辑
+Item,商å“
+"Add to Cart",æ·»åŠ åˆ°è´ç‰©è½¦
+Sku,Sku
+"Order saving error: %1","Order saving error: %1"
+"You created the order.","You created the order."
+Orders,订å•
+Customer,客户
+Guest,æ¥å®¾
+"Grand Total",总计
+Tax,ä¼ çœŸ
+Shipping,è¿é€
+"Account Information",å¸æˆ·ä¿¡æ¯
+"First Name",顾客姓å
+"Last Name",客户姓æ°
+Email,客户邮件
+Refresh,刷新
+Enable,Enable
+General,General
+Yes,是
+Name,姓å
+Status,状æ€
+Enabled,Enabled
+Title,æ ‡é¢˜
+Home,Home
+Any,Any
+From,æ¥è‡ª
+To,å‘é€è‡³
+" [deleted]"," [deleted]"
+Dashboard,Dashboard
+title,title
+Specified,Specified
+Order,订å•
+"Order #%1","Order #%1"
+"Shipping Amount",è¿é€é‡
+"Tax Amount",税é¢
+View,查看
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+N/A,N/A
+Ordered,已下å•
+Invoiced,已出å‘票
+Shipped,å·²å‘è´§
+Refunded,å·²å˜å‚¨
+Canceled,å·²å–消
+From:,æ¥è‡ªï¼š
+To:,至：
+"Gift Message",礼å“消æ¯
+Message:,ä¿¡æ¯ï¼š
+"Tier Pricing",å±‚çº§ä»·æ ¼
+"Go to Home Page","Go to Home Page"
+"Customer Group",客户组
+Closed,已关é—
+"Product Name",产å“å
+"Discount Amount",折扣å¸æˆ·
+Country,国家
+State/Province,å·ž/çœ
+"Payment Information",é…置文件信æ¯
+"Shipping Information",è¿é€ä¿¡æ¯
+"Shipping Method",è¿é€æ–¹å¼
+"Clear Shopping Cart",清空è´ç‰©è½¦
+City,城市
+"Zip/Postal Code",邮政编ç
+"Email Address",编辑电å邮件地å€
+Company,å…¬å¸
+Address,Address
+"Street Address",è¡—é“地å€
+Telephone,电è¯
+"Save in address book",ä¿å˜åˆ°åœ°å€ç°¿
+Continue,继ç»
+"Order #","Order #"
+"No Payment Methods",æ— æ”¯ä»˜æ–¹æ³•
+"Billing Address",è´¦å•åœ°å€
+"Shipping Address",é€è´§åœ°å€
+"Payment Method",支付方法的å称
+Sales,销售
+Created,创建于
+Select,选择
+Comment,评论
+%1,%1
+Date,日期
+"Add New Address",æ·»åŠ æ–°åœ°å€
+"Purchase Date","Purchase Date"
+"Bill-to Name",记账姓å
+"Ship-to Name",收货人
+"Order Total",订å•æ€»æ•°
+"Purchase Point",è´ä¹°è‡ªï¼ˆåº—铺）
+"Recent Orders",近期订å•
+"Store Credit",店铺信用
+Notified,已通知。
+"Notify Customer by Email",通过电å邮件通知客户
+Billing,è´¦å•
+"Newsletter Subscription",新闻邮件订阅
+"Order Status",订å•çŠ¶æ€
+"Wish List","Wish List"
+Pending,挂起
+"View Order",查看订å•
+Amount,æ•°é‡
+Message,ä¿¡æ¯
+Information,ä¿¡æ¯
+"Gift Options",礼å“选项
+"If you don't want to leave a gift message for the entire order, leave this box blank.","If you don't want to leave a gift message for the entire order, leave this box blank."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+New,新建
+"Custom Price",è‡ªå®šä¹‰ä»·æ ¼
+Processing,æ£åœ¨å¤„ç†
+"Add To Order",æ·»åŠ åˆ°è®¢å•
+"Configure and Add to Order",é…ç½®å¹¶æ·»åŠ åˆ°è®¢å•
+"No items",æ— é¡¹ç›®
+Authorization,授æƒ
+"Ordered amount of %1","Ordered amount of %1"
+"Payment transactions disallow storing objects.",支付交易ä¸å…许的店铺对象。
+"Transaction ID",交易ID
"Order ID","è®¢å• ID"
-"Order Information","订å•ä¿¡æ¯"
-"Order Invoices","订å•å‘票"
-"Order Shipments","订å•å‘è´§"
-"Order State","订å•çŠ¶æ€"
-"Order Status","订å•çŠ¶æ€"
-"Order Status Information","订å•çŠ¶æ€ä¿¡æ¯"
-"Order Statuses","订å•çŠ¶æ€"
-"Order Subtotal","订å•å°è®¡"
-"Order Taxes Report Grouped by Tax Rates","按税率分组的订å•ç¨Žè´¹æŠ¥å‘Š"
-"Order Total","订å•æ€»æ•°"
-"Order Totals","订å•æ€»æ•°"
-"Order Update","订å•æ›´æ–°"
-"Order Update for Guest","æ¥å®¾çš„订å•æ›´æ–°"
-"Order View","订å•æŸ¥çœ‹"
-"Order credit memo","订å•ä¿¡ç”¨è®°å½•"
-"Order does not allow to be canceled.","订å•ä¸å…许å–消。"
-"Order invoice","订å•å‘票"
-"Order is suspended as its capture amount %s is suspected to be fraudulent.","订å•è¢«æš‚åœï¼Œå› 为它的接å—é‡‘é¢ %s 被怀疑为欺诈。"
-"Order object is not specified.","订å•å¯¹è±¡æœªæŒ‡å®šã€‚"
-"Order saving error: %s","订å•ä¿å˜é”™è¯¯ï¼š%s"
-"Order shipments","订å•è¿é€"
-"Order status does not exist.","订å•çŠ¶æ€ä¸å˜åœ¨ã€‚"
-"Order status with the same status code already exist.","具有相åŒè®¢å•ä»£ç 的订å•çŠ¶æ€å·²å˜åœ¨ã€‚"
-"Order was placed using %s","使用 %s 下订å•"
-"Ordered","已下å•"
-"Ordered amount of %s.","%s 的已下å•æ•°é‡ã€‚"
-"Ordering amount of %s is pending approval on gateway.","%s的订å•æ•°é‡æ£åœ¨ç½‘站上挂起供审批。"
-"Orders","订å•"
-"Orders and Returns","订å•ä¸Žé€€è´§"
-"Orders and Returns Search Form","订å•ä¸Žé€€è´§æœç´¢è¡¨å•"
-"Original Price","åŽŸå§‹ä»·æ ¼"
-"Original order item that recurring payment corresponds to.","循环支付é…置文件所对应的原始订å•é¡¹ã€‚"
-"PDF Credit Memos","PDF版信用记录"
-"PDF Invoices","PDF版å‘票"
-"PDF Packing Slips","PDF版包裹清å•"
-"PDF Print-outs","PDF版打å°è¾“出"
-"PDF object is not specified.","PDF对象未指定。"
-"PDF page object is not specified.","PDF页é¢å¯¹è±¡æœªæŒ‡å®šã€‚"
-"PDF total model should extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal","PDF总模å—必须扩展\Magento\Sales\Model\Order\Pdf\Total\DefaultTotal"
-"Package","包裹"
-"Package types are disregarded for USPS domestic shipments.","USPS国内å‘货将忽略包装类型。"
-"Packages","包裹"
+Void,æ— æ•ˆ
+"Created At","Created At"
+"Payment Method:",支付方法：
+"Ship To",é€è´§è‡³
+"Invalid parent block for this block","Invalid parent block for this block"
+"Grand Total (Base)",G.T.（基本）
+"Grand Total (Purchased)",G.T.（已è´ä¹°ï¼‰
+"Customer Name","Customer Name"
+"We couldn't update the payment.","We couldn't update the payment."
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Refunded",退款总é‡
+Paid,已付费
+Coupons,折价券
+"Recently Viewed",最近查看过的
+"Recently Compared Products",最近比较过的产å“
+"Recently Viewed Products",最近查看过的产å“
+Print,打å°
+"Submit Comment",æ交评论
+Returned,已退款
+"Order Date",订å•æ—¥æœŸ
+"Order # ","Order # "
+"Order Date: ",订å•æ—¥æœŸï¼š
+"Comment Text",评论文å—
+"Visible on Frontend",å‰ç«¯å¯è§
+"Not Notified",未通知
+"Please select products.","Please select products."
+Number,æ•°å—
+"Order Date: %1","Order Date: %1"
+"Discount (%1)","Discount (%1)"
+"Shipping & Handling",è¿é€ä¸Žæ‰‹ç»è´¹
+"Credit Memos",信用记录
+Invoices,å‘票
+"We cannot get the order instance.","We cannot get the order instance."
+"Create New Order",创建新订å•
+"Save Order Address",ä¿å˜è®¢å•åœ°å€
+"Edit Order %1 %2 Address","Edit Order %1 %2 Address"
+"Order Address Information",订å•åœ°å€ä¿¡æ¯
+"Please correct the parent block for this block.","Please correct the parent block for this block."
+"Submit Order",æ交订å•
+"Are you sure you want to cancel this order?",您确认è¦å–消该订å•å—？
+"Order Comment",订å•è¯„论
+"Please select a customer.","Please select a customer."
+"Create New Customer",创建新客户
+"Edit Order #%1","Edit Order #%1"
+"Create New Order for %1 in %2","Create New Order for %1 in %2"
+"Create New Order for New Customer in %1","Create New Order for New Customer in %1"
+"Create New Order for %1","Create New Order for %1"
+"Create New Order for New Customer",为新客户创建新订å•
+"Items Ordered",商å“已下å•
+"This product is disabled.","This product is disabled."
+"Buy %1 for price %2","Buy %1 for price %2"
+"Item ordered qty",下å•å•†å“çš„æ•°é‡
+"%1 with %2 discount each","%1 with %2 discount each"
+"%1 for %2","%1 for %2"
+"* - Enter custom price including tax","* - 输入å«ç¨Žçš„è‡ªå®šä¹‰ä»·æ ¼"
+"* - Enter custom price excluding tax","* - 输入ä¸å«ç¨Žçš„è‡ªå®šä¹‰ä»·æ ¼"
+"This product does not have any configurable options",该产å“ä¸åŒ…å«ä»»ä½•å¯é…置选项
+"Add Selected Product(s) to Order",æ·»åŠ æ‰€é€‰äº§å“到订å•
+"Update Changes",更新更改
+"Are you sure you want to delete all items from shopping cart?",ä½ æ˜¯å¦ç¡®å®šè¦åˆ 除è´ç‰©è½¦ä¸çš„所有内容？
+"Products in Comparison List",比较列表ä¸çš„产å“
+"Last Ordered Items",上次订è´çš„商å“
+"Please select a store.","Please select a store."
+"Order Totals",订å•æ€»æ•°
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"New Credit Memo for Invoice #%1","New Credit Memo for Invoice #%1"
+"New Credit Memo for Order #%1","New Credit Memo for Order #%1"
+"Refund Shipping (Incl. Tax)",å‘货退款（å«ç¨Žï¼‰
+"Refund Shipping (Excl. Tax)",å‘货退款（ä¸å«ç¨Žï¼‰
+"Refund Shipping",å‘货退款
+"Update Qty's",æ›´æ–°æ•°é‡
+Refund,退款
+"Refund Offline",离线退款
+"Paid Amount",付费金é¢
+"Refund Amount",退款é¢åº¦
+"Shipping Refund",è¿å•é€€æ¬¾
+"Order Grand Total",订å•æ€»æ•°
+"Adjustment Refund",调整退款
+"Adjustment Fee",调整费
+"Send Email",å‘é€é‚®ä»¶
+"Are you sure you want to send a Credit memo email to customer?","Are you sure you want to send a Credit memo email to customer?"
+"The credit memo email was sent","The credit memo email was sent"
+"the credit memo email is not sent",信用备忘录邮件未å‘é€
+"Credit Memo #%1 | %3 | %2 (%4)","Credit Memo #%1 | %3 | %2 (%4)"
+"Total Refund",总退款é¢
+"New Invoice and Shipment for Order #%1","New Invoice and Shipment for Order #%1"
+"New Invoice for Order #%1","New Invoice for Order #%1"
+"Submit Invoice and Shipment",æ交å‘票与è¿å•
+"Submit Invoice",æ交å‘票
+"Are you sure you want to send an Invoice email to customer?","Are you sure you want to send an Invoice email to customer?"
+"Credit Memo",信用记录
+Capture,获å–
+"the invoice email was sent",å‘票电å邮件已å‘é€
+"the invoice email is not sent",å‘票电å邮件未å‘é€
+"Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)"
+"Order Statuses",订å•çŠ¶æ€
+"Create New Status",创建新状æ€
+"Assign Status to State",按国家分é…状æ€
+"Save Status Assignment",ä¿å˜çŠ¶æ€åè®®
+"Assign Order Status to State",按国家分é…订å•çŠ¶æ€
+"Assignment Information",分é…ä¿¡æ¯
+"Order State",订å•çŠ¶æ€
+"Use Order Status As Default",默认使用订å•çŠ¶æ€
+"Visible On Frontend","Visible On Frontend"
+"Edit Order Status",编辑订å•çŠ¶æ€
+"Save Status",销售状æ€
+"New Order Status",新订å•çŠ¶æ€
+"Order Status Information",订å•çŠ¶æ€ä¿¡æ¯
+"Status Code",状æ€ä»£ç
+"Status Label",状æ€æ ‡ç¾
+"Store View Specific Labels",åº—é“ºè§†å›¾æŒ‡å®šçš„æ ‡ç¾
+"Total Paid",åŒä»˜æ¬¾é¢
+"Total Due",总é¢
+"Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
+"This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. ' 'To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"
+"Are you sure you want to void the payment?",您确认è¦ä½¿æ”¯ä»˜æ— 效å—？
+Hold,暂挂
+hold,hold
+Unhold,适当
+unhold,unhold
+"Are you sure you want to accept this payment?",您确认è¦æŽ¥å—该支付å—？
+"Accept Payment",接å—付款
+"Are you sure you want to deny this payment?",您确认è¦æ‹’ç»è¯¥æ”¯ä»˜å—？
+"Deny Payment",æ‹’ç»æ”¯ä»˜
+"Get Payment Update",获得支付更新
+"Invoice and Ship",å‘票与å‘è´§
+Invoice,å‘票
+Ship,é€è´§
+Reorder,记录
+"Order # %1 %2 | %3","Order # %1 %2 | %3"
+"This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed.","This order contains (%1) items and therefore cannot be edited through the admin interface. ' 'If you wish to continue editing, the (%2) items will be removed, ' ' the order will be canceled and a new order will be placed."
+"Are you sure? This order will be canceled and a new one will be created instead.","Are you sure? This order will be canceled and a new one will be created instead."
+"Save Gift Message","Save Gift Message"
+"Order Credit Memos",订å•ä¿¡ç”¨è®°å½•
+"Credit memo #%1 created","Credit memo #%1 created"
+"Credit memo #%1 comment added","Credit memo #%1 comment added"
+"Shipment #%1 created","Shipment #%1 created"
+"Shipment #%1 comment added","Shipment #%1 comment added"
+"Invoice #%1 created","Invoice #%1 created"
+"Invoice #%1 comment added","Invoice #%1 comment added"
+"Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned"
+"Comments History",评论历å²
+"Order History",订å•åŽ†å²
+"Order Information",订å•ä¿¡æ¯
+"Order Invoices",订å•å‘票
+Shipments,å‘è´§
+"Order Shipments",订å•å‘è´§
+Transactions,交易
+"Order View",订å•æŸ¥çœ‹
+"Applies to Any of the Specified Order Statuses","Applies to Any of the Specified Order Statuses"
+"Show Actual Values","Show Actual Values"
+"Shipping & Handling",è¿è´¹å’Œæ‰‹ç»è´¹
+Fetch,获å–
+"Transaction # %1 | %2","Transaction # %1 | %2"
+Key,密钥
+Value,值
+"We found an invalid entity model.","We found an invalid entity model."
+"Order # %1","Order # %1"
+"Back to My Orders",返回我的订å•
+"View Another Order",查看å¦ä¸€è®¢å•
+"About Your Refund",关于您的退款
+"My Orders",我的订å•
+"About Your Invoice",关于您的å‘票
+"Print Order # %1","Print Order # %1"
+"Grand Total to be Charged",需è¦æ”¶å–的总费用
+Unassign,撤销分é…
+"We sent the message.","We sent the message."
+"This order no longer exists.",该订å•å·²ä¸å˜åœ¨ã€‚
+"Exception occurred during order load","Exception occurred during order load"
+"You sent the order email.","You sent the order email."
+"We couldn't send the email order.","We couldn't send the email order."
+"You canceled the order.","You canceled the order."
+"You have not canceled the item.","You have not canceled the item."
+"You put the order on hold.","You put the order on hold."
+"You have not put the order on hold.","You have not put the order on hold."
+"You released the order from holding status.","You released the order from holding status."
+"The order was not on hold.","The order was not on hold."
+"The payment has been accepted.",支付已被接å—。
+"The payment has been denied.",支付已被拒ç»ã€‚
+"The payment update has been made.","The payment update has been made."
+"Comment text cannot be empty.","Comment text cannot be empty."
+"We cannot add order history.","We cannot add order history."
+"%1 order(s) cannot be canceled.","%1 order(s) cannot be canceled."
+"You cannot cancel the order(s).","You cannot cancel the order(s)."
+"We canceled %1 order(s).","We canceled %1 order(s)."
+"%1 order(s) were not put on hold.","%1 order(s) were not put on hold."
+"No order(s) were put on hold.",没有被暂挂的订å•ã€‚
+"You have put %1 order(s) on hold.","You have put %1 order(s) on hold."
+"%1 order(s) were not released from on hold status.","%1 order(s) were not released from on hold status."
+"No order(s) were released from on hold status.","No order(s) were released from on hold status."
+"%1 order(s) have been released from on hold status.","%1 order(s) have been released from on hold status."
+"There are no printable documents related to selected orders.",没有与所选订å•æœ‰å…³çš„å¯æ‰“å°æ–‡æ¡£ã€‚
+"The payment has been voided.",支付已被撤销。
+"We couldn't void the payment.","We couldn't void the payment."
+"You updated the order address.","You updated the order address."
+"Something went wrong updating the order address.","Something went wrong updating the order address."
+"""%1"" coupon code is not valid.","""%1"" coupon code is not valid."
+"The coupon code has been accepted.",该代金券代ç 已被使用。
+"New Order",新订å•
+"The order no longer exists.","The order no longer exists."
+"Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"View Memo for #%1","View Memo for #%1"
+"View Memo","View Memo"
+"New Memo for #%1","New Memo for #%1"
+"New Memo","New Memo"
+"Cannot update the item's quantity.","Cannot update the item's quantity."
+"Credit memo's total must be positive.","Credit memo's total must be positive."
+"Cannot create online refund for Refund to Store Credit.","Cannot create online refund for Refund to Store Credit."
+"You created the credit memo.","You created the credit memo."
+"Cannot save the credit memo.","Cannot save the credit memo."
+"The credit memo has been canceled.","The credit memo has been canceled."
+"You canceled the credit memo.","You canceled the credit memo."
+"You voided the credit memo.","You voided the credit memo."
+"We can't void the credit memo.","We can't void the credit memo."
+"The Comment Text field cannot be empty.","The Comment Text field cannot be empty."
+"Cannot add new comment.","Cannot add new comment."
+"Edit Order","Edit Order"
+"The invoice no longer exists.","The invoice no longer exists."
+"The order does not allow an invoice to be created.","The order does not allow an invoice to be created."
+"Cannot create an invoice without products.","Cannot create an invoice without products."
+"New Invoice",æ–°å‘票
+"Cannot update item quantity.","Cannot update item quantity."
+"The invoice and the shipment have been created. ' 'The shipping label cannot be created now.","The invoice and the shipment have been created. ' 'The shipping label cannot be created now."
+"You created the invoice and shipment.","You created the invoice and shipment."
+"The invoice has been created.","The invoice has been created."
+"We can't send the invoice email.","We can't send the invoice email."
+"We can't send the shipment.","We can't send the shipment."
+"We can't save the invoice.","We can't save the invoice."
+"The invoice has been captured.","The invoice has been captured."
+"Invoice capturing error","Invoice capturing error"
+"You canceled the invoice.","You canceled the invoice."
+"Invoice canceling error","Invoice canceling error"
+"The invoice has been voided.","The invoice has been voided."
+"Invoice voiding error","Invoice voiding error"
+"Create New Order Status",创建新订å•çŠ¶æ€
+"We can't find this order status.","We can't find this order status."
+"We found another order status with the same order status code.","We found another order status with the same order status code."
+"You have saved the order status.","You have saved the order status."
+"We couldn't add your order status because something went wrong saving.","We couldn't add your order status because something went wrong saving."
+"You have assigned the order status.","You have assigned the order status."
+"An error occurred while assigning order status. Status has not been assigned.",分é…订å•çŠ¶æ€æ—¶å‘生错误。状æ€æœªè¢«åˆ†é…。
+"You have unassigned the order status.","You have unassigned the order status."
+"Something went wrong while we were unassigning the order.","Something went wrong while we were unassigning the order."
+"Something went wrong while saving the gift message.","Something went wrong while saving the gift message."
+"The gift message has been saved.","The gift message has been saved."
+"Please correct the transaction ID and try again.","Please correct the transaction ID and try again."
+"The transaction details have been updated.","The transaction details have been updated."
+"We can't update the transaction details.","We can't update the transaction details."
+"Orders and Returns",订å•ä¸Žé€€è´§
+"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
+"You entered incorrect data. Please try again.","You entered incorrect data. Please try again."
+"We couldn't find this wish list.","We couldn't find this wish list."
+"We could not add a product to cart by the ID ""%1"".","We could not add a product to cart by the ID ""%1""."
+"There is an error in one of the option rows.","There is an error in one of the option rows."
+"Shipping Address: ","Shipping Address: "
+"Billing Address: ","Billing Address: "
+"You need to specify order items.","You need to specify order items."
+"You need to specify a shipping method.","You need to specify a shipping method."
+"A payment method must be specified.","A payment method must be specified."
+"This payment method instance is not available.","This payment method instance is not available."
+"This payment method is not available.","This payment method is not available."
+"VAT Request Identifier","VAT Request Identifier"
+"VAT Request Date","VAT Request Date"
+"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually."
+"A hold action is not available.","A hold action is not available."
+"You cannot remove the hold.","You cannot remove the hold."
+"We cannot cancel this order.","We cannot cancel this order."
+"The most money available to refund is %1.","The most money available to refund is %1."
+"We cannot register an existing credit memo.","We cannot register an existing credit memo."
+"Unknown State",未知州
+"We found an invalid quantity to refund item ""%1"".","We found an invalid quantity to refund item ""%1""."
+"Maximum shipping amount allowed to refund is: %1","Maximum shipping amount allowed to refund is: %1"
+"We cannot register an existing invoice","We cannot register an existing invoice"
+"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""."
+"Unknown Status",ä½ç½®çŠ¶æ€
+Backordered,延期
+Partial,部分
+Mixed,æ··åˆ
+"An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
+"Captured amount of %1 online","Captured amount of %1 online"
+"An order with subscription items was registered.","An order with subscription items was registered."
+"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
+"Order is suspended as its capture amount %1 is suspected to be fraudulent.","Order is suspended as its capture amount %1 is suspected to be fraudulent."
+"Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
+"Registered a Void notification.",注册的撤销通知。
+"If the invoice was created offline, try creating an offline credit memo.","If the invoice was created offline, try creating an offline credit memo."
+"We refunded %1 online.","We refunded %1 online."
+"We refunded %1 offline.","We refunded %1 offline."
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"""
+"The credit memo has been created automatically.","The credit memo has been created automatically."
+"Registered notification about refunded amount of %1.","Registered notification about refunded amount of %1."
+"Canceled order online","Canceled order online"
+"Canceled order offline","Canceled order offline"
+"Approved the payment online.",å·²åœ¨çº¿å®¡æ ¸æ”¯ä»˜ã€‚
+"There is no need to approve this payment.",æ— éœ€å®¡æ ¸è¯¥æ”¯ä»˜ã€‚
+"Registered notification about approved payment.",注册的有关已审批支付的通知。
+"Denied the payment online","Denied the payment online"
+"There is no need to deny this payment.",æ— éœ€æ‹’ç»è¯¥æ”¯ä»˜ã€‚
+"Registered notification about denied payment.",注册的有关拒ç»æ”¯ä»˜çš„通知。
+"Registered update about approved payment.",注册的有关已审批支付的更新。
+"Registered update about denied payment.",注册的有关拒ç»æ”¯ä»˜çš„更新。
+"There is no update for the payment.",è¯¥æ”¯ä»˜æ— æ›´æ–°ã€‚
+"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"Authorized amount of %1","Authorized amount of %1"
+"Voided authorization.",æ— æ•ˆçš„è®¤è¯ã€‚
+"Amount: %1.","Amount: %1."
+"Transaction ID: ""%1""","Transaction ID: ""%1"""
+"The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID."
+"The transaction ""%1"" (%2) is already closed.","The transaction ""%1"" (%2) is already closed."
+"Set order for existing transactions not allowed",ä¸å…许对已å˜åœ¨çš„交易设置订å•
+"At minimum, you need to set a payment ID.","At minimum, you need to set a payment ID."
+"We found an unsupported transaction type ""%1"".","We found an unsupported transaction type ""%1""."
+"Please set a proper payment object.","Please set a proper payment object."
+"The Transaction ID field cannot be empty.","The Transaction ID field cannot be empty."
+"You can't do this without a transaction object.","You can't do this without a transaction object."
+"Sold to:","Sold to:"
+"Ship to:","Ship to:"
+"Shipping Method:",é€è´§æ–¹æ³•ï¼š
+"Total Shipping Charges",总è¿è´¹
+"We found an invalid renderer model.","We found an invalid renderer model."
+"Please define the PDF object before using.","Please define the PDF object before using."
+"We don't recognize the draw line data. Please define the ""lines"" array.","We don't recognize the draw line data. Please define the ""lines"" array."
+"Total (ex)","总计 (ex)"
+"Total (inc)",总数（å«ï¼‰
+"Credit Memo # ","Credit Memo # "
+"Invoice # ","Invoice # "
+"The order object is not specified.","The order object is not specified."
+"The source object is not specified.","The source object is not specified."
+"An item object is not specified.","An item object is not specified."
+"A PDF object is not specified.","A PDF object is not specified."
+"A PDF page object is not specified.","A PDF page object is not specified."
"Packing Slip # ","åŒ…è£¹æ¸…å• #"
-"Paid","已付费"
-"Paid Amount","付费金é¢"
-"Parent Transaction ID","父交易ID"
-"Parent transaction ID must have a transaction ID.","父交易ID必须有一个交易ID"
-"Partial","部分"
-"Payment Failed","支付失败"
-"Payment Information","支付信æ¯"
-"Payment Method","支付方å¼"
-"Payment Method","支付方法的å称"
-"Payment Method:","支付方法："
-"Payment Review","支付预览"
-"Payment disallow storing objects.","ä¸å…许支付的店铺对象。"
-"Payment transactions disallow storing objects.","支付交易ä¸å…许的店铺对象。"
-"Payment type","支付类型"
-"Payment update has been made.","支付更新已完æˆã€‚"
-"Pending","挂起"
-"Pending Payment","挂起的支付"
-"Period","周期"
-"Placed from IP","下å•ç”¨çš„IP"
-"Please Select Products to Add","请选择è¦æ·»åŠ 的产å“"
-"Please Select a Customer","请选择一个客户"
-"Please Select a Store","请选择商店"
-"Please check billing address information. %s","请检查å¸å•åœ°å€ä¿¡æ¯ã€‚ ï¼…s"
-"Please check shipping address information. %s","请检查é…é€åœ°å€ä¿¡æ¯ã€‚ï¼…s"
-"Please define PDF object before using.","请在使用å‰å®šä¹‰ PDF 对象。"
-"Please enter positive number in this field.","请在该å—段输入æ£æ•°ã€‚"
-"Please select a valid payment method.","请选择有效的支付方å¼ã€‚"
-"Please specify a shipping method.","请指定一个é…é€æ–¹æ³•ã€‚"
-"Please specify a valid grid column alias name that exists in grid table.","è¯·ä»ŽçŽ°æœ‰ç½‘æ ¼è¡¨ä¸æŒ‡å®šæœ‰æ•ˆçš„ç½‘æ ¼æ 别åå称。"
-"Price","ä»·æ ¼"
-"Print","打å°"
-"Print All","打å°å…¨éƒ¨"
-"Print All Invoices","打å°æ‰€æœ‰å‘票"
-"Print All Refunds","打å°æ‰€æœ‰é€€æ¬¾"
-"Print All Shipments","打å°æ‰€æœ‰è¿å•"
-"Print Credit Memos","打å°ä¿¡ç”¨è®°å½•"
-"Print Invoice","打å°å‘票"
-"Print Invoices","打å°å‘票"
-"Print Order","打å°è®¢å•"
-"Print Order # %s","打å°è®¢å• # %s"
-"Print Packing Slips","打å°åŒ…裹清å•"
-"Print Refund","打å°é€€æ¬¾"
-"Print Shipment","打å°è¿å•"
-"Print Shipping Label","打å°å‘è´§æ ‡ç¾"
-"Print Shipping Labels","打å°è¿å•æ ‡ç¾"
-"Processing","æ£åœ¨å¤„ç†"
-"Product","产å“"
-"Product Name","产å“å"
-"Products","产å“"
-"Products Bestsellers Report","产å“最佳销é‡æŠ¥å‘Š"
-"Products in Comparison List","比较列表ä¸çš„产å“"
-"Products should be added to package(s)","产å“åº”æ·»åŠ åˆ°åŒ…ä¸"
-"Payment #%s","é…置文件 #%s"
-"Payment Information","é…置文件信æ¯"
-"Payment State","é…置文件状æ€"
-"Profit","利润"
-"Promotion Coupons Usage Report","促销代金券使用情况报告"
-"Proper payment object must be set.","必须设置æ°å½“的支付对象。"
-"Purchase Order Number:","采è´è®¢å•å·"
-"Purchase Point","è´ä¹°è‡ªï¼ˆåº—铺）"
-"Purchased Date","è´ä¹°äºŽ"
-"Purchased From","è´ä¹°è‡ª"
-"Purchased Item","å·²è´ä¹°å†…容"
-"Qty","æ•°é‡"
-"Qty Invoiced","已开å‘票数é‡"
-"Qty Ordered","下å•çš„æ•°é‡"
-"Qty Shipped","å·²å‘货数é‡"
-"Qty To Add","æ·»åŠ çš„æ•°é‡"
-"Qty to Add","è¦æ·»åŠ çš„æ•°é‡"
-"Qty to Invoice","å‘票数é‡"
-"Qty to Refund","è¦é€€æ¬¾çš„æ•°é‡"
-"Qty to Ship","å‘货数é‡"
-"Quantity Ordered","下å•çš„æ•°é‡"
-"Quote item id is not received.","报价项编å·æ— 法接å—。"
-"Quote item is not loaded.","æŠ¥ä»·é¡¹æœªè¢«åŠ è½½ã€‚"
-"Rate","费率"
-"Recent Orders","近期订å•"
-"Recently Compared Products","最近比较过的产å“"
-"Recently Viewed","最近查看过的"
-"Recently Viewed Products","最近查看过的产å“"
-"Recurring Payment # %s","循环é…置文件 # %s"
-"Recurring Payment Initial Fee","循环é…置文件åˆå§‹åŒ–费用"
-"Recurring Payments","递归é…置文件"
-"Recurring Payments (beta)","循环é…置文件（测试）"
-"Reference ID","å‚考ID"
-"Reference ID:","å‚考ID："
-"Refresh","刷新"
-"Refund","退款"
-"Refund #","退款 #"
-"Refund #%s","退款 #%s"
-"Refund Amount","退款é¢åº¦"
-"Refund Offline","离线退款"
-"Refund Shipping","å‘货退款"
-"Refund Shipping (Excl. Tax)","å‘货退款（ä¸å«ç¨Žï¼‰"
-"Refund Shipping (Incl. Tax)","å‘货退款（å«ç¨Žï¼‰"
-"Refund Totals","退款总数"
-"Refunded","å·²å˜å‚¨"
-"Refunded amount of %s offline.","%s 离线退款的é¢åº¦"
-"Refunded amount of %s online.","%s 在线退款é¢åº¦"
-"Refunds","退款"
-"Registered a Void notification.","注册的撤销通知。"
-"Registered notification about approved payment.","注册的有关已审批支付的通知。"
-"Registered notification about captured amount of %s.","注册的有关%s获å–é¢åº¦çš„通知。"
-"Registered notification about denied payment.","注册的有关拒ç»æ”¯ä»˜çš„通知。"
-"Registered notification about refunded amount of %s.","注册的有关%s 退款é¢åº¦çš„通知。"
-"Registered update about approved payment.","注册的有关已审批支付的更新。"
-"Registered update about denied payment.","注册的有关拒ç»æ”¯ä»˜çš„更新。"
-"Regular Payment","æ£å¸¸æ”¯ä»˜"
-"Related Orders","相关订å•"
-"Remove","åˆ é™¤"
-"Remove Coupon Code","åˆ é™¤æŠ˜ä»·åˆ¸"
-"Remove tracking number","åˆ é™¤è¿½è¸ªå·ç "
-"Reorder","记录"
-"Retrieve credit memo info","检索贷项å‡å•ä¿¡æ¯"
-"Retrieve credit memo information","获å–信用记录信æ¯"
-"Retrieve credit memo list","检索贷项å‡å•æ¸…å•"
-"Retrieve invoice info","就获å–å‘票信æ¯"
-"Retrieve invoice information","获å–å‘票信æ¯"
-"Retrieve list of credit memos by filters","使用过滤器检索贷项å‡å•æ¸…å•"
-"Retrieve list of invoices by filters","使用ç›é€‰å™¨èŽ·å–å‘票列表"
-"Retrieve list of orders by filters","使用ç›é€‰å™¨èŽ·å–订å•åˆ—表"
-"Retrieve list of shipments by filters","使用ç›é€‰å™¨èŽ·å–è¿å•åˆ—表"
-"Retrieve order information","获å–订å•ä¿¡æ¯"
-"Retrieve orders info","获å–订å•ä¿¡æ¯"
-"Retrieve shipment info","获å–è¿å•ä¿¡æ¯"
-"Retrieve shipment information","获å–è¿å•ä¿¡æ¯"
-"Return to Stock","返回库å˜"
-"Returned","已退款"
-"Returns","返回"
-"Revenue","收入"
-"Row Subtotal","è¡Œå°è®¡"
-"Row Total","总行数"
-"SHIP TO:","è¿é€åˆ°ï¼š"
-"SKU","SKU"
-"SOLD TO:","å–给："
-"Sales","销售"
-"Sales Discount","销售折扣"
-"Sales Emails","销售邮件"
-"Sales Emails Section","销售邮件区域"
-"Sales Invoice Print View","销售å‘票打å°è§†å›¾"
-"Sales Items","销售产å“"
-"Sales Order Print View","销售订å•æ‰“å°è§†å›¾"
-"Sales Section","销售部分"
-"Sales Shipment Print View","销售å‘货打å°è§†å›¾"
-"Sales Shipping","销售å‘è´§"
-"Sales Tax","销售税"
-"Sales Total","销售总é‡"
-"Same As Billing Address","与账å•åœ°å€ç›¸åŒ"
-"Save Order Address","ä¿å˜è®¢å•åœ°å€"
-"Save Status","销售状æ€"
-"Save Status Assignment","ä¿å˜çŠ¶æ€åè®®"
-"Save in address book","ä¿å˜åˆ°åœ°å€ç°¿"
-"Schedule","计划"
-"Select","选择"
-"Select All","全选"
-"Select from existing customer addresses:","从现有客户地å€é€‰æ‹©ï¼š"
-"Send Credit Memo Comment Email Copy To","å‘é€ä¿¡ç”¨è®°å½•è¯„论邮件副本到"
-"Send Credit Memo Comments Email Copy Method","å‘é€ä¿¡ç”¨è®°å½•è¯„论邮件副本的方法"
-"Send Credit Memo Email Copy Method","å‘é€ä¿¡ç”¨è®°å½•é‚®ä»¶å‰¯æœ¬çš„方法"
-"Send Credit Memo Email Copy To","å‘é€ä¿¡ç”¨è®°å½•é‚®ä»¶å‰¯æœ¬è‡³"
-"Send Email","å‘é€é‚®ä»¶"
-"Send Invoice Comment Email Copy To","å‘é€å‘票评论邮件副本至"
-"Send Invoice Comments Email Copy Method","å‘é€å‘票评论邮件副本的方法"
-"Send Invoice Email Copy Method","å‘é€å‘票邮件副本的方法"
-"Send Invoice Email Copy To","å‘é€å‘票邮件副本到"
-"Send Order Comment Email Copy To","å‘é€è®¢å•è¯„论邮件副本至"
-"Send Order Comments Email Copy Method","å‘é€è®¢å•è¯„论邮件副本的方法"
-"Send Order Email","å‘é€è®¢å•é‚®ä»¶"
-"Send Order Email Copy Method","å‘é€è®¢å•é‚®ä»¶å‰¯æœ¬çš„方法"
-"Send Order Email Copy To","å‘é€è®¢å•é‚®ä»¶å‰¯æœ¬è‡³"
-"Send Sales Emails","å‘é€é”€å”®é‚®ä»¶"
-"Send Shipment Comment Email Copy To","å‘é€é€è´§è¯„价邮件副本至"
-"Send Shipment Comments Email Copy Method","å‘é€è¿å•è¯„论邮件副本的方法"
-"Send Shipment Email Copy Method","å‘é€è¿å•é‚®ä»¶å‰¯æœ¬çš„方法"
-"Send Shipment Email Copy To","å‘é€é€è´§é‚®ä»¶å‰¯æœ¬è‡³"
-"Send Tracking Information","å‘é€è¿½è¸ªä¿¡æ¯"
-"Set order for existing transactions not allowed","ä¸å…许对已å˜åœ¨çš„交易设置订å•"
-"Ship","é€è´§"
-"Ship Date","å‘货日期"
-"Ship To","é€è´§è‡³"
-"Ship-to Name","收货人"
-"Shipment","é€è´§å•å·"
-"Shipment","å‘è´§"
-"Shipment %1$s | %3$s (%2$s)","é€è´§å•å·#%1$s | %3$s (%2$s)"
-"Shipment %s","é€è´§å•å·#%s"
-"Shipment Comment Email Sender","é€è´§è¯„价邮件å‘é€è€…"
-"Shipment Comment Email Template","é€è´§è¯„价邮件模æ¿"
-"Shipment Comment Email Template for Guest","针对æ¥å®¾çš„è¿å•è¯„论邮件模æ¿"
-"Shipment Comments","è¿å•è¯„论"
-"Shipment Email Sender","è¿å•é‚®ä»¶å‘é€ç¨‹åº"
-"Shipment Email Template","é€è´§é‚®ä»¶æ¨¡æ¿"
-"Shipment Email Template for Guest","访客é€è´§é‚®ä»¶æ¨¡æ¿"
-"Shipment Update","é€è´§ä¿¡æ¯æ›´æ–°"
-"Shipment Update for Guest","针对æ¥å®¾çš„è¿å•æ›´æ–°"
-"Shipments","å‘è´§"
-"Shipped","å·²å‘è´§"
-"Shipped By","é€è´§æ–¹"
-"Shipping","è¿é€"
-"Shipping & Handling","è¿è´¹å’Œæ‰‹ç»è´¹"
-"Shipping & Handling","è¿é€ä¸Žæ‰‹ç»è´¹"
-"Shipping & Handling Information","è¿å• & 处ç†ä¿¡æ¯"
-"Shipping Address","é€è´§åœ°å€"
-"Shipping Amount","è¿é€é‡"
-"Shipping Information","è¿é€ä¿¡æ¯"
-"Shipping Method","è¿é€æ–¹å¼"
-"Shipping Method:","é€è´§æ–¹æ³•ï¼š"
-"Shipping Refund","è¿å•é€€æ¬¾"
-"Shipping and Tracking Information","è¿é€å’Œè¿½è¸ªä¿¡æ¯"
-"Shopping Cart","è´ç‰©è½¦"
-"Show Packages","显示包裹"
-"Signature Confirmation","ç¾å确认"
-"Signed Up From","ç¾ç½²è‡ª"
-"Size","尺寸"
-"Sku","Sku"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","下列æŸäº›äº§å“必须的选项ä¸å®Œæ•´ã€‚请修改并é…置所有必须的选项。"
-"Sorry, no quotes are available for this order at this time.","抱æ‰ï¼Œå½“å‰è¯¥è®¢å•ä¸æ²¡æœ‰æŠ¥ä»·å¯ç”¨ã€‚"
-"Source object is not specified.","æºå¯¹è±¡æœªæŒ‡å®šã€‚"
-"Specified profile does not exist.","指定的é…置文件ä¸å˜åœ¨ã€‚"
-"State Code [State Title]","州代ç [å·žå称]"
-"State/Province","å·ž/çœ"
-"Status","状æ€"
-"Status Code","状æ€ä»£ç "
-"Status Label","状æ€æ ‡ç¾"
-"Status:","状æ€ï¼š"
-"Store Credit","店铺信用"
-"Store View Specific Labels","åº—é“ºè§†å›¾æŒ‡å®šçš„æ ‡ç¾"
-"Street Address","è¡—é“地å€"
-"Submit Comment","æ交评论"
-"Submit Credit Memo","æ交信用记录"
-"Submit Invoice","æ交å‘票"
-"Submit Invoice and Shipment","æ交å‘票与è¿å•"
-"Submit Order","æ交订å•"
-"Submit Shipment","æ交è¿å•"
-"Subscribe to Newsletter","订阅到新闻通讯"
-"Subscribe to Order Status","订阅订å•çŠ¶æ€"
-"Subtotal","å°è®¡"
-"Subtotal after discount.","折扣åŽæ€»é¢ã€‚"
-"Subtotal:","å°è®¡ï¼š"
-"Suspected Fraud","欺诈嫌疑"
-"Suspend","挂起"
-"Suspended","暂挂"
-"Tax","ä¼ çœŸ"
-"Tax Amount","税é¢"
-"Tax Percent","税率"
-"Telephone","电è¯"
-"The Order State ""%s"" must not be set manually.","订å•çŠ¶æ€ ""%s"" 必须手工设置。"
+"We cannot register an existing shipment","We cannot register an existing shipment"
+"We cannot create an empty shipment.","We cannot create an empty shipment."
+"We found an invalid qty to ship for item ""%1"".","We found an invalid qty to ship for item ""%1""."
+"The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","The total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal."
+"Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.","Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself."
+"We found an invalid request for adding product to quote.","We found an invalid request for adding product to quote."
+"This is the wrong quote item id to update configuration.","This is the wrong quote item id to update configuration."
+"This shipping method is not available. To use this shipping method, please contact us.","This shipping method is not available. To use this shipping method, please contact us."
+"The address model is not defined.","The address model is not defined."
"The address total model should be extended from \Magento\Sales\Model\Quote\Address\Total\AbstractTotal.","地å€æ€»æ¨¡å—应扩展自\Magento\Sales\Model\Quote\Address\Total\AbstractTotal。"
-"The coupon code has been accepted.","该代金券代ç 已被使用。"
-"The message has been sent.","该信æ¯å·²å‘é€ã€‚"
-"The message was sent.","消æ¯å·²å‘é€ã€‚"
-"The order address has been updated.","订å•åœ°å€å·²æ›´æ–°ã€‚"
-"The order email has been sent.","订å•ç”µå邮件已å‘é€ã€‚"
-"The order has been cancelled.","订å•å·²è¢«å–消。"
-"The order has been created.","订å•å·²åˆ›å»ºã€‚"
-"The order has been put on hold.","订å•å·²è¢«æš‚挂。"
-"The order has been released from holding status.","订å•å·²è„±ç¦»æš‚挂状æ€ã€‚"
-"The order has not been cancelled.","订å•å°šæœªè¢«å–消。"
-"The order status has been assigned.","订å•çŠ¶æ€å·²è¢«åˆ†é…。"
-"The order status has been saved.","订å•çŠ¶æ€å·²è¢«ä¿å˜ã€‚"
-"The order status has been unassigned.","订å•çŠ¶æ€å·²è¢«æ’¤é”€åˆ†é…。"
-"The order was not put on hold.","订å•æ²¡æœ‰è¢«ä¿æŒã€‚"
-"The order was not unheld.","订å•æ²¡æœ‰è¢«ä¿æŒã€‚"
-"The order was placed using %s","订å•è¢«ä½¿ç”¨ %s 下达。"
-"The order(s) cannot be canceled","订å•æ— 法被å–消"
-"The payment has been accepted.","支付已被接å—。"
-"The payment has been denied.","支付已被拒ç»ã€‚"
-"The payment has been voided.","支付已被撤销。"
-"The profile has been updated.","个人资料已更新。"
-"The profile has no changes.","ä¸ªäººèµ„æ–™æ— å˜åŒ–。"
-"The profile state has been updated.","é…置文件状æ€å·²æ›´æ–°ã€‚"
-"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","ä½ æƒ³è¦æ·»åŠ çš„æ•°é‡è¶…出了æŸäº›æ‰€é€‰å•†å“的总å¯å‘货数é‡"
-"The requested Payment Method is not available.","请求的支付方å¼ä¸å¯ç”¨ã€‚"
-"The shipping label has been created.","è¿é€æ ‡ç¾å·²åˆ›å»ºã€‚"
-"The transaction ""%s"" (%s) is already closed.","交易 ""%s"" (%s) 已被关é—。"
-"The transaction ""%s"" cannot be captured yet.","交易 ""%s"" å°šæ— æ³•èŽ·å–。"
-"The value that you entered is not valid.","ä½ è¾“å…¥çš„æ•°å€¼æ— æ•ˆã€‚"
-"There are no printable documents related to selected orders.","没有与所选订å•æœ‰å…³çš„å¯æ‰“å°æ–‡æ¡£ã€‚"
-"There are no shipping labels related to selected %s.","没有与所选 %s 有关的å‘è´§æ ‡ç¾ã€‚"
-"There is no need to approve this payment.","æ— éœ€å®¡æ ¸è¯¥æ”¯ä»˜ã€‚"
-"There is no need to deny this payment.","æ— éœ€æ‹’ç»è¯¥æ”¯ä»˜ã€‚"
-"There is no update for the payment.","è¯¥æ”¯ä»˜æ— æ›´æ–°ã€‚"
-"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","如果折扣åŽçš„æ€»ä»·æ ¼ä½ŽäºŽæœ€å°å€¼ï¼Œè¯¥ä¿¡æ¯ä¼šæ˜¾ç¤ºåœ¨è´ç‰©è½¦é‡Œã€‚"
-"This operation requires an existing transaction object.","该æ“作需è¦ä¸€ä¸ªçŽ°æœ‰çš„äº¤æ˜“ç›®æ ‡ã€‚"
-"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","该订å•åŒ…å« (%s) ä¸ªé¡¹ç›®ï¼Œå› æ¤å½“å‰æ— 法通过管ç†å‘˜ç•Œé¢ç¼–辑，如果您希望继ç»ç¼–辑，(%s) ä¸ªé¡¹ç›®å°†è¢«åˆ é™¤ï¼Œè¯¥è®¢å•å°†è¢«å–消并生æˆæ–°è®¢å•ã€‚"
-"This order no longer exists.","该订å•å·²ä¸å˜åœ¨ã€‚"
-"This product does not have any configurable options","该产å“ä¸åŒ…å«ä»»ä½•å¯é…置选项"
-"This profile state cannot be changed to ""%s"".","该资料状æ€æ— 法更改为“%sâ€ã€‚"
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","这将会创建离线退款。è¦åˆ›å»ºåœ¨çº¿é€€æ¬¾ï¼Œæ‰“å¼€ä¸€å¼ å‘票并为其创建信用备忘录。您希望继ç»å—？"
-"Tier Pricing","å±‚çº§ä»·æ ¼"
-"Title","æ ‡é¢˜"
-"To","å‘é€è‡³"
-"To Name","到å称"
-"To:","至："
-"Total","总数"
-"Total %d product(s)","总共%d个产å“"
-"Total (ex)","总计 (ex)"
-"Total (inc)","总数（å«ï¼‰"
-"Total Due","总é¢"
-"Total Invoiced","å‘票总é‡"
-"Total Invoiced Paid","å‘票总金é¢"
-"Total Invoiced VS Paid Report","å‘票总数 VS 付款报告"
-"Total Invoiced not Paid","未付款å‘票总é¢"
-"Total Ordered Report","订å•æ€»æ•°æŠ¥å‘Š"
-"Total Paid","åŒä»˜æ¬¾é¢"
-"Total Quantity","总数é‡"
-"Total Refund","总退款é¢"
-"Total Refunded","退款总é‡"
-"Total Refunded Report","退款总数报告"
-"Total Sales Shipping","总销售è¿é€"
-"Total Shipped Report","å‘货总数报告"
-"Total Shipping","总è¿é€é¢"
-"Total Shipping Charges","总è¿è´¹"
-"Total Tax","总税款"
-"Total Weight","总高度"
-"Total model should be extended from \Magento\Sales\Model\Order\Total\AbstractTotal.","总模型应延长自 \Magento\Sales\Model\Order\Total\AbstractTotal。"
-"Track Order","追踪订å•"
-"Track all shipment(s)","追踪所有è¿é€"
-"Track all shipments","追踪所有è¿å•"
-"Track this shipment","追踪该è¿å•"
-"Track your order","追踪您的订å•"
-"Tracking","追踪"
-"Tracking Number","追踪编å·"
-"Tracking Number(s):","追踪编å·ï¼š"
-"Transaction ""%s"" was already processed.","交易 ""%s"" 已被处ç†ã€‚"
-"Transaction # %s | %s","交易 # %s | %s"
-"Transaction ID","交易ID"
-"Transaction ID must not be empty.","交易IDä¸èƒ½ä¸ºç©ºã€‚"
-"Transaction ID: ""%s"".","交易ID： ""%s""。"
-"Transaction Type","交易类型"
-"Transactions","交易"
-"Trial ","试用"
-"Trial Payment","试用支付"
-"Trial Period","å°è¯•å‘¨æœŸ"
-"Trial period payment","试用期支付"
-"Type","类型"
-"Unassign","撤销分é…"
-"Unhold","适当"
-"Unhold action is not available.","æ¢å¤æ“作ä¸å¯ç”¨ã€‚"
-"Unhold order","释放的订å•"
-"Unknown State","未知州"
-"Unknown Status","ä½ç½®çŠ¶æ€"
-"Unsupported transaction type ""%s"".","ä¸æ”¯æŒçš„交易类型""%s""。"
-"Update Changes","更新更改"
-"Update Items and Qty's","更新项目与数é‡"
-"Update Qty's","æ›´æ–°æ•°é‡"
-"Updated","更新于"
-"Updated:","更新时间："
-"Use Aggregated Data (beta)","使用èšåˆæ•°æ®ï¼ˆæµ‹è¯•ç‰ˆï¼‰"
-"Use Order Status As Default","默认使用订å•çŠ¶æ€"
-"Validate Each Address Separately in Multi-address Checkout","分别验è¯å¤šåœ°å€å¤é€‰æ¡†å†…çš„æ¯ä¸€ä¸ªåœ°å€"
-"Value","值"
-"View","查看"
-"View All","查看全部"
-"View Another Order","查看å¦ä¸€è®¢å•"
-"View Order","查看订å•"
-"Visible on Frontend","å‰ç«¯å¯è§"
-"Void","æ— æ•ˆ"
-"Void invoice","查看å‘票"
-"Voided authorization.","æ— æ•ˆçš„è®¤è¯ã€‚"
-"Website","网站"
-"Weight","高度"
-"Whether buyer can define the date when billing for the profile begins.","å–家是å¦å¯ä»¥åœ¨ç®€ä»‹å¼€å§‹æ—¶å®šä¹‰æ—¥æœŸã€‚"
-"Width","宽"
-"Wishlist","愿望清å•"
-"Wrong quote item id to update configuration.","æ›´æ–°é…置的报价项目ID错误。"
-"Wrong state: ""%s"".","州错误：""%s"""
-"Yes","是"
-"You can leave a box blank if you don't wish to add a gift message for whole order","如果ä¸å¸Œæœ›ä¸ºæ•´ä¸ªè®¢å•æ·»åŠ 礼å“ä¿¡æ¯ï¼Œå³å¯åœ¨è¿™é‡Œç•™ç©º"
-"You have placed no orders.","您没有下订å•ã€‚"
-"You will be redirected to the payment system website.","您将被é‡å®šå‘到支付系统网站。"
-"Your credit card will be charged for","您的信用å¡å°†è¢«æ”¶å–"
-"ZIP/Post Code","邮政编ç "
-"Zip/Postal Code","邮政编ç "
-"cm","厘米"
-"in","英寸"
-"kg","kg"
-"lb","lb"
-"the credit memo email is not sent","信用备忘录邮件未å‘é€"
-"the credit memo email was sent","信用备忘录邮件已å‘é€"
-"the invoice email is not sent","å‘票电å邮件未å‘é€"
-"the invoice email was sent","å‘票电å邮件已å‘é€"
-"the order confirmation email is not sent","订å•ç¡®è®¤ç”µå邮件未å‘é€"
-"the order confirmation email was sent","订å•ç¡®è®¤ç”µå邮件已å‘é€"
-"the shipment email is not sent","è¿é€ç”µå邮件未å‘é€"
-"the shipment email was sent","è¿é€ç”µå邮件已å‘é€"
+"Subscription Items","Subscription Items"
+"Regular Payment",æ£å¸¸æ”¯ä»˜
+"Shipping & Handling (%1)","Shipping & Handling (%1)"
+"We found an invalid item option format.","We found an invalid item option format."
+"Item qty declaration error","Item qty declaration error"
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Something went wrong during the item options declaration.","Something went wrong during the item options declaration."
+"We found an item options declaration error.","We found an item options declaration error."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"The requested Payment Method is not available.",请求的支付方å¼ä¸å¯ç”¨ã€‚
+"We cannot determine the field name.","We cannot determine the field name."
+"Please specify a valid grid column alias name that exists in the grid table.","Please specify a valid grid column alias name that exists in the grid table."
+"We don't have enough information to save the parent transaction ID.","We don't have enough information to save the parent transaction ID."
+"The last status can't be unassigned from its current state.","The last status can't be unassigned from its current state."
+"Please check the shipping address information. %1","Please check the shipping address information. %1"
+"Please specify a shipping method.",请指定一个é…é€æ–¹æ³•ã€‚
+"Please check the billing address information. %1","Please check the billing address information. %1"
+"Please select a valid payment method.",请选择有效的支付方å¼ã€‚
+"Pending Payment",挂起的支付
+"On Hold",暂挂
+Complete,完æˆ
+"Suspected Fraud",欺诈嫌疑
+"Payment Review",支付预览
+"Changing address information will not recalculate shipping, tax or other order amount.",更改地å€ä¿¡æ¯ä¸ä¼šå¯¼è‡´é‡æ–°è®¡ç®—å‘è´§ã€ç¨Žé‡‘，或其他金é¢ã€‚
+"Order Comments",订å•è¯„论
+"Order Currency:",订å•å¸ç§ï¼š
+"Select from existing customer addresses:",从现有客户地å€é€‰æ‹©ï¼š
+"Same As Billing Address",与账å•åœ°å€ç›¸åŒ
+"You don't need to select a shipping address.","You don't need to select a shipping address."
+"Gift Message for the Entire Order",整个订å•çš„礼å“ä¿¡æ¯
+"Move to Shopping Cart",移动到è´ç‰©è½¦
+"Subscribe to Newsletter",订阅到新闻通讯
+"Click to change shipping method",点击更改é€è´§æ–¹æ³•
+"Sorry, no quotes are available for this order.","Sorry, no quotes are available for this order."
+"Get shipping methods and rates",获得å‘货方法和费率
+"You don't need to select a shipping method.","You don't need to select a shipping method."
+"Customer's Activities","Customer's Activities"
+"Append Comments",é™„åŠ è¯„è®º
+"Email Order Confirmation",订å•ç¡®è®¤ç”¨é‚®ä»¶å‘é€
+"Grand Total Excl. Tax","Grand Total Excl. Tax"
+"Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"The order was placed using %1.","The order was placed using %1."
+"Items to Refund",è¦é€€è´§çš„商å“
+"Return to Stock",返回库å˜
+"Qty to Refund",è¦é€€æ¬¾çš„æ•°é‡
+"Row Total",总行数
+"No Items To Refund",æ— å¯é€€æ¬¾é¡¹ç›®
+"Credit Memo Comments",信用记录评论
+"Refund Totals",退款总数
+"Email Copy of Credit Memo",信用记录副本用邮件å‘é€
+"Please enter a positive number in this field.","Please enter a positive number in this field."
+"Items Refunded",商å“已退款
+"No Items",æ— é¡¹ç›®
+"Credit Memo History","Credit Memo History"
+"Credit Memo Totals","Credit Memo Totals"
+"Create Shipment",创建è¿å•
+"Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.","Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice."
+"Qty to Invoice",å‘票数é‡
+"Invoice History","Invoice History"
+"Invoice Comments",å‘票评论
+"Invoice Totals","Invoice Totals"
+"Capture Amount",获å–é¢åº¦
+"Capture Online",在线获å–
+"Capture Offline",离线获å–
+"Not Capture",æ— èŽ·å–
+"The invoice will be created offline without the payment gateway.","The invoice will be created offline without the payment gateway."
+"Email Copy of Invoice",å‘票副本用邮件å‘é€
+"Items Invoiced",商å“移开å‘票
+"Total Tax",总税款
+"From Name",通过å称
+"To Name",到å称
+"Add Order Comments",æ·»åŠ è®¢å•è¯„论
+"Notification Not Applicable",通知ä¸å¯ç”¨
+"the order confirmation email was sent",订å•ç¡®è®¤ç”µå邮件已å‘é€
+"the order confirmation email is not sent",订å•ç¡®è®¤ç”µå邮件未å‘é€
+"Order Date (%1)","Order Date (%1)"
+"Purchased From",è´ä¹°è‡ª
+"Link to the New Order",链接到新订å•
+"Link to the Previous Order",连接到å‰ä¸€è®¢å•
+"Placed from IP",下å•ç”¨çš„IP
+"%1 / %2 rate:","%1 / %2 rate:"
+"Item Status",商å“状æ€
+"Original Price",åŽŸå§‹ä»·æ ¼
+"Tax Percent",税率
+"Transaction Data","Transaction Data"
+"Parent Transaction ID",父交易ID
+"Transaction Type",交易类型
+"Is Closed","Is Closed"
+"Child Transactions","Child Transactions"
+"Transaction Details","Transaction Details"
+"Gift Message for this Order",该订å•çš„礼å“ä¿¡æ¯
+"Shipped By",é€è´§æ–¹
+"Tracking Number",追踪编å·
+"Billing Last Name",按姓æ°è®°è´¦
+"Find Order By:",订å•æŸ¥æ‰¾æ¡ä»¶ï¼š
+"ZIP Code","ZIP Code"
+"Billing ZIP Code",按邮编记账
+"Print All Refunds",打å°æ‰€æœ‰é€€æ¬¾
+"Refund #","退款 #"
+"Print Refund",打å°é€€æ¬¾
+"You have placed no orders.",您没有下订å•ã€‚
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">Order Date:</span> %1"
+"No shipping information available",æ— å¯ç”¨å‘货信æ¯
+"Print Order",打å°è®¢å•
+"Subscribe to Order Status",订阅订å•çŠ¶æ€
+"Print All Invoices",打å°æ‰€æœ‰å‘票
+"Invoice #","å‘票 #"
+"Print Invoice",打å°å‘票
+"Qty Invoiced",已开å‘票数é‡
+"Refund #%1","Refund #%1"
+"Invoice #%1","Invoice #%1"
+"Shipment #%1","Shipment #%1"
+"Items Shipped",商å“å·²å‘è´§
+"Qty Shipped",å·²å‘货数é‡
+"View All",查看全部
+"Gift Message for This Order",该订å•çš„礼å“ä¿¡æ¯
+"About Your Order",关于您的订å•
+"Shipment Comments","Shipment Comments"
+"Gift Options for ","Gift Options for "
+Ok,Ok
+"Anchor Custom Title",è‡ªå®šä¹‰æ ‡é¢˜é”šç‚¹
+Phone,Phone
+"Default Template",默认模æ¿
+"Minimum Order Amount","Minimum Order Amount"
+Comma-separated,Comma-separated
+"Hide Customer IP","Hide Customer IP"
+"Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos.","Choose whether a customer IP is shown in orders, invoices, shipments, and credit memos."
+"Checkout Totals Sort Order","Checkout Totals Sort Order"
+"Allow Reorder","Allow Reorder"
+"Invoice and Packing Slip Design","Invoice and Packing Slip Design"
+"Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
+"
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ ","
+ Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
+ "
+"Logo for HTML Print View","Logo for HTML Print View"
+"
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ ","
+ Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
+ "
+"Minimum Amount","Minimum Amount"
+"Subtotal after discount","Subtotal after discount"
+"Description Message","Description Message"
+"This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount.","This message will be shown in the shopping cart when the subtotal (after discount) is lower than the minimum allowed amount."
+"Error to Show in Shopping Cart","Error to Show in Shopping Cart"
+"Validate Each Address Separately in Multi-address Checkout","Validate Each Address Separately in Multi-address Checkout"
+"Multi-address Description Message","Multi-address Description Message"
+"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
+"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
+"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
+"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Sales Emails","Sales Emails"
+"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
+"New Order Confirmation Template","New Order Confirmation Template"
+"New Order Confirmation Template for Guest","New Order Confirmation Template for Guest"
+"Send Order Email Copy To","Send Order Email Copy To"
+"Send Order Email Copy Method","Send Order Email Copy Method"
+"Order Comment Email Sender","Order Comment Email Sender"
+"Order Comment Email Template","Order Comment Email Template"
+"Order Comment Email Template for Guest","Order Comment Email Template for Guest"
+"Send Order Comment Email Copy To","Send Order Comment Email Copy To"
+"Send Order Comments Email Copy Method","Send Order Comments Email Copy Method"
+"Invoice Email Sender","Invoice Email Sender"
+"Invoice Email Template","Invoice Email Template"
+"Invoice Email Template for Guest","Invoice Email Template for Guest"
+"Send Invoice Email Copy To","Send Invoice Email Copy To"
+"Send Invoice Email Copy Method","Send Invoice Email Copy Method"
+"Invoice Comment Email Sender","Invoice Comment Email Sender"
+"Invoice Comment Email Template","Invoice Comment Email Template"
+"Invoice Comment Email Template for Guest","Invoice Comment Email Template for Guest"
+"Send Invoice Comment Email Copy To","Send Invoice Comment Email Copy To"
+"Send Invoice Comments Email Copy Method","Send Invoice Comments Email Copy Method"
+Shipment,å‘è´§
+"Shipment Email Sender","Shipment Email Sender"
+"Shipment Email Template","Shipment Email Template"
+"Shipment Email Template for Guest","Shipment Email Template for Guest"
+"Send Shipment Email Copy To","Send Shipment Email Copy To"
+"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
+"Shipment Comment Email Sender","Shipment Comment Email Sender"
+"Shipment Comment Email Template","Shipment Comment Email Template"
+"Shipment Comment Email Template for Guest","Shipment Comment Email Template for Guest"
+"Send Shipment Comment Email Copy To","Send Shipment Comment Email Copy To"
+"Send Shipment Comments Email Copy Method","Send Shipment Comments Email Copy Method"
+"Credit Memo Email Sender","Credit Memo Email Sender"
+"Credit Memo Email Template","Credit Memo Email Template"
+"Credit Memo Email Template for Guest","Credit Memo Email Template for Guest"
+"Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
+"Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
+"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
+"Credit Memo Comment Email Template","Credit Memo Comment Email Template"
+"Credit Memo Comment Email Template for Guest","Credit Memo Comment Email Template for Guest"
+"Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
+"Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
+"PDF Print-outs","PDF Print-outs"
+"Display Order ID in Header","Display Order ID in Header"
+"Orders and Returns Search Form",订å•ä¸Žé€€è´§æœç´¢è¡¨å•
+"PDF Credit Memos",PDF版信用记录
+"PDF Invoices",PDF版å‘票
+"Invoice Date",å‘票日期
+"ZIP/Post Code",邮政编ç
+"Signed-up Point","Signed-up Point"
+order-header,order-header
+"New Order RSS",新订å•RSS
+"Print Invoices",打å°å‘票
+"Print Packing Slips",打å°åŒ…裹清å•
+"Print Credit Memos",打å°ä¿¡ç”¨è®°å½•
+"Print All",打å°å…¨éƒ¨
+"Print Shipping Labels",打å°è¿å•æ ‡ç¾
+"Ship Date",å‘货日期
+"Total Quantity",总数é‡
+"Default Status",默认状æ€
+"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)."
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 01a3e63518f..528a5d32df9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -21,6 +21,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+
+/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
?>
<?php
/**
@@ -128,12 +131,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount'],true,true); ?></small></span><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales')): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount'],true,true); ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -152,7 +155,7 @@
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales')): ?>
- <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+ <?php echo $this->formatPrice($_incl+$_weeeHelper->getWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
<?php endif; ?>
@@ -161,7 +164,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales')): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount'],true,true); ?></span><br />
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
@@ -177,7 +180,7 @@
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl+$_weeeHelper->getWeeeTaxInclTax($_item)); ?></span>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
@@ -220,12 +223,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales')): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -243,7 +246,7 @@
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales')): ?>
- <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php echo $this->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
@@ -252,7 +255,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales')): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
@@ -268,7 +271,7 @@
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?></span>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
@@ -282,7 +285,7 @@
<td class="col-price col-row-subtotal">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax($this->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices($this->getStore())): ?>
- <?php $_rowTotalWithoutDiscount = $_item->getPriceInclTax() * $_item->getQty() - $_item->getDiscountAmount() - $_item->getTaxAmount(); ?>
+ <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getDiscountAmount(); ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices($this->getStore())): ?>
<span class="label"><?php echo __('Excl. Tax'); ?>:</span>
<?php endif; ?>
@@ -303,12 +306,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales')): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -327,7 +330,7 @@
<?php endif; ?>
<?php $_incl = $_item->getPriceInclTax() * $_item->getQty() - $_item->getDiscountAmount(); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales')): ?>
- <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php echo $this->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
@@ -336,7 +339,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales')): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
@@ -352,7 +355,7 @@
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales')): ?>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?></span>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
index 409e0fc44da..b4a52fb282b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
@@ -21,6 +21,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+
+/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
?>
<?php $_item = $this->getItem() ?>
<?php $this->setPriceDataObject($_item) ?>
@@ -64,12 +67,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales', $_item->getStoreId())): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales', $_item->getStoreId())): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -97,7 +100,7 @@
<?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBasePriceInclTax($_item); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
- <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+ <?php echo $this->displayPrices($_baseIncl+$_weeeHelper->getBaseWeeeTaxInclTax($_item), $_incl+$_weeeHelper->getWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
<?php endif; ?>
@@ -107,7 +110,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales', $_item->getStoreId())): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales', $_item->getStoreId())): ?>
@@ -124,7 +127,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales', $_item->getStoreId())): ?>
<br />
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_weeeHelper->getBaseWeeeTaxInclTax($_item), $_incl+$_weeeHelper->getWeeeTaxInclTax($_item)); ?></span>
<?php endif; ?>
<?php endif; ?>
</div>
@@ -160,12 +163,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales', $_item->getStoreId())): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales', $_item->getStoreId())): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -192,7 +195,7 @@
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
<?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBaseSubtotalInclTax($_item); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
- <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmnt(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php echo $this->displayPrices($_baseIncl+$_weeeHelper->getBaseRowWeeeTaxInclTax($_item), $_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?>
<?php else: ?>
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
@@ -204,7 +207,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales', $_item->getStoreId())): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales', $_item->getStoreId())): ?>
@@ -220,7 +223,7 @@
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales', $_item->getStoreId())): ?>
- <br /><span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmnt(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <br /><span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_weeeHelper->getBaseRowWeeeTaxInclTax($_item), $_incl+$_weeeHelper->getRowWeeeTaxInclTax($_item)); ?></span>
<?php endif; ?>
<?php endif; ?>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
index bfc4f36230c..ff25f159ad3 100644
--- a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
@@ -32,5 +32,4 @@
</arguments>
</block>
</referenceBlock>
- <move element="sale.reorder.sidebar" destination="left"/>
</layout>
diff --git a/app/code/Magento/Sales/view/frontend/layout/default.xml b/app/code/Magento/Sales/view/frontend/layout/default.xml
index e9fc0c2386c..56236d02b2f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/default.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/default.xml
@@ -27,7 +27,7 @@
<referenceBlock name="head.components">
<block class="Magento\Framework\View\Element\Js\Components" name="sales_page_head_components" template="Magento_Sales::js/components.phtml"/>
</referenceBlock>
- <referenceContainer name="right">
+ <referenceContainer name="sidebar.additional">
<block class="Magento\Sales\Block\Reorder\Sidebar" name="sale.reorder.sidebar" as="reorder" template="reorder/sidebar.phtml"/>
</referenceContainer>
<referenceBlock name="footer_links">
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index 0b0fc85ae85..0c2d141bfec 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -70,7 +70,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" title="<?php echo __('Continue') ?>" class="action submit primary">
<span><?php echo __('Continue') ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
index 88e0251429d..ded58aa14fe 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
@@ -24,7 +24,7 @@
?>
<div class="order details items creditmemo">
<?php echo $this->getChildHtml('creditmemo_items') ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->getBackUrl() ?>" class="action back">
<span><?php echo $this->getBackTitle() ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
index 6ccc032359f..1d4039efdff 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
@@ -24,7 +24,7 @@
?>
<div class="order details items invoice">
<?php echo $this->getChildHtml('invoice_items') ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->getBackUrl() ?>" class="action back">
<span><?php echo $this->getBackTitle() ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
index a873147db6a..08cf3d7ad56 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
@@ -21,8 +21,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+
+$_item = $this->getItem();
+/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
?>
-<?php $_item = $this->getItem() ?>
<tr id="order-item-row-<?php echo $_item->getId() ?>">
<td class="col name">
<strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
@@ -103,12 +106,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -140,7 +143,7 @@
<span class="cart-price">
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+ <?php echo $this->getOrder()->formatPrice($_incl+$_weeeHelper->getWeeeTaxInclTax($this->getItem())); ?>
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
<?php endif; ?>
@@ -152,7 +155,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -170,7 +173,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$_weeeHelper->getWeeeTaxInclTax($this->getItem())); ?></span>
</span>
<?php endif; ?>
<?php endif; ?>
@@ -228,12 +231,12 @@
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>
@@ -266,7 +269,7 @@
<span class="cart-price">
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+ <?php echo $this->getOrder()->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($this->getItem())); ?>
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
@@ -278,7 +281,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
<?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -296,7 +299,7 @@
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay(2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$_weeeHelper->getRowWeeeTaxInclTax($this->getItem())); ?></span>
</span>
<?php endif; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print.phtml
index f05451d27be..0f6e73322d5 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print.phtml
@@ -23,7 +23,7 @@
*/
?>
<?php $_order = $this->getOrder() ?>
-<div class="page title">
+<div class="page-title">
<h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
</div>
<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
index ae1eb3aed8a..dd81437c0a2 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
@@ -23,7 +23,7 @@
*/
?>
<?php $_order = $this->getOrder() ?>
-<div class="page title">
+<div class="page-title">
<h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
</div>
<p class="order date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index c416cfd4489..d56dcc43c6d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -23,7 +23,7 @@
*/
?>
<?php $_order = $this->getOrder() ?>
-<div class="page title">
+<div class="page-title">
<h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
</div>
<p class="order date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index 0adbabbe48f..051a90c2324 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
@@ -24,7 +24,7 @@
?>
<?php /* @var $this \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
<?php $order = $this->getOrder(); ?>
-<div class="page title">
+<div class="page-title">
<h1 class="title">
<?php echo __('Order #%1', $this->getObjectData($order, 'real_order_id')); ?>
</h1>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
index 54082a3447c..885e151dd5b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
@@ -58,7 +58,7 @@
</dl>
</div>
<?php endif; ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a class="action back" href="<?php echo $this->getBackUrl() ?>">
<span><?php echo $this->getBackTitle() ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index d52c0724961..078f89395ea 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -52,7 +52,7 @@
<?php endforeach; ?>
</ol>
<div id="cart-sidebar-reorder-advice-container"></div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<?php if ($_showAddButtonFlag): ?>
<div class="primary">
<button type="submit" title="<?php echo __('Add to Cart') ?>" class="action tocart primary">
diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
index dcbb364c720..45407067608 100644
--- a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
@@ -76,7 +76,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" title="Continue" class="action search">
<span><?php echo __('Continue') ?></span>
diff --git a/app/code/Magento/SalesRule/i18n/de_DE.csv b/app/code/Magento/SalesRule/i18n/de_DE.csv
index 1285fcf7e80..a90c46aeb28 100644
--- a/app/code/Magento/SalesRule/i18n/de_DE.csv
+++ b/app/code/Magento/SalesRule/i18n/de_DE.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Warenkorb Preisregeln für ""%s"" Eigenschaften wurden deaktiviert."
-"%s Coupon(s) have been generated","Es wurden %s Kupons erstellt."
-"Actions","Aktionen"
-"Active","Aktiv"
+ID,ID
+Apply,Anwenden
+No,Nein
+Subtotal,"Zwischensumme des Betrags"
+Discount,Rabattbetrag
+Uses,"Anzahl der Verwendungen"
+Delete,Delete
+Yes,Ja
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
+Description,Beschreibung
+Catalog,Katalog
+Actions,Aktionen
+Rule,Regelname
+"Start on",Startdatum
+"End on",Verfalldatum
+Active,Aktiv
+"This rule no longer exists.","Diese Regel existiert nicht mehr."
+"General Information","Allgemeine Information"
+Websites,Websites
"Add New Rule","Neue Regel hinzufügen"
-"Alphabetical","Alphabetisch"
-"Alphanumeric","Alphanumerisch"
-"An error occurred while generating coupons. Please review the log and try again.","Während er Erstellung der Kupons trat ein Fehler auf. Bitte überprüfen sie diese und versuchen sie es nochmals."
-"Apply","Anwenden"
-"Apply To","Anwenden auf"
-"Apply the rule only if the following conditions are met (leave blank for all products)","Regel nur bei folgenden Bedingungen anwenden (Leer lassen für alle Produkte)"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Regel nur auf Artikel im Warenkorb mit den folgenden Bedingungen anwenden (Leer lassen für alle Artikel)"
-"Apply the rule to cart items matching the following conditions","Regel nur bei folgenden Bedingungen auf Artikel im Warenkorb anwenden"
-"Apply to Shipping Amount","Auf Versandbetrag anwenden"
-"Are you sure you want to delete the selected coupon(s)?","Wollen sie die ausgewählten Kupons wirklich löschen?"
-"Auto","Automatisch"
-"Auto Generated Specific Coupon Codes","Automatische generierte spezifische Kupon-Kennung"
-"Buy X get Y free (discount amount is Y)","X kaufen, Y kostenlos bekommen (Rabattbetrag ist Y)"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","Neue Regel"
+"Rule Information",Regelinformation
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing","Weitere Regelbearbeitung abbrechen"
+Conditions,Bedingungen
+"Rule Name","Rule Name"
+Inactive,"Nicht aktiv"
+"Customer Groups",Kundengruppen
+"From Date","Von Datum"
+"To Date","Bis Datum"
+Priority,Priorität
+Promotions,Promotionen
+"Edit Rule","Regel ändern"
+"The rule has been saved.","Die Regel wurde gespeichert."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","Die Regel wurde gelöscht."
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product","Produkt aktualisieren"
+"To Fixed Value","Zu festen Wert"
+"To Percentage","Zu Prozent"
"By Fixed value","Nach festen Wert"
"By Percentage","Nach Prozent"
-"Can't acquire coupon.","Kann Gutschein nicht erwerben."
-"Cart Attribute","Warenkorbattribut"
-"Catalog","Katalog"
-"Code Format","Kennung -Format"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method",Lieferungsart
+"Payment Method",Zahlungsart
+Created,"Erstellt am"
+Alphanumeric,Alphanumerisch
+"Apply To","Anwenden auf"
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,Alphabetisch
+Numeric,Numerisch
+Generate,Erstellen
+Auto,Automatisch
+Coupon,Gutschein
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code",Gutscheincode
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight",Gesamtgewicht
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels","Ãœberblick spezifischer Etikette im Lager"
+"Shopping Cart Price Rules","Warenkorb Preisgebote"
+"Update prices using the following information","Finden Sie neue Preise mit den folgenden Informationen"
+"Percent of product price discount","Prozente für Rabatt auf den Verkaufspreis"
+"Fixed amount discount","Rabatt mit festem Wert"
+"Fixed amount discount for whole cart","Fester Rabattbetrag für gesamten Warenkorb"
+"Buy X get Y free (discount amount is Y)","X kaufen, Y kostenlos bekommen (Rabattbetrag ist Y)"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount","Auf Versandbetrag anwenden"
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes","Kupon-Kennungen verwalten"
+"Coupons Information",Kuponinformationen
+"Coupon Qty","Coupon Qty"
"Code Length","Kennung -Länge"
+"Excluding prefix, suffix and separators.","Ausgenommen Präfix, Zusatzziffern und Trenner."
+"Code Format","Kennung -Format"
"Code Prefix","Kennung- Präfix"
"Code Suffix","Kennung - Zusatz"
-"Conditions","Bedingungen"
-"Conditions combination","Bedingungskombination"
-"Coupon","Gutschein"
-"Coupon Code","Gutscheincode"
-"Coupon Quantity","Anzahl Kupon"
-"Coupon with the same code","Kupon mit gleicher Kennung"
-"Coupons Information","Kuponinformationen"
-"Created","Erstellt am"
-"Customer Groups","Kundengruppen"
"Dash Every X Characters","Trennstrichs alle X Ziffern"
-"End on","Verfalldatum"
-"Start on","Startdatum"
-"Default Label","Standardlabel"
-"Default Rule Label for All Store Views","Standardregel Label für alle StoreViews"
-"Description","Beschreibung"
-"Discount","Rabattbetrag"
-"Discount Quantity Step (Buy X)","Rabattmengenschritt (X kaufen)"
-"Edit Rule","Regel ändern"
-"Edit Rule '%s'","Regel '%s' ändern"
-"Excluding prefix, suffix and separators.","Ausgenommen Präfix, Zusatzziffern und Trenner."
-"FOUND","GEFUNDEN"
-"Fixed amount discount","Rabatt mit festem Wert"
-"Fixed amount discount for whole cart","Fester Rabattbetrag für gesamten Warenkorb"
-"For matching items only","Nur für passende Artikel"
-"For shipment with matching items","Für Versand mit passenden Artikeln"
-"Free Shipping","Versandkostenfrei"
-"From Date","Von Datum"
-"General Information","Allgemeine Information"
-"Generate","Erstellen"
-"ID","ID"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Falls %s %s %s für eine Unterauswahl der Artikel im Einkaufswagen %s dieser Bedingungen entspricht:"
-"If an item is %s in the cart with %s of these conditions true:","Falls ein Artikel im Einkaufswagen %s ist und %s dieser Bedingungen vorliegen:"
"If empty no separation.","Wenn leer, keine Trennung."
+"Times Used","Wie oft eingelöst"
+"Are you sure you want to delete the selected coupon(s)?","Wollen sie die ausgewählten Kupons wirklich löschen?"
+Labels,Bezeichnungen
+"Default Label",Standardlabel
+"Default Rule Label for All Store Views","Standardregel Label für alle StoreViews"
+"Use Auto Generation","Ãœber Automatische Erstellung"
"If you select and save the rule you will be able to generate multiple coupon codes.","Wenn sie diese Erstellungsregel auswählen und abspeichern, können sie mehrere Kupon-Kennziffern erstellen."
-"Inactive","Nicht aktiv"
-"Item totals are not set for rule.","Artikel-Summen sind keine Regel."
-"Labels","Bezeichnungen"
-"Manage Coupon Codes","Kupon-Kennungen verwalten"
-"Maximum Quantity Discount is Applied To","Maximal angewendete Rabattmenge"
-"NOT FOUND","NICHT GEFUNDEN"
-"NOT LOGGED IN","NICHT ANGEMELDET"
-"New Rule","Neue Regel"
-"No","Nein"
-"No Coupon","Kein Gutschein"
-"Not valid data provided","Es liegen keine gültigen Daten vor"
-"Uses","Anzahl der Verwendungen"
-"Numeric","Numerisch"
-"Payment Method","Zahlungsart"
-"Percent of product price discount","Prozente für Rabatt auf den Verkaufspreis"
-"Interval","Zeitraum"
-"Price in cart","Preis im Warenkorb"
-"Priority","Priorität"
-"Product attribute combination","Kombination der Produktmerkmale"
-"Products subselection","Produktunterauswahl"
-"Promotions","Promotionen"
+"Uses per Coupon","Verwendung je Gutschein"
+"Uses per Customer","Verwendung je Kunde"
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
"Public In RSS Feed","Im RSS Feed veröffentlichen"
-"Quantity in cart","Menge im Warenkorb"
-"Row total in cart","Zeile Gesamt im Warenkorb"
-"Rule Information","Regelinformation"
-"Rule","Regelname"
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
"Rule is not defined","Regel nicht definiert"
-"Sales Discount","Rabttbetrag des Verkaufs"
-"Sales Subtotal","Zwischensumme des Verkaufsbetrags"
-"Sales Total","Gesamtbetrag des Verkaufs"
-"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
-"Shipping Country","Lieferland"
-"Shipping Method","Lieferungsart"
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code","Kupon mit gleicher Kennung"
+"No Coupon","Kein Gutschein"
+"Specific Coupon","spezieller Gutschein"
+"Can't acquire coupon.","Kann Gutschein nicht erwerben."
+"Special Price",Sonderpreis
+"Total Items Quantity","Gesamtmenge aller Artikel"
"Shipping Postcode","Postleitzahl der Lieferadresse"
"Shipping Region","Region der Lieferadresse"
"Shipping State/Province","Bundesland/Provinz der Lieferadresse"
-"Price Rule","Warenkorb Preisgebot"
-"Shopping Cart Price Rules","Warenkorb Preisgebote"
-"Special Price","Sonderpreis"
-"Specific Coupon","spezieller Gutschein"
-"Status","Status"
-"Stop Further Rules Processing","Weitere Regelbearbeitung abbrechen"
-"Store View Specific Labels","Ãœberblick spezifischer Etikette im Lager"
-"Subtotal","Zwischensumme"
-"Subtotal","Zwischensumme des Betrags"
-"The rule has been deleted.","Die Regel wurde gelöscht."
-"The rule has been saved.","Die Regel wurde gespeichert."
-"This rule no longer exists.","Diese Regel existiert nicht mehr."
-"Times Used","Wie oft eingelöst"
-"To Date","Bis Datum"
-"To Fixed Value","Zu festen Wert"
-"To Percentage","Zu Prozent"
-"Total","Gesamtbetrag"
-"Total","Gesamtbetrag"
-"Total Items Quantity","Gesamtmenge aller Artikel"
-"Total Weight","Gesamtgewicht"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","Angeforderte Anzahl an Kupons konnte nicht erstellt werden. Bitte Einstellungen überprüfen und nochmals versuchen."
-"Unable to find a rule to delete.","Keine Regel zum Löschen gefunden."
-"Update prices using the following information","Finden Sie neue Preise mit den folgenden Informationen"
-"Update product's %s %s: %s","%s %s: %s von Produkt aktualisieren"
-"Update the Product","Produkt aktualisieren"
-"Use Auto Generation","Ãœber Automatische Erstellung"
-"Used","Eingelöst"
-"Uses per Coupon","Verwendung je Gutschein"
-"Uses per Customer","Verwendung je Kunde"
-"Website","Webseite"
-"Websites","Websites"
-"Wrong rule specified.","Falsche Regel angegeben."
-"Yes","Ja"
-"total amount","Gesamtsumme"
-"total quantity","Gesamtmenge"
+"Shipping Country",Lieferland
+"Product attribute combination","Kombination der Produktmerkmale"
+"Products subselection",Produktunterauswahl
+"Conditions combination",Bedingungskombination
+"Cart Attribute",Warenkorbattribut
+"Quantity in cart","Menge im Warenkorb"
+"Price in cart","Preis im Warenkorb"
+"Row total in cart","Zeile Gesamt im Warenkorb"
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,GEFUNDEN
+"NOT FOUND","NICHT GEFUNDEN"
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
+"total quantity",Gesamtmenge
+"total amount",Gesamtsumme
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
diff --git a/app/code/Magento/SalesRule/i18n/en_US.csv b/app/code/Magento/SalesRule/i18n/en_US.csv
index a4ae3c0ca9c..7d0f94ee0d8 100644
--- a/app/code/Magento/SalesRule/i18n/en_US.csv
+++ b/app/code/Magento/SalesRule/i18n/en_US.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled."
-"%s Coupon(s) have been generated","%s Coupon(s) have been generated"
-"Actions","Actions"
-"Active","Active"
+ID,ID
+Apply,Apply
+No,No
+Subtotal,Subtotal
+Discount,Discount
+Uses,Uses
+Delete,Delete
+Yes,Yes
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Save and Continue Edit"
+Description,Description
+Catalog,Catalog
+Actions,Actions
+Rule,Rule
+"Start on","Start on"
+"End on","End on"
+Active,Active
+"This rule no longer exists.","This rule no longer exists."
+"General Information","General Information"
+Websites,Websites
"Add New Rule","Add New Rule"
-"Alphabetical","Alphabetical"
-"Alphanumeric","Alphanumeric"
-"An error occurred while generating coupons. Please review the log and try again.","An error occurred while generating coupons. Please review the log and try again."
-"Apply","Apply"
-"Apply To","Apply To"
-"Apply the rule only if the following conditions are met (leave blank for all products)","Apply the rule only if the following conditions are met (leave blank for all products)"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Apply the rule only to cart items matching the following conditions (leave blank for all items)"
-"Apply the rule to cart items matching the following conditions","Apply the rule to cart items matching the following conditions"
-"Apply to Shipping Amount","Apply to Shipping Amount"
-"Are you sure you want to delete the selected coupon(s)?","Are you sure you want to delete the selected coupon(s)?"
-"Auto","Auto"
-"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
-"Buy X get Y free (discount amount is Y)","Buy X get Y free (discount amount is Y)"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","New Rule"
+"Rule Information","Rule Information"
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing","Stop Further Rules Processing"
+Conditions,Conditions
+"Rule Name","Rule Name"
+Inactive,Inactive
+"Customer Groups","Customer Groups"
+"From Date","From Date"
+"To Date","To Date"
+Priority,Priority
+Promotions,Promotions
+"Edit Rule","Edit Rule"
+"The rule has been saved.","The rule has been saved."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","The rule has been deleted."
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product","Update the Product"
+"To Fixed Value","To Fixed Value"
+"To Percentage","To Percentage"
"By Fixed value","By Fixed value"
"By Percentage","By Percentage"
-"Can't acquire coupon.","Can't acquire coupon."
-"Cart Attribute","Cart Attribute"
-"Catalog","Catalog"
-"Code Format","Code Format"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method","Shipping Method"
+"Payment Method","Payment Method"
+Created,Created
+Alphanumeric,Alphanumeric
+"Apply To","Apply To"
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,Alphabetical
+Numeric,Numeric
+Generate,Generate
+Auto,Auto
+Coupon,Coupon
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code","Coupon Code"
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight","Total Weight"
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels","Store View Specific Labels"
+"Shopping Cart Price Rules","Shopping Cart Price Rules"
+"Update prices using the following information","Update prices using the following information"
+"Percent of product price discount","Percent of product price discount"
+"Fixed amount discount","Fixed amount discount"
+"Fixed amount discount for whole cart","Fixed amount discount for whole cart"
+"Buy X get Y free (discount amount is Y)","Buy X get Y free (discount amount is Y)"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount","Apply to Shipping Amount"
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes","Manage Coupon Codes"
+"Coupons Information","Coupons Information"
+"Coupon Qty","Coupon Qty"
"Code Length","Code Length"
+"Excluding prefix, suffix and separators.","Excluding prefix, suffix and separators."
+"Code Format","Code Format"
"Code Prefix","Code Prefix"
"Code Suffix","Code Suffix"
-"Conditions","Conditions"
-"Conditions combination","Conditions combination"
-"Coupon","Coupon"
-"Coupon Code","Coupon Code"
-"Coupon Quantity","Coupon Quantity"
-"Coupon with the same code","Coupon with the same code"
-"Coupons Information","Coupons Information"
-"Created","Created"
-"Customer Groups","Customer Groups"
"Dash Every X Characters","Dash Every X Characters"
-"End on","End on"
-"Start on","Start on"
+"If empty no separation.","If empty no separation."
+"Times Used","Times Used"
+"Are you sure you want to delete the selected coupon(s)?","Are you sure you want to delete the selected coupon(s)?"
+Labels,Labels
"Default Label","Default Label"
"Default Rule Label for All Store Views","Default Rule Label for All Store Views"
-"Description","Description"
-"Discount","Discount"
-"Discount Quantity Step (Buy X)","Discount Quantity Step (Buy X)"
-"Edit Rule","Edit Rule"
-"Edit Rule '%s'","Edit Rule '%s'"
-"Excluding prefix, suffix and separators.","Excluding prefix, suffix and separators."
-"FOUND","FOUND"
-"Fixed amount discount","Fixed amount discount"
-"Fixed amount discount for whole cart","Fixed amount discount for whole cart"
-"For matching items only","For matching items only"
-"For shipment with matching items","For shipment with matching items"
-"Free Shipping","Free Shipping"
-"From Date","From Date"
-"General Information","General Information"
-"Generate","Generate"
-"ID","ID"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","If %s %s %s for a subselection of items in cart matching %s of these conditions:"
-"If an item is %s in the cart with %s of these conditions true:","If an item is %s in the cart with %s of these conditions true:"
-"If empty no separation.","If empty no separation."
+"Use Auto Generation","Use Auto Generation"
"If you select and save the rule you will be able to generate multiple coupon codes.","If you select and save the rule you will be able to generate multiple coupon codes."
-"Inactive","Inactive"
-"Item totals are not set for rule.","Item totals are not set for rule."
-"Labels","Labels"
-"Manage Coupon Codes","Manage Coupon Codes"
-"Maximum Quantity Discount is Applied To","Maximum Quantity Discount is Applied To"
-"NOT FOUND","NOT FOUND"
-"NOT LOGGED IN","NOT LOGGED IN"
-"New Rule","New Rule"
-"No","No"
-"No Coupon","No Coupon"
-"Not valid data provided","Not valid data provided"
-"Uses","Uses"
-"Numeric","Numeric"
-"Payment Method","Payment Method"
-"Percent of product price discount","Percent of product price discount"
-"Interval","Interval"
-"Price in cart","Price in cart"
-"Priority","Priority"
-"Product attribute combination","Product attribute combination"
-"Products subselection","Products subselection"
-"Promotions","Promotions"
+"Uses per Coupon","Uses per Coupon"
+"Uses per Customer","Uses per Customer"
"Public In RSS Feed","Public In RSS Feed"
-"Quantity in cart","Quantity in cart"
-"Row total in cart","Row total in cart"
-"Rule Information","Rule Information"
-"Rule","Rule"
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
"Rule is not defined","Rule is not defined"
-"Sales Discount","Sales Discount"
-"Sales Subtotal","Sales Subtotal"
-"Sales Total","Sales Total"
-"Save and Continue Edit","Save and Continue Edit"
-"Shipping Country","Shipping Country"
-"Shipping Method","Shipping Method"
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code","Coupon with the same code"
+"No Coupon","No Coupon"
+"Specific Coupon","Specific Coupon"
+"Can't acquire coupon.","Can't acquire coupon."
+"Special Price","Special Price"
+"Total Items Quantity","Total Items Quantity"
"Shipping Postcode","Shipping Postcode"
"Shipping Region","Shipping Region"
"Shipping State/Province","Shipping State/Province"
-"Price Rule","Price Rule"
-"Shopping Cart Price Rules","Shopping Cart Price Rules"
-"Special Price","Special Price"
-"Specific Coupon","Specific Coupon"
-"Status","Status"
-"Stop Further Rules Processing","Stop Further Rules Processing"
-"Store View Specific Labels","Store View Specific Labels"
-"Subtotal","Subtotal"
-"Subtotal","Subtotal"
-"The rule has been deleted.","The rule has been deleted."
-"The rule has been saved.","The rule has been saved."
-"This rule no longer exists.","This rule no longer exists."
-"Times Used","Times Used"
-"To Date","To Date"
-"To Fixed Value","To Fixed Value"
-"To Percentage","To Percentage"
-"Total","Total"
-"Total","Total"
-"Total Items Quantity","Total Items Quantity"
-"Total Weight","Total Weight"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","Unable to create requested Coupon Quantity. Please check settings and try again."
-"Unable to find a rule to delete.","Unable to find a rule to delete."
-"Update prices using the following information","Update prices using the following information"
-"Update product's %s %s: %s","Update product's %s %s: %s"
-"Update the Product","Update the Product"
-"Use Auto Generation","Use Auto Generation"
-"Used","Used"
-"Uses per Coupon","Uses per Coupon"
-"Uses per Customer","Uses per Customer"
-"Website","Website"
-"Websites","Websites"
-"Wrong rule specified.","Wrong rule specified."
-"Yes","Yes"
-"total amount","total amount"
+"Shipping Country","Shipping Country"
+"Product attribute combination","Product attribute combination"
+"Products subselection","Products subselection"
+"Conditions combination","Conditions combination"
+"Cart Attribute","Cart Attribute"
+"Quantity in cart","Quantity in cart"
+"Price in cart","Price in cart"
+"Row total in cart","Row total in cart"
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,FOUND
+"NOT FOUND","NOT FOUND"
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
"total quantity","total quantity"
+"total amount","total amount"
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
diff --git a/app/code/Magento/SalesRule/i18n/es_ES.csv b/app/code/Magento/SalesRule/i18n/es_ES.csv
index d33f536fd0e..e9911fa4705 100644
--- a/app/code/Magento/SalesRule/i18n/es_ES.csv
+++ b/app/code/Magento/SalesRule/i18n/es_ES.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","Se han desactivado las reglas de precio del carro de la compra %d basadas en el atributo ""%s""."
-"%s Coupon(s) have been generated","se han generado un % de cupones"
-"Actions","Acciones"
-"Active","Activo"
+ID,ID
+Apply,Solicitar
+No,No
+Subtotal,"Cantidad subtotal"
+Discount,"Cantidad Descontada"
+Uses,"Número de Usos"
+Delete,Delete
+Yes,SÃ
+"Web Site","Web Site"
+Status,Estado
+"Save and Continue Edit","Guardar y continuar editando"
+Description,Descripción
+Catalog,Catálogo
+Actions,Acciones
+Rule,"Nombre de la Regla"
+"Start on","Fecha de inicio"
+"End on","Fecha de caducidad"
+Active,Activo
+"This rule no longer exists.","Esta regla ya no existe."
+"General Information","Información general"
+Websites,"Páginas Web"
"Add New Rule","Añadir nueva regla"
-"Alphabetical","alfabético"
-"Alphanumeric","Alfanumérico"
-"An error occurred while generating coupons. Please review the log and try again.","Ocurrió un error mientras se generaban los cupones. Por favor vuelva a iniciar sesión e inténtelo de nuevo."
-"Apply","Solicitar"
-"Apply To","Aplicar a."
-"Apply the rule only if the following conditions are met (leave blank for all products)","AplÃquese la regla sólo si se cumplen las siguientes condiciones (dejar en blanco para todos los productos)"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","AplÃquese la regla sólo a los artÃculos del carro que se ajusten a las siguientes condiciones (dejar en blanco para todos los artÃculos)"
-"Apply the rule to cart items matching the following conditions","AplÃquese la regla a los artÃculos del carro que se ajusten a las siguientes condiciones"
-"Apply to Shipping Amount","AplÃquese a la Cantidad de EnvÃo"
-"Are you sure you want to delete the selected coupon(s)?","¿Está seguro de que quiere eliminar el cupón/los cupones seleccionado(s)?"
-"Auto","Auto"
-"Auto Generated Specific Coupon Codes","Códigos de cupones especÃficos generados automáticamente"
-"Buy X get Y free (discount amount is Y)","Compre X y llévese Y gratis (la cantidad descontada es Y)"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","Nueva Regla"
+"Rule Information","Información sobre la Regla"
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing","Detener el Procesamiento de Reglas adicionales"
+Conditions,Condiciones
+"Rule Name","Rule Name"
+Inactive,Inactivo
+"Customer Groups","Grupos de Cliente"
+"From Date","A partir de la fecha"
+"To Date","Hasta la fecha"
+Priority,Prioridad
+Promotions,Promociones
+"Edit Rule","Editar Regla"
+"The rule has been saved.","La regla ha sido guardada."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","La regla ha sido eliminada."
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product","Actualizar el Producto"
+"To Fixed Value","Para Valor Fijo"
+"To Percentage","Para Porcentaje"
"By Fixed value","Por valor Fijo"
"By Percentage","Por Porcentaje"
-"Can't acquire coupon.","No se puede adquirir el cupón."
-"Cart Attribute","Atributos del Carro"
-"Catalog","Catálogo"
-"Code Format","Código de formato"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method","Método de envÃo"
+"Payment Method","Método de pago"
+Created,Creado
+Alphanumeric,Alfanumérico
+"Apply To","Aplicar a."
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,alfabético
+Numeric,Numérico
+Generate,Generar
+Auto,Auto
+Coupon,Cupón
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code","Código de cupón"
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight","Peso total"
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels","Etiquetas especÃficas de la vista de tienda"
+"Shopping Cart Price Rules","Reglas de Precio de Carro de Compra"
+"Update prices using the following information","Actualizar precios utilizando la siguiente información"
+"Percent of product price discount","Porcentaje de descuento en el precio del producto"
+"Fixed amount discount","Descuento de cantidad fija"
+"Fixed amount discount for whole cart","Descuento de cantidad fija para el carro completo"
+"Buy X get Y free (discount amount is Y)","Compre X y llévese Y gratis (la cantidad descontada es Y)"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount","AplÃquese a la Cantidad de EnvÃo"
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes","Administrar códigos de cupones"
+"Coupons Information","Información sobre cupones"
+"Coupon Qty","Coupon Qty"
"Code Length","Código de longitud"
+"Excluding prefix, suffix and separators.","excluyendo prefijos, sufijos y separaciones"
+"Code Format","Código de formato"
"Code Prefix","Código de prefijo"
"Code Suffix","Código de sufijo"
-"Conditions","Condiciones"
-"Conditions combination","Combinación de condiciones"
-"Coupon","Cupón"
-"Coupon Code","Código de cupón"
-"Coupon Quantity","Código de cantidad"
-"Coupon with the same code","Cupón con el mismo código"
-"Coupons Information","Información sobre cupones"
-"Created","Creado"
-"Customer Groups","Grupos de Cliente"
"Dash Every X Characters","Guión cada ""X"" caracteres"
-"End on","Fecha de caducidad"
-"Start on","Fecha de inicio"
+"If empty no separation.","Si está vacÃo no hay separación."
+"Times Used","Tiempos utilizados"
+"Are you sure you want to delete the selected coupon(s)?","¿Está seguro de que quiere eliminar el cupón/los cupones seleccionado(s)?"
+Labels,Etiquetas
"Default Label","Etiqueta por Defecto"
"Default Rule Label for All Store Views","Etiqueta Normativa por Defecto para Todas las Vistas de la Tienda"
-"Description","Descripción"
-"Discount","Cantidad Descontada"
-"Discount Quantity Step (Buy X)","Paso de Cantidad Descontada (Comprar X)"
-"Edit Rule","Editar Regla"
-"Edit Rule '%s'","Editar Regla '%s'"
-"Excluding prefix, suffix and separators.","excluyendo prefijos, sufijos y separaciones"
-"FOUND","ENCONTRADO"
-"Fixed amount discount","Descuento de cantidad fija"
-"Fixed amount discount for whole cart","Descuento de cantidad fija para el carro completo"
-"For matching items only","Sólo para artÃculos correspondientes"
-"For shipment with matching items","Para envÃos con artÃculos correspondientes"
-"Free Shipping","Transporte gratuito"
-"From Date","A partir de la fecha"
-"General Information","Información general"
-"Generate","Generar"
-"ID","ID"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Si %s %s %s para una subselección de artÃculos en la cesta coincidiendo %s de estas condiciones:"
-"If an item is %s in the cart with %s of these conditions true:","Si un artÃculo es %s en la cesta con %s de estas condiciones verdaderas:"
-"If empty no separation.","Si está vacÃo no hay separación."
+"Use Auto Generation","Utilizar Generación Automática"
"If you select and save the rule you will be able to generate multiple coupon codes.","Si selecciona y guarda esta norma, podrá generar múltiples códigos de cupones."
-"Inactive","Inactivo"
-"Item totals are not set for rule.","No se han establecido totales de artÃculo para la regla."
-"Labels","Etiquetas"
-"Manage Coupon Codes","Administrar códigos de cupones"
-"Maximum Quantity Discount is Applied To","Se aplica la Máxima Cantidad Descontada"
-"NOT FOUND","NO ENCONTRADO"
-"NOT LOGGED IN","NO CONECTADO"
-"New Rule","Nueva Regla"
-"No","No"
-"No Coupon","Sin cupón"
-"Not valid data provided","Los datos proporcionados no son válidos"
-"Uses","Número de Usos"
-"Numeric","Numérico"
-"Payment Method","Método de pago"
-"Percent of product price discount","Porcentaje de descuento en el precio del producto"
-"Interval","PerÃodo"
-"Price in cart","Precio en el carrito"
-"Priority","Prioridad"
-"Product attribute combination","Combinación de atributos de producto"
-"Products subselection","Subselección de productos"
-"Promotions","Promociones"
+"Uses per Coupon","Usos por cupón"
+"Uses per Customer","Usos por cliente"
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
"Public In RSS Feed","Publicar feed RSS"
-"Quantity in cart","Cantidad en el carrito"
-"Row total in cart","Total de filas en el carrito"
-"Rule Information","Información sobre la Regla"
-"Rule","Nombre de la Regla"
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
"Rule is not defined","Regla no definida"
-"Sales Discount","Importe de ventas con descuento"
-"Sales Subtotal","Importe subtotal de ventas"
-"Sales Total","Importe total de ventas"
-"Save and Continue Edit","Guardar y continuar editando"
-"Shipping Country","PaÃs de envÃo"
-"Shipping Method","Método de envÃo"
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code","Cupón con el mismo código"
+"No Coupon","Sin cupón"
+"Specific Coupon","Cupón especÃfico"
+"Can't acquire coupon.","No se puede adquirir el cupón."
+"Special Price","Precio especial"
+"Total Items Quantity","Cantidad total de artÃculos"
"Shipping Postcode","Código Postal"
"Shipping Region","Región de envÃo"
"Shipping State/Province","Provincia/Estado de envÃo"
-"Price Rule","Regla del precio del carro de compra."
-"Shopping Cart Price Rules","Reglas de Precio de Carro de Compra"
-"Special Price","Precio especial"
-"Specific Coupon","Cupón especÃfico"
-"Status","Estado"
-"Stop Further Rules Processing","Detener el Procesamiento de Reglas adicionales"
-"Store View Specific Labels","Etiquetas especÃficas de la vista de tienda"
-"Subtotal","Subtotal"
-"Subtotal","Cantidad subtotal"
-"The rule has been deleted.","La regla ha sido eliminada."
-"The rule has been saved.","La regla ha sido guardada."
-"This rule no longer exists.","Esta regla ya no existe."
-"Times Used","Tiempos utilizados"
-"To Date","Hasta la fecha"
-"To Fixed Value","Para Valor Fijo"
-"To Percentage","Para Porcentaje"
-"Total","Total"
-"Total","Cantidad total."
-"Total Items Quantity","Cantidad total de artÃculos"
-"Total Weight","Peso total"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","No se puede crear el cupón de cantidad solicitado. Por favor compruebe la configuración y vuelva a intentarlo."
-"Unable to find a rule to delete.","No se puede encontrar una regla para eliminar."
-"Update prices using the following information","Actualizar precios utilizando la siguiente información"
-"Update product's %s %s: %s","Actualizar los productos de %s %s: %s"
-"Update the Product","Actualizar el Producto"
-"Use Auto Generation","Utilizar Generación Automática"
-"Used","Utilizado"
-"Uses per Coupon","Usos por cupón"
-"Uses per Customer","Usos por cliente"
-"Website","Página web"
-"Websites","Páginas Web"
-"Wrong rule specified.","Regla especificada incorrecta."
-"Yes","SÃ"
-"total amount","Cantidad total"
+"Shipping Country","PaÃs de envÃo"
+"Product attribute combination","Combinación de atributos de producto"
+"Products subselection","Subselección de productos"
+"Conditions combination","Combinación de condiciones"
+"Cart Attribute","Atributos del Carro"
+"Quantity in cart","Cantidad en el carrito"
+"Price in cart","Precio en el carrito"
+"Row total in cart","Total de filas en el carrito"
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,ENCONTRADO
+"NOT FOUND","NO ENCONTRADO"
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
"total quantity","Suma total"
+"total amount","Cantidad total"
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
diff --git a/app/code/Magento/SalesRule/i18n/fr_FR.csv b/app/code/Magento/SalesRule/i18n/fr_FR.csv
index 78e03a34d4b..7e33a1a8bed 100644
--- a/app/code/Magento/SalesRule/i18n/fr_FR.csv
+++ b/app/code/Magento/SalesRule/i18n/fr_FR.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Règles de prix du panier basées sur l'attribut ""%s"" ont été désactivées."
-"%s Coupon(s) have been generated","%s bon(s) ont été créés"
-"Actions","Action"
-"Active","Actif"
+ID,ID
+Apply,Appliquer
+No,Non
+Subtotal,"Montant du sous-total"
+Discount,"Montant de la remise"
+Uses,"Nombre d'utilisations"
+Delete,Delete
+Yes,oui
+"Web Site","Web Site"
+Status,Statut
+"Save and Continue Edit","Sauvegarder et continuer l'édition"
+Description,Description
+Catalog,Catalogue
+Actions,Action
+Rule,"Nom de règle"
+"Start on","Date de début"
+"End on","Date d'expiration"
+Active,Actif
+"This rule no longer exists.","Cette règle n'existe plus."
+"General Information","Informations générales"
+Websites,"Sites Web"
"Add New Rule","Ajouter nouvelle règle"
-"Alphabetical","Alphabétique"
-"Alphanumeric","Alphanumérique"
-"An error occurred while generating coupons. Please review the log and try again.","Une erreur s'est produite lors de la création des bons. Veuillez examiner le registre et réessayer."
-"Apply","Appliquer"
-"Apply To","Appliquer à "
-"Apply the rule only if the following conditions are met (leave blank for all products)","Appliquer la règle seulement si les conditions suivantes sont respectées (laisser en blanc pour tous les produits)"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Appliquer la règle seulement aux articles du panier qui respectent les conditions suivantes (laisser en blanc pour tous les articles)"
-"Apply the rule to cart items matching the following conditions","Appliquer la règle aux articles du panier respectant les conditions suivantes"
-"Apply to Shipping Amount","Appliquer au montant de la livraison"
-"Are you sure you want to delete the selected coupon(s)?","Êtes-vous sûrs de vouloir supprimer le(s) bon(s) sélectionné(s) ?"
-"Auto","Automatique"
-"Auto Generated Specific Coupon Codes","Codes de bon particuliers créés automatiquement"
-"Buy X get Y free (discount amount is Y)","Achetez X et obtenez Y gratuitement (le montant de la remise est Y)"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","Nouvelle règle"
+"Rule Information","Information de règle"
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing","Ne pas aller plus loin dans le traitement des règles"
+Conditions,Conditions
+"Rule Name","Rule Name"
+Inactive,Inactif
+"Customer Groups","Groupes de clients"
+"From Date",Depuis
+"To Date","Date de fin"
+Priority,Priorité
+Promotions,Promotions
+"Edit Rule","Éditer la règle"
+"The rule has been saved.","La règle a été sauvée."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","La règle a été supprimée."
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product","Mettre à jour le produit"
+"To Fixed Value","Une certaine valeur"
+"To Percentage","Au pourcentage"
"By Fixed value","par valeur fixe"
"By Percentage","par pourcentage"
-"Can't acquire coupon.","ne peut pas obtenir le coupon"
-"Cart Attribute","Attribut du panier"
-"Catalog","Catalogue"
-"Code Format","Format du code"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method","Méthode d'expédition"
+"Payment Method","Méthode de paiement"
+Created,"Créé le"
+Alphanumeric,Alphanumérique
+"Apply To","Appliquer à "
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,Alphabétique
+Numeric,Numérique
+Generate,Créer
+Auto,Automatique
+Coupon,Coupon
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code","Code coupon"
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight","Poids total"
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels","Voir le magasin Labels spécifiques"
+"Shopping Cart Price Rules","Règles de prix du panier"
+"Update prices using the following information","Mettre à jour les prix en utilisant les informations suivantes"
+"Percent of product price discount","Pour cent de réduction des prix des produits"
+"Fixed amount discount","Montant fixe de la remise"
+"Fixed amount discount for whole cart","Montant fixe de la remise pour tout le panier"
+"Buy X get Y free (discount amount is Y)","Achetez X et obtenez Y gratuitement (le montant de la remise est Y)"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount","Appliquer au montant de la livraison"
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes","Gérer les codes de bon"
+"Coupons Information","Informations des bons"
+"Coupon Qty","Coupon Qty"
"Code Length","Longueur du code"
+"Excluding prefix, suffix and separators.","Exclure les préfixes, suffixes et séparateurs."
+"Code Format","Format du code"
"Code Prefix","Préfixe du code"
"Code Suffix","Suffixe du code"
-"Conditions","Conditions"
-"Conditions combination","Couplage des conditions"
-"Coupon","Coupon"
-"Coupon Code","Code coupon"
-"Coupon Quantity","Quantité de bon"
-"Coupon with the same code","Bon avec le même code"
-"Coupons Information","Informations des bons"
-"Created","Créé le"
-"Customer Groups","Groupes de clients"
"Dash Every X Characters","Supprimer tous les caractères X"
-"End on","Date d'expiration"
-"Start on","Date de début"
+"If empty no separation.","Pas de séparation si vide."
+"Times Used","Périodes utilisées"
+"Are you sure you want to delete the selected coupon(s)?","Êtes-vous sûrs de vouloir supprimer le(s) bon(s) sélectionné(s) ?"
+Labels,Etiquettes
"Default Label","Emballage par défaut"
"Default Rule Label for All Store Views","Règle d'étiquetage par défaut pour toutes les vues du magasins"
-"Description","Description"
-"Discount","Montant de la remise"
-"Discount Quantity Step (Buy X)","Remise Qté Etape (acheter X)"
-"Edit Rule","Éditer la règle"
-"Edit Rule '%s'","Éditer la règle '%s'"
-"Excluding prefix, suffix and separators.","Exclure les préfixes, suffixes et séparateurs."
-"FOUND","TROUVE"
-"Fixed amount discount","Montant fixe de la remise"
-"Fixed amount discount for whole cart","Montant fixe de la remise pour tout le panier"
-"For matching items only","Pour les articles correspondant seulement"
-"For shipment with matching items","Pour la livraison avec les articles correspondant"
-"Free Shipping","Expédition gratuite"
-"From Date","Depuis"
-"General Information","Informations générales"
-"Generate","Créer"
-"ID","ID"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Si %s %s %s pour une sous-sélection d'objets dans le panier correspondant à %s de ces conditions :"
-"If an item is %s in the cart with %s of these conditions true:","Si un objet est %s dans le panier avec %s de ces conditions :"
-"If empty no separation.","Pas de séparation si vide."
+"Use Auto Generation","Utiliser la création automatique"
"If you select and save the rule you will be able to generate multiple coupon codes.","Si vous sélectionnez et sauvegardez la règle, vous aurez la possibilité de créer plusieurs codes de bon."
-"Inactive","Inactif"
-"Item totals are not set for rule.","Le total des objets n'est pas déterminé."
-"Labels","Etiquettes"
-"Manage Coupon Codes","Gérer les codes de bon"
-"Maximum Quantity Discount is Applied To","La remise qté maximale est appliquée à "
-"NOT FOUND","NON TROUVE"
-"NOT LOGGED IN","DÉCONNECTÉ"
-"New Rule","Nouvelle règle"
-"No","Non"
-"No Coupon","Pas de coupon"
-"Not valid data provided","Aucune donnée valide fournie"
-"Uses","Nombre d'utilisations"
-"Numeric","Numérique"
-"Payment Method","Méthode de paiement"
-"Percent of product price discount","Pour cent de réduction des prix des produits"
-"Interval","Période"
-"Price in cart","Prix dans le panier"
-"Priority","Priorité"
-"Product attribute combination","Combinaison d'attributs de produits"
-"Products subselection","Sous-sélection de produits"
-"Promotions","Promotions"
+"Uses per Coupon","Utilisations par coupon"
+"Uses per Customer","Utilisations par client"
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
"Public In RSS Feed","Public dans le flux RSS"
-"Quantity in cart","Quantité dans le panier"
-"Row total in cart","Ligne total dans le panier"
-"Rule Information","Information de règle"
-"Rule","Nom de règle"
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
"Rule is not defined","La règle n'est pas définie"
-"Sales Discount","Montant des ventes discount"
-"Sales Subtotal","Montant du sous-total des ventes"
-"Sales Total","Montant total des ventes"
-"Save and Continue Edit","Sauvegarder et continuer l'édition"
-"Shipping Country","Méthode d'expédition"
-"Shipping Method","Méthode d'expédition"
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code","Bon avec le même code"
+"No Coupon","Pas de coupon"
+"Specific Coupon","Coupon spécifique"
+"Can't acquire coupon.","ne peut pas obtenir le coupon"
+"Special Price","Prix spécial"
+"Total Items Quantity","Quantité d'articles totale"
"Shipping Postcode","Code postal pour l'expédition"
"Shipping Region","Région d'expédition"
"Shipping State/Province","État/Région d'expédition"
-"Price Rule","Règle de prix du panier"
-"Shopping Cart Price Rules","Règles de prix du panier"
-"Special Price","Prix spécial"
-"Specific Coupon","Coupon spécifique"
-"Status","Statut"
-"Stop Further Rules Processing","Ne pas aller plus loin dans le traitement des règles"
-"Store View Specific Labels","Voir le magasin Labels spécifiques"
-"Subtotal","Sous-total"
-"Subtotal","Montant du sous-total"
-"The rule has been deleted.","La règle a été supprimée."
-"The rule has been saved.","La règle a été sauvée."
-"This rule no longer exists.","Cette règle n'existe plus."
-"Times Used","Périodes utilisées"
-"To Date","Date de fin"
-"To Fixed Value","Une certaine valeur"
-"To Percentage","Au pourcentage"
-"Total","Total"
-"Total","Montant total"
-"Total Items Quantity","Quantité d'articles totale"
-"Total Weight","Poids total"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","Impossible de générer la quantité de bons demandée. Veuillez vérifier les paramètres et réessayer."
-"Unable to find a rule to delete.","Aucune règle à supprimer"
-"Update prices using the following information","Mettre à jour les prix en utilisant les informations suivantes"
-"Update product's %s %s: %s","Mettre à jour le %s %s du produit: %s"
-"Update the Product","Mettre à jour le produit"
-"Use Auto Generation","Utiliser la création automatique"
-"Used","Utilisé"
-"Uses per Coupon","Utilisations par coupon"
-"Uses per Customer","Utilisations par client"
-"Website","Site web"
-"Websites","Sites Web"
-"Wrong rule specified.","Une mauvaise règle a été spécifiée."
-"Yes","oui"
-"total amount","montant total"
+"Shipping Country","Méthode d'expédition"
+"Product attribute combination","Combinaison d'attributs de produits"
+"Products subselection","Sous-sélection de produits"
+"Conditions combination","Couplage des conditions"
+"Cart Attribute","Attribut du panier"
+"Quantity in cart","Quantité dans le panier"
+"Price in cart","Prix dans le panier"
+"Row total in cart","Ligne total dans le panier"
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,TROUVE
+"NOT FOUND","NON TROUVE"
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
"total quantity","quantité totale"
+"total amount","montant total"
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
diff --git a/app/code/Magento/SalesRule/i18n/nl_NL.csv b/app/code/Magento/SalesRule/i18n/nl_NL.csv
index aa261b79e2c..43922d5d373 100644
--- a/app/code/Magento/SalesRule/i18n/nl_NL.csv
+++ b/app/code/Magento/SalesRule/i18n/nl_NL.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Winkelwagen Prijs Regels gebaseerd op ""%s"" attribuut zijn uitgeschakeld."
-"%s Coupon(s) have been generated","%s Coupon(s) zijn gegenereerd"
-"Actions","Acties"
-"Active","actief"
+ID,ID
+Apply,Aanbrengen
+No,Nee
+Subtotal,"Subtotaal bedrag"
+Discount,Kortingsbedrag
+Uses,"Aantal gebruiken"
+Delete,Delete
+Yes,ja
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Bewaar en Ga Door met Bewerking"
+Description,Omschrijving
+Catalog,Catalogus
+Actions,Acties
+Rule,"Regel naam"
+"Start on",Startdatum
+"End on",Vervaldatum
+Active,actief
+"This rule no longer exists.","Deze regel bestaat niet langer"
+"General Information","Algemene informatie"
+Websites,Websites
"Add New Rule","voeg nieuwe regel toe"
-"Alphabetical","Alfabetisch"
-"Alphanumeric","Alfanumeriek"
-"An error occurred while generating coupons. Please review the log and try again.","Er is een fout opgetreden bij het genereren van coupons. Lees het log en probeer het opnieuw."
-"Apply","Aanbrengen"
-"Apply To","Aanbrengen op"
-"Apply the rule only if the following conditions are met (leave blank for all products)","Breng de regel aan, doch enkel wanneer aan de volgende voorwaarden zijn voldaan (laat leeg voor alle producten)"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Breng de regel aan op winkelwagenproducten die voldoen aan de volgende voorwaarden (laat leeg voor alle producten)"
-"Apply the rule to cart items matching the following conditions","Breng de regel aan op winkelwagenproducten die aan de volgende voorwaarden voldoen"
-"Apply to Shipping Amount","Breng aan op verzendhoeveelheid"
-"Are you sure you want to delete the selected coupon(s)?","Weet u zeker dat u de geselecteerde coupon(s) wilt verwijderen?"
-"Auto","Auto"
-"Auto Generated Specific Coupon Codes","Auto Gegenereerd Specifieke Coupon Codes"
-"Buy X get Y free (discount amount is Y)","Koop X, krijg Y gratis (kortingsbedrag is Y)"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","Nieuwe regel"
+"Rule Information","Regel informatie"
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing","Stop verdere verwerking van regels"
+Conditions,Voorwaarden
+"Rule Name","Rule Name"
+Inactive,Inactief
+"Customer Groups",Klantgroepen
+"From Date","Vanaf datum"
+"To Date","Naar datum"
+Priority,Prioriteit
+Promotions,Promoties
+"Edit Rule","Bewerk regel"
+"The rule has been saved.","De regel is opgeslagen."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","De regel is verwijderd"
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product","Vernieuw het product"
+"To Fixed Value","Naar gefixeerde waarde"
+"To Percentage","Naar percentage"
"By Fixed value","Bij gefixeerde waarde"
"By Percentage","Bij percentage"
-"Can't acquire coupon.","Kan geen kortingsbon verkrijgen"
-"Cart Attribute","Winkelwagen attribuut"
-"Catalog","Catalogus"
-"Code Format","Code Formaat"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method",Bezorgmethode
+"Payment Method",Betalingsmethode
+Created,"Gemaakt Op"
+Alphanumeric,Alfanumeriek
+"Apply To","Aanbrengen op"
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,Alfabetisch
+Numeric,Numerieke
+Generate,Aanmaken
+Auto,Auto
+Coupon,Kortingsbon
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code",Kortingsboncode
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight",Totaalgewicht
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels","Winkel bekijk specifieke labels"
+"Shopping Cart Price Rules","Winkelmandje prijsregels"
+"Update prices using the following information","Update prijzen, gebruikmakende van de volgende informatie"
+"Percent of product price discount","Procent van productprijs als korting"
+"Fixed amount discount","Gefixeerd bedrag korting"
+"Fixed amount discount for whole cart","Gefixeerd bedrag korting voor de hele winkelwagen"
+"Buy X get Y free (discount amount is Y)","Koop X, krijg Y gratis (kortingsbedrag is Y)"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount","Breng aan op verzendhoeveelheid"
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes","Beheer Coupon Codes"
+"Coupons Information","Coupons Informatie"
+"Coupon Qty","Coupon Qty"
"Code Length","Code Lengte"
+"Excluding prefix, suffix and separators.","Exclusief voorvoegsels, achtervoegsels en afscheiders."
+"Code Format","Code Formaat"
"Code Prefix","Code Voorvoegsel"
"Code Suffix","Code Achtervoegsel"
-"Conditions","Voorwaarden"
-"Conditions combination","Voorwaarden combinatie"
-"Coupon","Kortingsbon"
-"Coupon Code","Kortingsboncode"
-"Coupon Quantity","Coupon Hoeveelheid"
-"Coupon with the same code","Coupon met dezelfde code"
-"Coupons Information","Coupons Informatie"
-"Created","Gemaakt Op"
-"Customer Groups","Klantgroepen"
"Dash Every X Characters","Dash Alle X-tekens"
-"End on","Vervaldatum"
-"Start on","Startdatum"
-"Default Label","Standaardlabel"
-"Default Rule Label for All Store Views","Standaard regel label voor alle winkelweergaven"
-"Description","Omschrijving"
-"Discount","Kortingsbedrag"
-"Discount Quantity Step (Buy X)","Kortingshoeveelheid stap (koop X)"
-"Edit Rule","Bewerk regel"
-"Edit Rule '%s'","Bewerk regel '%s'"
-"Excluding prefix, suffix and separators.","Exclusief voorvoegsels, achtervoegsels en afscheiders."
-"FOUND","GEVONDEN"
-"Fixed amount discount","Gefixeerd bedrag korting"
-"Fixed amount discount for whole cart","Gefixeerd bedrag korting voor de hele winkelwagen"
-"For matching items only","Alleen voor passende producten"
-"For shipment with matching items","Voor verzending met passende producten"
-"Free Shipping","Gratis verzending"
-"From Date","Vanaf datum"
-"General Information","Algemene informatie"
-"Generate","Aanmaken"
-"ID","ID"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Als %s %s %s voor een subselectie van producten in de winkelwagen overeenkomen met %s van deze condities:"
-"If an item is %s in the cart with %s of these conditions true:","Als een product %s is in de winkelwagen met %s van deze ware condities:"
"If empty no separation.","Indien leeg geen scheiding."
+"Times Used","Tijd Gebruikt"
+"Are you sure you want to delete the selected coupon(s)?","Weet u zeker dat u de geselecteerde coupon(s) wilt verwijderen?"
+Labels,Labels
+"Default Label",Standaardlabel
+"Default Rule Label for All Store Views","Standaard regel label voor alle winkelweergaven"
+"Use Auto Generation","Gebruik de Automatische Generatie"
"If you select and save the rule you will be able to generate multiple coupon codes.","Als u de regel selecteert en opslaat kunt u meerdere coupon codes genereren."
-"Inactive","Inactief"
-"Item totals are not set for rule.","Totalen voor producten zijn niet ingesteld voor regel."
-"Labels","Labels"
-"Manage Coupon Codes","Beheer Coupon Codes"
-"Maximum Quantity Discount is Applied To","Maximale hoeveelheid korting is ingesteld op"
-"NOT FOUND","NIET GEVONDEN"
-"NOT LOGGED IN","NIET INGELOGD"
-"New Rule","Nieuwe regel"
-"No","Nee"
-"No Coupon","Geen kortingsbon"
-"Not valid data provided","Niet geldig gegevens opgegeven"
-"Uses","Aantal gebruiken"
-"Numeric","Numerieke"
-"Payment Method","Betalingsmethode"
-"Percent of product price discount","Procent van productprijs als korting"
-"Interval","Periode"
-"Price in cart","Prijs in winkelwagen"
-"Priority","Prioriteit"
-"Product attribute combination","Product attributen combinatie"
-"Products subselection","Producten subselectie"
-"Promotions","Promoties"
+"Uses per Coupon","Aantal gebruiken per kortingsbon"
+"Uses per Customer","Aantal gebruiken per klant"
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
"Public In RSS Feed","Publiekelijk in RSS Feed"
-"Quantity in cart","Hoeveelheid in winkelwagen"
-"Row total in cart","Rij totalen in winkelwagen"
-"Rule Information","Regel informatie"
-"Rule","Regel naam"
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
"Rule is not defined","Regel is niet gedefinieerd"
-"Sales Discount","Verkoop kortingshoeveelheid"
-"Sales Subtotal","Verkoop subtotaal hoeveelheid"
-"Sales Total","Verkoop totalen hoeveelheid"
-"Save and Continue Edit","Bewaar en Ga Door met Bewerking"
-"Shipping Country","Verzending land"
-"Shipping Method","Bezorgmethode"
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code","Coupon met dezelfde code"
+"No Coupon","Geen kortingsbon"
+"Specific Coupon","Specifieke kortingsbon"
+"Can't acquire coupon.","Kan geen kortingsbon verkrijgen"
+"Special Price","Speciale prijs"
+"Total Items Quantity","Totale hoeveelheid producten"
"Shipping Postcode","Verzending postcode"
"Shipping Region","Verzending regio"
"Shipping State/Province","Verzending provincie/staat"
-"Price Rule","Winkelmandje prijsregel"
-"Shopping Cart Price Rules","Winkelmandje prijsregels"
-"Special Price","Speciale prijs"
-"Specific Coupon","Specifieke kortingsbon"
-"Status","Status"
-"Stop Further Rules Processing","Stop verdere verwerking van regels"
-"Store View Specific Labels","Winkel bekijk specifieke labels"
-"Subtotal","Subtotaal"
-"Subtotal","Subtotaal bedrag"
-"The rule has been deleted.","De regel is verwijderd"
-"The rule has been saved.","De regel is opgeslagen."
-"This rule no longer exists.","Deze regel bestaat niet langer"
-"Times Used","Tijd Gebruikt"
-"To Date","Naar datum"
-"To Fixed Value","Naar gefixeerde waarde"
-"To Percentage","Naar percentage"
-"Total","Totaal"
-"Total","Totaalbedrag"
-"Total Items Quantity","Totale hoeveelheid producten"
-"Total Weight","Totaalgewicht"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","Niet in staat om het gevraagde Coupon Aantal te creëren. Controleer de instellingen en probeer het opnieuw."
-"Unable to find a rule to delete.","Niet in staat om een regel te vinden om te verwijderen"
-"Update prices using the following information","Update prijzen, gebruikmakende van de volgende informatie"
-"Update product's %s %s: %s","Update producten %s %s: %s"
-"Update the Product","Vernieuw het product"
-"Use Auto Generation","Gebruik de Automatische Generatie"
-"Used","Gebruikt"
-"Uses per Coupon","Aantal gebruiken per kortingsbon"
-"Uses per Customer","Aantal gebruiken per klant"
-"Website","Website"
-"Websites","Websites"
-"Wrong rule specified.","Verkeerde regel gespecificeerd"
-"Yes","ja"
-"total amount","totaal bedrag"
+"Shipping Country","Verzending land"
+"Product attribute combination","Product attributen combinatie"
+"Products subselection","Producten subselectie"
+"Conditions combination","Voorwaarden combinatie"
+"Cart Attribute","Winkelwagen attribuut"
+"Quantity in cart","Hoeveelheid in winkelwagen"
+"Price in cart","Prijs in winkelwagen"
+"Row total in cart","Rij totalen in winkelwagen"
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,GEVONDEN
+"NOT FOUND","NIET GEVONDEN"
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
"total quantity","totaal aantal"
+"total amount","totaal bedrag"
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
diff --git a/app/code/Magento/SalesRule/i18n/pt_BR.csv b/app/code/Magento/SalesRule/i18n/pt_BR.csv
index b581f2eca90..6669abcf458 100644
--- a/app/code/Magento/SalesRule/i18n/pt_BR.csv
+++ b/app/code/Magento/SalesRule/i18n/pt_BR.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Regras de Preço de Carrinho de Compras baseado em atributo ""%s"" ter sido desativado."
-"%s Coupon(s) have been generated","%s Cupom(s) foram gerados"
-"Actions","Ações"
-"Active","Ativo"
+ID,Identidade
+Apply,Solicitar
+No,Não
+Subtotal,"Valor Subtotal"
+Discount,"Quantia de Desconto"
+Uses,"Número de Usuários"
+Delete,Delete
+Yes,Sim
+"Web Site","Web Site"
+Status,Status
+"Save and Continue Edit","Salvar e continuar a editar"
+Description,Descrição
+Catalog,Catálogo
+Actions,Ações
+Rule,"Nome da Regra"
+"Start on","Data Inicial"
+"End on",Vencimento
+Active,Ativo
+"This rule no longer exists.","Essa regra não existe mais."
+"General Information","Informações gerais"
+Websites,Sites
"Add New Rule","Adicionar nova regra"
-"Alphabetical","Alfabético"
-"Alphanumeric","Alfanumérico"
-"An error occurred while generating coupons. Please review the log and try again.","Ocorreu um erro ao gerar os cupons. Por favor reveja a sessão e tente novamente."
-"Apply","Solicitar"
-"Apply To","Aplicar a"
-"Apply the rule only if the following conditions are met (leave blank for all products)","Aplicar a regra apenas se as seguintes condições forem atendidas (deixe em branco para todos os produtos)"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Aplicar a regra apenas para itens do carrinho correspondendo às seguintes condições (deixe em branco para todos os itens)"
-"Apply the rule to cart items matching the following conditions","Aplicar a regra para itens do carrinho correspondendo às seguintes condições"
-"Apply to Shipping Amount","Aplicar a Valor de Envio"
-"Are you sure you want to delete the selected coupon(s)?","Tem certeza que quer apagar o(s) cupom(s) escolhido(s)?"
-"Auto","Auto"
-"Auto Generated Specific Coupon Codes","Códigos de Cupom EspecÃficos Auto Gerados"
-"Buy X get Y free (discount amount is Y)","Compre X obtenha Y grátis (valor do desconto é Y)"
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule","Nova Regra"
+"Rule Information","Informação da Regra"
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing","Parar Outras Regras de Processamento"
+Conditions,Condições
+"Rule Name","Rule Name"
+Inactive,Inativo
+"Customer Groups","Grupos do cliente"
+"From Date","A Partir da Data"
+"To Date","Até a Data Atual"
+Priority,Prioridade
+Promotions,Promoções
+"Edit Rule","Editar regra"
+"The rule has been saved.","A regra foi salva."
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.","A regra foi apagada."
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product","Atualizar o Produto"
+"To Fixed Value","Para Valor Fixo"
+"To Percentage","Para Percentagem"
"By Fixed value","Por Valor Fixo"
"By Percentage","Por Percentagem"
-"Can't acquire coupon.","Não é possÃvel adquirir cupons."
-"Cart Attribute","Atributo do Carrinho"
-"Catalog","Catálogo"
-"Code Format","Formato do código"
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method","Tipo de Frete"
+"Payment Method","Método de Pagamento"
+Created,"Criado Em"
+Alphanumeric,Alfanumérico
+"Apply To","Aplicar a"
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,Alfabético
+Numeric,Numérico
+Generate,Gerar
+Auto,Auto
+Coupon,Cupom
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code","Código do cupom"
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight","Peso Total"
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels","Vista das Marcas EspecÃficas da Loja"
+"Shopping Cart Price Rules","Regras de Preços de Carrinho de Compras"
+"Update prices using the following information","Atualizar preços usando as seguintes informações"
+"Percent of product price discount","Porcentagem do desconto sobre o preço do produto"
+"Fixed amount discount","Valor de desconto fixo"
+"Fixed amount discount for whole cart","Valor de desconto fixo para todo o carrinho"
+"Buy X get Y free (discount amount is Y)","Compre X obtenha Y grátis (valor do desconto é Y)"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount","Aplicar a Valor de Envio"
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes","Gerenciar Códigos de Cupom"
+"Coupons Information","Informação dos cupons"
+"Coupon Qty","Coupon Qty"
"Code Length","Tamanho do código"
+"Excluding prefix, suffix and separators.","Excluindo sufixo, prefixo e separadores."
+"Code Format","Formato do código"
"Code Prefix","Prefixo Código"
"Code Suffix","Sufixo Código"
-"Conditions","Condições"
-"Conditions combination","Combinação de Condições"
-"Coupon","Cupom"
-"Coupon Code","Código do cupom"
-"Coupon Quantity","Qtd. de Cupom"
-"Coupon with the same code","Cupom com o mesmo código"
-"Coupons Information","Informação dos cupons"
-"Created","Criado Em"
-"Customer Groups","Grupos do cliente"
"Dash Every X Characters","Trace Cada X Caracteres"
-"End on","Vencimento"
-"Start on","Data Inicial"
+"If empty no separation.","Se vazio sem separação."
+"Times Used","Vezes usadas"
+"Are you sure you want to delete the selected coupon(s)?","Tem certeza que quer apagar o(s) cupom(s) escolhido(s)?"
+Labels,Etiquetas
"Default Label","Etiqueta padrão"
"Default Rule Label for All Store Views","Etiqueta de regra padrão para todas as visualizações da loja"
-"Description","Descrição"
-"Discount","Quantia de Desconto"
-"Discount Quantity Step (Buy X)","Etapa de Desconto por Quantidade (Comprar X)"
-"Edit Rule","Editar regra"
-"Edit Rule '%s'","Editar regra ""s%"""
-"Excluding prefix, suffix and separators.","Excluindo sufixo, prefixo e separadores."
-"FOUND","ENCONTRADO"
-"Fixed amount discount","Valor de desconto fixo"
-"Fixed amount discount for whole cart","Valor de desconto fixo para todo o carrinho"
-"For matching items only","Apenas para itens correspondentes"
-"For shipment with matching items","Para o envio de itens correspondentes"
-"Free Shipping","Frete Grátis"
-"From Date","A Partir da Data"
-"General Information","Informações gerais"
-"Generate","Gerar"
-"ID","Identidade"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Se %s %s %s para uma subseleção de itens no carrinho correspondendo a %s destas condições:"
-"If an item is %s in the cart with %s of these conditions true:","Se um item está %s no carrinho com %s destas condições verdadeiras:"
-"If empty no separation.","Se vazio sem separação."
+"Use Auto Generation","Usar Auto Geração"
"If you select and save the rule you will be able to generate multiple coupon codes.","Se você selecionar e salvar a regra, será capaz de gerar múltiplos códigos de cupom."
-"Inactive","Inativo"
-"Item totals are not set for rule.","Os totais dos itens não são configurados via de regra."
-"Labels","Etiquetas"
-"Manage Coupon Codes","Gerenciar Códigos de Cupom"
-"Maximum Quantity Discount is Applied To","A Quantidade Máxima de Desconto é Aplicada A"
-"NOT FOUND","NÃO ENCONTRADO"
-"NOT LOGGED IN","NÃO LIGADO"
-"New Rule","Nova Regra"
-"No","Não"
-"No Coupon","Sem Cupom"
-"Not valid data provided","Não há dados válidos"
-"Uses","Número de Usuários"
-"Numeric","Numérico"
-"Payment Method","Método de Pagamento"
-"Percent of product price discount","Porcentagem do desconto sobre o preço do produto"
-"Interval","PerÃodo"
-"Price in cart","Preço no carrinho"
-"Priority","Prioridade"
-"Product attribute combination","Combinação de atributos do produto"
-"Products subselection","Sub-seleção de produtos"
-"Promotions","Promoções"
+"Uses per Coupon","Uso por cupom"
+"Uses per Customer","Uso por cliente"
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
"Public In RSS Feed","Público No Feed RSS"
-"Quantity in cart","Quantidade no carrinho"
-"Row total in cart","Total de linhas no carrinho"
-"Rule Information","Informação da Regra"
-"Rule","Nome da Regra"
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
"Rule is not defined","A regra não está definida"
-"Sales Discount","Valor do Desconto de Venda"
-"Sales Subtotal","Subtotal do Valor de Vendas"
-"Sales Total","Total do Valor de Vendas"
-"Save and Continue Edit","Salvar e continuar a editar"
-"Shipping Country","PaÃs de Envio"
-"Shipping Method","Tipo de Frete"
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code","Cupom com o mesmo código"
+"No Coupon","Sem Cupom"
+"Specific Coupon","Cupom EspecÃfico"
+"Can't acquire coupon.","Não é possÃvel adquirir cupons."
+"Special Price","Preço Especial"
+"Total Items Quantity","Quantidade total de itens"
"Shipping Postcode","Código Postal de Envio"
"Shipping Region","Região de Envio"
"Shipping State/Province","Estado/ProvÃncia de Envio"
-"Price Rule","Regra de Preço de Carrinho de Compras"
-"Shopping Cart Price Rules","Regras de Preços de Carrinho de Compras"
-"Special Price","Preço Especial"
-"Specific Coupon","Cupom EspecÃfico"
-"Status","Status"
-"Stop Further Rules Processing","Parar Outras Regras de Processamento"
-"Store View Specific Labels","Vista das Marcas EspecÃficas da Loja"
-"Subtotal","Subtotal"
-"Subtotal","Valor Subtotal"
-"The rule has been deleted.","A regra foi apagada."
-"The rule has been saved.","A regra foi salva."
-"This rule no longer exists.","Essa regra não existe mais."
-"Times Used","Vezes usadas"
-"To Date","Até a Data Atual"
-"To Fixed Value","Para Valor Fixo"
-"To Percentage","Para Percentagem"
-"Total","Total"
-"Total","Valor Total"
-"Total Items Quantity","Quantidade total de itens"
-"Total Weight","Peso Total"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","Não poi possÃvel criar a Quantidade de Cupons solicitada. Por favor cheque as configurações e tente novamente."
-"Unable to find a rule to delete.","Incapaz de encontrar uma regra para excluir."
-"Update prices using the following information","Atualizar preços usando as seguintes informações"
-"Update product's %s %s: %s","Atualização dos produtos %s %s: %s"
-"Update the Product","Atualizar o Produto"
-"Use Auto Generation","Usar Auto Geração"
-"Used","Utilizado"
-"Uses per Coupon","Uso por cupom"
-"Uses per Customer","Uso por cliente"
-"Website","Website"
-"Websites","Sites"
-"Wrong rule specified.","Especificação de regra incorreta."
-"Yes","Sim"
-"total amount","quantia total"
+"Shipping Country","PaÃs de Envio"
+"Product attribute combination","Combinação de atributos do produto"
+"Products subselection","Sub-seleção de produtos"
+"Conditions combination","Combinação de Condições"
+"Cart Attribute","Atributo do Carrinho"
+"Quantity in cart","Quantidade no carrinho"
+"Price in cart","Preço no carrinho"
+"Row total in cart","Total de linhas no carrinho"
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,ENCONTRADO
+"NOT FOUND","NÃO ENCONTRADO"
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
"total quantity","quantidade total"
+"total amount","quantia total"
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
diff --git a/app/code/Magento/SalesRule/i18n/zh_CN.csv b/app/code/Magento/SalesRule/i18n/zh_CN.csv
index 651790cbcf2..93761f1bcef 100644
--- a/app/code/Magento/SalesRule/i18n/zh_CN.csv
+++ b/app/code/Magento/SalesRule/i18n/zh_CN.csv
@@ -1,132 +1,141 @@
-"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d è´ç‰©è½¦ä»·æ ¼è§„则基于 ""%s"" 属性，已被ç¦ç”¨ã€‚"
-"%s Coupon(s) have been generated","å·²ç”Ÿæˆ %s 个组"
-"Actions","æ“作"
-"Active","活动"
-"Add New Rule","æ·»åŠ æ–°è§„åˆ™"
-"Alphabetical","å—æ¯è¡¨"
-"Alphanumeric","å—æ¯è¡¨"
-"An error occurred while generating coupons. Please review the log and try again.","生æˆæŠ˜æ‰£åˆ¸æ—¶å‡ºé”™ã€‚请查阅日志并é‡è¯•ã€‚"
-"Apply","应用"
-"Apply To","应用给"
-"Apply the rule only if the following conditions are met (leave blank for all products)","åªæœ‰ä¸‹åˆ—æ¡ä»¶æ»¡è¶³æ—¶æ‰åº”用规则（留空å³å¯é’ˆå¯¹æ‰€æœ‰äº§å“）"
-"Apply the rule only to cart items matching the following conditions (leave blank for all items)","åªå¯¹è´ç‰©è½¦ä¸æ»¡è¶³ä¸‹åˆ—æ¡ä»¶çš„产å“应用规则（留空å³å¯é’ˆå¯¹æ‰€æœ‰äº§å“）"
-"Apply the rule to cart items matching the following conditions","对è´ç‰©è½¦ä¸ç¬¦åˆä¸‹åˆ—æ¡ä»¶çš„商å“应用规则"
-"Apply to Shipping Amount","应用给è¿å•é¢åº¦"
-"Are you sure you want to delete the selected coupon(s)?","ä½ æ˜¯å¦ç¡®å®šè¦åˆ 除所选折扣券？"
-"Auto","自动"
-"Auto Generated Specific Coupon Codes","自动生æˆæŒ‡å®šçš„折扣券代ç "
+ID,ID
+Apply,应用
+No,å¦
+Subtotal,å°è®¡é¢åº¦
+Discount,折扣å¸æˆ·
+Uses,用户数
+Delete,Delete
+Yes,是
+"Web Site","Web Site"
+Status,状æ€
+"Save and Continue Edit",ä¿å˜å¹¶ç»§ç»ç¼–辑
+Description,æè¿°
+Catalog,分类
+Actions,æ“作
+Rule,规则å称
+"Start on",开始日
+"End on",过期日
+Active,活动
+"This rule no longer exists.",该规则已ä¸å˜åœ¨ã€‚
+"General Information",常规信æ¯
+Websites,网站
+"Add New Rule",æ·»åŠ æ–°è§„åˆ™
+"Edit Rule '%1'","Edit Rule '%1'"
+"New Rule",新规则
+"Rule Information",规则信æ¯
+"Discount Amount","Discount Amount"
+"Stop Further Rules Processing",åœæ¢è¿›ä¸€æ¥çš„规则处ç†
+Conditions,æ¡ä»¶
+"Rule Name","Rule Name"
+Inactive,未激活
+"Customer Groups",客户组
+"From Date",æ¥è‡ªæ—¥æœŸ
+"To Date",截æ¢æ—¥æœŸ
+Priority,优先级
+Promotions,促销
+"Edit Rule",修改规则
+"The rule has been saved.",规则已ä¿å˜ã€‚
+"An error occurred while saving the rule data. Please review the log and try again.","An error occurred while saving the rule data. Please review the log and try again."
+"The rule has been deleted.",è§„åˆ™å·²åˆ é™¤ã€‚
+"An error occurred while deleting the rule. Please review the log and try again.","An error occurred while deleting the rule. Please review the log and try again."
+"Update the Product",更新产å“
+"To Fixed Value",为固定值
+"To Percentage",为百分率
+"By Fixed value",由固定值
+"By Percentage",按百分比
+"Update product's %1 %2: %3","Update product's %1 %2: %3"
+"Conditions Combination","Conditions Combination"
+"Product Attribute","Product Attribute"
+"Shipping Method",è¿é€æ–¹å¼
+"Payment Method",支付方å¼
+Created,创建于
+Alphanumeric,å—æ¯è¡¨
+"Apply To",应用给
+"is one of","is one of"
+"is not one of","is not one of"
+"equals or greater than","equals or greater than"
+"equals or less than","equals or less than"
+"greater than","greater than"
+"less than","less than"
+Alphabetical,å—æ¯è¡¨
+Numeric,æ•°å—
+Generate,生æˆ
+Auto,自动
+Coupon,折扣券
+"Shopping Cart Price Rule","Shopping Cart Price Rule"
+"Coupon Code",折扣券代ç
+is,is
+"is not","is not"
+CSV,CSV
+"Excel XML","Excel XML"
+"Total Weight",总é‡é‡
+"Discount (%1)","Discount (%1)"
+"Store View Specific Labels",åº—é“ºè§†å›¾æŒ‡å®šçš„æ ‡ç¾
+"Shopping Cart Price Rules",è´ç‰©è½¦ä»·æ ¼è§„则
+"Update prices using the following information",使用下列信æ¯æ›´æ–°ä»·æ ¼
+"Percent of product price discount",产å“ä»·æ ¼æŠ˜æ‰£æ¯”ä¾‹
+"Fixed amount discount",定é¢æŠ˜æ‰£
+"Fixed amount discount for whole cart",整个è´ç‰©è½¦çš„定é¢æŠ˜æ‰£
"Buy X get Y free (discount amount is Y)","è´ä¹° X å³å¯å…费获得 Y（折扣é¢æ˜¯Y）"
-"By Fixed value","由固定值"
-"By Percentage","按百分比"
-"Can't acquire coupon.","æ— æ³•èŽ·å–代金券。"
-"Cart Attribute","è´ç‰©è½¦å±žæ€§"
-"Catalog","分类"
-"Code Format","代ç æ ¼å¼"
-"Code Length","代ç 长度"
-"Code Prefix","代ç å‰ç¼€"
-"Code Suffix","代ç åŽç¼€"
-"Conditions","æ¡ä»¶"
-"Conditions combination","æ¡ä»¶ç»„åˆ"
-"Coupon","折扣券"
-"Coupon Code","折扣券代ç "
-"Coupon Quantity","折扣券数é‡"
-"Coupon with the same code","使用相åŒä»£ç 的折扣券"
-"Coupons Information","折扣券信æ¯"
-"Created","创建于"
-"Customer Groups","客户组"
-"Dash Every X Characters","æ¯x个å—ç¬¦åŠ æ¨ªçº¿"
-"End on","过期日"
-"Start on","开始日"
-"Default Label","é»˜è®¤æ ‡ç¾"
-"Default Rule Label for All Store Views","é’ˆå¯¹æ‰€æœ‰åº—é“ºè§†å›¾çš„é»˜è®¤è§„åˆ™æ ‡ç¾"
-"Description","æè¿°"
-"Discount","折扣å¸æˆ·"
-"Discount Quantity Step (Buy X)","折扣数é‡æ¥éª¤ï¼ˆè´ä¹° X）"
-"Edit Rule","修改规则"
-"Edit Rule '%s'","修改规则'%s'"
-"Excluding prefix, suffix and separators.","包å«å‰ç¼€ã€åŽç¼€ï¼Œä»¥åŠåˆ†éš”符。"
-"FOUND","找到"
-"Fixed amount discount","定é¢æŠ˜æ‰£"
-"Fixed amount discount for whole cart","整个è´ç‰©è½¦çš„定é¢æŠ˜æ‰£"
-"For matching items only","ä»…é™åŒ¹é…的商å“"
-"For shipment with matching items","针对è¿å•ä¸åŒ¹é…的商å“"
-"Free Shipping","å…è¿è´¹"
-"From Date","æ¥è‡ªæ—¥æœŸ"
-"General Information","常规信æ¯"
-"Generate","生æˆ"
-"ID","ID"
-"If %s %s %s for a subselection of items in cart matching %s of these conditions:","如果è´ç‰©è½¦ä¸çš„ %s %s %s 附属项目符åˆä¸‹åˆ— %s 个æ¡ä»¶ï¼š"
-"If an item is %s in the cart with %s of these conditions true:","如果è´ç‰©è½¦ä¸çš„项目 %s 满足下列 %s 个æ¡ä»¶ï¼š"
-"If empty no separation.","如果为空则ä¸åˆ†éš”。"
-"If you select and save the rule you will be able to generate multiple coupon codes.","如果选择并ä¿å˜è¯¥è§„åˆ™ï¼Œä½ å°±å¯ä»¥ç”Ÿæˆå¤šä¸ªæŠ˜æ‰£åˆ¸ä»£ç 。"
-"Inactive","未激活"
-"Item totals are not set for rule.","商å“总数并ä¸ç”±è§„则设置"
-"Labels","æ ‡ç¾"
-"Manage Coupon Codes","管ç†æŠ˜æ‰£åˆ¸ä»£ç "
-"Maximum Quantity Discount is Applied To","最大数é‡æŠ˜æ‰£è¢«åº”用给"
-"NOT FOUND","未找到"
-"NOT LOGGED IN","未登录"
-"New Rule","新规则"
-"No","å¦"
-"No Coupon","æ— ä»£é‡‘åˆ¸"
-"Not valid data provided","æ供的数æ®æ— 效"
-"Uses","用户数"
-"Numeric","æ•°å—"
-"Payment Method","支付方å¼"
-"Percent of product price discount","产å“ä»·æ ¼æŠ˜æ‰£æ¯”ä¾‹"
-"Interval","周期"
-"Price in cart","è´ç‰©è½¦ä»·æ ¼"
-"Priority","优先级"
-"Product attribute combination","产å“属性组åˆ"
-"Products subselection","产å“å¤é€‰"
-"Promotions","促销"
-"Public In RSS Feed","å‘布到RSSæºä¸"
-"Quantity in cart","è´ç‰©è½¦ä¸æ•°é‡"
-"Row total in cart","è´ç‰©è½¦ä¸è¡Œæ•°"
-"Rule Information","规则信æ¯"
-"Rule","规则å称"
-"Rule is not defined","规则未定义"
-"Sales Discount","销售折扣é¢"
-"Sales Subtotal","销售å°è®¡é¢åº¦"
-"Sales Total","销售总é¢"
-"Save and Continue Edit","ä¿å˜å¹¶ç»§ç»ç¼–辑"
-"Shipping Country","è¿é€å›½å®¶"
-"Shipping Method","è¿é€æ–¹å¼"
-"Shipping Postcode","è¿é€é‚®ç¼–"
-"Shipping Region","è¿é€åœ°åŒº"
-"Shipping State/Province","è¿è¡Œå·ž/çœ"
-"Price Rule","共享è´ç‰©è½¦è§„则"
-"Shopping Cart Price Rules","è´ç‰©è½¦ä»·æ ¼è§„则"
-"Special Price","ç‰¹æ®Šä»·æ ¼"
-"Specific Coupon","指定代金券"
-"Status","状æ€"
-"Stop Further Rules Processing","åœæ¢è¿›ä¸€æ¥çš„规则处ç†"
-"Store View Specific Labels","åº—é“ºè§†å›¾æŒ‡å®šçš„æ ‡ç¾"
-"Subtotal","å°è®¡"
-"Subtotal","å°è®¡é¢åº¦"
-"The rule has been deleted.","è§„åˆ™å·²åˆ é™¤ã€‚"
-"The rule has been saved.","规则已ä¿å˜ã€‚"
-"This rule no longer exists.","该规则已ä¸å˜åœ¨ã€‚"
-"Times Used","使用时间"
-"To Date","截æ¢æ—¥æœŸ"
-"To Fixed Value","为固定值"
-"To Percentage","为百分率"
-"Total","总数"
-"Total","总数é‡"
-"Total Items Quantity","总商å“æ•°é‡"
-"Total Weight","总é‡é‡"
-"Unable to create requested Coupon Quantity. Please check settings and try again.","æ— æ³•åˆ›å»ºæ‰€éœ€æ•°é‡çš„折扣券。请检查设置并é‡è¯•ã€‚"
-"Unable to find a rule to delete.","æ— æ³•æŸ¥æ‰¾è¦åˆ 除的规则。"
-"Update prices using the following information","使用下列信æ¯æ›´æ–°ä»·æ ¼"
-"Update product's %s %s: %s","更新产å“çš„ %s %s：%s"
-"Update the Product","更新产å“"
-"Use Auto Generation","使用自动生æˆ"
-"Used","已使用"
-"Uses per Coupon","æ¯ä»£é‡‘券使用"
-"Uses per Customer","æ¯å®¢æˆ·ä½¿ç”¨"
-"Website","网站"
-"Websites","网站"
-"Wrong rule specified.","所指定规则有误。"
-"Yes","是"
-"total amount","总数"
-"total quantity","总é‡"
+"Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"Discount Qty Step (Buy X)","Discount Qty Step (Buy X)"
+"Apply to Shipping Amount",应用给è¿å•é¢åº¦
+"Apply the rule only to cart items matching the following conditions ' '(leave blank for all items).","Apply the rule only to cart items matching the following conditions ' '(leave blank for all items)."
+"Apply the rule only if the following conditions are met (leave blank for all products).","Apply the rule only if the following conditions are met (leave blank for all products)."
+"Manage Coupon Codes",管ç†æŠ˜æ‰£åˆ¸ä»£ç
+"Coupons Information",折扣券信æ¯
+"Coupon Qty","Coupon Qty"
+"Code Length",代ç 长度
+"Excluding prefix, suffix and separators.",包å«å‰ç¼€ã€åŽç¼€ï¼Œä»¥åŠåˆ†éš”符。
+"Code Format",代ç æ ¼å¼
+"Code Prefix",代ç å‰ç¼€
+"Code Suffix",代ç åŽç¼€
+"Dash Every X Characters",æ¯x个å—ç¬¦åŠ æ¨ªçº¿
+"If empty no separation.",如果为空则ä¸åˆ†éš”。
+"Times Used",使用时间
+"Are you sure you want to delete the selected coupon(s)?",ä½ æ˜¯å¦ç¡®å®šè¦åˆ 除所选折扣券？
+Labels,æ ‡ç¾
+"Default Label",é»˜è®¤æ ‡ç¾
+"Default Rule Label for All Store Views",é’ˆå¯¹æ‰€æœ‰åº—é“ºè§†å›¾çš„é»˜è®¤è§„åˆ™æ ‡ç¾
+"Use Auto Generation",使用自动生æˆ
+"If you select and save the rule you will be able to generate multiple coupon codes.",如果选择并ä¿å˜è¯¥è§„åˆ™ï¼Œä½ å°±å¯ä»¥ç”Ÿæˆå¤šä¸ªæŠ˜æ‰£åˆ¸ä»£ç 。
+"Uses per Coupon",æ¯ä»£é‡‘券使用
+"Uses per Customer",æ¯å®¢æˆ·ä½¿ç”¨
+"Usage limit enforced for logged in customers only.","Usage limit enforced for logged in customers only."
+"Public In RSS Feed",å‘布到RSSæºä¸
+"Cart Price Rules","Cart Price Rules"
+"New Cart Price Rule","New Cart Price Rule"
+"The wrong rule is specified.","The wrong rule is specified."
+"We can't find a rule to delete.","We can't find a rule to delete."
+"Rule is not defined",规则未定义
+"Invalid data provided","Invalid data provided"
+"%1 coupon(s) have been generated.","%1 coupon(s) have been generated."
+"Something went wrong while generating coupons. Please review the log and try again.","Something went wrong while generating coupons. Please review the log and try again."
+"We cannot create the requested Coupon Qty. Please check your settings and try again.","We cannot create the requested Coupon Qty. Please check your settings and try again."
+"%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Shopping Cart Price Rules based on ""%2"" attribute have been disabled."
+"Coupon with the same code",使用相åŒä»£ç 的折扣券
+"No Coupon",æ— ä»£é‡‘åˆ¸
+"Specific Coupon",指定代金券
+"Can't acquire coupon.",æ— æ³•èŽ·å–代金券。
+"Special Price",ç‰¹æ®Šä»·æ ¼
+"Total Items Quantity",总商å“æ•°é‡
+"Shipping Postcode",è¿é€é‚®ç¼–
+"Shipping Region",è¿é€åœ°åŒº
+"Shipping State/Province",è¿è¡Œå·ž/çœ
+"Shipping Country",è¿é€å›½å®¶
+"Product attribute combination",产å“属性组åˆ
+"Products subselection",产å“å¤é€‰
+"Conditions combination",æ¡ä»¶ç»„åˆ
+"Cart Attribute",è´ç‰©è½¦å±žæ€§
+"Quantity in cart",è´ç‰©è½¦ä¸æ•°é‡
+"Price in cart",è´ç‰©è½¦ä»·æ ¼
+"Row total in cart",è´ç‰©è½¦ä¸è¡Œæ•°
+"Cart Item Attribute","Cart Item Attribute"
+FOUND,找到
+"NOT FOUND",未找到
+"If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
+"total quantity",总é‡
+"total amount",总数
+"If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:","If %1 %2 %3 for a subselection of items in cart matching %4 of these conditions:"
+"Item totals are not set for the rule.","Item totals are not set for the rule."
+"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes"
diff --git a/app/code/Magento/Sendfriend/i18n/de_DE.csv b/app/code/Magento/Sendfriend/i18n/de_DE.csv
index acda3c76bf3..2606d7e09c8 100644
--- a/app/code/Magento/Sendfriend/i18n/de_DE.csv
+++ b/app/code/Magento/Sendfriend/i18n/de_DE.csv
@@ -1,38 +1,37 @@
+Back,Zurück
+Name,Name
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,Nachricht:
+"Email to a Friend","E-Mail an einen Freund"
+"Email Address",E-Mail-Adresse
+"Email Templates","Email Templates"
+Name:,Name:
+"Email Address:",E-Mail-Adresse:
+Sender:,Absender:
+Email:,E-Mail:
+Recipient:,Empfänger:
"Add Recipient","Empfänger hinzufügen"
-"Allow for Guests","Für Gäste erlauben"
-"An invalid email address for recipient was entered.","Sie haben eine ungültige E-Mail-Adresse als Empfänger angegeben."
+"Send Email","E-Mail senden"
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.","Der Link wurde an den Freund gesendet."
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.","Einige E-Mail wurden nicht gesendet."
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.","Der Absender-Name kann nicht freigelassen werden."
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.","Das Nachrichten-Feld kann nicht freigelassen werden."
"At least one recipient must be specified.","Es muss mindestens ein Empfänger eingetragen werden."
-"Back","Zurück"
-"Catalog Product Email to a Friend","Produkt aus dem Katalog per E-Mail an einen Freund senden"
-"Email Address","E-Mail-Adresse"
-"Email Address:","E-Mail-Adresse:"
-"Email Templates","E-Mail Vorlagen"
-"Email to a Friend","E-Mail an einen Freund"
-"Email:","E-Mail:"
-"Enabled","Aktiviert"
-"Invalid Sender Information","Ungültiger Absender"
-"Invalid sender email.","Ungültige Absender E-Mail-Adresse."
-"Limit Sending By","Senden einschränken auf"
-"Max Products Sent in 1 Hour","Maximale Anzahl in einer Stunde gesendeter Produkte"
-"Max Recipients","Maximale Empfängeranzahl"
-"Maximum %d email addresses allowed.","Maximal %d E-Mail-Adressen erlaubt."
-"Message:","Nachricht:"
-"Name","Name"
-"Name:","Name:"
-"No more than %d emails can be sent at a time.","Es können nicht mehr als %d E-Mails auf einmal versendet werden."
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","Legen Sie bitte eine korrekte Cookie-Instanz fest."
"Please define a correct Product instance.","Legen Sie bitte eine korrekte Produkt-Instanz fest."
+"Invalid Sender Information","Ungültiger Absender"
"Please define the correct Sender information.","Bitte legen Sie korrekte Senderinformationen fest."
-"Recipient:","Empfänger:"
"Remove Email","E-Mail löschen"
-"Select Email Template","E-Mail-Vorlage wählen"
-"Send Email","E-Mail senden"
-"Send product to a friend","Dieses Produkt an einen Freund senden"
-"Sender:","Absender:"
-"Some emails were not sent.","Einige E-Mail wurden nicht gesendet."
-"The link to a friend was sent.","Der Link wurde an den Freund gesendet."
-"The message cannot be empty.","Das Nachrichten-Feld kann nicht freigelassen werden."
-"The messages cannot be sent more than %d times in an hour","Die Nachrichten können nicht öfter als %d mal pro Stunde gesendet werden"
-"The sender name cannot be empty.","Der Absender-Name kann nicht freigelassen werden."
-"There were some problems with the data.","Es traten Probleme mit den Daten auf."
-"You have exceeded limit of %d sends in an hour","Sie haben das Limit von %d Nachrichten pro Stunde überschritten"
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
+"Select Email Template","Select Email Template"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/i18n/en_US.csv b/app/code/Magento/Sendfriend/i18n/en_US.csv
index a3ec96de500..ae4c737497f 100644
--- a/app/code/Magento/Sendfriend/i18n/en_US.csv
+++ b/app/code/Magento/Sendfriend/i18n/en_US.csv
@@ -1,38 +1,37 @@
-"Add Recipient","Add Recipient"
-"Allow for Guests","Allow for Guests"
-"An invalid email address for recipient was entered.","An invalid email address for recipient was entered."
-"At least one recipient must be specified.","At least one recipient must be specified."
-"Back","Back"
-"Catalog Product Email to a Friend","Catalog Product Email to a Friend"
+Back,Back
+Name,Name
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,Message:
+"Email to a Friend","Email to a Friend"
"Email Address","Email Address"
-"Email Address:","Email Address:"
"Email Templates","Email Templates"
-"Email to a Friend","Email to a Friend"
-"Email:","Email:"
-"Enabled","Enabled"
-"Invalid Sender Information","Invalid Sender Information"
-"Invalid sender email.","Invalid sender email."
-"Limit Sending By","Limit Sending By"
-"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
-"Max Recipients","Max Recipients"
-"Maximum %d email addresses allowed.","Maximum %d email addresses allowed."
-"Message:","Message:"
-"Name","Name"
-"Name:","Name:"
-"No more than %d emails can be sent at a time.","No more than %d emails can be sent at a time."
+Name:,Name:
+"Email Address:","Email Address:"
+Sender:,Sender:
+Email:,Email:
+Recipient:,Recipient:
+"Add Recipient","Add Recipient"
+"Send Email","Send Email"
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.","The link to a friend was sent."
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.","Some emails were not sent."
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.","The sender name cannot be empty."
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.","The message cannot be empty."
+"At least one recipient must be specified.","At least one recipient must be specified."
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","Please define a correct Cookie instance."
"Please define a correct Product instance.","Please define a correct Product instance."
+"Invalid Sender Information","Invalid Sender Information"
"Please define the correct Sender information.","Please define the correct Sender information."
-"Recipient:","Recipient:"
"Remove Email","Remove Email"
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
"Select Email Template","Select Email Template"
-"Send Email","Send Email"
-"Send product to a friend","Send product to a friend"
-"Sender:","Sender:"
-"Some emails were not sent.","Some emails were not sent."
-"The link to a friend was sent.","The link to a friend was sent."
-"The message cannot be empty.","The message cannot be empty."
-"The messages cannot be sent more than %d times in an hour","The messages cannot be sent more than %d times in an hour"
-"The sender name cannot be empty.","The sender name cannot be empty."
-"There were some problems with the data.","There were some problems with the data."
-"You have exceeded limit of %d sends in an hour","You have exceeded limit of %d sends in an hour"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/i18n/es_ES.csv b/app/code/Magento/Sendfriend/i18n/es_ES.csv
index 360c92142c7..5da762e1593 100644
--- a/app/code/Magento/Sendfriend/i18n/es_ES.csv
+++ b/app/code/Magento/Sendfriend/i18n/es_ES.csv
@@ -1,38 +1,37 @@
-"Add Recipient","Añadir Destinatario"
-"Allow for Guests","Permitir invitados"
-"An invalid email address for recipient was entered.","Un correo electrónico inválido como destinario fue introducido."
-"At least one recipient must be specified.","Al menos un destinatario debe ser especificado."
-"Back","Volver"
-"Catalog Product Email to a Friend","Enviar Email a un amigo con el Catálogo de Productos"
+Back,Volver
+Name,Nombre
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,Mensaje:
+"Email to a Friend","Escribir un Email a un amigo"
"Email Address","Dirección de email"
+"Email Templates","Email Templates"
+Name:,Nombre:
"Email Address:","dirección de email:"
-"Email Templates","Plantillas de correo electrónico"
-"Email to a Friend","Escribir un Email a un amigo"
-"Email:","Email:"
-"Enabled","Habilitado"
-"Invalid Sender Information","Información del remitente inválida"
-"Invalid sender email.","Correo electrónico del remitente inválido"
-"Limit Sending By","LÃmite de envÃo por"
-"Max Products Sent in 1 Hour","Máximos productos enviados en 1 hora"
-"Max Recipients","Máximos destinatarios."
-"Maximum %d email addresses allowed.","Máximo %d direcciones de email permitidas"
-"Message:","Mensaje:"
-"Name","Nombre"
-"Name:","Nombre:"
-"No more than %d emails can be sent at a time.","No más de %d correos electrónicos pueden ser enviados a la vez"
+Sender:,Remitente:
+Email:,Email:
+Recipient:,Destinatario:
+"Add Recipient","Añadir Destinatario"
+"Send Email","EnvÃar Correo electrónico"
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.","El enlace fue envÃado a un amigo."
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.","Algunos correos electrónicos no fueron enviados."
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.","El nombre del remitente no puede estar vacÃo."
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.","El mensaje no puede estar vacÃo."
+"At least one recipient must be specified.","Al menos un destinatario debe ser especificado."
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","Por favor defina una correcta petición de cookie."
"Please define a correct Product instance.","Por favor defina una correcta petición de producto."
+"Invalid Sender Information","Información del remitente inválida"
"Please define the correct Sender information.","Por favor defina la información correcta del remitente."
-"Recipient:","Destinatario:"
"Remove Email","Eliminar E-mail"
-"Select Email Template","Elegir plantilla de correo electrónico"
-"Send Email","EnvÃar Correo electrónico"
-"Send product to a friend","EnvÃar el producto a un amigo"
-"Sender:","Remitente:"
-"Some emails were not sent.","Algunos correos electrónicos no fueron enviados."
-"The link to a friend was sent.","El enlace fue envÃado a un amigo."
-"The message cannot be empty.","El mensaje no puede estar vacÃo."
-"The messages cannot be sent more than %d times in an hour","Los mensajes no pueden ser enviados más %d de veces en una hora"
-"The sender name cannot be empty.","El nombre del remitente no puede estar vacÃo."
-"There were some problems with the data.","Ha habido algunos problemas con los datos."
-"You have exceeded limit of %d sends in an hour","Ha excedido el lÃmite de %d enviados en una hora"
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
+"Select Email Template","Select Email Template"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/i18n/fr_FR.csv b/app/code/Magento/Sendfriend/i18n/fr_FR.csv
index 4c7b2fd6e04..637c3e09ba0 100644
--- a/app/code/Magento/Sendfriend/i18n/fr_FR.csv
+++ b/app/code/Magento/Sendfriend/i18n/fr_FR.csv
@@ -1,38 +1,37 @@
-"Add Recipient","Ajouter destinataire"
-"Allow for Guests","Autoriser pour invités"
-"An invalid email address for recipient was entered.","Une adresse email invalide a été entrée dans le champ destinataire."
-"At least one recipient must be specified.","Au moins un destinataire doit être entré."
-"Back","Retour"
-"Catalog Product Email to a Friend","Envoyer le catalogue de produits par email à un ami"
+Back,Retour
+Name,Nom
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,"Message :"
+"Email to a Friend","Envoyer à un ami par email"
"Email Address","Adresse email"
+"Email Templates","Email Templates"
+Name:,"Nom :"
"Email Address:","Adresse email :"
-"Email Templates","Modèles d'emails"
-"Email to a Friend","Envoyer à un ami par email"
-"Email:","Email :"
-"Enabled","Activé"
-"Invalid Sender Information","Information de l'expéditeur invalide"
-"Invalid sender email.","Email de l'expéditeur invalide."
-"Limit Sending By","Limiter l'envoi par"
-"Max Products Sent in 1 Hour","Maximum de produits envoyés en une heure"
-"Max Recipients","Maximum de destinataires"
-"Maximum %d email addresses allowed.","%d adresses email autorisées maximum."
-"Message:","Message :"
-"Name","Nom"
-"Name:","Nom :"
-"No more than %d emails can be sent at a time.","Pas plus de %d emails ne peuvent être envoyés en même temps."
+Sender:,"Expéditeur :"
+Email:,"Email :"
+Recipient:,"Destinataire :"
+"Add Recipient","Ajouter destinataire"
+"Send Email","Envoyer l'email"
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.","Le lien a été envoyé à un ami."
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.","Certains emails n'ont pas été envoyés."
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.","Le nom de l'expéditeur ne peut pas être vide."
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.","Le message ne peut pas être vide."
+"At least one recipient must be specified.","Au moins un destinataire doit être entré."
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","Veuillez définir un cookie correct."
"Please define a correct Product instance.","Veuillez définir un produit correct."
+"Invalid Sender Information","Information de l'expéditeur invalide"
"Please define the correct Sender information.","Veuillez définir les informations correctes de l'expéditeur."
-"Recipient:","Destinataire :"
"Remove Email","Supprimer l'email"
-"Select Email Template","Sélectionner le modèle d'email"
-"Send Email","Envoyer l'email"
-"Send product to a friend","Envoyer le produit à un ami"
-"Sender:","Expéditeur :"
-"Some emails were not sent.","Certains emails n'ont pas été envoyés."
-"The link to a friend was sent.","Le lien a été envoyé à un ami."
-"The message cannot be empty.","Le message ne peut pas être vide."
-"The messages cannot be sent more than %d times in an hour","Les messages ne peuvent pas être envoyés plus de %d fois en une heure."
-"The sender name cannot be empty.","Le nom de l'expéditeur ne peut pas être vide."
-"There were some problems with the data.","Il y avait quelques problèmes avec les données."
-"You have exceeded limit of %d sends in an hour","Vous avez excédé la limite de %d envois en une heure"
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
+"Select Email Template","Select Email Template"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/i18n/nl_NL.csv b/app/code/Magento/Sendfriend/i18n/nl_NL.csv
index 9ee822e1424..59536fbbd8d 100644
--- a/app/code/Magento/Sendfriend/i18n/nl_NL.csv
+++ b/app/code/Magento/Sendfriend/i18n/nl_NL.csv
@@ -1,38 +1,37 @@
+Back,Terug
+Name,Naam
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,Bericht:
+"Email to a Friend","E-mail Vriend"
+"Email Address",e-mailadres
+"Email Templates","Email Templates"
+Name:,Naam:
+"Email Address:",E-mailadres:
+Sender:,Verzender:
+Email:,E-mail
+Recipient:,Ontvanger:
"Add Recipient","Voeg een Ontvanger toe"
-"Allow for Guests","Toegestaan voor Gasten"
-"An invalid email address for recipient was entered.","Een ongeldig e-mailadres was voor de ontvanger ingevuld."
+"Send Email","Verstuur E-mail"
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.","Deze link was naar een vriend verstuurd."
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.","Sommige emails zijn niet verzonden."
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.","De verzender naam mag niet leeg zijn."
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.","Het bericht mag niet leeg zijn."
"At least one recipient must be specified.","U moet tenminste een ontvanger kiezen."
-"Back","Terug"
-"Catalog Product Email to a Friend","Catalogus Product E-mail naar een Vriend"
-"Email Address","e-mailadres"
-"Email Address:","E-mailadres:"
-"Email Templates","E-mail Sjabloon"
-"Email to a Friend","E-mail Vriend"
-"Email:","E-mail"
-"Enabled","Aan"
-"Invalid Sender Information","Ongeldige Verzender Informatie"
-"Invalid sender email.","Ongeldige Verzender E-mail."
-"Limit Sending By","Limiteer Versturen Door"
-"Max Products Sent in 1 Hour","Maximum Aantal Producten Verstuurd in 1 Uur"
-"Max Recipients","Maximum Hoeveelheid Ontvangers"
-"Maximum %d email addresses allowed.","Maximum %s e-mailadressen toegestaan."
-"Message:","Bericht:"
-"Name","Naam"
-"Name:","Naam:"
-"No more than %d emails can be sent at a time.","Niet meer dan %d e-mails per keer versturen."
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","Gelieve een correcte Cookie voorbeeld te definiëren."
"Please define a correct Product instance.","Gelieve een correct Product voorbeeld te definiëren."
+"Invalid Sender Information","Ongeldige Verzender Informatie"
"Please define the correct Sender information.","Gelieve een correct Verzender Informatie voorbeeld te definiëren."
-"Recipient:","Ontvanger:"
"Remove Email","Verwijder E-mail"
-"Select Email Template","Kies een E-mail Sjabloon"
-"Send Email","Verstuur E-mail"
-"Send product to a friend","Verstuur dit product naar een vriend"
-"Sender:","Verzender:"
-"Some emails were not sent.","Sommige emails zijn niet verzonden."
-"The link to a friend was sent.","Deze link was naar een vriend verstuurd."
-"The message cannot be empty.","Het bericht mag niet leeg zijn."
-"The messages cannot be sent more than %d times in an hour","De berechten kunnen niet meer dan %d keer per uur worden verstuurd"
-"The sender name cannot be empty.","De verzender naam mag niet leeg zijn."
-"There were some problems with the data.","Er waren een aantal problemen met de gegevens."
-"You have exceeded limit of %d sends in an hour","U heeft het limiet van %d verzendingen per uur bereikt"
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
+"Select Email Template","Select Email Template"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/i18n/pt_BR.csv b/app/code/Magento/Sendfriend/i18n/pt_BR.csv
index 32b823a4d02..bf143a533be 100644
--- a/app/code/Magento/Sendfriend/i18n/pt_BR.csv
+++ b/app/code/Magento/Sendfriend/i18n/pt_BR.csv
@@ -1,38 +1,37 @@
-"Add Recipient","Adicione Destinatário"
-"Allow for Guests","Permitir para convidados"
-"An invalid email address for recipient was entered.","Um endereço de e-mail de destinatário foi inserido é inválido."
-"At least one recipient must be specified.","Pelo menos um destinatário deve ser especificado."
-"Back","Voltar"
-"Catalog Product Email to a Friend","Produto de Catálogo: Mandar E-Mail para Amigo"
+Back,Voltar
+Name,Nome
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,Mensagem:
+"Email to a Friend","Enviar por e-mail a um amigo"
"Email Address","Endereço de e-mail"
+"Email Templates","Email Templates"
+Name:,Nome:
"Email Address:","Endereço de e-mail:"
-"Email Templates","Modelos de e-mail"
-"Email to a Friend","Enviar por e-mail a um amigo"
-"Email:","E-mail:"
-"Enabled","Ativado"
-"Invalid Sender Information","Informações inválidas de remetente"
-"Invalid sender email.","E-mail de remetente inválido."
-"Limit Sending By","Limitar os envios por"
-"Max Products Sent in 1 Hour","Número máximo de produtos enviados em 1 hora"
-"Max Recipients","Máximo de destinatários"
-"Maximum %d email addresses allowed.","Só são permitidos %d endereços de e-mail."
-"Message:","Mensagem:"
-"Name","Nome"
-"Name:","Nome:"
-"No more than %d emails can be sent at a time.","No máximo %d e-mails podem ser enviados de uma vez."
+Sender:,Remetente:
+Email:,E-mail:
+Recipient:,Destinatário:
+"Add Recipient","Adicione Destinatário"
+"Send Email","Enviar email"
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.","O link para um amigo foi enviado."
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.","Alguns e-mails não foram enviados."
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.","O nome do remetente não pode estar em branco."
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.","A mensagem não pode estar vazia."
+"At least one recipient must be specified.","Pelo menos um destinatário deve ser especificado."
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","Defina um elemento de Cookie correto."
"Please define a correct Product instance.","Defina um elemento de Produto correto."
+"Invalid Sender Information","Informações inválidas de remetente"
"Please define the correct Sender information.","Defina as informações corretas do Remetente."
-"Recipient:","Destinatário:"
"Remove Email","Remover Email"
-"Select Email Template","Escolha o modelo de e-mail"
-"Send Email","Enviar email"
-"Send product to a friend","Envie o produto para um amigo"
-"Sender:","Remetente:"
-"Some emails were not sent.","Alguns e-mails não foram enviados."
-"The link to a friend was sent.","O link para um amigo foi enviado."
-"The message cannot be empty.","A mensagem não pode estar vazia."
-"The messages cannot be sent more than %d times in an hour","As mensagens não podem ser enviadas mais de %s vezes em uma hora"
-"The sender name cannot be empty.","O nome do remetente não pode estar em branco."
-"There were some problems with the data.","Ocorreram alguns problemas com os dados."
-"You have exceeded limit of %d sends in an hour","Você excedeu o limite de %d envios em uma hora"
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
+"Select Email Template","Select Email Template"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/i18n/zh_CN.csv b/app/code/Magento/Sendfriend/i18n/zh_CN.csv
index 1e0be61d179..6ed28d89388 100644
--- a/app/code/Magento/Sendfriend/i18n/zh_CN.csv
+++ b/app/code/Magento/Sendfriend/i18n/zh_CN.csv
@@ -1,38 +1,37 @@
-"Add Recipient","æ·»åŠ æ”¶ä»¶äºº"
-"Allow for Guests","对æ¥å®¾å…许"
-"An invalid email address for recipient was entered.","输入的收件人电å邮件地å€æ— 效。"
-"At least one recipient must be specified.","必须至少指定一个收件人。"
-"Back","返回"
-"Catalog Product Email to a Friend","将分类产å“用邮件å‘é€ç»™æœ‹å‹"
-"Email Address","编辑电å邮件地å€"
-"Email Address:","电å邮件地å€ï¼š"
-"Email Templates","邮件模æ¿"
-"Email to a Friend","给朋å‹å‘邮件"
-"Email:","电å邮件："
-"Enabled","å·²å¯ç”¨"
-"Invalid Sender Information","æ— æ•ˆçš„å‘é€è€…ä¿¡æ¯"
-"Invalid sender email.","æ— æ•ˆçš„å‘é€è€…电å邮件。"
-"Limit Sending By","é™åˆ¶å‘é€ï¼Œé€šè¿‡"
-"Max Products Sent in 1 Hour","1 å°æ—¶å†…最多产å“å‘é€"
-"Max Recipients","最大收件人数é‡"
-"Maximum %d email addresses allowed.","最多å…许å‘é€ %då°é‚®ä»¶ã€‚"
-"Message:","ä¿¡æ¯ï¼š"
-"Name","姓å"
-"Name:","姓å："
-"No more than %d emails can be sent at a time.","一次能å‘é€ä¸è¶…过 %d å°ç”µå邮件。"
+Back,返回
+Name,姓å
+Enabled,Enabled
+"* Required Fields","* Required Fields"
+Message:,ä¿¡æ¯ï¼š
+"Email to a Friend",给朋å‹å‘邮件
+"Email Address",编辑电å邮件地å€
+"Email Templates","Email Templates"
+Name:,姓å：
+"Email Address:",电å邮件地å€ï¼š
+Sender:,å‘é€äººï¼š
+Email:,电å邮件：
+Recipient:,收件人：
+"Add Recipient",æ·»åŠ æ”¶ä»¶äºº
+"Send Email",å‘é€é‚®ä»¶
+"You can't send messages more than %1 times an hour.","You can't send messages more than %1 times an hour."
+"The link to a friend was sent.",链接已å‘é€ç»™æœ‹å‹ã€‚
+"We found some problems with the data.","We found some problems with the data."
+"Some emails were not sent.",æŸäº›é‚®ä»¶æœªå‘é€
+"You've met your limit of %1 sends in an hour.","You've met your limit of %1 sends in an hour."
+"The sender name cannot be empty.",å‘é€äººå§“åä¸èƒ½ä¸ºç©ºã€‚
+"Invalid Sender Email","Invalid Sender Email"
+"The message cannot be empty.",消æ¯ä¸èƒ½ä¸ºç©ºã€‚
+"At least one recipient must be specified.",必须至少指定一个收件人。
+"Please enter a correct recipient email address.","Please enter a correct recipient email address."
+"No more than %1 emails can be sent at a time.","No more than %1 emails can be sent at a time."
"Please define a correct Cookie instance.","请定义æ£ç¡®çš„ Cookie 实例。"
-"Please define a correct Product instance.","请定义æ£ç¡®çš„产å“实例。"
-"Please define the correct Sender information.","请定义æ£ç¡®çš„å‘é€è€…ä¿¡æ¯ã€‚"
-"Recipient:","收件人："
-"Remove Email","åˆ é™¤é‚®ä»¶"
-"Select Email Template","选择邮件模æ¿"
-"Send Email","å‘é€é‚®ä»¶"
-"Send product to a friend","å‘é€äº§å“给朋å‹"
-"Sender:","å‘é€äººï¼š"
-"Some emails were not sent.","æŸäº›é‚®ä»¶æœªå‘é€"
-"The link to a friend was sent.","链接已å‘é€ç»™æœ‹å‹ã€‚"
-"The message cannot be empty.","消æ¯ä¸èƒ½ä¸ºç©ºã€‚"
-"The messages cannot be sent more than %d times in an hour","一å°æ—¶å†…消æ¯ä¸èƒ½å‘é€è¶…过%d次。"
-"The sender name cannot be empty.","å‘é€äººå§“åä¸èƒ½ä¸ºç©ºã€‚"
-"There were some problems with the data.","æ•°æ®æœ‰äº›é—®é¢˜ã€‚"
-"You have exceeded limit of %d sends in an hour","您已超过一å°æ—¶å†…çš„%d次å‘é€é™åˆ¶ã€‚"
+"Please define a correct Product instance.",请定义æ£ç¡®çš„产å“实例。
+"Invalid Sender Information",æ— æ•ˆçš„å‘é€è€…ä¿¡æ¯
+"Please define the correct Sender information.",请定义æ£ç¡®çš„å‘é€è€…ä¿¡æ¯ã€‚
+"Remove Email",åˆ é™¤é‚®ä»¶
+"Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed."
+"Select Email Template","Select Email Template"
+"Allow for Guests","Allow for Guests"
+"Max Recipients","Max Recipients"
+"Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
+"Limit Sending By","Limit Sending By"
diff --git a/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml b/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml
index c5d4a4ae07b..275153630f4 100644
--- a/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml
@@ -28,7 +28,7 @@
*/
?>
<script id="add-recipient-tmpl" type="text/x-jQuery-tmpl">
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<button type="button" id="btn-remove${_index_}" class="action remove"
title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><span><?php echo $this->escapeJsQuote(__('Remove Email')) ?></span></button>
@@ -36,17 +36,17 @@
</div>
<fieldset class="fieldset">
<div class="field name required">
- <label for="recipients-name${_index_}" class="label"><span><?php echo __('Name:')?></span></label>
+ <label for="recipients-name${_index_}" class="label"><span><?php echo __('Name')?></span></label>
<div class="control">
- <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:') ?>" class="input-text"
+ <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name') ?>" class="input-text"
id="recipients-name${_index_}" data-validate="{required:true}"/>
</div>
</div>
<div class="field email required">
- <label for="recipients-email${_index_}" class="label"><span><?php echo __('Email Address:') ?></span></label>
+ <label for="recipients-email${_index_}" class="label"><span><?php echo __('Email Address') ?></span></label>
<div class="control">
- <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>"
+ <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address') ?>"
id="recipients-email${_index_}" type="email" class="input-text"
data-validate="{required:true, 'validate-email':true}"/>
</div>
@@ -70,10 +70,10 @@
class="form send friend" data-hasRequired="<?php echo __('* Required Fields') ?>">
<fieldset class="fieldset sender" id="sender_options">
<?php echo $this->getBlockHtml('formkey')?>
- <legend class="legend"><span><?php echo __('Sender:') ?></span></legend>
+ <legend class="legend"><span><?php echo __('Sender') ?></span></legend>
<br>
<div class="field sender required">
- <label for="sender-name" class="label"><span><?php echo __('Name:') ?></span></label>
+ <label for="sender-name" class="label"><span><?php echo __('Name') ?></span></label>
<div class="control">
<input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>"
title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text"
@@ -82,7 +82,7 @@
</div>
<div class="field email required">
- <label for="sender-email" class="label"><span><?php echo __('Email:') ?></span></label>
+ <label for="sender-email" class="label"><span><?php echo __('Email') ?></span></label>
<div class="control">
<input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>"
title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text"
@@ -91,7 +91,7 @@
</div>
<div class="field text required">
- <label for="sender-message" class="label"><span><?php echo __('Message:') ?></span></label>
+ <label for="sender-message" class="label"><span><?php echo __('Message') ?></span></label>
<div class="control">
<textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3"
data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage()) ?></textarea>
@@ -101,7 +101,7 @@
<fieldset class="fieldset recipients">
<?php echo $this->getBlockHtml('formkey')?>
- <legend class="legend"><span><?php echo __('Recipient:') ?></span></legend>
+ <legend class="legend"><span><?php echo __('Recipient') ?></span></legend>
<br />
<div id="recipients-options"></div>
<?php if ($this->getMaxRecipients()): ?>
@@ -109,7 +109,7 @@
<span><?php echo __('Maximum %1 email addresses allowed.', $this->getMaxRecipients()) ?></span>
</div>
<?php endif; ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<?php if (1 < $this->getMaxRecipients()): ?>
<button type="button" id="add-recipient-button" class="action add">
@@ -118,7 +118,7 @@
</div>
</div>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit"
class="action submit primary"<?php if (!$this->canSend()): ?> disabled="disabled"<?php endif ?>>
diff --git a/app/code/Magento/Shipping/i18n/de_DE.csv b/app/code/Magento/Shipping/i18n/de_DE.csv
index c7c90c58944..326f627ae56 100644
--- a/app/code/Magento/Shipping/i18n/de_DE.csv
+++ b/app/code/Magento/Shipping/i18n/de_DE.csv
@@ -1,93 +1,160 @@
-" for more information or ","für mehr Information oder"
-"# of Items (and above)","Anzahl (und höher)"
-"# of Items vs. Destination","Anzahl zu Destination"
-"Allow Shipping to Multiple Addresses","Lieferung an Mehrere Adressen Erlauben"
-"An error occurred while import table rates.","Während des Imports der Kostentabelle trat ein Fehler auf."
-"Calculate Handling Fee","Bearbeitungsgebühr berechnen"
-"Carrier:","Transport:"
-"City","Stadt"
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,Titel
+Type,Typ
+Description,Beschreibung
+"Select All","Select All"
+OK,OK
+Fixed,Fix
+N/A,"Nicht verfügbar"
+Percent,Prozent
"Close Window","Fenster Schließen"
-"Condition","Bedingung"
-"Country","Land"
-"Custom Value","Zollwert"
-"Date","Datum"
-"Delivered on:","Geliefert am:"
-"Delivered to:","Geliefert an:"
-"Description","Beschreibung"
-"Displayed Error Message","Angezeigte Fehlermeldung"
-"Divide to equal weight (one request)","Auf gleiches Gewicht verteilen (eine Anfrage)"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Zeile duplizieren #%s (Land""%s"", Region/Bundesland ""%s"", PLZ ""%s"" und Wert ""%s"")."
-"Enabled","Aktiviert"
-"Error:","Fehler:"
-"Export","Export"
-"File has not been imported. See the following list of errors: %s","Die Datei konnte nicht importiert werden. Vgl. die folgende Fehlerliste: %s"
-"Fixed","Fix"
-"Flat Rate","Pauschaltarif:"
-"Free Shipping","Versandkostenfrei"
-"Google Sitemap Section","Google-Sitemap-Sektion"
-"Handling Fee","Bearbeitungsgebühren"
-"Import","Import"
-"Include Virtual Products in Price Calculation","Virtuelle Produkte in Preiskalkulation miteinbeziehen"
-"Info:","Info:"
-"Invalid %s ""%s"" in the Row #%s.","%s ""%s"" ungültig in Zeile #%s."
-"Invalid Country ""%s"" in the Row #%s.","Ungültiges Land ""%s"" in Zeile #%s."
-"Invalid Region/State ""%s"" in the Row #%s.","Ungültige Region/Bundesland ""%s"" in Zeile #%s."
-"Invalid Shipping Price ""%s"" in the Row #%s.","Ungültiger Lieferpreis ""%s"" in Zeile #%s."
-"Invalid Table Rate code for type %s: %s","Ungültiger Tabellenraten-Code für Typ %s: %s"
-"Invalid Table Rate code type: %s","Ungültiger Tabellenraten-Code des Typs: %s"
-"Invalid Table Rates File Format","Ungültiges Tabellenraten-Dateiformat"
-"Invalid Table Rates format in the Row #%s","Ungültiges Format für Tabellenwerte in Zeile #%s"
-"Local Time","Ortszeit"
-"Location","Ort"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","Erlaubte Höchstanzahl für Lieferung an Mehrere Adressen"
-"Method Name","Methodenname"
-"Minimum Order Amount","Mindestmenge für Bestellung"
-"N/A","Nicht verfügbar"
-"None","Keine"
-"Options","Optionen"
-"Order Subtotal (and above)","Bestellungszwischensumme (und höher)"
-"Origin","Ursprung"
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,Datum
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,Ort
+"Shipping Methods","Shipping Methods"
"Per Order","Auf Bestellung"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,Status:
+Print,Print
+"Custom Value",Zollwert
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information",Routeninformation
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.","Dieser Lieferungsmodul ist nicht verfügbar."
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
+"Divide to equal weight (one request)","Auf gleiches Gewicht verteilen (eine Anfrage)"
+"Use origin weight (few requests)","Ursprungsgewicht verwenden (wenige Anfragen)"
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
"Per Package","Pro Paket"
-"Percent","Prozent"
-"Price","Preis"
-"Price vs. Destination","Preis zu Destination"
-"Region/State","Region/Bundesland"
-"Service Type:","Dienstleistungstyp:"
-"Ship to Applicable Countries","Versand in zutreffende Länder"
-"Ship to Specific Countries","Versand in angegebene Länder"
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
"Shipment #","Lieferung #"
-"Shipment Tracking Popup","Lieferungs-Tracking-Popup"
-"Shipped or billed on:","Geliefert und in Rechnung gestellt an:"
-"Shipping Methods","Lieferungsmethoden"
-"Shipping Methods Section","Lieferungsmethoden-Sektion"
-"Shipping Settings","Lieferungsoptionen"
-"Shipping Settings Section","Lieferungsoptionen-Sektion"
-"Show Method if Not Applicable","Wenn nicht anwendbar, Verfahren anzeigen"
-"Signed by:","Unterschrieben von:"
-"Sort Order","Sortierreihenfolge"
-"Status:","Status:"
-"Store Pickup","Abholung"
-"Street Address","Anschrift (Straße, Hausnummer, PLZ)"
-"Street Address Line 2","Adressangabe Straße Zeile 2"
-"Table Rates","Tabellenraten"
-"The shipping module is not available for selected delivery country.","Dieses Lieferungsmodul ist für das ausgewählte Lieferungsland nicht verfügbar."
-"The shipping module is not available.","Dieser Lieferungsmodul ist nicht verfügbar."
-"There is no tracking available for this shipment.","Für diese Lieferung ist kein Tracking verfügbar."
-"There is no tracking available.","Tracking ist nicht verfügbar."
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Diese Lieferungsmethode ist zur Zeit nicht verfügbar. Wenn Sie mit diese Lieferungsmethode verwenden wollen, kontaktieren Sie uns bitte."
-"This shipping method is not available, please specify ZIP-code","Diese Lieferungsmethode ist nicht verfügbar, bitte geben Sie eine Postleitzahl an"
-"Title","Titel"
-"Track:","Route:"
-"Tracking Information","Routeninformation"
-"Tracking Number:","Tracking-Nummer:"
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
+"Tracking Number:",Tracking-Nummer:
+Carrier:,Transport:
+Error:,Fehler:
"Tracking information is currently not available. Please ","Tracking-Information ist zur Zeit nicht verfügbar. Bitte"
-"Tracking information is currently unavailable.","Tracking-Information ist zur Zeit nicht verfügbar."
-"Type","Typ"
-"Use origin weight (few requests)","Ursprungsgewicht verwenden (wenige Anfragen)"
-"Weight (and above)","Gewicht (und höher)"
-"Weight vs. Destination","Gewicht zu Destination"
-"Weight:","Gewicht:"
-"ZIP/Postal Code","Postleitzahl"
"contact us","kontaktieren Sie uns"
+" for more information or ","für mehr Information oder"
"email us at ","schreiben Sie uns eine E-Mail an"
+Info:,Info:
+Track:,Route:
+"Delivered on:","Geliefert am:"
+"Signed by:","Unterschrieben von:"
+"Delivered to:","Geliefert an:"
+"Shipped or billed on:","Geliefert und in Rechnung gestellt an:"
+"Service Type:",Dienstleistungstyp:
+Weight:,Gewicht:
+"Local Time",Ortszeit
+"There is no tracking available for this shipment.","Für diese Lieferung ist kein Tracking verfügbar."
+"There is no tracking available.","Tracking ist nicht verfügbar."
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/i18n/en_US.csv b/app/code/Magento/Shipping/i18n/en_US.csv
index e57c0bcbf28..2193b829ed9 100644
--- a/app/code/Magento/Shipping/i18n/en_US.csv
+++ b/app/code/Magento/Shipping/i18n/en_US.csv
@@ -1,93 +1,160 @@
-" for more information or "," for more information or "
-"# of Items (and above)","# of Items (and above)"
-"# of Items vs. Destination","# of Items vs. Destination"
-"Allow Shipping to Multiple Addresses","Allow Shipping to Multiple Addresses"
-"An error occurred while import table rates.","An error occurred while import table rates."
-"Calculate Handling Fee","Calculate Handling Fee"
-"Carrier:","Carrier:"
-"City","City"
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,Title
+Type,Type
+Description,Description
+"Select All","Select All"
+OK,OK
+Fixed,Fixed
+N/A,N/A
+Percent,Percent
"Close Window","Close Window"
-"Condition","Condition"
-"Country","Country"
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,Date
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,Location
+"Shipping Methods","Shipping Methods"
+"Per Order","Per Order"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,Status:
+Print,Print
"Custom Value","Custom Value"
-"Date","Date"
-"Delivered on:","Delivered on:"
-"Delivered to:","Delivered to:"
-"Description","Description"
-"Displayed Error Message","Displayed Error Message"
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information","Tracking Information"
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.","The shipping module is not available."
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
"Divide to equal weight (one request)","Divide to equal weight (one request)"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"")."
-"Enabled","Enabled"
-"Error:","Error:"
-"Export","Export"
-"File has not been imported. See the following list of errors: %s","File has not been imported. See the following list of errors: %s"
-"Fixed","Fixed"
-"Flat Rate","Flat Rate"
-"Free Shipping","Free Shipping"
-"Google Sitemap Section","Google Sitemap Section"
-"Handling Fee","Handling Fee"
-"Import","Import"
-"Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation"
-"Info:","Info:"
-"Invalid %s ""%s"" in the Row #%s.","Invalid %s ""%s"" in the Row #%s."
-"Invalid Country ""%s"" in the Row #%s.","Invalid Country ""%s"" in the Row #%s."
-"Invalid Region/State ""%s"" in the Row #%s.","Invalid Region/State ""%s"" in the Row #%s."
-"Invalid Shipping Price ""%s"" in the Row #%s.","Invalid Shipping Price ""%s"" in the Row #%s."
-"Invalid Table Rate code for type %s: %s","Invalid Table Rate code for type %s: %s"
-"Invalid Table Rate code type: %s","Invalid Table Rate code type: %s"
-"Invalid Table Rates File Format","Invalid Table Rates File Format"
-"Invalid Table Rates format in the Row #%s","Invalid Table Rates format in the Row #%s"
-"Local Time","Local Time"
-"Location","Location"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","Maximum Quantity Allowed for Shipping to Multiple Addresses"
-"Method Name","Method Name"
-"Minimum Order Amount","Minimum Order Amount"
-"N/A","N/A"
-"None","None"
-"Options","Options"
-"Order Subtotal (and above)","Order Subtotal (and above)"
-"Origin","Origin"
-"Per Order","Per Order"
+"Use origin weight (few requests)","Use origin weight (few requests)"
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
"Per Package","Per Package"
-"Percent","Percent"
-"Price","Price"
-"Price vs. Destination","Price vs. Destination"
-"Region/State","Region/State"
-"Service Type:","Service Type:"
-"Ship to Applicable Countries","Ship to Applicable Countries"
-"Ship to Specific Countries","Ship to Specific Countries"
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
"Shipment #","Shipment #"
-"Shipment Tracking Popup","Shipment Tracking Popup"
-"Shipped or billed on:","Shipped or billed on:"
-"Shipping Methods","Shipping Methods"
-"Shipping Methods Section","Shipping Methods Section"
-"Shipping Settings","Shipping Settings"
-"Shipping Settings Section","Shipping Settings Section"
-"Show Method if Not Applicable","Show Method if Not Applicable"
-"Signed by:","Signed by:"
-"Sort Order","Sort Order"
-"Status:","Status:"
-"Store Pickup","Store Pickup"
-"Street Address","Street Address"
-"Street Address Line 2","Street Address Line 2"
-"Table Rates","Table Rates"
-"The shipping module is not available for selected delivery country.","The shipping module is not available for selected delivery country."
-"The shipping module is not available.","The shipping module is not available."
-"There is no tracking available for this shipment.","There is no tracking available for this shipment."
-"There is no tracking available.","There is no tracking available."
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us."
-"This shipping method is not available, please specify ZIP-code","This shipping method is not available, please specify ZIP-code"
-"Title","Title"
-"Track:","Track:"
-"Tracking Information","Tracking Information"
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
"Tracking Number:","Tracking Number:"
+Carrier:,Carrier:
+Error:,Error:
"Tracking information is currently not available. Please ","Tracking information is currently not available. Please "
-"Tracking information is currently unavailable.","Tracking information is currently unavailable."
-"Type","Type"
-"Use origin weight (few requests)","Use origin weight (few requests)"
-"Weight (and above)","Weight (and above)"
-"Weight vs. Destination","Weight vs. Destination"
-"Weight:","Weight:"
-"ZIP/Postal Code","ZIP/Postal Code"
"contact us","contact us"
+" for more information or "," for more information or "
"email us at ","email us at "
+Info:,Info:
+Track:,Track:
+"Delivered on:","Delivered on:"
+"Signed by:","Signed by:"
+"Delivered to:","Delivered to:"
+"Shipped or billed on:","Shipped or billed on:"
+"Service Type:","Service Type:"
+Weight:,Weight:
+"Local Time","Local Time"
+"There is no tracking available for this shipment.","There is no tracking available for this shipment."
+"There is no tracking available.","There is no tracking available."
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/i18n/es_ES.csv b/app/code/Magento/Shipping/i18n/es_ES.csv
index 0d0524b220e..8e25a425368 100644
--- a/app/code/Magento/Shipping/i18n/es_ES.csv
+++ b/app/code/Magento/Shipping/i18n/es_ES.csv
@@ -1,93 +1,160 @@
-" for more information or ","para más información o"
-"# of Items (and above)","número de artÃculos (o más)"
-"# of Items vs. Destination","número de artÃculos vs. destino"
-"Allow Shipping to Multiple Addresses","Permitir envÃo a varias direcciones"
-"An error occurred while import table rates.","Ha habido un error al importar los Ãndices de las tablas."
-"Calculate Handling Fee","Calcular el gastos de envÃo"
-"Carrier:","Transportista:"
-"City","Ciudad"
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,TÃtulo
+Type,Tipo
+Description,Descripción
+"Select All","Select All"
+OK,OK
+Fixed,Fijo
+N/A,N/A
+Percent,Porcentaje
"Close Window","Cerrar Ventana"
-"Condition","Condición"
-"Country","PaÃs"
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,Fecha
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,Localidad
+"Shipping Methods","Shipping Methods"
+"Per Order","Por Pedido"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,Situación:
+Print,Print
"Custom Value","Valor Personalizado"
-"Date","Fecha"
-"Delivered on:","Enviado el dÃa:"
-"Delivered to:","Enviado a:"
-"Description","Descripción"
-"Displayed Error Message","Mostrado mensaje de error"
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information","Información de seguimiento"
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.","El módulo de envÃo no está disponible"
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
"Divide to equal weight (one request)","Dividir al mismo peso (una petición)"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Duplicar fila #%s (PaÃs ""%s"", Región/Estado ""%s"", Código Postal ""%s"" y Valor ""%s"")."
-"Enabled","Habilitado"
-"Error:","Error:"
-"Export","Exportar"
-"File has not been imported. See the following list of errors: %s","No se ha importado el fichero. Vea la siguiente lista de errores: %s"
-"Fixed","Fijo"
-"Flat Rate","Tarifa plana"
-"Free Shipping","Transporte gratuito"
-"Google Sitemap Section","Sección Mapa del Sitio Google"
-"Handling Fee","Gastos de Tramitación"
-"Import","Importar"
-"Include Virtual Products in Price Calculation","Incluir Productos Virtuales en el cálculo del precio"
-"Info:","Información:"
-"Invalid %s ""%s"" in the Row #%s.","%s ""%s"" no válido en la fila #%s."
-"Invalid Country ""%s"" in the Row #%s.","PaÃs no válido ""%s"" en la fila #%s."
-"Invalid Region/State ""%s"" in the Row #%s.","Región/Estado ""%s"" no válido en la fila #%s."
-"Invalid Shipping Price ""%s"" in the Row #%s.","Precio de envÃo ""%s"" no válido en la fila #%s."
-"Invalid Table Rate code for type %s: %s","No válido: Tabla de Costes para tipo %s: %s"
-"Invalid Table Rate code type: %s","No válido: tipo de código de Tabla de Coste %s"
-"Invalid Table Rates File Format","No válido: formato de archivo de Tabla de Costes"
-"Invalid Table Rates format in the Row #%s","Formato de Tarifas de Tabla inválida en la fila #%s"
-"Local Time","Hora Local"
-"Location","Localidad"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","Cantidad máxima permitida para el envÃo a varias direcciones"
-"Method Name","Nombre de Método"
-"Minimum Order Amount","Pedido mÃnimo"
-"N/A","N/A"
-"None","Nada"
-"Options","Opciones"
-"Order Subtotal (and above)","Subtotal del Pedido"
-"Origin","Origen"
-"Per Order","Por Pedido"
+"Use origin weight (few requests)","Utilizar peso original (pocas peticiones)"
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
"Per Package","Por Paquete"
-"Percent","Porcentaje"
-"Price","Precio"
-"Price vs. Destination","Precio vs. Destino"
-"Region/State","Región/Provincia"
-"Service Type:","Tipo de Servicio:"
-"Ship to Applicable Countries","Enviar a los paÃses aplicables"
-"Ship to Specific Countries","Enviar a paÃses especÃficos"
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
"Shipment #","EnvÃo #"
-"Shipment Tracking Popup","Popup de Seguimiento del EnvÃo"
-"Shipped or billed on:","Enviado o facturado el dÃa:"
-"Shipping Methods","Métodos de envÃo"
-"Shipping Methods Section","Sección de Métodos de EnvÃo"
-"Shipping Settings","Ajustes de EnvÃo"
-"Shipping Settings Section","Sección de Ajustes de EnvÃo"
-"Show Method if Not Applicable","Mostrar el método si no se aplica"
-"Signed by:","Firmado por:"
-"Sort Order","Ordenar Pedido"
-"Status:","Situación:"
-"Store Pickup","Recogida en tienda"
-"Street Address","Dirección postal"
-"Street Address Line 2","LÃnea 2 de dirección postal"
-"Table Rates","Tabla de Costes"
-"The shipping module is not available for selected delivery country.","El módulo de envÃo no está disponible en el paÃs seleccionado"
-"The shipping module is not available.","El módulo de envÃo no está disponible"
-"There is no tracking available for this shipment.","No se dispone de seguimiento para este envÃo"
-"There is no tracking available.","No hay seguimiento disponible"
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Este método de envÃo actualmente no está disponible. Si desearÃa usar este método para sus envÃos, póngase en contacto con nosotros."
-"This shipping method is not available, please specify ZIP-code","Este método de envÃo no está disponible, por favor especifique un código postal."
-"Title","TÃtulo"
-"Track:","Seguir:"
-"Tracking Information","Información de seguimiento"
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
"Tracking Number:","Número de seguimiento:"
+Carrier:,Transportista:
+Error:,Error:
"Tracking information is currently not available. Please ","La información de seguimiento actualmente no está disponible. Por favor"
-"Tracking information is currently unavailable.","La información de seguimiento actualmente no está disponible."
-"Type","Tipo"
-"Use origin weight (few requests)","Utilizar peso original (pocas peticiones)"
-"Weight (and above)","Peso (o más)"
-"Weight vs. Destination","Peso vs Destino"
-"Weight:","Peso:"
-"ZIP/Postal Code","Código Postal"
-"contact us","contáctenos"
+"contact us",contáctenos
+" for more information or ","para más información o"
"email us at ","envÃenos un email a:"
+Info:,Información:
+Track:,Seguir:
+"Delivered on:","Enviado el dÃa:"
+"Signed by:","Firmado por:"
+"Delivered to:","Enviado a:"
+"Shipped or billed on:","Enviado o facturado el dÃa:"
+"Service Type:","Tipo de Servicio:"
+Weight:,Peso:
+"Local Time","Hora Local"
+"There is no tracking available for this shipment.","No se dispone de seguimiento para este envÃo"
+"There is no tracking available.","No hay seguimiento disponible"
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/i18n/fr_FR.csv b/app/code/Magento/Shipping/i18n/fr_FR.csv
index 241907e7a25..c19b760aa60 100644
--- a/app/code/Magento/Shipping/i18n/fr_FR.csv
+++ b/app/code/Magento/Shipping/i18n/fr_FR.csv
@@ -1,93 +1,160 @@
-" for more information or ","pour plus d'informations ou"
-"# of Items (and above)","# d'articles (et au-dessus)"
-"# of Items vs. Destination","# d'articles vs. destination"
-"Allow Shipping to Multiple Addresses","Permettre l'envoi à plusieurs adresses"
-"An error occurred while import table rates.","Une erreur est survenue lors de l'importation des taux du tableau."
-"Calculate Handling Fee","Calculer les frais de gestion"
-"Carrier:","Transporteur :"
-"City","Ville"
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,Titre
+Type,Type
+Description,Description
+"Select All","Select All"
+OK,OK
+Fixed,Fixé
+N/A,"non applicable"
+Percent,"pour cent"
"Close Window","Fermer la fenêtre"
-"Condition","Condition"
-"Country","Pays"
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,Date
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,Emplacement
+"Shipping Methods","Shipping Methods"
+"Per Order","Par commande"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,Statut
+Print,Print
"Custom Value","Valeur en douane"
-"Date","Date"
-"Delivered on:","Livré le :"
-"Delivered to:","Livré à :"
-"Description","Description"
-"Displayed Error Message","Message d'erreur affiché"
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information","Information de suivi"
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.","Le module d'envoi n'est pas disponible."
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
"Divide to equal weight (one request)","Diviser pour un poids égal (une demande)"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Dupliquer ligne #%s (Pays""%s"", Région/Etat ""%s"", Code postal ""%s"" et Valeur ""%s"")."
-"Enabled","Activé"
-"Error:","Erreur :"
-"Export","Exporter"
-"File has not been imported. See the following list of errors: %s","Le fichier n'a pas été importé. Voir la liste d'erreurs suivantes: %s"
-"Fixed","Fixé"
-"Flat Rate","Tarif uniforme"
-"Free Shipping","Expédition gratuite"
-"Google Sitemap Section","Section plan de site Google"
-"Handling Fee","Frais de gestion"
-"Import","Importer"
-"Include Virtual Products in Price Calculation","Inclure les produits virtuels dans le calcul du prix"
-"Info:","Info :"
-"Invalid %s ""%s"" in the Row #%s.","%s invalide ""%s"" dans la ligne #%s."
-"Invalid Country ""%s"" in the Row #%s.","Pays non-valide ""%s"" dans la ligne #%s."
-"Invalid Region/State ""%s"" in the Row #%s.","Région/Etat non-valide ""%s"" dans la ligne #%s."
-"Invalid Shipping Price ""%s"" in the Row #%s.","Tarifs d'expédition non-valide ""%s"" dans la ligne #%s."
-"Invalid Table Rate code for type %s: %s","Code de tableau des tarifs invalide pour le type %s : %s"
-"Invalid Table Rate code type: %s","Type de code de tableau des tarifs invalide : %s"
-"Invalid Table Rates File Format","Format de fichier du tableau des tarifs invalide"
-"Invalid Table Rates format in the Row #%s","Format des tables de taux invalide à la ligne #%s"
-"Local Time","Heure locale"
-"Location","Emplacement"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","Quantité max. autorisée pour l'envoi à plusieurs adresses"
-"Method Name","Nom de la méthode"
-"Minimum Order Amount","Montant de commande minimal"
-"N/A","non applicable"
-"None","aucun"
-"Options","Options"
-"Order Subtotal (and above)","Sous-total de la commande (et au-dessus)"
-"Origin","Origine"
-"Per Order","Par commande"
+"Use origin weight (few requests)","Utiliser le poids d'origine (quelques requêtes)"
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
"Per Package","Par paquet"
-"Percent","pour cent"
-"Price","Prix"
-"Price vs. Destination","Prix par destination"
-"Region/State","Région/État"
-"Service Type:","Type de service"
-"Ship to Applicable Countries","Envoyer aux pays en vigueur"
-"Ship to Specific Countries","Envoyer à des pays spécifiques"
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
"Shipment #","N° d'envoi"
-"Shipment Tracking Popup","Fenêtre de suivi d'envoi"
-"Shipped or billed on:","Envoyé ou facturé à :"
-"Shipping Methods","Méthode d'envoi"
-"Shipping Methods Section","Section de méthode d'envoi"
-"Shipping Settings","Réglages d'envoi"
-"Shipping Settings Section","Section de réglages d'envoi"
-"Show Method if Not Applicable","Afficher la méthode si non disponible"
-"Signed by:","Signé par:"
-"Sort Order","Trier les widgets"
-"Status:","Statut"
-"Store Pickup","Récupérer en magasin"
-"Street Address","Adresse de la rue"
-"Street Address Line 2","Adresse municipale ligne 2"
-"Table Rates","Taux"
-"The shipping module is not available for selected delivery country.","Le module d'envoi n'est pas disponible pour le pays de livraison sélectionné."
-"The shipping module is not available.","Le module d'envoi n'est pas disponible."
-"There is no tracking available for this shipment.","Il n'y pas de service de suivi pour cet envoi."
-"There is no tracking available.","Il n'y a pas de service de suivi."
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","La méthode d'envoi est actuellement indisponible. Si vous voulez envoyer par cette méthode, merci de nous contacter."
-"This shipping method is not available, please specify ZIP-code","Cette méthode d'envoi n'est pas disponible, précisez un code postal."
-"Title","Titre"
-"Track:","Suivi:"
-"Tracking Information","Information de suivi"
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
"Tracking Number:","Numéro de suivi"
+Carrier:,"Transporteur :"
+Error:,"Erreur :"
"Tracking information is currently not available. Please ","Informations de suivi actuellement indisponibles"
-"Tracking information is currently unavailable.","Informations de suivi actuellement indisponibles"
-"Type","Type"
-"Use origin weight (few requests)","Utiliser le poids d'origine (quelques requêtes)"
-"Weight (and above)","Poids (et plus)"
-"Weight vs. Destination","Poids par destination"
-"Weight:","Poids"
-"ZIP/Postal Code","Code postal"
"contact us","Nous contacter"
+" for more information or ","pour plus d'informations ou"
"email us at ","Envoyer nous un email à "
+Info:,"Info :"
+Track:,Suivi:
+"Delivered on:","Livré le :"
+"Signed by:","Signé par:"
+"Delivered to:","Livré à :"
+"Shipped or billed on:","Envoyé ou facturé à :"
+"Service Type:","Type de service"
+Weight:,Poids
+"Local Time","Heure locale"
+"There is no tracking available for this shipment.","Il n'y pas de service de suivi pour cet envoi."
+"There is no tracking available.","Il n'y a pas de service de suivi."
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/i18n/nl_NL.csv b/app/code/Magento/Shipping/i18n/nl_NL.csv
index 326d99f1fea..07c848014a0 100644
--- a/app/code/Magento/Shipping/i18n/nl_NL.csv
+++ b/app/code/Magento/Shipping/i18n/nl_NL.csv
@@ -1,93 +1,160 @@
-" for more information or ","Voor meer informatie of"
-"# of Items (and above)","# Artikelen (en daarboven)"
-"# of Items vs. Destination","# Artikelen en Lokaties"
-"Allow Shipping to Multiple Addresses","Sta Verschepen naar Meerdere Adressen Toe"
-"An error occurred while import table rates.","Er heeft zich een fout voorgedaan tijdens het importeren van tabelwaarden."
-"Calculate Handling Fee","Bereken Behandelingskosten"
-"Carrier:","Bode:"
-"City","Stad"
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,Titel
+Type,Type
+Description,Beschrijving
+"Select All","Select All"
+OK,OK
+Fixed,Gemaakt
+N/A,Nvt
+Percent,Procent
"Close Window","Venster Sluiten"
-"Condition","Voorwaarde"
-"Country","Land"
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,Datum
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,Locatie
+"Shipping Methods","Shipping Methods"
+"Per Order","Per Bestelling"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,Status:
+Print,Print
"Custom Value","Klant Waarde"
-"Date","Datum"
-"Delivered on:","Geleverd op:"
-"Delivered to:","Geleverd aan:"
-"Description","Beschrijving"
-"Displayed Error Message","Geef Foutmelding Weer"
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information","Tracking Informatie"
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.","Deze verzendingsmodule is niet beschikbaar."
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
"Divide to equal weight (one request)","Verdeel gewicht gelijkmatig (een verzoek)"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Dubbele Rij #%s (Land ""%s"", Regio/Provincie ""%s"", Postcode ""%s"" en Waarde ""%s"")."
-"Enabled","Aan"
-"Error:","Four:"
-"Export","Export"
-"File has not been imported. See the following list of errors: %s","Bestand is niet geïmporteerd. Bekijk de volgende lijst met fouten: %s"
-"Fixed","Gemaakt"
-"Flat Rate","Plat Tarief"
-"Free Shipping","Gratis Verzending"
-"Google Sitemap Section","Google Sitemap Sectie"
-"Handling Fee","Behandelingskosten"
-"Import","Import"
-"Include Virtual Products in Price Calculation","Tel Virtuele Producten Mee in de Prijs Berekening"
-"Info:","Info:"
-"Invalid %s ""%s"" in the Row #%s.","Ongeldige %s ""%s"" in rij #%s."
-"Invalid Country ""%s"" in the Row #%s.","Ongeldig Land ""%s"" in rij #%s."
-"Invalid Region/State ""%s"" in the Row #%s.","Ongeldig Regio/Provincie ""%s"" in rij #%s."
-"Invalid Shipping Price ""%s"" in the Row #%s.","Ongeldig Verzendkosten ""%s"" in rij #%s."
-"Invalid Table Rate code for type %s: %s","Ongeldige Tabel Tarief code voor type %s: %s"
-"Invalid Table Rate code type: %s","Ongeldige Tabel Tarief code type: %s"
-"Invalid Table Rates File Format","Ongeldige Tabel Tarief Bestandsformaat"
-"Invalid Table Rates format in the Row #%s","Ongeldig Tabel Tarieven formaat in Rij #%s"
-"Local Time","Lokale Tijd"
-"Location","Locatie"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","Maximum Hoeveelheid Toegestaan voor het verschepen naar Meerdere Adressen"
-"Method Name","Methode naam"
-"Minimum Order Amount","Minimum Bestel Hoeveelheid"
-"N/A","Nvt"
-"None","Geen"
-"Options","Opties"
-"Order Subtotal (and above)","Bestelling Subtotaal (en hier boven)"
-"Origin","Herkomst"
-"Per Order","Per Bestelling"
+"Use origin weight (few requests)","Gebruik herkomstgewicht (enkele aanvragen)"
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
"Per Package","Per Pakket"
-"Percent","Procent"
-"Price","Prijs"
-"Price vs. Destination","Prijs en Bestemming"
-"Region/State","Regio/Staat"
-"Service Type:","Service Soort:"
-"Ship to Applicable Countries","Verscheep naar Aanwendbare Landen"
-"Ship to Specific Countries","Verscheep naar Gespecificeerde Landen"
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
"Shipment #","Versturing #"
-"Shipment Tracking Popup","Verzending Tracking Pop-up"
-"Shipped or billed on:","Verstuurd of gefactureerd op:"
-"Shipping Methods","Versturing Methodes"
-"Shipping Methods Section","Versturing Methodes Sectie"
-"Shipping Settings","Versturing Instellingen"
-"Shipping Settings Section","Versturing Instellingen Sectie"
-"Show Method if Not Applicable","Laat Methode Zien indien Niet Mogelijk"
-"Signed by:","Ondertekend door:"
-"Sort Order","Sorteer Bestelling"
-"Status:","Status:"
-"Store Pickup","Ophalen in de Winkel"
-"Street Address","Adres straat"
-"Street Address Line 2","Adres Lijn 2"
-"Table Rates","Tabel Tarieven"
-"The shipping module is not available for selected delivery country.","Deze verzendingsmodule is niet beschikbaar voor het door uw geselecteerde bezorgingsland."
-"The shipping module is not available.","Deze verzendingsmodule is niet beschikbaar."
-"There is no tracking available for this shipment.","Er is geen tracking beschikbaar voor deze verzending."
-"There is no tracking available.","Er is geen tracking beschikbaar."
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","De verzendingmethode is op het moment niet beschikbaar. Indien u graag deze verzendingsmethode wilt gebruiken, neem alstublieft contact met ons op."
-"This shipping method is not available, please specify ZIP-code","Deze verzendingsmethode is niet beschikbaar, vul alstublieft uw postcode in"
-"Title","Titel"
-"Track:","Track:"
-"Tracking Information","Tracking Informatie"
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
"Tracking Number:","Tracking Nummer:"
+Carrier:,Bode:
+Error:,Four:
"Tracking information is currently not available. Please ","Tracking informatie is momenteel niet beschikbaar. Alstublieft"
-"Tracking information is currently unavailable.","Tracking informatie is momenteel niet beschikbaar."
-"Type","Type"
-"Use origin weight (few requests)","Gebruik herkomstgewicht (enkele aanvragen)"
-"Weight (and above)","Gewicht (en daarboven)"
-"Weight vs. Destination","Gewicht vs. Bestemming"
-"Weight:","Gewicht:"
-"ZIP/Postal Code","Postcode"
"contact us","neem contact met ons op"
+" for more information or ","Voor meer informatie of"
"email us at ","email ons op"
+Info:,Info:
+Track:,Track:
+"Delivered on:","Geleverd op:"
+"Signed by:","Ondertekend door:"
+"Delivered to:","Geleverd aan:"
+"Shipped or billed on:","Verstuurd of gefactureerd op:"
+"Service Type:","Service Soort:"
+Weight:,Gewicht:
+"Local Time","Lokale Tijd"
+"There is no tracking available for this shipment.","Er is geen tracking beschikbaar voor deze verzending."
+"There is no tracking available.","Er is geen tracking beschikbaar."
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/i18n/pt_BR.csv b/app/code/Magento/Shipping/i18n/pt_BR.csv
index 3435504a492..d2142838d0f 100644
--- a/app/code/Magento/Shipping/i18n/pt_BR.csv
+++ b/app/code/Magento/Shipping/i18n/pt_BR.csv
@@ -1,93 +1,160 @@
-" for more information or ","para mais informações ou"
-"# of Items (and above)","nº de Itens (e acima)"
-"# of Items vs. Destination","nº de Itens vs. Destino"
-"Allow Shipping to Multiple Addresses","Permitir Envio a Múltiplos Endereços"
-"An error occurred while import table rates.","Ocorreu um erro ao importar as tabelas de tarifas."
-"Calculate Handling Fee","Calcular a Taxa de Manuseio"
-"Carrier:","Transportadora:"
-"City","Cidade"
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,TÃtulo
+Type,Tipo
+Description,Descrição
+"Select All","Select All"
+OK,OK
+Fixed,Fixado
+N/A,IndisponÃvel
+Percent,Percentagem
"Close Window","Fechar Janela"
-"Condition","Estado"
-"Country","PaÃs"
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,Data
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,Local
+"Shipping Methods","Shipping Methods"
+"Per Order","Por Ordem"
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,"Estado atual:"
+Print,Print
"Custom Value","Valor Aduaneiro"
-"Date","Data"
-"Delivered on:","Entregado dia:"
-"Delivered to:","Entregado a:"
-"Description","Descrição"
-"Displayed Error Message","Mensagem de Erro Apresentada"
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information","Informações de Rastreamento"
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.","O módulo de entrega não está disponÃvel."
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
"Divide to equal weight (one request)","Dividir para peso igual (um pedido)"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Duplicar Linha #%s (PaÃs ""%s"", Região/Estado ""%s"", CEP ""%s"" e Valor ""%s"")."
-"Enabled","Ativado"
-"Error:","Erro:"
-"Export","Exportar"
-"File has not been imported. See the following list of errors: %s","O arquivo não foi importado. Veja a lista de erros a seguir: %s"
-"Fixed","Fixado"
-"Flat Rate","Taxa Fixa"
-"Free Shipping","Frete Grátis"
-"Google Sitemap Section","Seção Google Sitemap"
-"Handling Fee","Taxa de Manuseio"
-"Import","Importar"
-"Include Virtual Products in Price Calculation","Incluir Produtos Virtuais no Cálculo de Preço"
-"Info:","Informação:"
-"Invalid %s ""%s"" in the Row #%s.","%s ""%s"" Inválido na Linha #%s."
-"Invalid Country ""%s"" in the Row #%s.","PaÃs Inválido ""%s"" na Linha #%s."
-"Invalid Region/State ""%s"" in the Row #%s.","Região/Estado Inválido ""%s"" na Linha #%s."
-"Invalid Shipping Price ""%s"" in the Row #%s.","Custo de Entrega Inválido ""%s"" na Linha #%s."
-"Invalid Table Rate code for type %s: %s","Código da Tabela de Tarifa inválido para tipo %s: %s"
-"Invalid Table Rate code type: %s","Código da Tabela de Tarifa tipo: %s"
-"Invalid Table Rates File Format","Formato de Arquivo da Tabela de Tarifas Inválido"
-"Invalid Table Rates format in the Row #%s","Formato Inválido de Taxas de Tabela na Linha #%s"
-"Local Time","Hora Local"
-"Location","Local"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","Quant. Máxima Permitida para Envio a Múltiplos Endereços"
-"Method Name","Nome do Método"
-"Minimum Order Amount","Valor MÃnimo do Pedido"
-"N/A","IndisponÃvel"
-"None","Nenhum"
-"Options","Opções"
-"Order Subtotal (and above)","Subtotal do Pedido (e acima)"
-"Origin","Origem"
-"Per Order","Por Ordem"
+"Use origin weight (few requests)","Usar peso de origem (poucos pedidos)"
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
"Per Package","Por Embalagem"
-"Percent","Percentagem"
-"Price","Preço"
-"Price vs. Destination","Preço vs. Destino"
-"Region/State","Região/Estado"
-"Service Type:","Tipo de Serviço:"
-"Ship to Applicable Countries","Enviar a PaÃses Aplicáveis"
-"Ship to Specific Countries","Enviar a PaÃses EspecÃficos"
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
"Shipment #","Remessa #"
-"Shipment Tracking Popup","Popup de Rastreamento de Entrega"
-"Shipped or billed on:","Enviado ou faturado em:"
-"Shipping Methods","Tipos de Frete"
-"Shipping Methods Section","Seção de Métodos de Entrega"
-"Shipping Settings","Configurações de Entrega"
-"Shipping Settings Section","Seção de Configurações de Entrega"
-"Show Method if Not Applicable","Mostrar Método se Não Aplicável"
-"Signed by:","Assinado por:"
-"Sort Order","Classificar pedido"
-"Status:","Estado atual:"
-"Store Pickup","Retirada na Loja"
-"Street Address","Endereço da Rua"
-"Street Address Line 2","Endereço Linha 2"
-"Table Rates","Taxas de Tabela"
-"The shipping module is not available for selected delivery country.","O módulo de entrega não está disponÃvel para o paÃs de entrega selecionado."
-"The shipping module is not available.","O módulo de entrega não está disponÃvel."
-"There is no tracking available for this shipment.","Não há disponibilidade de rastreamento para este método de entrega."
-"There is no tracking available.","Não há disponibilidade de rastreamento."
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Este método de entrega está atualmente indisponÃvel. Se você deseja utilizar este método de entrega, por favor, entre em contato conosco."
-"This shipping method is not available, please specify ZIP-code","Este método de entrega não está disponÃvel, por favor, especifique o CEP"
-"Title","TÃtulo"
-"Track:","Rastrear:"
-"Tracking Information","Informações de Rastreamento"
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
"Tracking Number:","Número de Rastreamento:"
+Carrier:,Transportadora:
+Error:,Erro:
"Tracking information is currently not available. Please ","O rastreamento de informações não está disponÃvel no momento. Por favor"
-"Tracking information is currently unavailable.","O rastreamento de informações não está disponÃvel no momento."
-"Type","Tipo"
-"Use origin weight (few requests)","Usar peso de origem (poucos pedidos)"
-"Weight (and above)","Peso (e acima)"
-"Weight vs. Destination","Peso vs. Destino"
-"Weight:","Peso:"
-"ZIP/Postal Code","CEP/Código Postal"
"contact us","entre em contato conosco"
+" for more information or ","para mais informações ou"
"email us at ","envie um email para nós -"
+Info:,Informação:
+Track:,Rastrear:
+"Delivered on:","Entregado dia:"
+"Signed by:","Assinado por:"
+"Delivered to:","Entregado a:"
+"Shipped or billed on:","Enviado ou faturado em:"
+"Service Type:","Tipo de Serviço:"
+Weight:,Peso:
+"Local Time","Hora Local"
+"There is no tracking available for this shipment.","Não há disponibilidade de rastreamento para este método de entrega."
+"There is no tracking available.","Não há disponibilidade de rastreamento."
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/i18n/zh_CN.csv b/app/code/Magento/Shipping/i18n/zh_CN.csv
index f946217bb2b..366aa7594c4 100644
--- a/app/code/Magento/Shipping/i18n/zh_CN.csv
+++ b/app/code/Magento/Shipping/i18n/zh_CN.csv
@@ -1,93 +1,160 @@
-" for more information or ","欲知详情或"
-"# of Items (and above)","# 商å“（上述）"
-"# of Items vs. Destination","# å•†å“ vs. ç›®æ ‡"
-"Allow Shipping to Multiple Addresses","å…许å‘é€åˆ°å¤šä¸ªåœ°å€"
-"An error occurred while import table rates.","å¯¼å…¥è¡¨æ ¼è´¹çŽ‡æ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"Calculate Handling Fee","计算的手ç»è´¹"
-"Carrier:","è¿è¥å•†ï¼š"
-"City","城市"
-"Close Window","å…³é—窗å£"
-"Condition","æ¡ä»¶"
-"Country","国家"
-"Custom Value","自定义值"
-"Date","日期"
-"Delivered on:","å‘布于："
-"Delivered to:","å‘布至："
-"Description","æè¿°"
-"Displayed Error Message","显示的错误信æ¯"
-"Divide to equal weight (one request)","拆分为相ç‰é‡é‡ï¼ˆç”³è¯·ä¸€æ¬¡ï¼‰"
-"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","é‡å¤è¡Œ #%s (国家 ""%s"", 地区/å·ž ""%s"", 邮编 ""%s"" ，以åŠå€¼ ""%s"")。"
-"Enabled","å·²å¯ç”¨"
-"Error:","错误："
-"Export","导出"
-"File has not been imported. See the following list of errors: %s","文件并未导入。请查看下列错误列表：%s"
-"Fixed","固定"
-"Flat Rate","å¹³å¦è´¹çŽ‡"
-"Free Shipping","å…è¿è´¹"
-"Google Sitemap Section","Google站点结构图区域"
-"Handling Fee","处ç†è´¹"
-"Import","导入"
-"Include Virtual Products in Price Calculation","è®¡ç®—çš„ä»·æ ¼ä¸åŒ…å«è™šæ‹Ÿäº§å“"
-"Info:","ä¿¡æ¯ï¼š"
-"Invalid %s ""%s"" in the Row #%s.","è¡Œ #%s å˜åœ¨æ— 效的 %s ""%s"""
-"Invalid Country ""%s"" in the Row #%s.","è¡Œ #%s å˜åœ¨æ— 效的国家""%s""。"
-"Invalid Region/State ""%s"" in the Row #%s.","è¡Œ #%s å˜åœ¨æ— 效的地区/å·ž ""%s""。"
-"Invalid Shipping Price ""%s"" in the Row #%s.","è¡Œ #%s å˜åœ¨æ— 效的è¿è´¹ ""%s"" 。"
-"Invalid Table Rate code for type %s: %s","类型 %s: %s çš„è¡¨æ ¼è´¹çŽ‡ä»£ç æ— æ•ˆ"
-"Invalid Table Rate code type: %s","类型 %s çš„è¡¨æ ¼è´¹çŽ‡ä»£ç æ— æ•ˆ"
-"Invalid Table Rates File Format","æ— æ•ˆçš„è¡¨æ ¼è´¹çŽ‡æ–‡ä»¶æ ¼å¼"
-"Invalid Table Rates format in the Row #%s","è¡Œ #%s å˜åœ¨æ— æ•ˆçš„è¡¨è´¹çŽ‡æ ¼å¼"
-"Local Time","本地时间"
-"Location","ä½ç½®"
-"Maximum Quantity Allowed for Shipping to Multiple Addresses","å…许å‘é€åˆ°å¤šä¸ªåœ°å€çš„最多数é‡"
-"Method Name","方法的å称"
-"Minimum Order Amount","最å°è®¢å•æ•°é‡"
-"N/A","N/A"
-"None","æ— "
-"Options","选项"
-"Order Subtotal (and above)","订å•å°è®¡ï¼ˆä»¥ä¸Šï¼‰"
-"Origin","原始"
-"Per Order","æ¯è®¢å•"
-"Per Package","æ¯ä¸ªåŒ…裹"
-"Percent","百分之"
-"Price","ä»·æ ¼"
-"Price vs. Destination","ä»·æ ¼ vs. ç›®æ ‡"
-"Region/State","地区/州"
-"Service Type:","æœåŠ¡ç±»åž‹ï¼š"
-"Ship to Applicable Countries","å‘é€åˆ°é€‚用的国家"
-"Ship to Specific Countries","å‘é€åˆ°æŒ‡å®šå›½å®¶"
-"Shipment #","é€è´§å•å·"
-"Shipment Tracking Popup","è¿å•è¿½è¸ªå¼¹å‡ºçª—å£"
-"Shipped or billed on:","å‘é€æˆ–扣款于："
-"Shipping Methods","è¿é€æ–¹å¼"
-"Shipping Methods Section","å‘é€æ–¹æ³•é€‰æ‹©"
-"Shipping Settings","å‘é€è®¾ç½®"
-"Shipping Settings Section","å‘é€è®¾ç½®åŒºåŸŸ"
-"Show Method if Not Applicable","如果ä¸å¯ç”¨ï¼Œæ˜¾ç¤ºå…¶ä»–方法"
-"Signed by:","ç¾å者："
-"Sort Order","排åºé¡ºåº"
-"Status:","状æ€ï¼š"
-"Store Pickup","店铺å–è´§"
-"Street Address","è¡—é“地å€"
-"Street Address Line 2","è¡—é“地å€ç¬¬äºŒè¡Œ"
-"Table Rates","表费率"
-"The shipping module is not available for selected delivery country.","é’ˆå¯¹æ‰€é€‰ç›®æ ‡å›½å®¶ï¼Œå‘货模å—ä¸å¯ç”¨ã€‚"
-"The shipping module is not available.","è¿é€æ¨¡å—ä¸å¯ç”¨ã€‚"
-"There is no tracking available for this shipment.","æ¤è¿é€é¡¹ç›®æ— å¯ç”¨çš„状æ€è¿½è¸ªã€‚"
-"There is no tracking available.","没有å¯ç”¨çš„追踪。"
-"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","该è¿é€æ–¹å¼å½“å‰ä¸å¯ç”¨ã€‚如果您è¦ä½¿ç”¨è¯¥è¿é€æ–¹å¼è¿›è¡Œè¿é€ï¼Œè¯·è”系我们。"
-"This shipping method is not available, please specify ZIP-code","该è¿é€æ–¹å¼ä¸å¯ç”¨ï¼Œè¯·æŒ‡å®šé‚®æ”¿ç¼–ç "
-"Title","æ ‡é¢˜"
-"Track:","追踪："
-"Tracking Information","追踪信æ¯"
-"Tracking Number:","追踪å·ç ："
-"Tracking information is currently not available. Please ","追踪信æ¯å½“å‰ä¸å¯ç”¨ã€‚请"
-"Tracking information is currently unavailable.","追踪信æ¯å½“å‰ä¸å¯ç”¨ã€‚"
-"Type","类型"
-"Use origin weight (few requests)","使用原始é‡é‡ï¼ˆè¾ƒå°‘请求）"
-"Weight (and above)","é‡é‡ï¼ˆå’Œä»¥ä¸Šï¼‰"
-"Weight vs. Destination","é‡é‡ vs. 目的地"
-"Weight:","é‡é‡ï¼š"
-"ZIP/Postal Code","邮政编ç "
-"contact us","è”系我们"
-"email us at ","å‘é€ç”µå邮件给我们："
+"Are you sure?","Are you sure?"
+Cancel,Cancel
+"Add Products","Add Products"
+Product,Product
+SKU,SKU
+Qty,Qty
+Action,Action
+"Incl. Tax","Incl. Tax"
+Add,Add
+Delete,Delete
+Title,æ ‡é¢˜
+Type,类型
+Description,æè¿°
+"Select All","Select All"
+OK,OK
+Fixed,固定
+N/A,N/A
+Percent,百分之
+"Close Window",å…³é—窗å£
+"Product Name","Product Name"
+Country,Country
+"Payment Information","Payment Information"
+"Shipping Information","Shipping Information"
+City,City
+"Street Address","Street Address"
+Weight,Weight
+Contents,Contents
+Package,Package
+Packages,Packages
+Date,日期
+cm,cm
+Height,Height
+Width,Width
+"No packages for request","No packages for request"
+Region/State,Region/State
+Location,ä½ç½®
+"Shipping Methods","Shipping Methods"
+"Per Order",æ¯è®¢å•
+"All Allowed Countries","All Allowed Countries"
+"Specific Countries","Specific Countries"
+Status:,状æ€ï¼š
+Print,Print
+"Custom Value",自定义值
+"Print Shipping Label","Print Shipping Label"
+"Show Packages","Show Packages"
+"Products should be added to package(s)","Products should be added to package(s)"
+"Please specify a carrier.","Please specify a carrier."
+"Tracking Information",追踪信æ¯
+"No detail for number ""%1""","No detail for number ""%1"""
+"Customs Value","Customs Value"
+"Qty Ordered","Qty Ordered"
+"Create Shipping Label","Create Shipping Label"
+"Add Package","Add Package"
+"Create Packages","Create Packages"
+Size,Size
+Girth,Girth
+"Total Weight","Total Weight"
+Length,Length
+"Signature Confirmation","Signature Confirmation"
+in,in
+lb,lb
+kg,kg
+"Delete Package","Delete Package"
+Explanation,Explanation
+"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
+"Please select products.","Please select products."
+Carrier,Carrier
+Number,Number
+"Items in the Package","Items in the Package"
+"Shipping and Tracking Information","Shipping and Tracking Information"
+"Track this shipment","Track this shipment"
+Ship,Ship
+Shipments,Shipments
+"Order # %1","Order # %1"
+"Back to My Orders","Back to My Orders"
+"View Another Order","View Another Order"
+"The order no longer exists.","The order no longer exists."
+"Cannot add new comment.","Cannot add new comment."
+"Total Shipping Charges","Total Shipping Charges"
+"Append Comments","Append Comments"
+"The order was placed using %1.","The order was placed using %1."
+"No shipping information available","No shipping information available"
+"Items Shipped","Items Shipped"
+"Qty Shipped","Qty Shipped"
+"New Shipment for Order #%1","New Shipment for Order #%1"
+"Submit Shipment","Submit Shipment"
+"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
+"The value that you entered is not valid.","The value that you entered is not valid."
+"Add Tracking Number","Add Tracking Number"
+"Send Tracking Information","Send Tracking Information"
+"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
+"the shipment email was sent","the shipment email was sent"
+"the shipment email is not sent","the shipment email is not sent"
+"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
+"Create Shipping Label...","Create Shipping Label..."
+"About Your Shipment","About Your Shipment"
+"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
+"Cannot do shipment for the order.","Cannot do shipment for the order."
+"Please enter a tracking number.","Please enter a tracking number."
+"New Shipment","New Shipment"
+"The shipment has been created.","The shipment has been created."
+"You created the shipping label.","You created the shipping label."
+"An error occurred while creating shipping label.","An error occurred while creating shipping label."
+"Cannot save shipment.","Cannot save shipment."
+"You sent the shipment.","You sent the shipment."
+"Cannot send shipment information.","Cannot send shipment information."
+"Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."
+"Cannot add tracking number.","Cannot add tracking number."
+"Cannot initialize shipment for delete tracking number.","Cannot initialize shipment for delete tracking number."
+"Cannot delete tracking number.","Cannot delete tracking number."
+"Cannot load track with retrieving identifier.","Cannot load track with retrieving identifier."
+"The comment text field cannot be empty.","The comment text field cannot be empty."
+"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
+"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
+"The shipping module is not available.",è¿é€æ¨¡å—ä¸å¯ç”¨ã€‚
+"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
+Development,Development
+Live,Live
+"Divide to equal weight (one request)",拆分为相ç‰é‡é‡ï¼ˆç”³è¯·ä¸€æ¬¡ï¼‰
+"Use origin weight (few requests)",使用原始é‡é‡ï¼ˆè¾ƒå°‘请求）
+"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
+"Per Package",æ¯ä¸ªåŒ…裹
+"Tracking information is unavailable.","Tracking information is unavailable."
+"Items to Ship","Items to Ship"
+"Qty to Ship","Qty to Ship"
+"Shipment Comments","Shipment Comments"
+"Email Copy of Shipment","Email Copy of Shipment"
+"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
+"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
+"Shipping & Handling Information","Shipping & Handling Information"
+"Track Order","Track Order"
+"Shipment History","Shipment History"
+"Print All Shipments","Print All Shipments"
+"Shipment #",é€è´§å•å·
+"Print Shipment","Print Shipment"
+"Tracking Number(s):","Tracking Number(s):"
+"Tracking Number:",追踪å·ç ：
+Carrier:,è¿è¥å•†ï¼š
+Error:,错误：
+"Tracking information is currently not available. Please ",追踪信æ¯å½“å‰ä¸å¯ç”¨ã€‚请
+"contact us",è”系我们
+" for more information or ",欲知详情或
+"email us at ",å‘é€ç”µå邮件给我们：
+Info:,ä¿¡æ¯ï¼š
+Track:,追踪：
+"Delivered on:",å‘布于：
+"Signed by:",ç¾å者：
+"Delivered to:",å‘布至：
+"Shipped or billed on:",å‘é€æˆ–扣款于：
+"Service Type:",æœåŠ¡ç±»åž‹ï¼š
+Weight:,é‡é‡ï¼š
+"Local Time",本地时间
+"There is no tracking available for this shipment.",æ¤è¿é€é¡¹ç›®æ— å¯ç”¨çš„状æ€è¿½è¸ªã€‚
+"There is no tracking available.",没有å¯ç”¨çš„追踪。
+"ZIP/Postal Code","ZIP/Postal Code"
+"Street Address Line 2","Street Address Line 2"
+"Shipping Settings","Shipping Settings"
+Origin,Origin
diff --git a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
index 8e15e4591c4..89362b43770 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
@@ -24,7 +24,7 @@
?>
<div class="order items details shipments">
<?php echo $this->getChildHtml('shipment_items') ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="secondary">
<a href="<?php echo $this->getBackUrl() ?>" class="action back">
<span><?php echo $this->getBackTitle() ?></span>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index 32f633d3397..4e1964180e6 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -25,7 +25,7 @@
<?php /** @var $this \Magento\Shipping\Block\Tracking\Popup */ ?>
<?php $_results = $this->getTrackingInfo(); ?>
<div class="page tracking">
- <div class="page title">
+ <div class="page-title">
<h1 class="title">
<span class="base"><?php echo __('Tracking Information'); ?></span>
</h1>
diff --git a/app/code/Magento/Sitemap/README.md b/app/code/Magento/Sitemap/README.md
new file mode 100644
index 00000000000..1bca90e32ea
--- /dev/null
+++ b/app/code/Magento/Sitemap/README.md
@@ -0,0 +1,2 @@
+The Sitemap module allows managing the Magento application sitemap and
+[sitemap.xml](http://en.wikipedia.org/wiki/Sitemaps) for searching engines.
\ No newline at end of file
diff --git a/app/code/Magento/Sitemap/i18n/de_DE.csv b/app/code/Magento/Sitemap/i18n/de_DE.csv
index c67f9122148..0cce6adaaf6 100644
--- a/app/code/Magento/Sitemap/i18n/de_DE.csv
+++ b/app/code/Magento/Sitemap/i18n/de_DE.csv
@@ -1,46 +1,62 @@
-"Action","Aktion"
-"Add Sitemap","Sitemap hinzufügen"
-"Always","Immer"
-"CMS Pages Options","CMS Seitenoptionen"
-"Categories Options","Kategorien Optionen"
-"Daily","Täglich"
+All,All
+None,None
+ID,ID
+Action,Aktion
+Enabled,Enabled
+"Store View",Store-Ansicht
+Catalog,Catalog
+Always,Immer
+Priority,Priority
+Path,Pfad
+Daily,Täglich
+Weekly,Wöchentlich
+Monthly,Monatlich
+Never,Niemals
+Generate,Generieren
+Hourly,Stündlich
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
"Edit Sitemap","Sitemap bearbeiten"
-"Enabled","Aktiviert"
-"Error Email Recipient","Email-Empfänger bei auftretenden Fehlern"
-"Error Email Sender","Email-Absender bei auftretenden Fehlern"
-"Error Email Template","Email-Vorlage bei auftretenden Fehlern"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","Datei ""%s"" kann nicht gespeichert werden. Bitte stellen Sie sicher, dass das Verzeichnis ""%s"" seitens des Webservers beschreibbar ist."
-"Filename","Dateiname"
-"Frequency","Frequenz"
-"Generate","Generieren"
-"Generation Settings","Generierungseinstellungen"
-"Google Sitemap","Google Sitemap"
-"Hourly","Stündlich"
-"ID","ID"
-"Last Generated","Zuletzt generiert"
-"Link for Google","Link für Google"
-"Monthly","Monatlich"
-"Never","Niemals"
"New Sitemap","Neue Sitemap"
-"Path","Pfad"
-"Please create the specified folder ""%s"" before saving the sitemap.","Bitte erstellen sie den benötigten Ordner ""%s"", bevor Sie die Sitemap speichern."
-"Please define correct path","Bitte definieren Sie einen korrekten Pfad"
-"Please make sure that ""%s"" is writable by web-server.","Bitte vergewissern Sie sich, dass ""%s"" seitens des Webservers beschreibbar ist."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z), Zahlen (0-9) oder Unterstriche (_) im Dateinamen. Leerzeichen oder andere Zeichen sind nicht zugelassen."
-"Priority","Priorität"
-"Products Options","Produkte Optionen"
-"Sitemap","Sitemap"
-"Sitemap generate Warnings","Warnungen zu Sitemap generieren"
-"Start Time","Startzeit"
-"Store View","Store-Ansicht"
-"The priority must be between 0 and 1.","Die Priorität muss zwischen 0 und 1 liegen."
-"The sitemap ""%s"" has been generated.","Die Sitemap ""%s"" wurde generiert."
-"The sitemap has been deleted.","Die Sitemap wurde gelöscht."
-"The sitemap has been saved.","Die Sitemap wurde gespeichert."
+"Sitemap Information","Sitemap Information"
+Sitemap,Sitemap
+Filename,Dateiname
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap","Sitemap hinzufügen"
+"Site Map","Site Map"
"This sitemap no longer exists.","Diese Sitemap existiert nicht mehr."
-"Unable to find a sitemap to delete.","Sitemap zur Löschung konnte nicht gefunden werden."
-"Unable to find a sitemap to generate.","Sitemap, die generiert werden soll, konnte nicht gefunden werden."
-"Unable to generate the sitemap.","Sitemap kann nicht erstellt werden."
-"Valid values range: from 0.0 to 1.0.","Gültige Eingaben: zwischen 0,0 und 1,0."
-"Weekly","Wöchentlich"
-"Yearly","Jährlich"
+"New Site Map","New Site Map"
+"The sitemap has been saved.","Die Sitemap wurde gespeichert."
+"The sitemap has been deleted.","Die Sitemap wurde gelöscht."
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.","Die Priorität muss zwischen 0 und 1 liegen."
+Yearly,Jährlich
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
+"Generation Settings","Generation Settings"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
+"Link for Google","Link für Google"
+"Last Generated","Zuletzt generiert"
diff --git a/app/code/Magento/Sitemap/i18n/en_US.csv b/app/code/Magento/Sitemap/i18n/en_US.csv
index 5d8cfe02c8b..ab061da7a8c 100644
--- a/app/code/Magento/Sitemap/i18n/en_US.csv
+++ b/app/code/Magento/Sitemap/i18n/en_US.csv
@@ -1,46 +1,62 @@
-"Action","Action"
-"Add Sitemap","Add Sitemap"
-"Always","Always"
-"CMS Pages Options","CMS Pages Options"
-"Categories Options","Categories Options"
-"Daily","Daily"
+All,All
+None,None
+ID,ID
+Action,Action
+Enabled,Enabled
+"Store View","Store View"
+Catalog,Catalog
+Always,Always
+Priority,Priority
+Path,Path
+Daily,Daily
+Weekly,Weekly
+Monthly,Monthly
+Never,Never
+Generate,Generate
+Hourly,Hourly
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
"Edit Sitemap","Edit Sitemap"
-"Enabled","Enabled"
+"New Sitemap","New Sitemap"
+"Sitemap Information","Sitemap Information"
+Sitemap,Sitemap
+Filename,Filename
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap","Add Sitemap"
+"Site Map","Site Map"
+"This sitemap no longer exists.","This sitemap no longer exists."
+"New Site Map","New Site Map"
+"The sitemap has been saved.","The sitemap has been saved."
+"The sitemap has been deleted.","The sitemap has been deleted."
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.","The priority must be between 0 and 1."
+Yearly,Yearly
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
"Error Email Recipient","Error Email Recipient"
"Error Email Sender","Error Email Sender"
"Error Email Template","Error Email Template"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server."
-"Filename","Filename"
-"Frequency","Frequency"
-"Generate","Generate"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
"Generation Settings","Generation Settings"
-"Google Sitemap","Google Sitemap"
-"Hourly","Hourly"
-"ID","ID"
-"Last Generated","Last Generated"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
"Link for Google","Link for Google"
-"Monthly","Monthly"
-"Never","Never"
-"New Sitemap","New Sitemap"
-"Path","Path"
-"Please create the specified folder ""%s"" before saving the sitemap.","Please create the specified folder ""%s"" before saving the sitemap."
-"Please define correct path","Please define correct path"
-"Please make sure that ""%s"" is writable by web-server.","Please make sure that ""%s"" is writable by web-server."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed."
-"Priority","Priority"
-"Products Options","Products Options"
-"Sitemap","Sitemap"
-"Sitemap generate Warnings","Sitemap generate Warnings"
-"Start Time","Start Time"
-"Store View","Store View"
-"The priority must be between 0 and 1.","The priority must be between 0 and 1."
-"The sitemap ""%s"" has been generated.","The sitemap ""%s"" has been generated."
-"The sitemap has been deleted.","The sitemap has been deleted."
-"The sitemap has been saved.","The sitemap has been saved."
-"This sitemap no longer exists.","This sitemap no longer exists."
-"Unable to find a sitemap to delete.","Unable to find a sitemap to delete."
-"Unable to find a sitemap to generate.","Unable to find a sitemap to generate."
-"Unable to generate the sitemap.","Unable to generate the sitemap."
-"Valid values range: from 0.0 to 1.0.","Valid values range: from 0.0 to 1.0."
-"Weekly","Weekly"
-"Yearly","Yearly"
+"Last Generated","Last Generated"
diff --git a/app/code/Magento/Sitemap/i18n/es_ES.csv b/app/code/Magento/Sitemap/i18n/es_ES.csv
index 736cc68c5a0..875bf3e74ef 100644
--- a/app/code/Magento/Sitemap/i18n/es_ES.csv
+++ b/app/code/Magento/Sitemap/i18n/es_ES.csv
@@ -1,46 +1,62 @@
-"Action","Acción"
-"Add Sitemap","Añadir mapa del sito web"
-"Always","siempre"
-"CMS Pages Options","Opciones de páginas de CMS (sistema de gestion de contenidos)"
-"Categories Options","Opciones de categorias"
-"Daily","Diario"
+All,All
+None,None
+ID,Identificación
+Action,Acción
+Enabled,Enabled
+"Store View","Ver Tienda"
+Catalog,Catalog
+Always,siempre
+Priority,Priority
+Path,Camino
+Daily,Diario
+Weekly,Semanalmente
+Monthly,Mensualmente
+Never,Nunca
+Generate,Generar
+Hourly,"Cada hora"
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
"Edit Sitemap","Editar mapa del sitio web"
-"Enabled","Habilitado"
-"Error Email Recipient","Error en el destinatario del mensaje"
-"Error Email Sender","Error en el remitente del mensaje"
-"Error Email Template","Error en la plantilla del mensaje"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","No se puede guardar el archivo ""%s"". Por favor, cerciórese de que el directorio ""%s"" permite la escritura mediante el servidor web."
-"Filename","Nombre del archivo"
-"Frequency","Frecuencia"
-"Generate","Generar"
-"Generation Settings","Ajuste generacinal"
-"Google Sitemap","Google Sitemap [[It's used the same way in Spanish]]"
-"Hourly","Cada hora"
-"ID","Identificación"
-"Last Generated","Última vez que se generó"
-"Link for Google","Enlace para Google"
-"Monthly","Mensualmente"
-"Never","Nunca"
"New Sitemap","Nuevo mapa del sitio web"
-"Path","Camino"
-"Please create the specified folder ""%s"" before saving the sitemap.","Por favor, cree el archivo ""%s"" especificado antes de guardar el mapa del sitio."
-"Please define correct path","Por favor defina la trayectoria correcta"
-"Please make sure that ""%s"" is writable by web-server.","Por favor, cerciórese de que ""%s"" permite la escritura mediante el servidor web."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Por favor use solamente las letras (a-z o A-Z), números (0-9) o guón bajo (_) en el nombre del archivo. Ni espacios ni otros carácteres están permitidos"
-"Priority","Prioridad"
-"Products Options","Opciones de productos"
-"Sitemap","Mapa de sitio"
-"Sitemap generate Warnings","El mapa del sitio web genera avisos"
-"Start Time","Tiempo de inicio."
-"Store View","Ver Tienda"
-"The priority must be between 0 and 1.","La prioridad debe de estar entre 0 y 1"
-"The sitemap ""%s"" has been generated.","Se ha generado el mapa del sitio ""%s""."
-"The sitemap has been deleted.","El mapa del sitio web ha sido borrado"
-"The sitemap has been saved.","El mapa del sitio web se ha guardado"
+"Sitemap Information","Sitemap Information"
+Sitemap,"Mapa de sitio"
+Filename,"Nombre del archivo"
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap","Añadir mapa del sito web"
+"Site Map","Site Map"
"This sitemap no longer exists.","Este mapa del sitio web ya no existe"
-"Unable to find a sitemap to delete.","No se puede encontrar el mapa del sitio web para borrarlo"
-"Unable to find a sitemap to generate.","No se puede encontrar un mapa del sitio web para ser generado"
-"Unable to generate the sitemap.","No se puede generar el mapa del sitio web"
-"Valid values range: from 0.0 to 1.0.","Rango de los valores admitidos: desde 0.0 hasta 1.0."
-"Weekly","Semanalmente"
-"Yearly","Anualmente"
+"New Site Map","New Site Map"
+"The sitemap has been saved.","El mapa del sitio web se ha guardado"
+"The sitemap has been deleted.","El mapa del sitio web ha sido borrado"
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.","La prioridad debe de estar entre 0 y 1"
+Yearly,Anualmente
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
+"Generation Settings","Generation Settings"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
+"Link for Google","Enlace para Google"
+"Last Generated","Última vez que se generó"
diff --git a/app/code/Magento/Sitemap/i18n/fr_FR.csv b/app/code/Magento/Sitemap/i18n/fr_FR.csv
index 287e26197ae..398caf182fc 100644
--- a/app/code/Magento/Sitemap/i18n/fr_FR.csv
+++ b/app/code/Magento/Sitemap/i18n/fr_FR.csv
@@ -1,46 +1,62 @@
-"Action","Action"
-"Add Sitemap","Ajouter une sitemap"
-"Always","Toujours"
-"CMS Pages Options","Options des pages SGC"
-"Categories Options","Options des catégories"
-"Daily","Tous les jours"
+All,All
+None,None
+ID,ID
+Action,Action
+Enabled,Enabled
+"Store View","Vue du magasin"
+Catalog,Catalog
+Always,Toujours
+Priority,Priority
+Path,Chemin
+Daily,"Tous les jours"
+Weekly,"Toutes les semaines"
+Monthly,"Tous les mois"
+Never,Jamais
+Generate,Générer
+Hourly,"Toutes les heures"
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
"Edit Sitemap","Éditer la sitemap"
-"Enabled","Activé"
-"Error Email Recipient","Erreur dans le destinataire du mail"
-"Error Email Sender","Erreur dans l'expéditeur du mail"
-"Error Email Template","Erreur dans le modèle du mail"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","Le fichier ""%s"" n'a pas pu être enregistré. Assurez-vous que le répertoire ""%s"" est accessible en écriture pour le serveur web."
-"Filename","Nom de fichier"
-"Frequency","Fréquence"
-"Generate","Générer"
-"Generation Settings","Réglages de génération"
-"Google Sitemap","Google Sitemap"
-"Hourly","Toutes les heures"
-"ID","ID"
-"Last Generated","Généré pour la dernière fois"
-"Link for Google","Lien pour Google"
-"Monthly","Tous les mois"
-"Never","Jamais"
"New Sitemap","Nouvelle sitemap"
-"Path","Chemin"
-"Please create the specified folder ""%s"" before saving the sitemap.","Veuillez créer le dossier spécifié ""%s"" avant d'enregistrer le plan du site."
-"Please define correct path","Définissez un chemin correct"
-"Please make sure that ""%s"" is writable by web-server.","Veuillez vous assurer que ""%s"" est accessible en écriture par le serveur web."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","N'utilisez que des lettres (a-z ou A-Z), des nombres (0-9) ou un blanc souligné (_) dans le nom du fichier. Aucune espace ou autre caractère ne sont autorisés."
-"Priority","Priorité"
-"Products Options","Options de produit"
-"Sitemap","Sitemap"
-"Sitemap generate Warnings","Avertissements de génération de sitemap"
-"Start Time","Heure de début"
-"Store View","Vue du magasin"
-"The priority must be between 0 and 1.","La priorité est comprise entre 0 et 1"
-"The sitemap ""%s"" has been generated.","Le plan du site ""%s"" a été généré."
-"The sitemap has been deleted.","La sitemap a été supprimée."
-"The sitemap has been saved.","La sitemap a été sauvegardée."
+"Sitemap Information","Sitemap Information"
+Sitemap,Sitemap
+Filename,"Nom de fichier"
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap","Ajouter une sitemap"
+"Site Map","Site Map"
"This sitemap no longer exists.","La sitemap n'existe plus."
-"Unable to find a sitemap to delete.","Impossible de trouver une sitemap à supprimer."
-"Unable to find a sitemap to generate.","Impossible de trouver une sitemap à générer."
-"Unable to generate the sitemap.","Impossible de générer une sitemap."
-"Valid values range: from 0.0 to 1.0.","Intervalles de valeurs valides: de 0.0 Ã 1.0"
-"Weekly","Toutes les semaines"
-"Yearly","Tous les ans"
+"New Site Map","New Site Map"
+"The sitemap has been saved.","La sitemap a été sauvegardée."
+"The sitemap has been deleted.","La sitemap a été supprimée."
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.","La priorité est comprise entre 0 et 1"
+Yearly,"Tous les ans"
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
+"Generation Settings","Generation Settings"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
+"Link for Google","Lien pour Google"
+"Last Generated","Généré pour la dernière fois"
diff --git a/app/code/Magento/Sitemap/i18n/nl_NL.csv b/app/code/Magento/Sitemap/i18n/nl_NL.csv
index 49bc67849e4..dc33625dd7d 100644
--- a/app/code/Magento/Sitemap/i18n/nl_NL.csv
+++ b/app/code/Magento/Sitemap/i18n/nl_NL.csv
@@ -1,46 +1,62 @@
-"Action","Actie"
-"Add Sitemap","Sitekaart toevoegen"
-"Always","Altijd"
-"CMS Pages Options","CMS pagina's opties"
-"Categories Options","Categorieopties"
-"Daily","Dagelijks"
+All,All
+None,None
+ID,ID
+Action,Actie
+Enabled,Enabled
+"Store View","Aanblik winkel"
+Catalog,Catalog
+Always,Altijd
+Priority,Priority
+Path,Pad
+Daily,Dagelijks
+Weekly,Wekelijks
+Monthly,Maandelijks
+Never,Nooit
+Generate,Aanmaken
+Hourly,"Elk uur"
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
"Edit Sitemap","Sitekaart bewerken"
-"Enabled","Aan"
-"Error Email Recipient","Foutmelding Email Ontvanger"
-"Error Email Sender","Foutmelding Email Verstuurder"
-"Error Email Template","Foutmelding Email Template"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","Bestand ""%s"" kan niet worden opgeslagen. Zorg ervoor dat ""%s"" directory beschrijfbaar is door webserver."
-"Filename","Bestandsnaam"
-"Frequency","Frequentie"
-"Generate","Aanmaken"
-"Generation Settings","Aanmaakinstellingen"
-"Google Sitemap","Google sitekaart"
-"Hourly","Elk uur"
-"ID","ID"
-"Last Generated","Laatste maal aangemaakt"
-"Link for Google","Link voor Google"
-"Monthly","Maandelijks"
-"Never","Nooit"
"New Sitemap","Nieuwe Sitemap"
-"Path","Pad"
-"Please create the specified folder ""%s"" before saving the sitemap.","Maak de specifieke map ""%s"" voor het opslaan van de sitemap."
-"Please define correct path","Definieer a.u.b. correct pad"
-"Please make sure that ""%s"" is writable by web-server.","Zorg ervoor dat ""%s"" beschrijfbaar is door webserver."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Gebruik a.u.b. alleen letters (a-z of A-Z), nummers (0-9) or underscore (_) in de filenaam. Spaties or andere karakters zijn niet toegestaan."
-"Priority","Prioriteit"
-"Products Options","Product Opties"
-"Sitemap","Sitemap"
-"Sitemap generate Warnings","Sitemap genereert Waarschuwing"
-"Start Time","Begintijd"
-"Store View","Aanblik winkel"
-"The priority must be between 0 and 1.","De prioriteit moet tussen 0 en 1 zijn."
-"The sitemap ""%s"" has been generated.","De sitemap ""%s"" is gegenereerd."
-"The sitemap has been deleted.","De sitemap is verwijderd."
-"The sitemap has been saved.","De sitemap is opgeslagen."
+"Sitemap Information","Sitemap Information"
+Sitemap,Sitemap
+Filename,Bestandsnaam
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap","Sitekaart toevoegen"
+"Site Map","Site Map"
"This sitemap no longer exists.","De sitemap bestaat niet langer."
-"Unable to find a sitemap to delete.","Kan geen sitemap vinden om te verwijderen."
-"Unable to find a sitemap to generate.","Kan geen sitemap vinden om te genereren."
-"Unable to generate the sitemap.","Kan sitemap niet genereren."
-"Valid values range: from 0.0 to 1.0.","Toegestane waardes reiken: van 0.0 tot 1.0."
-"Weekly","Wekelijks"
-"Yearly","Jaarlijks"
+"New Site Map","New Site Map"
+"The sitemap has been saved.","De sitemap is opgeslagen."
+"The sitemap has been deleted.","De sitemap is verwijderd."
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.","De prioriteit moet tussen 0 en 1 zijn."
+Yearly,Jaarlijks
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
+"Generation Settings","Generation Settings"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
+"Link for Google","Link voor Google"
+"Last Generated","Laatste maal aangemaakt"
diff --git a/app/code/Magento/Sitemap/i18n/pt_BR.csv b/app/code/Magento/Sitemap/i18n/pt_BR.csv
index 9b71bc3b860..1c56a4976f7 100644
--- a/app/code/Magento/Sitemap/i18n/pt_BR.csv
+++ b/app/code/Magento/Sitemap/i18n/pt_BR.csv
@@ -1,46 +1,62 @@
-"Action","Ação"
-"Add Sitemap","Adicionar Mapa do Site"
-"Always","Sempre"
-"CMS Pages Options","Opções de páginas CMS"
-"Categories Options","Opções de Categorias"
-"Daily","Diário"
+All,All
+None,None
+ID,Identidade
+Action,Ação
+Enabled,Enabled
+"Store View","Visualização da loja"
+Catalog,Catalog
+Always,Sempre
+Priority,Priority
+Path,Caminho
+Daily,Diário
+Weekly,Semanalmente
+Monthly,Mensal
+Never,Nunca
+Generate,Gerar
+Hourly,Horário
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
"Edit Sitemap","Editar Mapa do Site"
-"Enabled","Ativado"
-"Error Email Recipient","Erro de Destinatário de Email"
-"Error Email Sender","Erro de Remetente de Email"
-"Error Email Template","Erro de Template de Email"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","O arquivo ""%s"" não pode ser salvo. Certifique-se de que o diretório ""%s"" é gravável pelo servidor web."
-"Filename","Nome do arquivo"
-"Frequency","Freqüência"
-"Generate","Gerar"
-"Generation Settings","Configurações de Geração"
-"Google Sitemap","Google Sitemap"
-"Hourly","Horário"
-"ID","Identidade"
-"Last Generated","Último Momento Gerado"
-"Link for Google","Link para o Google"
-"Monthly","Mensal"
-"Never","Nunca"
"New Sitemap","Novo Sitemap"
-"Path","Caminho"
-"Please create the specified folder ""%s"" before saving the sitemap.","Por favor crie a pasta especificada ""%s"" antes de salvar o mapa do site."
-"Please define correct path","Por favor defina o caminho correto"
-"Please make sure that ""%s"" is writable by web-server.","Por favor certifique-se que ""%s"" é gravável pelo servidor web."
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Por favor use apenas letras (a-z ou A-Z), números (0-9) ou underscore (_) no nome do arquivo. Nenhuns espaços ou outros caracteres são permitidos."
-"Priority","Prioridade"
-"Products Options","Opções de Produtos"
-"Sitemap","Mapa do Site"
-"Sitemap generate Warnings","Mapa do site gera Avisos"
-"Start Time","Tempo de InÃcio"
-"Store View","Visualização da loja"
-"The priority must be between 0 and 1.","A prioridade deve ser entre 0 e 1."
-"The sitemap ""%s"" has been generated.","O mapa do site ""%s"" foi gerado."
-"The sitemap has been deleted.","O mapa do site foi apagado."
-"The sitemap has been saved.","O mapa do site foi salvo."
+"Sitemap Information","Sitemap Information"
+Sitemap,"Mapa do Site"
+Filename,"Nome do arquivo"
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap","Adicionar Mapa do Site"
+"Site Map","Site Map"
"This sitemap no longer exists.","Este mapa do site não existe mais."
-"Unable to find a sitemap to delete.","Incapaz de encontrar um mapa do site para apagar."
-"Unable to find a sitemap to generate.","Incapaz de encontrar um mapa do site para gerar."
-"Unable to generate the sitemap.","Incapaz de gerar o mapa do site."
-"Valid values range: from 0.0 to 1.0.","Valores válidos variam: de 0,0 a 1,0."
-"Weekly","Semanalmente"
-"Yearly","Anualmente"
+"New Site Map","New Site Map"
+"The sitemap has been saved.","O mapa do site foi salvo."
+"The sitemap has been deleted.","O mapa do site foi apagado."
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.","A prioridade deve ser entre 0 e 1."
+Yearly,Anualmente
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
+"Generation Settings","Generation Settings"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
+"Link for Google","Link para o Google"
+"Last Generated","Último Momento Gerado"
diff --git a/app/code/Magento/Sitemap/i18n/zh_CN.csv b/app/code/Magento/Sitemap/i18n/zh_CN.csv
index 2def6cc0e86..e67ef509643 100644
--- a/app/code/Magento/Sitemap/i18n/zh_CN.csv
+++ b/app/code/Magento/Sitemap/i18n/zh_CN.csv
@@ -1,46 +1,62 @@
-"Action","æ“作"
-"Add Sitemap","æ·»åŠ ç«™ç‚¹ç»“æž„å›¾"
-"Always","总是"
-"CMS Pages Options","CMS包选项"
-"Categories Options","分类选项"
-"Daily","æ¯å¤©"
-"Edit Sitemap","编辑站点结构图"
-"Enabled","å·²å¯ç”¨"
-"Error Email Recipient","邮件接收有误"
-"Error Email Sender","邮件å‘é€æœ‰è¯¯"
-"Error Email Template","邮件模æ¿æœ‰è¯¯"
-"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","文件 ""%s"" æ— æ³•ä¿å˜ã€‚请确ä¿ç›®å½• ""%s"" å¯è¢«WebæœåŠ¡å™¨å†™å…¥ã€‚"
-"Filename","文件å"
-"Frequency","频率"
-"Generate","生æˆ"
-"Generation Settings","常规设置"
-"Google Sitemap","Google Sitemap"
-"Hourly","æ¯å°æ—¶"
-"ID","ID"
-"Last Generated","上一次生æˆæ—¶é—´"
-"Link for Google","Google的链接"
-"Monthly","æ¯æœˆ"
-"Never","æ°¸ä¸"
-"New Sitemap","新站点结构图"
-"Path","路径"
-"Please create the specified folder ""%s"" before saving the sitemap.","ä¿å˜ç«™ç‚¹ç»“构图之å‰ï¼Œè¯·åˆ›å»ºæŒ‡å®šçš„文件夹 ""%s""。"
-"Please define correct path","请定义æ£ç¡®çš„路径"
-"Please make sure that ""%s"" is writable by web-server.","请确ä¿WebæœåŠ¡å™¨å¯å†™å…¥ ""%s""。"
-"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","在文件åä¸è¯·åªä½¿ç”¨å—æ¯ï¼ˆa-z或A-Z）ã€æ•°å—（0-9），或下划线（_）。ä¸å…è®¸ä½¿ç”¨ç©ºæ ¼æˆ–å…¶ä»–å—符。"
-"Priority","优先级"
-"Products Options","产å“选项"
-"Sitemap","站点结构图"
-"Sitemap generate Warnings","站点结构图生æˆè¦æŠ¥"
-"Start Time","开始时间"
-"Store View","店铺视图"
-"The priority must be between 0 and 1.","优先级必须介于0和1之间。"
-"The sitemap ""%s"" has been generated.","站点结构图 “%sâ€å·²ç”Ÿæˆã€‚"
-"The sitemap has been deleted.","ç«™ç‚¹ç»“æž„å›¾å·²è¢«åˆ é™¤ã€‚"
-"The sitemap has been saved.","站点结构图已ä¿å˜ã€‚"
-"This sitemap no longer exists.","站点结构图ä¸å˜åœ¨ã€‚"
-"Unable to find a sitemap to delete.","æ— æ³•æ‰¾åˆ°è¦åˆ 除的站点结构图。"
-"Unable to find a sitemap to generate.","æ— æ³•æ‰¾åˆ°ç”Ÿæˆçš„站点结构图。"
-"Unable to generate the sitemap.","æ— æ³•ç”Ÿæˆç«™ç‚¹ç»“构图。"
-"Valid values range: from 0.0 to 1.0.","有效的值范围：从0.0到1.0。"
-"Weekly","æ¯å‘¨"
-"Yearly","æ¯å¹´"
+All,All
+None,None
+ID,ID
+Action,æ“作
+Enabled,Enabled
+"Store View",店铺视图
+Catalog,Catalog
+Always,总是
+Priority,Priority
+Path,路径
+Daily,æ¯å¤©
+Weekly,æ¯å‘¨
+Monthly,æ¯æœˆ
+Never,æ°¸ä¸
+Generate,生æˆ
+Hourly,æ¯å°æ—¶
+"Start Time","Start Time"
+Frequency,Frequency
+"Save & Generate","Save & Generate"
+"Edit Sitemap",编辑站点结构图
+"New Sitemap",新站点结构图
+"Sitemap Information","Sitemap Information"
+Sitemap,站点结构图
+Filename,文件å
+"example: sitemap.xml","example: sitemap.xml"
+"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","example: ""sitemap/"" or ""/"" for base path (path must be writeable)"
+"XML Sitemap","XML Sitemap"
+"Add Sitemap",æ·»åŠ ç«™ç‚¹ç»“æž„å›¾
+"Site Map","Site Map"
+"This sitemap no longer exists.",站点结构图ä¸å˜åœ¨ã€‚
+"New Site Map","New Site Map"
+"The sitemap has been saved.",站点结构图已ä¿å˜ã€‚
+"The sitemap has been deleted.",ç«™ç‚¹ç»“æž„å›¾å·²è¢«åˆ é™¤ã€‚
+"We can't find a sitemap to delete.","We can't find a sitemap to delete."
+"The sitemap ""%1"" has been generated.","The sitemap ""%1"" has been generated."
+"Something went wrong generating the sitemap.","Something went wrong generating the sitemap."
+"We can't find a sitemap to generate.","We can't find a sitemap to generate."
+"The priority must be between 0 and 1.",优先级必须介于0和1之间。
+Yearly,æ¯å¹´
+"File handler unreachable","File handler unreachable"
+"Please define a correct path.","Please define a correct path."
+"Please create the specified folder ""%1"" before saving the sitemap.","Please create the specified folder ""%1"" before saving the sitemap."
+"Please make sure that ""%1"" is writable by the web-server.","Please make sure that ""%1"" is writable by the web-server."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename. No spaces or other characters are allowed."
+"Base Only","Base Only"
+"Error Email Recipient","Error Email Recipient"
+"Error Email Sender","Error Email Sender"
+"Error Email Template","Error Email Template"
+"Categories Options","Categories Options"
+"Valid values range from 0.0 to 1.0.","Valid values range from 0.0 to 1.0."
+"Products Options","Products Options"
+"Add Images into Sitemap","Add Images into Sitemap"
+"CMS Pages Options","CMS Pages Options"
+"Generation Settings","Generation Settings"
+"Sitemap File Limits","Sitemap File Limits"
+"Maximum No of URLs Per File","Maximum No of URLs Per File"
+"Maximum File Size","Maximum File Size"
+"File size in bytes.","File size in bytes."
+"Search Engine Submission Settings","Search Engine Submission Settings"
+"Enable Submission to Robots.txt","Enable Submission to Robots.txt"
+"Link for Google",Google的链接
+"Last Generated",上一次生æˆæ—¶é—´
diff --git a/app/code/Magento/Store/i18n/de_DE.csv b/app/code/Magento/Store/i18n/de_DE.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/de_DE.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Store/i18n/en_US.csv b/app/code/Magento/Store/i18n/en_US.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/en_US.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Store/i18n/es_ES.csv b/app/code/Magento/Store/i18n/es_ES.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/es_ES.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Store/i18n/fr_FR.csv b/app/code/Magento/Store/i18n/fr_FR.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/fr_FR.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Store/i18n/nl_NL.csv b/app/code/Magento/Store/i18n/nl_NL.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/nl_NL.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Store/i18n/pt_BR.csv b/app/code/Magento/Store/i18n/pt_BR.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/pt_BR.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Store/i18n/zh_CN.csv b/app/code/Magento/Store/i18n/zh_CN.csv
new file mode 100644
index 00000000000..144b5864e3c
--- /dev/null
+++ b/app/code/Magento/Store/i18n/zh_CN.csv
@@ -0,0 +1,12 @@
+"All Store Views","All Store Views"
+"-- Please Select --","-- Please Select --"
+Admin,Admin
+"Store with the same code","Store with the same code"
+"Website with the same code","Website with the same code"
+"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
+"Name is required","Name is required"
+"The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_),' ' the first character must be a letter"
+"Your Language:","Your Language:"
+"Your Language","Your Language"
+Language,Language
+"Select Store","Select Store"
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
index fa8f0be6eb3..3bd85afc954 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
@@ -88,7 +88,6 @@ class Tax extends \Magento\Backend\App\Action
try {
/** @var $classModel \Magento\Tax\Model\ClassModel */
$classModel = $this->_objectManager->create('Magento\Tax\Model\ClassModel')->load($classId);
- $classModel->checkClassCanBeDeleted();
$classModel->delete();
$responseContent = $this->_objectManager->get(
'Magento\Core\Helper\Data'
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index fbb5f71e624..ad1611af9e6 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -21,8 +21,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+
namespace Magento\Tax\Model\Calculation;
+use Magento\Framework\Exception\CouldNotDeleteException;
+
/**
* Tax Rate Model
*
@@ -185,7 +188,7 @@ class Rate extends \Magento\Framework\Model\AbstractModel
protected function _beforeDelete()
{
if ($this->_isInRule()) {
- throw new \Magento\Framework\Model\Exception(__('The tax rate cannot be removed. It exists in a tax rule.'));
+ throw new CouldNotDeleteException('The tax rate cannot be removed. It exists in a tax rule.');
}
return parent::_beforeDelete();
}
diff --git a/app/code/Magento/Tax/Model/Calculation/TaxRuleConverter.php b/app/code/Magento/Tax/Model/Calculation/TaxRuleConverter.php
index d574a346c3c..cff63dfd5cb 100644
--- a/app/code/Magento/Tax/Model/Calculation/TaxRuleConverter.php
+++ b/app/code/Magento/Tax/Model/Calculation/TaxRuleConverter.php
@@ -72,13 +72,17 @@ class TaxRuleConverter
$this->taxRuleDataObjectBuilder->setCode($ruleModel->getCode());
}
if (!is_null($ruleModel->getCustomerTaxClasses())) {
- $this->taxRuleDataObjectBuilder->setCustomerTaxClassIds(array_unique($ruleModel->getCustomerTaxClasses()));
+ $this->taxRuleDataObjectBuilder->setCustomerTaxClassIds(
+ $this->_getUniqueValues($ruleModel->getCustomerTaxClasses())
+ );
}
if (!is_null($ruleModel->getProductTaxClasses())) {
- $this->taxRuleDataObjectBuilder->setProductTaxClassIds(array_unique($ruleModel->getProductTaxClasses()));
+ $this->taxRuleDataObjectBuilder->setProductTaxClassIds(
+ $this->_getUniqueValues($ruleModel->getProductTaxClasses())
+ );
}
if (!is_null($ruleModel->getRates())) {
- $this->taxRuleDataObjectBuilder->setTaxRateIds(array_unique($ruleModel->getRates()));
+ $this->taxRuleDataObjectBuilder->setTaxRateIds($this->_getUniqueValues($ruleModel->getRates()));
}
if (!is_null($ruleModel->getPriority())) {
$this->taxRuleDataObjectBuilder->setPriority($ruleModel->getPriority());
@@ -110,4 +114,15 @@ class TaxRuleConverter
$taxRuleModel->setPosition($taxRuleDataObject->getSortOrder());
return $taxRuleModel;
}
+
+ /**
+ * Get unique values of indexed array.
+ *
+ * @param array $values
+ * @return array
+ */
+ protected function _getUniqueValues($values)
+ {
+ return array_values(array_unique($values));
+ }
}
diff --git a/app/code/Magento/Tax/Model/ClassModel.php b/app/code/Magento/Tax/Model/ClassModel.php
index f2a211e7c19..7d0e2302e7b 100644
--- a/app/code/Magento/Tax/Model/ClassModel.php
+++ b/app/code/Magento/Tax/Model/ClassModel.php
@@ -22,6 +22,8 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Tax\Model;
+
/**
* Tax class model
*
@@ -31,11 +33,7 @@
* @method \Magento\Tax\Model\ClassModel setClassName(string $value)
* @method string getClassType()
* @method \Magento\Tax\Model\ClassModel setClassType(string $value)
- *
- * @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Tax\Model;
-
class ClassModel extends \Magento\Framework\Model\AbstractModel
{
/**
@@ -87,7 +85,7 @@ class ClassModel extends \Magento\Framework\Model\AbstractModel
* @return bool
* @throws \Magento\Framework\Model\Exception
*/
- public function checkClassCanBeDeleted()
+ protected function checkClassCanBeDeleted()
{
if (!$this->getId()) {
throw new \Magento\Framework\Model\Exception(__('This class no longer exists.'));
@@ -114,4 +112,16 @@ class ClassModel extends \Magento\Framework\Model\AbstractModel
return true;
}
+
+ /**
+ * Validate tax class can be deleted
+ *
+ * @return $this
+ * @throws \Magento\Framework\Model\Exception
+ */
+ protected function _beforeDelete()
+ {
+ $this->checkClassCanBeDeleted();
+ return parent::_beforeDelete();
+ }
}
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index cf0b53ae8f7..e338e2d86e1 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -38,8 +38,6 @@ class Config
const XML_PATH_TAX_NOTIFICATION_IGNORE_PRICE_DISPLAY = 'tax/notification/ignore_price_display';
- const XML_PATH_TAX_NOTIFICATION_IGNORE_FPT_CONFIGURATION = 'tax/notification/ignore_fpt_configuration';
-
const XML_PATH_TAX_NOTIFICATION_INFO_URL = 'tax/notification/info_url';
// tax classes
@@ -118,15 +116,6 @@ class Config
const DISPLAY_TYPE_BOTH = 3;
- /**
- * Indexes for FPT Configuration Types
- */
- const FPT_NOT_TAXED = 0;
-
- const FPT_TAXED = 1;
-
- const FPT_LOADED_DISPLAY_WITH_TAX = 2;
-
/**
* @var bool|null
*/
@@ -798,21 +787,6 @@ class Config
);
}
- /**
- * Check if warning about conflicting FPT configuration should be shown
- *
- * @param null|string|bool|int|Store $store
- * @return bool
- */
- public function isConflictingFptTaxConfigurationSettingsIgnored($store = null)
- {
- return (bool)$this->_scopeConfig->getValue(
- self::XML_PATH_TAX_NOTIFICATION_IGNORE_FPT_CONFIGURATION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
- }
-
/**
* Return the notification info url
*
diff --git a/app/code/Magento/Tax/Model/Converter.php b/app/code/Magento/Tax/Model/Converter.php
new file mode 100644
index 00000000000..a9ae2ae053d
--- /dev/null
+++ b/app/code/Magento/Tax/Model/Converter.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Model;
+
+use Magento\Tax\Model\ClassModel as TaxClassModel;
+use Magento\Tax\Model\ClassModelFactory as TaxClassFactory;
+use Magento\Tax\Service\V1\Data\TaxClass;
+use Magento\Tax\Service\V1\Data\TaxClassBuilder;
+
+/**
+ * Tax class converter. Allows conversion between tax class model and tax class service data object.
+ */
+class Converter
+{
+ /**
+ * @var TaxClassBuilder
+ */
+ protected $taxClassBuilder;
+
+ /**
+ * @var TaxClassFactory
+ */
+ protected $taxClassFactory;
+
+ /**
+ * Initialize dependencies.
+ *
+ * @param TaxClassBuilder $taxClassBuilder
+ * @param TaxClassFactory $taxClassFactory
+ */
+ public function __construct(TaxClassBuilder $taxClassBuilder, TaxClassFactory $taxClassFactory)
+ {
+ $this->taxClassBuilder = $taxClassBuilder;
+ $this->taxClassFactory = $taxClassFactory;
+ }
+
+ /**
+ * Convert tax class model into tax class service data object.
+ *
+ * @param TaxClassModel $taxClassModel
+ * @return TaxClass
+ */
+ public function createTaxClassData(TaxClassModel $taxClassModel)
+ {
+ $this->taxClassBuilder
+ ->setClassId($taxClassModel->getId())
+ ->setClassName($taxClassModel->getClassName())
+ ->setClassType($taxClassModel->getClassType());
+ return $this->taxClassBuilder->create();
+ }
+
+ /**
+ * Convert tax class service data object into tax class model.
+ *
+ * @param TaxClass $taxClass
+ * @return TaxClassModel
+ */
+ public function createTaxClassModel(TaxClass $taxClass)
+ {
+ /** @var TaxClassModel $taxClassModel */
+ $taxClassModel = $this->taxClassFactory->create();
+ $taxClassModel
+ ->setId($taxClass->getClassId())
+ ->setClassName($taxClass->getClassName())
+ ->setClassType($taxClass->getClassType());
+ return $taxClassModel;
+ }
+}
diff --git a/app/code/Magento/Tax/Model/Resource/TaxClass.php b/app/code/Magento/Tax/Model/Resource/TaxClass.php
index 564f0b49da0..1a62e66b938 100644
--- a/app/code/Magento/Tax/Model/Resource/TaxClass.php
+++ b/app/code/Magento/Tax/Model/Resource/TaxClass.php
@@ -30,6 +30,11 @@ namespace Magento\Tax\Model\Resource;
*/
class TaxClass extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
+ /**
+ * Unique tax class and tax type title. Also used for error message text on save.
+ */
+ const UNIQUE_TAX_CLASS_MSG = 'Class name and class type';
+
/**
* Resource initialization
*
@@ -51,7 +56,7 @@ class TaxClass extends \Magento\Framework\Model\Resource\Db\AbstractDb
array(
'field' => array('class_type', 'class_name'),
'title' => __(
- 'Something went wrong saving this tax class because a class with the same name already exists.'
+ self::UNIQUE_TAX_CLASS_MSG
)
)
);
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index 87a69428140..722db2818c4 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -509,8 +509,10 @@ class Tax extends AbstractTotal
) {
$qty = $item->getTotalQty();
$inclTax = $item->getIsPriceInclTax();
- $price = $item->getTaxableAmount() + $item->getExtraTaxableAmount();
- $basePrice = $item->getBaseTaxableAmount() + $item->getBaseExtraTaxableAmount();
+ $price = $item->getTaxableAmount();
+ $basePrice = $item->getBaseTaxableAmount();
+ $extraTaxableAmount = $item->getExtraTaxableAmount();
+ $baseExtraTaxableAmount = $item->getBaseExtraTaxableAmount();
$rateKey = ($taxId == null) ? (string)$rate : $taxId;
$unitTaxBeforeDiscount = 0;
@@ -570,6 +572,13 @@ class Tax extends AbstractTotal
}
$rowTax = $this->_store->roundPrice(max(0, $qty * $unitTax));
$baseRowTax = $this->_store->roundPrice(max(0, $qty * $baseUnitTax));
+
+ $extraTaxAmount = $this->_calculator->calcTaxAmount($extraTaxableAmount, $rate, $inclTax, true);
+ $rowExtraTaxAmount = $extraTaxAmount * $qty;
+ $baseExtraTaxAmount = $this->_calculator->calcTaxAmount($baseExtraTaxableAmount, $rate, $inclTax, true);
+ $rowBaseExtraTaxAmount = $baseExtraTaxAmount * $qty;
+ $rowTax += $rowExtraTaxAmount;
+ $baseRowTax += $rowBaseExtraTaxAmount;
$item->setTaxAmount($item->getTaxAmount() + $rowTax);
$item->setBaseTaxAmount($item->getBaseTaxAmount() + $baseRowTax);
if (is_array($taxGroups)) {
@@ -708,8 +717,10 @@ class Tax extends AbstractTotal
$recalculateRowTotalInclTax = false
) {
$inclTax = $item->getIsPriceInclTax();
- $subtotal = $taxSubtotal = $item->getTaxableAmount() + $item->getExtraRowTaxableAmount();
- $baseSubtotal = $baseTaxSubtotal = $item->getBaseTaxableAmount() + $item->getBaseExtraRowTaxableAmount();
+ $subtotal = $taxSubtotal = $item->getTaxableAmount();
+ $baseSubtotal = $baseTaxSubtotal = $item->getBaseTaxableAmount();
+ $extraRowTaxableAmount = $item->getExtraRowTaxableAmount();
+ $baseExtraRowTaxableAmount = $item->getBaseExtraRowTaxableAmount();
$rateKey = ($taxId == null) ? (string)$rate : $taxId;
$hiddenTax = 0;
@@ -782,6 +793,12 @@ class Tax extends AbstractTotal
}
break;
}
+ //round tax on extra taxable separately
+ $rowExtraTaxAmount = $this->_calculator->calcTaxAmount($extraRowTaxableAmount, $rate, $inclTax, true);
+ $baseRowExtraTaxAmount = $this->_calculator->calcTaxAmount($baseExtraRowTaxableAmount, $rate, $inclTax, true);
+ $rowTax += $rowExtraTaxAmount;
+ $baseRowTax += $baseRowExtraTaxAmount;
+
$item->setTaxAmount($item->getTaxAmount() + max(0, $rowTax));
$item->setBaseTaxAmount($item->getBaseTaxAmount() + max(0, $baseRowTax));
if (is_array($taxGroups)) {
@@ -931,8 +948,10 @@ class Tax extends AbstractTotal
) {
$inclTax = $item->getIsPriceInclTax();
$rateKey = ($taxId == null) ? (string)$rate : $taxId;
- $taxSubtotal = $subtotal = $item->getTaxableAmount() + $item->getExtraRowTaxableAmount();
- $baseTaxSubtotal = $baseSubtotal = $item->getBaseTaxableAmount() + $item->getBaseExtraRowTaxableAmount();
+ $taxSubtotal = $subtotal = $item->getTaxableAmount();
+ $baseTaxSubtotal = $baseSubtotal = $item->getBaseTaxableAmount();
+ $extraTaxableAmount = $item->getExtraRowTaxableAmount();
+ $baseExtraTaxableAmount = $item->getBaseExtraRowTaxableAmount();
if (!isset($taxGroups[$rateKey]['totals'])) {
$taxGroups[$rateKey]['totals'] = array();
@@ -957,6 +976,13 @@ class Tax extends AbstractTotal
$inclTax,
'base'
);
+
+ //Round extra tax amount separately
+ $extraTaxAmount = $this->_calculator->calcTaxAmount($extraTaxableAmount, $rate, $inclTax, true);
+ $baseExtraTaxAmount = $this->_calculator->calcTaxAmount($baseExtraTaxableAmount, $rate, $inclTax, true);
+ $rowTax += $extraTaxAmount;
+ $baseRowTax += $baseExtraTaxAmount;
+
$item->setTaxAmount($item->getTaxAmount() + max(0, $rowTax));
$item->setBaseTaxAmount($item->getBaseTaxAmount() + max(0, $baseRowTax));
break;
@@ -979,9 +1005,6 @@ class Tax extends AbstractTotal
$rowTax = $this->_deltaRound($rowTax, $rateKey, $inclTax);
$baseRowTax = $this->_deltaRound($baseRowTax, $rateKey, $inclTax, 'base');
- $item->setTaxAmount($item->getTaxAmount() + max(0, $rowTax));
- $item->setBaseTaxAmount($item->getBaseTaxAmount() + max(0, $baseRowTax));
-
//Calculate the Row taxes before discount
$rowTaxBeforeDiscount = $this->_calculator->calcTaxAmount(
$subtotal,
@@ -1018,6 +1041,16 @@ class Tax extends AbstractTotal
'incl_tax' => $inclTax
);
}
+
+ //Round extra tax amount separately
+ $extraTaxAmount = $this->_calculator->calcTaxAmount($extraTaxableAmount, $rate, $inclTax, true);
+ $baseExtraTaxAmount = $this->_calculator->calcTaxAmount($baseExtraTaxableAmount, $rate, $inclTax, true);
+ $rowTax += $extraTaxAmount;
+ $baseRowTax += $baseExtraTaxAmount;
+
+ $item->setTaxAmount($item->getTaxAmount() + max(0, $rowTax));
+ $item->setBaseTaxAmount($item->getBaseTaxAmount() + max(0, $baseRowTax));
+
break;
}
diff --git a/app/code/Magento/Tax/Model/System/Message/Notifications.php b/app/code/Magento/Tax/Model/System/Message/Notifications.php
index 4e0d52ef063..8cc3406820f 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notifications.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notifications.php
@@ -61,13 +61,6 @@ class Notifications implements \Magento\AdminNotification\Model\System\MessageIn
*/
protected $storesWithInvalidDiscountSettings;
- /*
- * Stores with conflicting FPT settings
- *
- * @var array
- */
- protected $storesWithConflictingFPTSettings;
-
/**
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlBuilder
@@ -202,54 +195,28 @@ class Notifications implements \Magento\AdminNotification\Model\System\MessageIn
return $storeNames;
}
- /**
- * Return list of store names which have not compatible tax calculation type and price display settings.
- * Return true if settings are wrong for default store.
- *
- * @return array
- */
- public function getStoresWithConflictingFptTaxConfigurationSettings()
- {
- $storeNames = array();
-
- // Will enable in future work
- //$storeCollection = $this->storeManager->getStores(true);
- //foreach ($storeCollection as $store) {
- // if ($this->weeeData->validateCatalogPricesAndFptConfiguration($store)) {
- // $website = $store->getWebsite();
- // $storeNames[] = $website->getName() . '(' . $store->getName() . ')';
- // }
- //}
-
- return $storeNames;
- }
-
/**
* Check whether notification is displayed
* Checks if any of these settings are being ignored or valid:
* 1. Wrong discount settings
* 2. Wrong display settings
- * 3. Conflicting FPT settings
*
* @return bool
*/
public function isDisplayed()
{
// Check if we are ignoring all notifications
- if ($this->taxConfig->isWrongDisplaySettingsIgnored() && $this->taxConfig->isWrongDiscountSettingsIgnored()
- && $this->taxConfig->isConflictingFptTaxConfigurationSettingsIgnored()) {
+ if ($this->taxConfig->isWrongDisplaySettingsIgnored() && $this->taxConfig->isWrongDiscountSettingsIgnored()) {
return false;
}
$this->storesWithInvalidDisplaySettings = $this->getStoresWithWrongDisplaySettings();
$this->storesWithInvalidDiscountSettings = $this->getStoresWithWrongDiscountSettings();
- $this->storesWithConflictingFPTSettings = $this->getStoresWithConflictingFptTaxConfigurationSettings();
// Check if we have valid tax notifications
if ((!empty($this->storesWithInvalidDisplaySettings) && !$this->taxConfig->isWrongDisplaySettingsIgnored())
|| (!empty($this->storesWithInvalidDiscountSettings) && !$this->taxConfig->isWrongDiscountSettingsIgnored())
- || (!empty($this->storesWithConflictingFPTSettings)
- && !$this->taxConfig->isConflictingFptTaxConfigurationSettingsIgnored())) {
+ ) {
return true;
}
@@ -297,24 +264,6 @@ class Notifications implements \Magento\AdminNotification\Model\System\MessageIn
$messageDetails .= "</div><br>";
}
- if (!empty($this->storesWithConflictingFPTSettings)
- && !$this->taxConfig->isConflictingFptTaxConfigurationSettingsIgnored()
- ) {
- $messageDetails .= '<strong>';
- $messageDetails .= __(
- 'Warning tax configuration can result in unexpected FPT prices on applicable devices. '
- );
- $messageDetails .= '</strong><br>';
- $messageDetails .= __('Store(s) affected: ');
- $messageDetails .= implode(', ', $this->storesWithConflictingFPTSettings);
- $messageDetails .= '<br><div style="text-align:right">';
- $messageDetails .= __(
- 'Click on the link to <a href="%1">ignore this notification</a>',
- $this->getIgnoreTaxNotificationUrl('fpt_configuration')
- );
- $messageDetails .= "</div><br>";
- }
-
$messageDetails .= '<br>';
$messageDetails .= __('Please see <a href="%1">documentation</a> for more details. ', $this->getInfoUrl());
$messageDetails .= __(
diff --git a/app/code/Magento/Tax/Service/V1/Data/SearchResults.php b/app/code/Magento/Tax/Service/V1/Data/SearchResults.php
new file mode 100644
index 00000000000..bab5597929d
--- /dev/null
+++ b/app/code/Magento/Tax/Service/V1/Data/SearchResults.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1\Data;
+
+/**
+ * Data object for Tax class search results.
+ */
+class SearchResults extends \Magento\Framework\Service\Data\AbstractObject
+{
+ /**
+ * Get list of tax classes.
+ *
+ * @return \Magento\Tax\Service\V1\Data\TaxClass[]
+ */
+ public function getItems()
+ {
+ return is_null($this->_get('items')) ? [] : $this->_get('items');
+ }
+
+ /**
+ * Get search criteria.
+ *
+ * @return \Magento\Framework\Service\V1\Data\SearchCriteria
+ */
+ public function getSearchCriteria()
+ {
+ return $this->_get('search_criteria');
+ }
+
+ /**
+ * Get total count.
+ *
+ * @return int
+ */
+ public function getTotalCount()
+ {
+ return $this->_get('total_count');
+ }
+}
diff --git a/app/code/Magento/Tax/Service/V1/Data/SearchResultsBuilder.php b/app/code/Magento/Tax/Service/V1/Data/SearchResultsBuilder.php
new file mode 100644
index 00000000000..15e98d8866a
--- /dev/null
+++ b/app/code/Magento/Tax/Service/V1/Data/SearchResultsBuilder.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1\Data;
+
+use Magento\Framework\Service\V1\Data\SearchCriteria;
+
+/**
+ * Builder for the SearchResults Service Data Object
+ *
+ * @method SearchResults create()
+ */
+class SearchResultsBuilder extends \Magento\Framework\Service\Data\AbstractObjectBuilder
+{
+ /**
+ * Set search criteria.
+ *
+ * @param SearchCriteria $searchCriteria
+ * @return SearchResultsBuilder
+ */
+ public function setSearchCriteria(SearchCriteria $searchCriteria)
+ {
+ return $this->_set('search_criteria', $searchCriteria);
+ }
+
+ /**
+ * Set total count.
+ *
+ * @param int $totalCount
+ * @return SearchResultsBuilder
+ */
+ public function setTotalCount($totalCount)
+ {
+ return $this->_set('total_count', $totalCount);
+ }
+
+ /**
+ * Set items.
+ *
+ * @param TaxClass[] $items
+ * @return SearchResultsBuilder
+ */
+ public function setItems($items)
+ {
+ return $this->_set('items', $items);
+ }
+}
diff --git a/app/code/Magento/Tax/Service/V1/Data/TaxClass.php b/app/code/Magento/Tax/Service/V1/Data/TaxClass.php
new file mode 100644
index 00000000000..f39d25bfeb1
--- /dev/null
+++ b/app/code/Magento/Tax/Service/V1/Data/TaxClass.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1\Data;
+
+/**
+ * Tax class data
+ */
+class TaxClass extends \Magento\Framework\Service\Data\AbstractObject
+{
+ /**#@+
+ * Tax class type.
+ */
+ const TYPE_CUSTOMER = 'CUSTOMER';
+ const TYPE_PRODUCT = 'PRODUCT';
+ /**#@-*/
+
+ /**#@+
+ * Tax class field key.
+ */
+ const KEY_ID = 'class_id';
+ const KEY_NAME = 'class_name';
+ const KEY_TYPE = 'class_type';
+ /**#@-*/
+
+ /**
+ * Get tax class ID.
+ *
+ * @return int|null
+ */
+ public function getClassId()
+ {
+ return $this->_get(self::KEY_ID);
+ }
+
+ /**
+ * Get tax class name.
+ *
+ * @return string
+ */
+ public function getClassName()
+ {
+ return $this->_get(self::KEY_NAME);
+ }
+
+ /**
+ * Get tax class type.
+ *
+ * @return string
+ */
+ public function getClassType()
+ {
+ return $this->_get(self::KEY_TYPE);
+ }
+}
diff --git a/app/code/Magento/Tax/Service/V1/Data/TaxClassBuilder.php b/app/code/Magento/Tax/Service/V1/Data/TaxClassBuilder.php
new file mode 100644
index 00000000000..b24c8959065
--- /dev/null
+++ b/app/code/Magento/Tax/Service/V1/Data/TaxClassBuilder.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1\Data;
+
+/**
+ * Tax class data builder
+ *
+ * @method TaxClass create()
+ */
+class TaxClassBuilder extends \Magento\Framework\Service\Data\AbstractObjectBuilder
+{
+ /**
+ * Set tax class ID.
+ *
+ * @param int $id
+ * @return TaxClassBuilder
+ */
+ public function setClassId($id)
+ {
+ return $this->_set(TaxClass::KEY_ID, $id);
+ }
+
+ /**
+ * Set tax class name.
+ *
+ * @param string $name
+ * @return TaxClassBuilder
+ */
+ public function setClassName($name)
+ {
+ return $this->_set(TaxClass::KEY_NAME, $name);
+ }
+
+ /**
+ * Set tax class type.
+ *
+ * @param string $type
+ * @return TaxClassBuilder
+ */
+ public function setClassType($type)
+ {
+ return $this->_set(TaxClass::KEY_TYPE, $type);
+ }
+}
diff --git a/app/code/Magento/Tax/Service/V1/Data/TaxRate.php b/app/code/Magento/Tax/Service/V1/Data/TaxRate.php
index 5784e38b37d..f7ce7073ffb 100644
--- a/app/code/Magento/Tax/Service/V1/Data/TaxRate.php
+++ b/app/code/Magento/Tax/Service/V1/Data/TaxRate.php
@@ -46,7 +46,7 @@ class TaxRate extends \Magento\Framework\Service\Data\AbstractObject
/**
* Get id
*
- * @return int
+ * @return int|null
*/
public function getId()
{
diff --git a/app/code/Magento/Tax/Service/V1/Data/TaxRule.php b/app/code/Magento/Tax/Service/V1/Data/TaxRule.php
index b10c6a3823c..0a977d023a9 100644
--- a/app/code/Magento/Tax/Service/V1/Data/TaxRule.php
+++ b/app/code/Magento/Tax/Service/V1/Data/TaxRule.php
@@ -52,7 +52,7 @@ class TaxRule extends AbstractObject
/**
* Get id
*
- * @return int
+ * @return int|null
*/
public function getId()
{
@@ -92,7 +92,7 @@ class TaxRule extends AbstractObject
/**
* Get tax rate ids
*
- * @return int[]|null
+ * @return string[]|null
*/
public function getTaxRateIds()
{
diff --git a/app/code/Magento/Tax/Service/V1/Data/TaxRuleSearchResults.php b/app/code/Magento/Tax/Service/V1/Data/TaxRuleSearchResults.php
index 220f15d4b22..23ffa398558 100644
--- a/app/code/Magento/Tax/Service/V1/Data/TaxRuleSearchResults.php
+++ b/app/code/Magento/Tax/Service/V1/Data/TaxRuleSearchResults.php
@@ -24,12 +24,12 @@
namespace Magento\Tax\Service\V1\Data;
-use Magento\Customer\Service\V1\Data\SearchResults;
+use Magento\Customer\Service\V1\Data\SearchResults as CustomerServiceDataSearchResults;
/**
* TaxRuleSearchResults Service Data Object used for the search service requests
*/
-class TaxRuleSearchResults extends SearchResults
+class TaxRuleSearchResults extends CustomerServiceDataSearchResults
{
/**
* Get items
diff --git a/app/code/Magento/Tax/Service/V1/TaxClassService.php b/app/code/Magento/Tax/Service/V1/TaxClassService.php
new file mode 100644
index 00000000000..003216283d5
--- /dev/null
+++ b/app/code/Magento/Tax/Service/V1/TaxClassService.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Model\Exception as ModelException;
+use Magento\Framework\Service\V1\Data\Search\FilterGroup;
+use Magento\Framework\Service\V1\Data\SearchCriteria;
+use Magento\Tax\Model\ClassModelFactory as TaxClassModelFactory;
+use Magento\Tax\Model\Converter;
+use Magento\Tax\Model\Resource\TaxClass\Collection as TaxClassCollection;
+use Magento\Tax\Model\Resource\TaxClass\CollectionFactory as TaxClassCollectionFactory;
+use Magento\Tax\Service\V1\Data\SearchResultsBuilder;
+use Magento\Tax\Service\V1\Data\TaxClass as TaxClassDataObject;
+
+/**
+ * Tax class service.
+ */
+class TaxClassService implements TaxClassServiceInterface
+{
+ /**
+ * @var TaxClassCollectionFactory
+ */
+ protected $taxClassCollectionFactory;
+
+ /**
+ * @var SearchResultsBuilder
+ */
+ protected $searchResultsBuilder;
+
+ /**
+ * @var Converter
+ */
+ protected $converter;
+
+ /**
+ * @var TaxClassModelFactory
+ */
+ protected $taxClassModelFactory;
+
+ const CLASS_ID_NOT_ALLOWED = 'class_id is not expected for this request.';
+
+ /**
+ * Initialize dependencies.
+ *
+ * @param TaxClassCollectionFactory $taxClassCollectionFactory
+ * @param TaxClassModelFactory $taxClassModelFactory
+ * @param SearchResultsBuilder $searchResultsBuilder
+ * @param Converter $converter
+ */
+ public function __construct(
+ TaxClassCollectionFactory $taxClassCollectionFactory,
+ TaxClassModelFactory $taxClassModelFactory,
+ SearchResultsBuilder $searchResultsBuilder,
+ Converter $converter
+ ) {
+ $this->taxClassCollectionFactory = $taxClassCollectionFactory;
+ $this->taxClassModelFactory = $taxClassModelFactory;
+ $this->searchResultsBuilder = $searchResultsBuilder;
+ $this->converter = $converter;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function createTaxClass(TaxClassDataObject $taxClass)
+ {
+ if ($taxClass->getClassId()) {
+ throw new InputException(self::CLASS_ID_NOT_ALLOWED);
+ }
+
+ $this->validateTaxClassData($taxClass);
+ $taxModel = $this->converter->createTaxClassModel($taxClass);
+ try {
+ $taxModel->save();
+ } catch (ModelException $e) {
+ if (strpos($e->getMessage(), \Magento\Tax\Model\Resource\TaxClass::UNIQUE_TAX_CLASS_MSG) !== false) {
+ throw new InputException(
+ 'A class with the same name already exists for ClassType %classType.',
+ ['classType' => $taxClass->getClassType()]
+ );
+ } else {
+ throw $e;
+ }
+ }
+ return $taxModel->getId();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTaxClass($taxClassId)
+ {
+ $taxClassModel = $this->taxClassModelFactory->create()->load($taxClassId);
+ if (!$taxClassModel->getId()) {
+ throw NoSuchEntityException::singleField(TaxClassDataObject::KEY_ID, $taxClassId);
+ }
+ return $this->converter->createTaxClassData($taxClassModel);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function updateTaxClass($taxClassId, TaxClassDataObject $taxClass)
+ {
+ if ($taxClass->getClassId()) {
+ throw new InputException(self::CLASS_ID_NOT_ALLOWED);
+ }
+
+ $this->validateTaxClassData($taxClass);
+
+ if (!$taxClassId) {
+ throw InputException::invalidFieldValue('taxClassId', $taxClassId);
+ }
+
+ $originalTaxClassModel = $this->taxClassModelFactory->create()->load($taxClassId);
+ if (!$originalTaxClassModel->getId()) {
+ throw NoSuchEntityException::singleField('taxClassId', $taxClassId);
+ }
+
+ $taxClassModel = $this->converter->createTaxClassModel($taxClass);
+ $taxClassModel->setId($taxClassId);
+
+ /* should not be allowed to switch the tax class type */
+ if ($originalTaxClassModel->getClassType() !== $taxClassModel->getClassType()) {
+ throw new InputException('Updating classType is not allowed.');
+ }
+
+ try {
+ $taxClassModel->save();
+ } catch (\Exception $e) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function deleteTaxClass($taxClassId)
+ {
+ $taxClassModel = $this->taxClassModelFactory->create()->load($taxClassId);
+ if (!$taxClassModel->getId()) {
+ throw NoSuchEntityException::singleField('taxClassId', $taxClassId);
+ }
+
+ try {
+ $taxClassModel->delete();
+ } catch (\Exception $e) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate TaxClass Data
+ *
+ * @param TaxClassDataObject $taxClass
+ * @return void
+ * @throws InputException
+ */
+ protected function validateTaxClassData(TaxClassDataObject $taxClass)
+ {
+ $exception = new InputException();
+
+ if (!\Zend_Validate::is(trim($taxClass->getClassName()), 'NotEmpty')) {
+ $exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxClassDataObject::KEY_NAME]);
+ }
+
+ $classType = $taxClass->getClassType();
+ if (!\Zend_Validate::is(trim($classType), 'NotEmpty')) {
+ $exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxClassDataObject::KEY_TYPE]);
+ } else if ($classType !== TaxClassDataObject::TYPE_CUSTOMER
+ && $classType !== TaxClassDataObject::TYPE_PRODUCT
+ ) {
+ $exception->addError(
+ InputException::INVALID_FIELD_VALUE,
+ ['fieldName' => TaxClassDataObject::KEY_TYPE, 'value' => $classType]
+ );
+ }
+
+ if ($exception->wasErrorAdded()) {
+ throw $exception;
+ }
+ }
+
+ /**
+ * Retrieve tax classes which match a specific criteria.
+ *
+ * @param \Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria
+ * @return \Magento\Tax\Service\V1\Data\SearchResults containing Data\TaxClass
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function searchTaxClass(\Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria)
+ {
+ $this->searchResultsBuilder->setSearchCriteria($searchCriteria);
+ /** @var TaxClassCollection $collection */
+ $collection = $this->taxClassCollectionFactory->create();
+ /** TODO: This method duplicates functionality of search methods in other services and should be refactored. */
+ foreach ($searchCriteria->getFilterGroups() as $group) {
+ $this->addFilterGroupToCollection($group, $collection);
+ }
+ $this->searchResultsBuilder->setTotalCount($collection->getSize());
+ $sortOrders = $searchCriteria->getSortOrders();
+ if ($sortOrders) {
+ foreach ($searchCriteria->getSortOrders() as $field => $direction) {
+ $collection->addOrder($field, $direction == SearchCriteria::SORT_ASC ? 'ASC' : 'DESC');
+ }
+ }
+ $collection->setCurPage($searchCriteria->getCurrentPage());
+ $collection->setPageSize($searchCriteria->getPageSize());
+ $taxClasses = [];
+ /** @var \Magento\Tax\Model\ClassModel $taxClassModel */
+ foreach ($collection->getItems() as $taxClassModel) {
+ $taxClasses[] = $this->converter->createTaxClassData($taxClassModel);
+ }
+ $this->searchResultsBuilder->setItems($taxClasses);
+ return $this->searchResultsBuilder->create();
+ }
+
+ /**
+ * Helper function that adds a FilterGroup to the collection.
+ *
+ * TODO: This method duplicates functionality of search methods in other services and should be refactored.
+ *
+ * @param FilterGroup $filterGroup
+ * @param TaxClassCollection $collection
+ * @return void
+ */
+ protected function addFilterGroupToCollection(FilterGroup $filterGroup, TaxClassCollection $collection)
+ {
+ $fields = [];
+ $conditions = [];
+ foreach ($filterGroup->getFilters() as $filter) {
+ $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+ $fields[] = $filter->getField();
+ $conditions[] = [$condition => $filter->getValue()];
+ }
+ if ($fields) {
+ $collection->addFieldToFilter($fields, $conditions);
+ }
+ }
+}
diff --git a/app/code/Magento/Tax/Service/V1/TaxClassServiceInterface.php b/app/code/Magento/Tax/Service/V1/TaxClassServiceInterface.php
new file mode 100644
index 00000000000..4a3617407e5
--- /dev/null
+++ b/app/code/Magento/Tax/Service/V1/TaxClassServiceInterface.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1;
+
+/**
+ * Interface for tax class service.
+ */
+interface TaxClassServiceInterface
+{
+ /**
+ * Create a Tax Class
+ *
+ * @param \Magento\Tax\Service\V1\Data\TaxClass $taxClass
+ * @return string id for the newly created Tax class
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Model\Exception
+ */
+ public function createTaxClass(\Magento\Tax\Service\V1\Data\TaxClass $taxClass);
+
+ /**
+ * Get a tax class with the given tax class id.
+ *
+ * @param int $taxClassId
+ * @return \Magento\Tax\Service\V1\Data\TaxClass
+ * @throws \Magento\Framework\Exception\NoSuchEntityException If tax class with $taxClassId does not exist
+ */
+ public function getTaxClass($taxClassId);
+
+ /**
+ * Update a tax class with the given information.
+ *
+ * @param int $taxClassId
+ * @param \Magento\Tax\Service\V1\Data\TaxClass $taxClass
+ * @return bool True if the tax class was updated, false otherwise
+ * @throws \Magento\Framework\Exception\NoSuchEntityException If tax class with given tax class ID does not exist
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function updateTaxClass($taxClassId, \Magento\Tax\Service\V1\Data\TaxClass $taxClass);
+
+ /**
+ * Delete a tax class with the given tax class id.
+ *
+ * @param int $taxClassId
+ * @return bool True if the tax class was deleted, false otherwise
+ * @throws \Magento\Framework\Exception\NoSuchEntityException If tax class with $taxClassId does not exist
+ */
+ public function deleteTaxClass($taxClassId);
+
+ /**
+ * Retrieve tax classes which match a specific criteria.
+ *
+ * @param \Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria
+ * @return \Magento\Tax\Service\V1\Data\SearchResults containing Data\TaxClass
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function searchTaxClass(\Magento\Framework\Service\V1\Data\SearchCriteria $searchCriteria);
+}
diff --git a/app/code/Magento/Tax/Service/V1/TaxRateService.php b/app/code/Magento/Tax/Service/V1/TaxRateService.php
index b9de69c6175..b5c9e32d78e 100644
--- a/app/code/Magento/Tax/Service/V1/TaxRateService.php
+++ b/app/code/Magento/Tax/Service/V1/TaxRateService.php
@@ -24,12 +24,13 @@
namespace Magento\Tax\Service\V1;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Model\Exception as ModelException;
use Magento\Tax\Model\Calculation\Rate\Converter;
-use Magento\Tax\Service\V1\Data\TaxRate as TaxRateDataObject;
use Magento\Tax\Model\Calculation\Rate as RateModel;
-use Magento\Tax\Service\V1\Data\TaxRateBuilder;
-use Magento\Framework\Exception\InputException;
use Magento\Tax\Model\Calculation\RateRegistry;
+use Magento\Tax\Service\V1\Data\TaxRate as TaxRateDataObject;
+use Magento\Tax\Service\V1\Data\TaxRateBuilder;
/**
* Handles tax rate CRUD operations
@@ -122,14 +123,22 @@ class TaxRateService implements TaxRateServiceInterface
*
* @param TaxRateDataObject $taxRate
* @throws InputException
- * @throws \Magento\Framework\Model\Exception
+ * @throws ModelException
* @return RateModel
*/
protected function saveTaxRate(TaxRateDataObject $taxRate)
{
$this->validate($taxRate);
$taxRateModel = $this->converter->createTaxRateModel($taxRate);
- $taxRateModel->save();
+ try {
+ $taxRateModel->save();
+ } catch (ModelException $e) {
+ if ($e->getCode() == ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS) {
+ throw new InputException($e->getMessage());
+ } else {
+ throw $e;
+ }
+ }
$this->rateRegistry->registerTaxRate($taxRateModel);
return $taxRateModel;
}
diff --git a/app/code/Magento/Tax/Service/V1/TaxRuleService.php b/app/code/Magento/Tax/Service/V1/TaxRuleService.php
index 3f51a1fab2e..c8f0033c72f 100644
--- a/app/code/Magento/Tax/Service/V1/TaxRuleService.php
+++ b/app/code/Magento/Tax/Service/V1/TaxRuleService.php
@@ -24,13 +24,14 @@
namespace Magento\Tax\Service\V1;
+use Magento\Framework\Exception\InputException;
use Magento\Framework\Service\V1\Data\SearchCriteria;
+use Magento\Tax\Model\Calculation\Rule as TaxRuleModel;
use Magento\Tax\Model\Calculation\TaxRuleConverter;
+use Magento\Tax\Model\Calculation\TaxRuleRegistry;
use Magento\Tax\Service\V1\Data\TaxRule;
use Magento\Tax\Service\V1\Data\TaxRuleBuilder;
-use Magento\Tax\Model\Calculation\TaxRuleRegistry;
-use Magento\Framework\Exception\InputException;
-use Magento\Tax\Model\Calculation\Rule as TaxRuleModel;
+use Magento\Framework\Model\Exception as ModelException;
class TaxRuleService implements TaxRuleServiceInterface
{
@@ -69,9 +70,9 @@ class TaxRuleService implements TaxRuleServiceInterface
/**
* {@inheritdoc}
*/
- public function createTaxRule(TaxRule $taxRule)
+ public function createTaxRule(TaxRule $rule)
{
- $taxRuleModel = $this->saveTaxRule($taxRule);
+ $taxRuleModel = $this->saveTaxRule($rule);
return $this->converter->createTaxRuleDataObjectFromModel($taxRuleModel);
}
@@ -102,9 +103,9 @@ class TaxRuleService implements TaxRuleServiceInterface
/**
* {@inheritdoc}
*/
- public function getTaxRule($taxRuleId)
+ public function getTaxRule($ruleId)
{
- $taxRuleModel = $this->taxRuleRegistry->retrieveTaxRule($taxRuleId);
+ $taxRuleModel = $this->taxRuleRegistry->retrieveTaxRule($ruleId);
return $this->converter->createTaxRuleDataObjectFromModel($taxRuleModel);
}
@@ -119,16 +120,24 @@ class TaxRuleService implements TaxRuleServiceInterface
/**
* Save Tax Rule
*
- * @param TaxRule $taxRule
+ * @param TaxRule $rule
* @return TaxRuleModel
* @throws InputException
- * @throws \Magento\Framework\Model\Exception
+ * @throws ModelException
*/
- protected function saveTaxRule(TaxRule $taxRule)
+ protected function saveTaxRule(TaxRule $rule)
{
- $this->validate($taxRule);
- $taxRuleModel = $this->converter->createTaxRuleModel($taxRule);
- $taxRuleModel->save();
+ $this->validate($rule);
+ $taxRuleModel = $this->converter->createTaxRuleModel($rule);
+ try {
+ $taxRuleModel->save();
+ } catch (ModelException $e) {
+ if ($e->getCode() == ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS) {
+ throw new InputException($e->getMessage());
+ } else {
+ throw $e;
+ }
+ }
$this->taxRuleRegistry->registerTaxRule($taxRuleModel);
return $taxRuleModel;
}
@@ -136,53 +145,53 @@ class TaxRuleService implements TaxRuleServiceInterface
/**
* Validate tax rule
*
- * @param TaxRule $taxRule
+ * @param TaxRule $rule
* @return void
* @throws InputException
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
- private function validate(TaxRule $taxRule)
+ private function validate(TaxRule $rule)
{
$exception = new InputException();
// SortOrder is required and must be 0 or greater
- if (!\Zend_Validate::is(trim($taxRule->getSortOrder()), 'NotEmpty')) {
+ if (!\Zend_Validate::is(trim($rule->getSortOrder()), 'NotEmpty')) {
$exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxRule::SORT_ORDER]);
}
- if (!\Zend_Validate::is(trim($taxRule->getSortOrder()), 'GreaterThan', [-1])) {
+ if (!\Zend_Validate::is(trim($rule->getSortOrder()), 'GreaterThan', [-1])) {
$exception->addError(
InputException::INVALID_FIELD_MIN_VALUE,
- ['fieldName' => TaxRule::SORT_ORDER, 'value' => $taxRule->getSortOrder(), 'minValue' => 0]
+ ['fieldName' => TaxRule::SORT_ORDER, 'value' => $rule->getSortOrder(), 'minValue' => 0]
);
}
// Priority is required and must be 0 or greater
- if (!\Zend_Validate::is(trim($taxRule->getPriority()), 'NotEmpty')) {
+ if (!\Zend_Validate::is(trim($rule->getPriority()), 'NotEmpty')) {
$exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxRule::PRIORITY]);
}
- if (!\Zend_Validate::is(trim($taxRule->getPriority()), 'GreaterThan', [-1])) {
+ if (!\Zend_Validate::is(trim($rule->getPriority()), 'GreaterThan', [-1])) {
$exception->addError(
InputException::INVALID_FIELD_MIN_VALUE,
- ['fieldName' => TaxRule::PRIORITY, 'value' => $taxRule->getPriority(), 'minValue' => 0]
+ ['fieldName' => TaxRule::PRIORITY, 'value' => $rule->getPriority(), 'minValue' => 0]
);
}
// Code is required
- if (!\Zend_Validate::is(trim($taxRule->getCode()), 'NotEmpty')) {
+ if (!\Zend_Validate::is(trim($rule->getCode()), 'NotEmpty')) {
$exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxRule::CODE]);
}
// customer tax class ids is required
- if (($taxRule->getCustomerTaxClassIds() === null) || !$taxRule->getCustomerTaxClassIds()) {
+ if (($rule->getCustomerTaxClassIds() === null) || !$rule->getCustomerTaxClassIds()) {
$exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxRule::CUSTOMER_TAX_CLASS_IDS]);
}
// product tax class ids is required
- if (($taxRule->getProductTaxClassIds() === null) || !$taxRule->getProductTaxClassIds()) {
+ if (($rule->getProductTaxClassIds() === null) || !$rule->getProductTaxClassIds()) {
$exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxRule::PRODUCT_TAX_CLASS_IDS]);
}
// tax rate ids is required
- if (($taxRule->getTaxRateIds() === null) || !$taxRule->getTaxRateIds()) {
+ if (($rule->getTaxRateIds() === null) || !$rule->getTaxRateIds()) {
$exception->addError(InputException::REQUIRED_FIELD, ['fieldName' => TaxRule::TAX_RATE_IDS]);
}
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index f2bf3f08de7..33fbbac3cd9 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -30,6 +30,7 @@
type="Magento\Tax\Service\V1\TaxRuleService"/>
<preference for="Magento\Tax\Service\V1\TaxCalculationServiceInterface"
type="Magento\Tax\Service\V1\TaxCalculationService"/>
+ <preference for="Magento\Tax\Service\V1\TaxClassServiceInterface" type="Magento\Tax\Service\V1\TaxClassService" />
<type name="Magento\Tax\Helper\Data">
<arguments>
<argument name="taxConfig" xsi:type="object">Magento\Tax\Model\Config\Proxy</argument>
diff --git a/app/code/Magento/Tax/etc/webapi.xml b/app/code/Magento/Tax/etc/webapi.xml
new file mode 100644
index 00000000000..84934d02085
--- /dev/null
+++ b/app/code/Magento/Tax/etc/webapi.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../app/code/Magento/Webapi/etc/webapi.xsd">
+ <route url="/V1/taxRate" method="POST">
+ <service class="Magento\Tax\Service\V1\TaxRateServiceInterface" method="createTaxRate"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRate/:rateId" method="GET">
+ <service class="Magento\Tax\Service\V1\TaxRateServiceInterface" method="getTaxRate"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRate" method="PUT">
+ <service class="Magento\Tax\Service\V1\TaxRateServiceInterface" method="updateTaxRate"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRate/:rateId" method="DELETE">
+ <service class="Magento\Tax\Service\V1\TaxRateServiceInterface" method="deleteTaxRate"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRules" method="POST">
+ <service class="Magento\Tax\Service\V1\TaxRuleServiceInterface" method="createTaxRule"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRules" method="PUT">
+ <service class="Magento\Tax\Service\V1\TaxRuleServiceInterface" method="updateTaxRule"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRules/:ruleId" method="DELETE">
+ <service class="Magento\Tax\Service\V1\TaxRuleServiceInterface" method="deleteTaxRule"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRules/:ruleId" method="GET">
+ <service class="Magento\Tax\Service\V1\TaxRuleServiceInterface" method="getTaxRule"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxRules/search" method="PUT">
+ <service class="Magento\Tax\Service\V1\TaxRuleServiceInterface" method="searchTaxRules"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxClass" method="POST">
+ <service class="Magento\Tax\Service\V1\TaxClassServiceInterface" method="createTaxClass"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxClass/:taxClassId" method="GET">
+ <service class="Magento\Tax\Service\V1\TaxClassServiceInterface" method="getTaxClass"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxClass/:taxClassId" method="PUT">
+ <service class="Magento\Tax\Service\V1\TaxClassServiceInterface" method="updateTaxClass"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxClass/:taxClassId" method="DELETE">
+ <service class="Magento\Tax\Service\V1\TaxClassServiceInterface" method="deleteTaxClass"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+ <route url="/V1/taxClass/search" method="PUT">
+ <service class="Magento\Tax\Service\V1\TaxClassServiceInterface" method="searchTaxClass"/>
+ <resources>
+ <resource ref="Magento_Tax::manage_tax"/>
+ </resources>
+ </route>
+</routes>
diff --git a/app/code/Magento/Tax/i18n/de_DE.csv b/app/code/Magento/Tax/i18n/de_DE.csv
index 5d69362e827..e1c992f8e2d 100644
--- a/app/code/Magento/Tax/i18n/de_DE.csv
+++ b/app/code/Magento/Tax/i18n/de_DE.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - gleicht mit allem ab; 'xyz*' - gleicht mit allem ab, was mit 'xyz' beginnt und nicht länger als %d ist."
-"-- Please Select --","-- Bitte auswählen --"
-"Add New Class","Neue Klasse hinzufügen"
-"Add New Tax Rate","Neuen Steuersatz hinzufügen"
-"Add New Tax Rule","Neue Steuerregel hinzufügen"
-"After Discount","Nach Rabatt"
-"An error occurred while deleting this rate.","Beim Löschen dieses Steuersatzes ist ein Fehler aufgetreten."
-"An error occurred while deleting this rate. Incorrect rate ID.","Beim Löschen dieses Steuersatzes ist ein Fehler aufgetreten. Inkorrekte SatzID."
-"An error occurred while deleting this tax class.","Beim Löschen dieser Steuerklasse ist ein Fehler aufgetreten."
-"An error occurred while deleting this tax rule.","Beim Löschen dieser Steuerregel ist ein Fehler aufgetreten."
-"An error occurred while saving this rate.","Beim Speichern dieses Steuersatzes ist ein Fehler aufgetreten."
-"An error occurred while saving this tax class.","Beim Sepichern dieser Steuerklasse ist ein Fehler aufgetreten."
-"An error occurred while saving this tax class. A class with the same name","Beim Speichern dieser Steuerklasse ist ein Fehler aufgetreten. Eine Klasse mit dem selben Namen"
-"An error occurred while saving this tax rule.","Beim Sepichern dieser Steuerregel ist ein Fehler aufgetreten."
-"Apply Customer Tax","Kundensteuer anwenden"
-"Apply Discount On Prices","Rabatt auf Preise anwenden"
-"Apply Tax On","Steuer anwenden auf"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Der Rabatt auf den Preis einschließlich Steuern basiert auf der Ladensteuer, wenn ""Steuer nach dem Rabatt"" gewählt wurde."
+None,Keine
+Cancel,Cancel
+Back,Zurück
+Subtotal,Subtotal
+"Excl. Tax","Steuer weglassen"
+Total,Gesamtbetrag
+"Incl. Tax","Steuer inkludieren"
+Reset,Zurücksetzen
+"Unit Price",Einheitspreis
+Tax,Steuer
+Save,Save
+Name,Name
+Code,Code
+"Sort Order",Sortierreihenfolge
+"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?"
-"Back","Zurück"
-"Before Discount","Vor Rabatt"
-"CSV","CSV"
-"Calculation Settings","Berechnungseinstellungen"
-"Catalog Prices","Katalogpreise"
-"Class Name","Klassenname"
-"Code","Code"
-"Country","Land"
-"County","Landkreis"
-"Custom price if available","Benutzerdefinierter Preis falls verfügbar"
-"Customer Tax Class","Kundensteuerklasse"
-"Customer Tax Class Information","Kunden Steuerklasse Information"
-"Customer Tax Classes","Kunden Steuerklassen"
-"Default Country","Standard Land"
-"Default Post Code","Standard Postleitzahl"
-"Default State","Standard Staat"
-"Default Tax Destination Calculation","Standard Steuerzielberechnung"
-"Delete Class","Klasse löschen"
-"Delete Rate","Steuersatz löschen"
-"Delete Rule","Regel löschen"
-"Display Full Tax Summary","Vollständige Steuerzusammenfassung anzeigen"
-"Display Prices","Preise anzeigen"
-"Display Product Prices In Catalog","Produktpreise im Katalog anzeigen"
-"Display Shipping Amount","Versandbetrag anzeigen"
-"Display Shipping Prices","Versandpreise anzeigen"
-"Display Subtotal","Zwischensumme anzeigen"
-"Display Zero Tax Subtotal","Nullsteuer Zwischensumme anzeigen"
-"Edit Class","Klasse bearbeiten"
-"Edit Class '%s'","Klasse bearbeiten '%s'"
+"This rule no longer exists.","Diese Regel existiert nicht mehr."
+"New Rule","Neue Regel"
+Priority,Priorität
"Edit Rule","Regel ändern"
-"Edit Tax Rate","Steuersatz bearbeiten"
-"Excel XML","Excel-XML"
-"Excl. Tax","Steuer weglassen"
-"Excl. Tax:","Zzgl. Steuern:"
-"Excluding Tax","Zuzüglich Steuern"
-"Export Tax Rates","Steuersätze exportieren"
-"Grand Total (Excl. Tax)","Gesamtsumme (zzgl. Steuern)"
-"Grand Total (Excl.Tax)","Gesamtsumme (zzgl. Steuern)"
-"Grand Total (Incl. Tax)","Gesamtsumme (inkl. Steuern)"
-"Grand Total (Incl.Tax)","Gesamtsumme (inkl. Steuern)"
+Country,Land
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,Verkäufe
+CSV,CSV
+"Excel XML",Excel-XML
+Rate,Steuersatz
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
"Grand Total Excl. Tax","Gesamtsumme zzgl. Steuern"
"Grand Total Incl. Tax","Gesamtsumme inkl. Steuern"
-"Import / Export Tax Rates","Steuersätze importieren / exportieren"
-"Import Tax Rates","Steuersätze importieren"
-"Inc. Tax","Inkl. Steuern"
-"Incl. Tax","Steuer inkludieren"
-"Incl. Tax:","Inkl. Steuern:"
-"Include Tax In Grand Total","Steuern in Gesamtsumme inklusive"
-"Including Tax","Inklusive Steuern"
-"Including and Excluding Tax","Inklusive und zuzüglich Steuern"
-"Invalid file format upload attempt","Ungültiges Dateiformat hochgeladen"
-"Invalid file upload attempt","Ungültige Datei hochgeladen"
-"Manage Customer Tax Classes","Kundensteuerklassen verwalten"
-"Manage Product Tax Classes","Produktsteuerklassen verwalten"
-"Manage Tax Rates","Steuersätze verwalten"
-"Manage Tax Rules","Steuerregeln verwalten"
-"Manage Tax Zones & Rates","Steuerzonen und -sätze verwalten"
-"Name","Name"
-"New Class","Neue Steuerklasse"
-"New Rule","Neue Regel"
-"New Tax Rate","Neuer Steuersatz"
-"No","Nein"
-"None","Keine"
-"One of the country has invalid code.","Eines der Bundesländer hat einen ungültigen Code."
-"Orders, Invoices, Credit Memos Display Settings","Bestellungen, Rechnungen, Verkaufsgutschriften Display-Einstellungen"
-"Original price only","Nur Originalpreis"
-"Price Display Settings","Anzeige-Einstellungen für Preis"
-"Priority","Priorität"
-"Product Tax Class","Produktsteuerklasse"
-"Product Tax Class Information","Produktsteuerklasse Information"
-"Product Tax Classes","Produktsteuerklassen"
+"Subtotal (Excl. Tax)","Zwischensumme (exkl. MwSt.)"
+"Subtotal (Incl. Tax)","Zwischensumme (inkl. MwSt.)"
+"Row Total",Zeilensumme
+"Tax Rate Information",Steuersatzinformation
+"Tax Identifier",Steuerbezeichner
+"Zip/Post is Range","Postleitzahl ist im Bereich"
+"Zip/Post Code",Postleitzahl
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
"Range From","Im Bereich von"
"Range To","Im Bereich bis"
-"Rate","Steuersatz"
+State,Staat
"Rate Percent","Steuersatz Prozent"
-"Reset","Zurücksetzen"
-"Row Total","Zeilensumme"
-"Sales","Verkäufe"
-"Save Class","Steuerklasse speichern"
+"Tax Titles",Steuertitel
+"Add New Tax Rate","Neuen Steuersatz hinzufügen"
+"Delete Rate","Steuersatz löschen"
"Save Rate","Steuersatz speichern"
+"Manage Tax Rules","Steuerregeln verwalten"
+"Add New Tax Rule","Neue Steuerregel hinzufügen"
"Save Rule","Regel speichern"
-"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
-"Shipping & Handling (Excl.Tax)","Versandkosten (exkl. MwSt.)"
-"Shipping & Handling (Incl.Tax)","Versandkosten (inkl. MwSt)"
-"Shipping & Handling Tax","Versandkosten & Steuern"
-"Shipping (Excl. Tax)","Versand (excl. MwSt.)"
-"Shipping (Incl. Tax)","Versand (inkl. MwSt.)"
-"Shipping Excl. Tax (%s)","Versand exkl. MwSt. (%s)"
-"Shipping Incl. Tax (%s)","Versand inkl. MwSt. (%s)"
-"Shipping Prices","Versandpreise"
-"Shopping Cart Display Settings","Warenkorb Anzeige Einstellungen"
-"Sort Order","Sortierreihenfolge"
-"State","Staat"
-"State/Region","Bundesstaat/Region"
-"Subtotal (Excl. Tax)","Zwischensumme (exkl. MwSt.)"
+"Delete Rule","Regel löschen"
+"Tax Rule Information",Steuerregelinformation
+"Customer Tax Class",Kundensteuerklasse
+"Product Tax Class",Produktsteuerklasse
+"Tax Rate",Steuersatz
+"Tax rates at the same priority are added, others are compounded.","Steuersätze mit gleicher Priorität sind hinzugefügt, andere sind zusammengesetzt."
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
"Subtotal (Excl.Tax)","Zwischensumme (exkl. MwSt.)"
-"Subtotal (Incl. Tax)","Zwischensumme (inkl. MwSt.)"
"Subtotal (Incl.Tax)","Zwischensumme (inkl. MwSt.)"
-"Tax","Steuer"
-"Tax Calculation Based On","Steuerberechnung basiert auf"
-"Tax Calculation Method Based On","Steuerberechnungsmethode basiert auf"
-"Tax Class for Shipping","Steuerklasse für Versand"
-"Tax Classes","Steuerklassen"
-"Tax Identifier","Steuerbezeichner"
-"Tax Rate","Steuersatz"
-"Tax Rate Information","Steuersatzinformation"
-"Tax Rule Information","Steuerregelinformation"
-"Tax Rules","Steuerregeln"
-"Tax Section","Steuerbereich"
-"Tax Titles","Steuertitel"
-"Tax rate cannot be removed. It exists in tax rule","Steuersätze können nicht entfernt werden. Diese bestehen in der Regelsteuer"
-"Tax rates at the same priority are added, others are compounded.","Steuersätze mit gleicher Priorität sind hinzugefügt, andere sind zusammengesetzt."
-"The tax class has been deleted.","Die Steuerklasse wurde gelöscht."
-"The tax class has been saved.","Die Steuerklasse wurde gespeichert."
+"Shipping & Handling (Excl.Tax)","Versandkosten (exkl. MwSt.)"
+"Shipping & Handling (Incl.Tax)","Versandkosten (inkl. MwSt)"
+"Grand Total (Excl.Tax)","Gesamtsumme (zzgl. Steuern)"
+"Grand Total (Incl.Tax)","Gesamtsumme (inkl. Steuern)"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates","Steuersätze verwalten"
+"New Tax Rate","Neuer Steuersatz"
+"The tax rate has been saved.","Der Steuersatz wurde gespeichert."
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate","Steuersatz bearbeiten"
"The tax rate has been deleted.","Der Steuersatz wurde gelöscht."
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
"The tax rate has been imported.","Der Steuersatz wurde importiert."
-"The tax rate has been saved.","Der Steuersatz wurde gespeichert."
-"The tax rule has been deleted.","Die Steuerregel wurde gelöscht."
+"Invalid file upload attempt","Ungültige Datei hochgeladen"
+"Tax Rules",Steuerregeln
+"New Tax Rule","New Tax Rule"
"The tax rule has been saved.","Die Steuerregel wurde gespeichert."
-"This class no longer exists","Diese Klasse existiert nicht mehr."
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
"This rule no longer exists","Diese Regel existiert nicht mehr."
-"This rule no longer exists.","Diese Regel existiert nicht mehr."
-"Total","Gesamtbetrag"
-"Unit Price","Einheitspreis"
-"Whether catalog prices entered by admin include tax.","Ob vom Admin eingegebene Katalogpreise Steuer beinhalten."
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","Ob vom Admin eingegebene oder vom Gateway erhaltene Versandbeträge Steuer beinhalten."
-"Yes","Ja"
-"You cannot delete this tax class as it is used for %d customer groups.","Sie können diese Steuerklasse nicht löschen, da sie für %d Kundengruppen verwendet wird."
-"You cannot delete this tax class as it is used for %d products.","Sie können diese Steuerklasse nicht löschen, da sie für %d Produkte verwendet wird."
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","Sie können diese Steuerklasse nicht löschen da sie in den Steuerregeln verwendet wird. Sie müssen die Regeln, in der sie verwendet wird, zuerst löschen."
-"Zip/Post Code","Postleitzahl"
-"Zip/Post is Range","Postleitzahl ist im Bereich"
+"The tax rule has been deleted.","Die Steuerregel wurde gelöscht."
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
+"Shipping & Handling Tax","Versandkosten & Steuern"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available","Benutzerdefinierter Preis falls verfügbar"
+"Original price only","Nur Originalpreis"
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)","Gesamtsumme (zzgl. Steuern)"
+"Grand Total (Incl. Tax)","Gesamtsumme (inkl. Steuern)"
+"Shipping (Excl. Tax)","Versand (excl. MwSt.)"
+"Shipping (Incl. Tax)","Versand (inkl. MwSt.)"
+"Before Discount","Vor Rabatt"
+"After Discount","Nach Rabatt"
+"Excluding Tax","Zuzüglich Steuern"
+"Including Tax","Inklusive Steuern"
+"Including and Excluding Tax","Inklusive und zuzüglich Steuern"
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates","Steuersätze importieren"
+"Export Tax Rates","Steuersätze exportieren"
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class","Neue Klasse hinzufügen"
+"Default Country","Default Country"
+"Tax Calculation Based On","Tax Calculation Based On"
+"Tax Classes","Tax Classes"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,Bundesstaat/Region
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv
index a7d4ea42c8a..5b3e2253c94 100644
--- a/app/code/Magento/Tax/i18n/en_US.csv
+++ b/app/code/Magento/Tax/i18n/en_US.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d."
-"-- Please Select --","-- Please Select --"
-"Add New Class","Add New Class"
-"Add New Tax Rate","Add New Tax Rate"
-"Add New Tax Rule","Add New Tax Rule"
-"After Discount","After Discount"
-"An error occurred while deleting this rate.","An error occurred while deleting this rate."
-"An error occurred while deleting this rate. Incorrect rate ID.","An error occurred while deleting this rate. Incorrect rate ID."
-"An error occurred while deleting this tax class.","An error occurred while deleting this tax class."
-"An error occurred while deleting this tax rule.","An error occurred while deleting this tax rule."
-"An error occurred while saving this rate.","An error occurred while saving this rate."
-"An error occurred while saving this tax class.","An error occurred while saving this tax class."
-"An error occurred while saving this tax class. A class with the same name","An error occurred while saving this tax class. A class with the same name"
-"An error occurred while saving this tax rule.","An error occurred while saving this tax rule."
-"Apply Customer Tax","Apply Customer Tax"
-"Apply Discount On Prices","Apply Discount On Prices"
-"Apply Tax On","Apply Tax On"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+None,None
+Cancel,Cancel
+Back,Back
+Subtotal,Subtotal
+"Excl. Tax","Excl. Tax"
+Total,Total
+"Incl. Tax","Incl. Tax"
+Reset,Reset
+"Unit Price","Unit Price"
+Tax,Tax
+Save,Save
+Name,Name
+Code,Code
+"Sort Order","Sort Order"
+"Save and Continue Edit","Save and Continue Edit"
"Are you sure you want to do this?","Are you sure you want to do this?"
-"Back","Back"
-"Before Discount","Before Discount"
-"CSV","CSV"
-"Calculation Settings","Calculation Settings"
-"Catalog Prices","Catalog Prices"
-"Class Name","Class Name"
-"Code","Code"
-"Country","Country"
-"County","County"
-"Custom price if available","Custom price if available"
-"Customer Tax Class","Customer Tax Class"
-"Customer Tax Class Information","Customer Tax Class Information"
-"Customer Tax Classes","Customer Tax Classes"
-"Default Country","Default Country"
-"Default Post Code","Default Post Code"
-"Default State","Default State"
-"Default Tax Destination Calculation","Default Tax Destination Calculation"
-"Delete Class","Delete Class"
-"Delete Rate","Delete Rate"
-"Delete Rule","Delete Rule"
-"Display Full Tax Summary","Display Full Tax Summary"
-"Display Prices","Display Prices"
-"Display Product Prices In Catalog","Display Product Prices In Catalog"
-"Display Shipping Amount","Display Shipping Amount"
-"Display Shipping Prices","Display Shipping Prices"
-"Display Subtotal","Display Subtotal"
-"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
-"Edit Class","Edit Class"
-"Edit Class '%s'","Edit Class '%s'"
+"This rule no longer exists.","This rule no longer exists."
+"New Rule","New Rule"
+Priority,Priority
"Edit Rule","Edit Rule"
-"Edit Tax Rate","Edit Tax Rate"
+Country,Country
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,Sales
+CSV,CSV
"Excel XML","Excel XML"
-"Excl. Tax","Excl. Tax"
-"Excl. Tax:","Excl. Tax:"
-"Excluding Tax","Excluding Tax"
-"Export Tax Rates","Export Tax Rates"
-"Grand Total (Excl. Tax)","Grand Total (Excl. Tax)"
-"Grand Total (Excl.Tax)","Grand Total (Excl.Tax)"
-"Grand Total (Incl. Tax)","Grand Total (Incl. Tax)"
-"Grand Total (Incl.Tax)","Grand Total (Incl.Tax)"
+Rate,Rate
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
"Grand Total Excl. Tax","Grand Total Excl. Tax"
"Grand Total Incl. Tax","Grand Total Incl. Tax"
-"Import / Export Tax Rates","Import / Export Tax Rates"
-"Import Tax Rates","Import Tax Rates"
-"Inc. Tax","Inc. Tax"
-"Incl. Tax","Incl. Tax"
-"Incl. Tax:","Incl. Tax:"
-"Include Tax In Grand Total","Include Tax In Grand Total"
-"Including Tax","Including Tax"
-"Including and Excluding Tax","Including and Excluding Tax"
-"Invalid file format upload attempt","Invalid file format upload attempt"
-"Invalid file upload attempt","Invalid file upload attempt"
-"Manage Customer Tax Classes","Manage Customer Tax Classes"
-"Manage Product Tax Classes","Manage Product Tax Classes"
-"Manage Tax Rates","Manage Tax Rates"
-"Manage Tax Rules","Manage Tax Rules"
-"Manage Tax Zones & Rates","Manage Tax Zones & Rates"
-"Name","Name"
-"New Class","New Class"
-"New Rule","New Rule"
-"New Tax Rate","New Tax Rate"
-"No","No"
-"None","None"
-"One of the country has invalid code.","One of the country has invalid code."
-"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
-"Original price only","Original price only"
-"Price Display Settings","Price Display Settings"
-"Priority","Priority"
-"Product Tax Class","Product Tax Class"
-"Product Tax Class Information","Product Tax Class Information"
-"Product Tax Classes","Product Tax Classes"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"Row Total","Row Total"
+"Tax Rate Information","Tax Rate Information"
+"Tax Identifier","Tax Identifier"
+"Zip/Post is Range","Zip/Post is Range"
+"Zip/Post Code","Zip/Post Code"
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
"Range From","Range From"
"Range To","Range To"
-"Rate","Rate"
+State,State
"Rate Percent","Rate Percent"
-"Reset","Reset"
-"Row Total","Row Total"
-"Sales","Sales"
-"Save Class","Save Class"
+"Tax Titles","Tax Titles"
+"Add New Tax Rate","Add New Tax Rate"
+"Delete Rate","Delete Rate"
"Save Rate","Save Rate"
+"Manage Tax Rules","Manage Tax Rules"
+"Add New Tax Rule","Add New Tax Rule"
"Save Rule","Save Rule"
-"Save and Continue Edit","Save and Continue Edit"
+"Delete Rule","Delete Rule"
+"Tax Rule Information","Tax Rule Information"
+"Customer Tax Class","Customer Tax Class"
+"Product Tax Class","Product Tax Class"
+"Tax Rate","Tax Rate"
+"Tax rates at the same priority are added, others are compounded.","Tax rates at the same priority are added, others are compounded."
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
+"Subtotal (Excl.Tax)","Subtotal (Excl.Tax)"
+"Subtotal (Incl.Tax)","Subtotal (Incl.Tax)"
"Shipping & Handling (Excl.Tax)","Shipping & Handling (Excl.Tax)"
"Shipping & Handling (Incl.Tax)","Shipping & Handling (Incl.Tax)"
+"Grand Total (Excl.Tax)","Grand Total (Excl.Tax)"
+"Grand Total (Incl.Tax)","Grand Total (Incl.Tax)"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates","Manage Tax Rates"
+"New Tax Rate","New Tax Rate"
+"The tax rate has been saved.","The tax rate has been saved."
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate","Edit Tax Rate"
+"The tax rate has been deleted.","The tax rate has been deleted."
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
+"The tax rate has been imported.","The tax rate has been imported."
+"Invalid file upload attempt","Invalid file upload attempt"
+"Tax Rules","Tax Rules"
+"New Tax Rule","New Tax Rule"
+"The tax rule has been saved.","The tax rule has been saved."
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
+"This rule no longer exists","This rule no longer exists"
+"The tax rule has been deleted.","The tax rule has been deleted."
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
"Shipping & Handling Tax","Shipping & Handling Tax"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available","Custom price if available"
+"Original price only","Original price only"
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)","Grand Total (Excl. Tax)"
+"Grand Total (Incl. Tax)","Grand Total (Incl. Tax)"
"Shipping (Excl. Tax)","Shipping (Excl. Tax)"
"Shipping (Incl. Tax)","Shipping (Incl. Tax)"
-"Shipping Excl. Tax (%s)","Shipping Excl. Tax (%s)"
-"Shipping Incl. Tax (%s)","Shipping Incl. Tax (%s)"
-"Shipping Prices","Shipping Prices"
-"Shopping Cart Display Settings","Shopping Cart Display Settings"
-"Sort Order","Sort Order"
-"State","State"
-"State/Region","State/Region"
-"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
-"Subtotal (Excl.Tax)","Subtotal (Excl.Tax)"
-"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
-"Subtotal (Incl.Tax)","Subtotal (Incl.Tax)"
-"Tax","Tax"
+"Before Discount","Before Discount"
+"After Discount","After Discount"
+"Excluding Tax","Excluding Tax"
+"Including Tax","Including Tax"
+"Including and Excluding Tax","Including and Excluding Tax"
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates","Import Tax Rates"
+"Export Tax Rates","Export Tax Rates"
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class","Add New Class"
+"Default Country","Default Country"
"Tax Calculation Based On","Tax Calculation Based On"
-"Tax Calculation Method Based On","Tax Calculation Method Based On"
-"Tax Class for Shipping","Tax Class for Shipping"
"Tax Classes","Tax Classes"
-"Tax Identifier","Tax Identifier"
-"Tax Rate","Tax Rate"
-"Tax Rate Information","Tax Rate Information"
-"Tax Rule Information","Tax Rule Information"
-"Tax Rules","Tax Rules"
-"Tax Section","Tax Section"
-"Tax Titles","Tax Titles"
-"Tax rate cannot be removed. It exists in tax rule","Tax rate cannot be removed. It exists in tax rule"
-"Tax rates at the same priority are added, others are compounded.","Tax rates at the same priority are added, others are compounded."
-"The tax class has been deleted.","The tax class has been deleted."
-"The tax class has been saved.","The tax class has been saved."
-"The tax rate has been deleted.","The tax rate has been deleted."
-"The tax rate has been imported.","The tax rate has been imported."
-"The tax rate has been saved.","The tax rate has been saved."
-"The tax rule has been deleted.","The tax rule has been deleted."
-"The tax rule has been saved.","The tax rule has been saved."
-"This class no longer exists","This class no longer exists"
-"This rule no longer exists","This rule no longer exists"
-"This rule no longer exists.","This rule no longer exists."
-"Total","Total"
-"Unit Price","Unit Price"
-"Whether catalog prices entered by admin include tax.","Whether catalog prices entered by admin include tax."
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","Whether shipping amounts entered by admin or obtained from gateways include tax."
-"Yes","Yes"
-"You cannot delete this tax class as it is used for %d customer groups.","You cannot delete this tax class as it is used for %d customer groups."
-"You cannot delete this tax class as it is used for %d products.","You cannot delete this tax class as it is used for %d products."
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first."
-"Zip/Post Code","Zip/Post Code"
-"Zip/Post is Range","Zip/Post is Range"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,State/Region
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Tax/i18n/es_ES.csv b/app/code/Magento/Tax/i18n/es_ES.csv
index f065819974d..6f854286d52 100644
--- a/app/code/Magento/Tax/i18n/es_ES.csv
+++ b/app/code/Magento/Tax/i18n/es_ES.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - corresponde a cualquiera; 'xyz*' - corresponde a cualquiera que comience por 'xyz' y no sea más larga de % d"
-"-- Please Select --","-- Seleccionar, por favor --"
-"Add New Class","Anadir Nueva CategorÃa"
-"Add New Tax Rate","Añadir Nueva Tasa Impositiva"
-"Add New Tax Rule","Añadir Nueva Norma Impositiva"
-"After Discount","Después de Descuento"
-"An error occurred while deleting this rate.","Ha ocurrido un error al eliminar esta la tasa"
-"An error occurred while deleting this rate. Incorrect rate ID.","Ha ocurrido un error al eliminar esta tasa. ID de tasa incorrecto."
-"An error occurred while deleting this tax class.","Ha ocurrido un error al eliminar esta categorÃa de tasas"
-"An error occurred while deleting this tax rule.","Ha ocurrido un error al eliminar esta norma impositiva"
-"An error occurred while saving this rate.","Ha ocurrido un error al guardar éste Ãndice"
-"An error occurred while saving this tax class.","Ha ocurrido un error al guardar ésta categorÃa de Ãndice"
-"An error occurred while saving this tax class. A class with the same name","Ha ocurrido un error al guardar esta clase de impuesto. Una clase con el mismo nombre"
-"An error occurred while saving this tax rule.","Ha ocurrido un error al guardar esta norma impositiva"
-"Apply Customer Tax","Aplicar Tasa de Cliente"
-"Apply Discount On Prices","Aplicar Descuento en Precios"
-"Apply Tax On","Aplicar Impuesto"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Aplicar descuento al precio incluidos impuestos se calcula basándose en el impuesto de reserva, si se selecciona ""Aplicar impuesto tras descuento""."
+None,Nada
+Cancel,Cancel
+Back,Volver
+Subtotal,Subtotal
+"Excl. Tax","Impuestos no incluidos"
+Total,Total
+"Incl. Tax","Impuestos incluidos"
+Reset,Restablecer
+"Unit Price","Precio por unidad"
+Tax,Impuestos
+Save,Save
+Name,Nombre
+Code,Código
+"Sort Order","Ordenar Pedido"
+"Save and Continue Edit","Guardar y continuar editando"
"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?"
-"Back","Volver"
-"Before Discount","Antes de Descuento"
-"CSV","CSV"
-"Calculation Settings","Ajustes de Cálculo"
-"Catalog Prices","Precios de Catálogo"
-"Class Name","Nombre de CategorÃa"
-"Code","Código"
-"Country","PaÃs"
-"County","Región"
-"Custom price if available","Impoorte de aranceles si es aplicable"
-"Customer Tax Class","Clase impositiva del cliente"
-"Customer Tax Class Information","Información de clase de impuestos del cliente"
-"Customer Tax Classes","Tipos de impuestos del cliente"
-"Default Country","PaÃs predeterminado"
-"Default Post Code","Código Postal por defecto"
-"Default State","Estado por defecto"
-"Default Tax Destination Calculation","Cálculo de Impuestos de Destino Predeterminado"
-"Delete Class","Eliminar CategorÃa"
-"Delete Rate","Eliminar Ãndice"
-"Delete Rule","Eliminar Regla"
-"Display Full Tax Summary","Monstrar Reumen de Tasas Completo"
-"Display Prices","Mostrar Precios"
-"Display Product Prices In Catalog","Mostrar Precios de los Productos en Catálogo"
-"Display Shipping Amount","Mostrar Importe de EnvÃo"
-"Display Shipping Prices","Mostrar Precios de EnvÃo"
-"Display Subtotal","Mostrar Subtotal"
-"Display Zero Tax Subtotal","Mostrar Subtotal con Tasa Cero"
-"Edit Class","Editar CategorÃa"
-"Edit Class '%s'","Editar CategorÃa '%s'"
+"This rule no longer exists.","Esta regla ya no existe."
+"New Rule","Nueva Regla"
+Priority,Prioridad
"Edit Rule","Editar Regla"
-"Edit Tax Rate","Editar indicador de impuesto"
+Country,PaÃs
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,Ventas
+CSV,CSV
"Excel XML","Excel XML"
-"Excl. Tax","Impuestos no incluidos"
-"Excl. Tax:","Impuestos no IncluÃdos:"
-"Excluding Tax","Impuestos no IncluÃdos"
-"Export Tax Rates","Tasas de Impuestos a la Exportación"
-"Grand Total (Excl. Tax)","Total (Impuestos no IncluÃdos)"
-"Grand Total (Excl.Tax)","Total (Impuestos no IncluÃdos)"
-"Grand Total (Incl. Tax)","Total (Impuestos IncluÃdos)"
-"Grand Total (Incl.Tax)","Total (Impuestos IncluÃdos)"
+Rate,Tarifa
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
"Grand Total Excl. Tax","Total sin Incluir Impuestos"
"Grand Total Incl. Tax","Total Incluyendo Impuestos"
-"Import / Export Tax Rates","Tasas de Impuestos de Importación / Exportación"
-"Import Tax Rates","Tasas de Impuestos de Importación"
-"Inc. Tax","Impuestos IncluÃdos"
-"Incl. Tax","Impuestos incluidos"
-"Incl. Tax:","Impuestos IncluÃdos:"
-"Include Tax In Grand Total","Impuestos IncluÃdos en el Total"
-"Including Tax","Impuestos IncluÃdos"
-"Including and Excluding Tax","Inclusión y Exclusión de Impuestos"
-"Invalid file format upload attempt","Intento de subida de un formato de archivo no válido"
-"Invalid file upload attempt","Intento de subida de un archivo no válido"
-"Manage Customer Tax Classes","Gestión de impuestos sobre los tipos de clientes"
-"Manage Product Tax Classes","Gestión de impuestos sobre los tipos de productos"
-"Manage Tax Rates","Gestión de las Tasas de Impuestos"
-"Manage Tax Rules","Gestión de las normas fiscales"
-"Manage Tax Zones & Rates","Gestión de las Zonas de Impuestos y Precios"
-"Name","Nombre"
-"New Class","Nueva Clase"
-"New Rule","Nueva Regla"
-"New Tax Rate","Nueva Tarifa de Impuesto"
-"No","No"
-"None","Nada"
-"One of the country has invalid code.","Uno de los paÃses tiene un código no válido."
-"Orders, Invoices, Credit Memos Display Settings","Ajustes de visualización de Pedidos, Facturas, Notas de crédito"
-"Original price only","Sólo precio original"
-"Price Display Settings","Precio de Configuración de Pantalla"
-"Priority","Prioridad"
-"Product Tax Class","Clase de impuesto del producto"
-"Product Tax Class Information","Información de clase impositiva del producto"
-"Product Tax Classes","Tipos de Impuestos de Productos"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Impuestos)"
+"Subtotal (Incl. Tax)","Subtotal (Incl. Impuestos)"
+"Row Total","Fila Total"
+"Tax Rate Information","Información sobre Tarifas de Impuestos"
+"Tax Identifier","Identificador Tributario"
+"Zip/Post is Range","Código Postal es Rango"
+"Zip/Post Code","CP/Código Postal"
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
"Range From","Intervalo Desde"
"Range To","Intervalo Hasta"
-"Rate","Tarifa"
+State,Estado
"Rate Percent","Tasa de Porcentaje"
-"Reset","Restablecer"
-"Row Total","Fila Total"
-"Sales","Ventas"
-"Save Class","Guardar Clase"
+"Tax Titles","TÃtulos Tributarias"
+"Add New Tax Rate","Añadir Nueva Tasa Impositiva"
+"Delete Rate","Eliminar Ãndice"
"Save Rate","Guardar Tarifa"
+"Manage Tax Rules","Gestión de las normas fiscales"
+"Add New Tax Rule","Añadir Nueva Norma Impositiva"
"Save Rule","Guardar Regla"
-"Save and Continue Edit","Guardar y continuar editando"
-"Shipping & Handling (Excl.Tax)","EnvÃo y Servicio (Impuestos no IncluÃdos)"
-"Shipping & Handling (Incl.Tax)","EnvÃo y Servicio (Impuestos IncluÃdos)"
-"Shipping & Handling Tax","Impuestos de envÃo y manipulación"
-"Shipping (Excl. Tax)","EnvÃo (Impuestos no IncluÃdos)"
-"Shipping (Incl. Tax)","EnvÃo (Impuestos IncluÃdos)"
-"Shipping Excl. Tax (%s)","Impuestos de EnvÃo no IncluÃdos (%s)"
-"Shipping Incl. Tax (%s)","Impuestos de EnvÃo IncluÃdos (%s)"
-"Shipping Prices","Precios de EnvÃo"
-"Shopping Cart Display Settings","Configuraciones de Visualización del Carrito de Compra"
-"Sort Order","Ordenar Pedido"
-"State","Estado"
-"State/Region","Estado/Región"
-"Subtotal (Excl. Tax)","Subtotal (Excl. Impuestos)"
-"Subtotal (Excl.Tax)","Subtotal (Excl. Impuestos)"
-"Subtotal (Incl. Tax)","Subtotal (Incl. Impuestos)"
-"Subtotal (Incl.Tax)","Subtotal (Incl. Impuestos)"
-"Tax","Impuestos"
-"Tax Calculation Based On","Cálculo Tributario Basado En"
-"Tax Calculation Method Based On","Método de Cálculo Tributario Basado En"
-"Tax Class for Shipping","Clase de Impuestos para EnvÃos"
-"Tax Classes","Clases de Impuestos"
-"Tax Identifier","Identificador Tributario"
-"Tax Rate","Tarifa de Impuestos"
-"Tax Rate Information","Información sobre Tarifas de Impuestos"
+"Delete Rule","Eliminar Regla"
"Tax Rule Information","Información sobre Reglas Tributarias"
-"Tax Rules","Reglas de Impuestos"
-"Tax Section","Sección de Impuestos"
-"Tax Titles","TÃtulos Tributarias"
-"Tax rate cannot be removed. It exists in tax rule","El Ãndice de impuestos no se puede eliminar. Existe en la regla de impuestos."
+"Customer Tax Class","Clase impositiva del cliente"
+"Product Tax Class","Clase de impuesto del producto"
+"Tax Rate","Tarifa de Impuestos"
"Tax rates at the same priority are added, others are compounded.","Las tarifas tributarias con la misma prioridad son añadidas, las demás son compuestas."
-"The tax class has been deleted.","Esta clase de impuestos ha sido eliminada."
-"The tax class has been saved.","Esta clase de impuestos ha sido guardada."
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
+"Subtotal (Excl.Tax)","Subtotal (Excl. Impuestos)"
+"Subtotal (Incl.Tax)","Subtotal (Incl. Impuestos)"
+"Shipping & Handling (Excl.Tax)","EnvÃo y Servicio (Impuestos no IncluÃdos)"
+"Shipping & Handling (Incl.Tax)","EnvÃo y Servicio (Impuestos IncluÃdos)"
+"Grand Total (Excl.Tax)","Total (Impuestos no IncluÃdos)"
+"Grand Total (Incl.Tax)","Total (Impuestos IncluÃdos)"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates","Gestión de las Tasas de Impuestos"
+"New Tax Rate","Nueva Tarifa de Impuesto"
+"The tax rate has been saved.","Esta tarifa tributaria se ha guardado."
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate","Editar indicador de impuesto"
"The tax rate has been deleted.","Esta tarifa tributaria ha sido eliminada."
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
"The tax rate has been imported.","Esta tarifa tributaria ha sido importada."
-"The tax rate has been saved.","Esta tarifa tributaria se ha guardado."
-"The tax rule has been deleted.","Esta regla tributaria ha sido eliminada."
+"Invalid file upload attempt","Intento de subida de un archivo no válido"
+"Tax Rules","Reglas de Impuestos"
+"New Tax Rule","New Tax Rule"
"The tax rule has been saved.","Esta regla tributaria ha sido guardada."
-"This class no longer exists","Esta clase ya no existe."
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
"This rule no longer exists","Esta regla ya no existe"
-"This rule no longer exists.","Esta regla ya no existe."
-"Total","Total"
-"Unit Price","Precio por unidad"
-"Whether catalog prices entered by admin include tax.","Si los precios de catálogo introducidos por el administrador incluyen impuestos."
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","Si las gastos de envÃo introducidos por el administrador u obtenidos a través de puertas de enlace incluyen impuestos."
-"Yes","SÃ"
-"You cannot delete this tax class as it is used for %d customer groups.","No puede eliminar esta clase de impuestos ya que está siendo utilizada por %d grupos de clientes."
-"You cannot delete this tax class as it is used for %d products.","No puede eliminar esta clase de impuestos ya que está siendo utilizada por productos &d."
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","No puede eliminar esta clase de impuestos ya que está siendo utilizada en las Reglas Tributarias (Tax Rules). Debe eliminar las reglas que está utilizando primero."
-"Zip/Post Code","CP/Código Postal"
-"Zip/Post is Range","Código Postal es Rango"
+"The tax rule has been deleted.","Esta regla tributaria ha sido eliminada."
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
+"Shipping & Handling Tax","Impuestos de envÃo y manipulación"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available","Impoorte de aranceles si es aplicable"
+"Original price only","Sólo precio original"
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)","Total (Impuestos no IncluÃdos)"
+"Grand Total (Incl. Tax)","Total (Impuestos IncluÃdos)"
+"Shipping (Excl. Tax)","EnvÃo (Impuestos no IncluÃdos)"
+"Shipping (Incl. Tax)","EnvÃo (Impuestos IncluÃdos)"
+"Before Discount","Antes de Descuento"
+"After Discount","Después de Descuento"
+"Excluding Tax","Impuestos no IncluÃdos"
+"Including Tax","Impuestos IncluÃdos"
+"Including and Excluding Tax","Inclusión y Exclusión de Impuestos"
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates","Tasas de Impuestos de Importación"
+"Export Tax Rates","Tasas de Impuestos a la Exportación"
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class","Anadir Nueva CategorÃa"
+"Default Country","Default Country"
+"Tax Calculation Based On","Tax Calculation Based On"
+"Tax Classes","Tax Classes"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,Estado/Región
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Tax/i18n/fr_FR.csv b/app/code/Magento/Tax/i18n/fr_FR.csv
index 9fb406d679c..010f1d192fd 100644
--- a/app/code/Magento/Tax/i18n/fr_FR.csv
+++ b/app/code/Magento/Tax/i18n/fr_FR.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - correspond à n'importe quoi; 'xyz*' correspond à n'importe quoi qui commence par 'xyz' et qui n'est pas plus long que %d."
-"-- Please Select --","-- Veuillez sélectionner --"
-"Add New Class","Ajouter une nouvelle classe"
-"Add New Tax Rate","Ajouter un nouveau taux de change"
-"Add New Tax Rule","Ajouter une nouvelle règle de taxe"
-"After Discount","Après réduction"
-"An error occurred while deleting this rate.","Une erreur est survenue à la suppression de ce taux."
-"An error occurred while deleting this rate. Incorrect rate ID.","Une erreur est survenue à la suppression de ce taux. ID de taux incorrecte."
-"An error occurred while deleting this tax class.","Une erreur est survenue à la suppression de cette classe de taxe."
-"An error occurred while deleting this tax rule.","Une erreur est survenue à la suppression de cette règle de taxe."
-"An error occurred while saving this rate.","Une erreur est survenue à la sauvegarde de ce taux."
-"An error occurred while saving this tax class.","Une erreur est survenue à la sauvegarde de cette classe de taux."
-"An error occurred while saving this tax class. A class with the same name","Une erreur est survenue lors de l'enregistrement de cette classe de taxes. Une classe avec le même nom"
-"An error occurred while saving this tax rule.","Une erreur est survenue à la sauvegarde de cette règle de taxe."
-"Apply Customer Tax","Appliquer la taxe client."
-"Apply Discount On Prices","Appliquer la réduction aux prix"
-"Apply Tax On","Appliquer la taxe"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Appliquer la réduction dont la taxe calculée sur la taxe du store, si ""Appliquer la taxe après la réduction"" est sélectionné."
+None,aucun
+Cancel,Cancel
+Back,Retour
+Subtotal,Subtotal
+"Excl. Tax","Taxe non comprise"
+Total,Total
+"Incl. Tax","Taxe comprise"
+Reset,Réinitialiser
+"Unit Price","Prix unitaire"
+Tax,Taxe
+Save,Save
+Name,Nom
+Code,Code
+"Sort Order","Trier les widgets"
+"Save and Continue Edit","Sauvegarder et continuer l'édition"
"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà ?"
-"Back","Retour"
-"Before Discount","Avant réduction"
-"CSV","CSV (valeurs séparées par des virgules)"
-"Calculation Settings","Réglages de calcul"
-"Catalog Prices","Prix du catalogue"
-"Class Name","Nom de la classe"
-"Code","Code"
-"Country","Pays"
-"County","Comté"
-"Custom price if available","Prix client si disponible"
-"Customer Tax Class","Classe de tax client"
-"Customer Tax Class Information","Information sur la classe de taxe client"
-"Customer Tax Classes","Classes de taxe client"
-"Default Country","Pays par défaut"
-"Default Post Code","Code postal par défaut"
-"Default State","État par défaut"
-"Default Tax Destination Calculation","Calcul de destination de la taxe par défaut"
-"Delete Class","Supprimer la classe"
-"Delete Rate","Supprimer le taux"
-"Delete Rule","Supprimer la règle"
-"Display Full Tax Summary","Afficher le résumé des taxes."
-"Display Prices","Afficher les prix."
-"Display Product Prices In Catalog","Afficher les prix des produits en catalogue"
-"Display Shipping Amount","Afficher le montant de l'envoi"
-"Display Shipping Prices","Afficher les prix d'envoi"
-"Display Subtotal","Afficher le sous-total"
-"Display Zero Tax Subtotal","Afficher le sous-total HT"
-"Edit Class","Éditer la classe"
-"Edit Class '%s'","Éditer la classe '%s'"
+"This rule no longer exists.","Cette règle n'existe plus."
+"New Rule","Nouvelle règle"
+Priority,Priorité
"Edit Rule","Éditer la règle"
-"Edit Tax Rate","Éditer le taux de la taxe"
+Country,Pays
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,Ventes
+CSV,"CSV (valeurs séparées par des virgules)"
"Excel XML","Excel XML"
-"Excl. Tax","Taxe non comprise"
-"Excl. Tax:","H.T."
-"Excluding Tax","Hors Taxes"
-"Export Tax Rates","Taux de taxe d'exportation"
-"Grand Total (Excl. Tax)","Total général (H.T.)"
-"Grand Total (Excl.Tax)","Total général (H.T.)"
-"Grand Total (Incl. Tax)","Total général (T.T.C.)"
-"Grand Total (Incl.Tax)","Total général (T.T.C.)"
+Rate,Taux
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
"Grand Total Excl. Tax","Total général H.T."
"Grand Total Incl. Tax","Total général T.T.C."
-"Import / Export Tax Rates","Taux de taxe d'importation / d'exportation"
-"Import Tax Rates","Taux de taxe d'importation"
-"Inc. Tax","T.T.C."
-"Incl. Tax","Taxe comprise"
-"Incl. Tax:","T.T.C."
-"Include Tax In Grand Total","Taxes comprises dans le total général"
-"Including Tax","Toutes Taxes Comprises"
-"Including and Excluding Tax","Toutes Taxes Comprises et Hors Taxes"
-"Invalid file format upload attempt","Tentative de téléchargement de fichier au format invalide"
-"Invalid file upload attempt","Tentative de téléchargement de fichier invalide"
-"Manage Customer Tax Classes","Gérer les catégories de taxes sur les clients"
-"Manage Product Tax Classes","Gérer les catégories de taxes sur les produits"
-"Manage Tax Rates","Gérer les taux d'imposition"
-"Manage Tax Rules","Gérer les règles d'imposition"
-"Manage Tax Zones & Rates","Gérer les taux d'imposition par zone"
-"Name","Nom"
-"New Class","Nouvelle catégorie"
-"New Rule","Nouvelle règle"
-"New Tax Rate","Nouveau taux d'imposition"
-"No","Non"
-"None","aucun"
-"One of the country has invalid code.","Un des pays a un code invalide"
-"Orders, Invoices, Credit Memos Display Settings","Commandes, Factures, Paramètres d'affichage des mémos crédit"
-"Original price only","Prix d'origine seulement"
-"Price Display Settings","Paramètres d'Affichage des Prix"
-"Priority","Priorité"
-"Product Tax Class","Classe de taxe de produit"
-"Product Tax Class Information","Information sur la catégorie de taxe sur les produits"
-"Product Tax Classes","Catégories de taxes sur les produits"
+"Subtotal (Excl. Tax)","Sous-total (HT)"
+"Subtotal (Incl. Tax)","Sous-total (TTC)"
+"Row Total","Total de la Ligne"
+"Tax Rate Information","Information sur le taux d'imposition"
+"Tax Identifier","Tax Identifier"
+"Zip/Post is Range","Le code postal est étendu"
+"Zip/Post Code","Code postal"
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
"Range From","Trier à partir de"
"Range To","Trier jusqu'Ã "
-"Rate","Taux"
+State,État
"Rate Percent","Taux Pourcentage"
-"Reset","Réinitialiser"
-"Row Total","Total de la Ligne"
-"Sales","Ventes"
-"Save Class","Enregistrer la Catégorie"
+"Tax Titles","Titre des taxes"
+"Add New Tax Rate","Ajouter un nouveau taux de change"
+"Delete Rate","Supprimer le taux"
"Save Rate","Enregistrer le Taux"
+"Manage Tax Rules","Gérer les règles d'imposition"
+"Add New Tax Rule","Ajouter une nouvelle règle de taxe"
"Save Rule","Enregistrer la règle"
-"Save and Continue Edit","Sauvegarder et continuer l'édition"
-"Shipping & Handling (Excl.Tax)","Expédition et traitement (HT)"
-"Shipping & Handling (Incl.Tax)","Expédition et traitement (TTC)"
-"Shipping & Handling Tax","Expédition & Frais de traitement"
-"Shipping (Excl. Tax)","Expédition (HT)"
-"Shipping (Incl. Tax)","Expédition (TTC)"
-"Shipping Excl. Tax (%s)","Expédition HT (%s)"
-"Shipping Incl. Tax (%s)","Expédition TTC (%s)"
-"Shipping Prices","Frais d'envoi"
-"Shopping Cart Display Settings","Paramètres d'affichage du panier"
-"Sort Order","Trier les widgets"
-"State","État"
-"State/Region","État/Région"
-"Subtotal (Excl. Tax)","Sous-total (HT)"
-"Subtotal (Excl.Tax)","Sous-total (HT)"
-"Subtotal (Incl. Tax)","Sous-total (TTC)"
-"Subtotal (Incl.Tax)","Sous-total (TTC)"
-"Tax","Taxe"
-"Tax Calculation Based On","Calcul des taxes basé sur"
-"Tax Calculation Method Based On","Méthode de calcul des taxes basée sur"
-"Tax Class for Shipping","Catégorie de taxe pour l'envoi"
-"Tax Classes","Catégorie de taxe"
-"Tax Identifier","Tax Identifier"
-"Tax Rate","Taux d'imposition"
-"Tax Rate Information","Information sur le taux d'imposition"
+"Delete Rule","Supprimer la règle"
"Tax Rule Information","Information sur les règles des taxes"
-"Tax Rules","Règles des taxes"
-"Tax Section","Section des taxes"
-"Tax Titles","Titre des taxes"
-"Tax rate cannot be removed. It exists in tax rule","Le taux de frais ne peut être supprimé. Il existe dans les règles"
+"Customer Tax Class","Classe de tax client"
+"Product Tax Class","Classe de taxe de produit"
+"Tax Rate","Taux d'imposition"
"Tax rates at the same priority are added, others are compounded.","Les taux d'imposition de la même priorité sont ajoutés, les autres sont combinés."
-"The tax class has been deleted.","La catégorie de taxe a été supprimée."
-"The tax class has been saved.","La catégorie de taxe a été sauvegardée."
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
+"Subtotal (Excl.Tax)","Sous-total (HT)"
+"Subtotal (Incl.Tax)","Sous-total (TTC)"
+"Shipping & Handling (Excl.Tax)","Expédition et traitement (HT)"
+"Shipping & Handling (Incl.Tax)","Expédition et traitement (TTC)"
+"Grand Total (Excl.Tax)","Total général (H.T.)"
+"Grand Total (Incl.Tax)","Total général (T.T.C.)"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates","Gérer les taux d'imposition"
+"New Tax Rate","Nouveau taux d'imposition"
+"The tax rate has been saved.","Le taux d'imposition a été sauvegardé."
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate","Éditer le taux de la taxe"
"The tax rate has been deleted.","Le taux d'imposition a été supprimé."
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
"The tax rate has been imported.","Le taux d'imposition a été importé."
-"The tax rate has been saved.","Le taux d'imposition a été sauvegardé."
-"The tax rule has been deleted.","La règle de taxe a été supprimée."
+"Invalid file upload attempt","Tentative de téléchargement de fichier invalide"
+"Tax Rules","Règles des taxes"
+"New Tax Rule","New Tax Rule"
"The tax rule has been saved.","La règle de taxe a été enregistrée."
-"This class no longer exists","Cette catégorie n'existe plus."
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
"This rule no longer exists","Cette règle n'existe plus"
-"This rule no longer exists.","Cette règle n'existe plus."
-"Total","Total"
-"Unit Price","Prix unitaire"
-"Whether catalog prices entered by admin include tax.","Si les prix du catalogue ajoutés par l'admin comprennent les taxes."
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","Si les montants d'expédition ajoutés par l'admin ou obtenus par les passerelles comprennent les taxes."
-"Yes","oui"
-"You cannot delete this tax class as it is used for %d customer groups.","Vous ne pouvez pas supprimer cette catégorie de taxe car elle est utilisée par %d groupes de clients."
-"You cannot delete this tax class as it is used for %d products.","Vous ne pouvez pas supprimer cette catégorie de taxe car elle est utilisée par %d produits."
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","Vous ne pouvez pas supprimer cette taxe car elle est utilisée par une ou plusieurs règle(s). Vous devez d'abord supprimer la ou les règle(s) dans la(les)quelle(s) elle figure."
-"Zip/Post Code","Code postal"
-"Zip/Post is Range","Le code postal est étendu"
+"The tax rule has been deleted.","La règle de taxe a été supprimée."
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
+"Shipping & Handling Tax","Expédition & Frais de traitement"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available","Prix client si disponible"
+"Original price only","Prix d'origine seulement"
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)","Total général (H.T.)"
+"Grand Total (Incl. Tax)","Total général (T.T.C.)"
+"Shipping (Excl. Tax)","Expédition (HT)"
+"Shipping (Incl. Tax)","Expédition (TTC)"
+"Before Discount","Avant réduction"
+"After Discount","Après réduction"
+"Excluding Tax","Hors Taxes"
+"Including Tax","Toutes Taxes Comprises"
+"Including and Excluding Tax","Toutes Taxes Comprises et Hors Taxes"
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates","Taux de taxe d'importation"
+"Export Tax Rates","Taux de taxe d'exportation"
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class","Ajouter une nouvelle classe"
+"Default Country","Default Country"
+"Tax Calculation Based On","Tax Calculation Based On"
+"Tax Classes","Tax Classes"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,État/Région
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Tax/i18n/nl_NL.csv b/app/code/Magento/Tax/i18n/nl_NL.csv
index b663e68fcb3..558df8d20fa 100644
--- a/app/code/Magento/Tax/i18n/nl_NL.csv
+++ b/app/code/Magento/Tax/i18n/nl_NL.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - komt overeen met alles; 'xyz*' - komt overeen met alles dat begint met 'xyz' en niet langer dan %d."
-"-- Please Select --","-- Selecteer alstublieft --"
-"Add New Class","Voeg Nieuwe Klasse toe"
-"Add New Tax Rate","Voeg Nieuwe BTW Waarde toe"
-"Add New Tax Rule","Voeg Nieuwe BTW Regel toe"
-"After Discount","Na Korting"
-"An error occurred while deleting this rate.","Er is een fout opgetreden tijdens het verwijderen van dit tarief."
-"An error occurred while deleting this rate. Incorrect rate ID.","Er is een fout opgetreden tijdens het verwijderen van dit tarief. Incorrecte ID van tarief."
-"An error occurred while deleting this tax class.","Er is een fout opgetreden tijdens het verwijderen van deze BTW klasse."
-"An error occurred while deleting this tax rule.","Er is een fout opgetreden tijdens het verwijderen van dit BTW tarief."
-"An error occurred while saving this rate.","Er is een fout opgetreden tijdens het opslaan van dit tarief."
-"An error occurred while saving this tax class.","Er is een fout opgetreden tijdens het opslaan van deze BTW klasse."
-"An error occurred while saving this tax class. A class with the same name","Er heeft zich een fout voorgedaan bij het opslaan van deze belasting groep. A groep met dezelfde naam"
-"An error occurred while saving this tax rule.","Er is een fout opgetreden tijdens het opslaan van deze BTW regel."
-"Apply Customer Tax","Pas Klant BTW toe"
-"Apply Discount On Prices","Pas Korting toe Op Prijzen"
-"Apply Tax On","Pas BTW toe Op"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Korting op de prijs inclusief b.t.w. is berekend op basis van winkel belasting, wanneer Apple Belasting na Korting"" is geselecteerd."
+None,Geen
+Cancel,Cancel
+Back,Terug
+Subtotal,Subtotal
+"Excl. Tax","Excl. BTW"
+Total,Totaal
+"Incl. Tax","Incl. BTW"
+Reset,Opnieuw
+"Unit Price",Eenheidsprijs
+Tax,Belasting
+Save,Save
+Name,Naam
+Code,Code
+"Sort Order","Sorteer Bestelling"
+"Save and Continue Edit","Opslaan en doorgaan met bewerken"
"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?"
-"Back","Terug"
-"Before Discount","Voor Korting"
-"CSV","CSV"
-"Calculation Settings","Berekeningsinstellingen"
-"Catalog Prices","Catalogusprijzen"
-"Class Name","Naam Klasse"
-"Code","Code"
-"Country","Land"
-"County","Land"
-"Custom price if available","Aangepaste prijs indien beschikbaar"
-"Customer Tax Class","Klant BTW Klasse"
-"Customer Tax Class Information","Klant Belastingklasse Informatie"
-"Customer Tax Classes","Belastingtarieven klant"
-"Default Country","Standaard Land"
-"Default Post Code","Standaard Post Code"
-"Default State","Standaard Staat"
-"Default Tax Destination Calculation","Standaard Belastingbestemming Berekening"
-"Delete Class","Verwijder Klasse"
-"Delete Rate","Verwijder Tarief"
-"Delete Rule","Verwijder Regel"
-"Display Full Tax Summary","Laat Volledige Belastingsamenvatting zien"
-"Display Prices","Laat Prijzen zien"
-"Display Product Prices In Catalog","Laat Product Prijzen in Catalogus zien"
-"Display Shipping Amount","Laat Verscheep Hoeveelheid zien"
-"Display Shipping Prices","Laat Verscheep Prijs zien"
-"Display Subtotal","Laat Subtotaal zien"
-"Display Zero Tax Subtotal","Laat Geen Belasting Subtotaal zien"
-"Edit Class","Pas Klasse aan"
-"Edit Class '%s'","Pas Klasse '%s' aan"
+"This rule no longer exists.","Deze regel bestaat niet meer"
+"New Rule","Nieuwe Regel"
+Priority,Prioriteit
"Edit Rule","Pas Regel aan"
-"Edit Tax Rate","Pas Belastingtarief aan"
+Country,Land
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,Verkoop
+CSV,CSV
"Excel XML","Excel XML"
-"Excl. Tax","Excl. BTW"
-"Excl. Tax:","Excl. Belasting:"
-"Excluding Tax","Exclusief Belasting"
-"Export Tax Rates","Export Belasting Tarieven"
-"Grand Total (Excl. Tax)","Totaal (Ex. Belasting)"
-"Grand Total (Excl.Tax)","Algemeen Totaal (Excl. Belasting)"
-"Grand Total (Incl. Tax)","Totaal (Incl. Belasting)"
-"Grand Total (Incl.Tax)","Algemeen Totaal (Incl. Belasting)"
+Rate,Tarief
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
"Grand Total Excl. Tax","Algemeen Totaal Excl. Belasting"
"Grand Total Incl. Tax","Algemeen Totaal Incl. Belasting"
-"Import / Export Tax Rates","Import / Export Belasting Tarieven"
-"Import Tax Rates","Import Belasting Tarieven"
-"Inc. Tax","Incl. Belasting"
-"Incl. Tax","Incl. BTW"
-"Incl. Tax:","Incl. Belasting:"
-"Include Tax In Grand Total","Neem Belasting mee in Algemeen Totaal"
-"Including Tax","Inclusief Belasting"
-"Including and Excluding Tax","Inclusief en Exclusief Belasting"
-"Invalid file format upload attempt","Ongeldig bestandsformaat upload poging"
-"Invalid file upload attempt","Ongeldig bestand upload poging"
-"Manage Customer Tax Classes","Manage Klant Belasting Klassen"
-"Manage Product Tax Classes","Manage Product Belasting Klassen"
-"Manage Tax Rates","Manage Belasting Tarieven"
-"Manage Tax Rules","Manage Belasting Regels"
-"Manage Tax Zones & Rates","Beheer Belasting Zones en Tarieven"
-"Name","Naam"
-"New Class","Nieuwe Klasse"
-"New Rule","Nieuwe Regel"
-"New Tax Rate","Nieuw Belastingtarief"
-"No","Nee"
-"None","Geen"
-"One of the country has invalid code.","Een van de landen heeft een ongeldige code."
-"Orders, Invoices, Credit Memos Display Settings","Bestellingen, Facturen, Kredietnota's Display Instellingen"
-"Original price only","Alleen de oorspronkelijke prijs"
-"Price Display Settings","Prijs Weergave Instellingen"
-"Priority","Prioriteit"
-"Product Tax Class","Product BTW Klasse"
-"Product Tax Class Information","Product belasting Klasse Informatie"
-"Product Tax Classes","Product Belasting Klassen"
-"Range From","Vanaf"
-"Range To","Tot"
-"Rate","Tarief"
-"Rate Percent","Tarief Percentage"
-"Reset","Opnieuw"
-"Row Total","Rij Totaal"
-"Sales","Verkoop"
-"Save Class","Sla Klasse Op"
-"Save Rate","Sla Tarief Op"
-"Save Rule","Sla Regel Op"
-"Save and Continue Edit","Opslaan en doorgaan met bewerken"
-"Shipping & Handling (Excl.Tax)","Verzending & Behandeling (Excl. Belasting)"
-"Shipping & Handling (Incl.Tax)","Verzending & Behandeling (Incl. Belasting)"
-"Shipping & Handling Tax","Verzending - en verwerkingstax"
-"Shipping (Excl. Tax)","Verzending (Excl. Belasting)"
-"Shipping (Incl. Tax)","Verzending (Incl. Belasting)"
-"Shipping Excl. Tax (%s)","Verzending Excl. Belasting (%s)"
-"Shipping Incl. Tax (%s)","Verzending Incl. Belasting (%s)"
-"Shipping Prices","Verzendkosten"
-"Shopping Cart Display Settings","Winkelwagentje Display Instellingen"
-"Sort Order","Sorteer Bestelling"
-"State","Provincie"
-"State/Region","Provincie"
"Subtotal (Excl. Tax)","Subtotaal (exclusief belasting)"
-"Subtotal (Excl.Tax)","Subtotaal (Excl.Belasting)"
"Subtotal (Incl. Tax)","Subtotaal (inclusief belasting)"
-"Subtotal (Incl.Tax)","Subtotaal (Incl.Belasting)"
-"Tax","Belasting"
-"Tax Calculation Based On","Belasting Berekening Gebaseerd Op"
-"Tax Calculation Method Based On","Belasting Berekening Methode Gebaseerd Op"
-"Tax Class for Shipping","Belastingklasse voor Verzending"
-"Tax Classes","Belastingklasses"
-"Tax Identifier","Belastingidentificeerder"
-"Tax Rate","Belastingniveau"
+"Row Total","Rij Totaal"
"Tax Rate Information","Belastingniveau Informatie"
+"Tax Identifier",Belastingidentificeerder
+"Zip/Post is Range","Post is Verscheiden"
+"Zip/Post Code",Postcode
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
+"Range From",Vanaf
+"Range To",Tot
+State,Provincie
+"Rate Percent","Tarief Percentage"
+"Tax Titles",Belastingtitels
+"Add New Tax Rate","Voeg Nieuwe BTW Waarde toe"
+"Delete Rate","Verwijder Tarief"
+"Save Rate","Sla Tarief Op"
+"Manage Tax Rules","Manage Belasting Regels"
+"Add New Tax Rule","Voeg Nieuwe BTW Regel toe"
+"Save Rule","Sla Regel Op"
+"Delete Rule","Verwijder Regel"
"Tax Rule Information","Belastingregel Informatie"
-"Tax Rules","Belastingregels"
-"Tax Section","Belastingsectie"
-"Tax Titles","Belastingtitels"
-"Tax rate cannot be removed. It exists in tax rule","Belastingverhouding kan niet verwijderd worden. Dit staat in de wet."
+"Customer Tax Class","Klant BTW Klasse"
+"Product Tax Class","Product BTW Klasse"
+"Tax Rate",Belastingniveau
"Tax rates at the same priority are added, others are compounded.","Belastingniveau van dezelfde prioriteit zijn toegevoegd, anderen zijn verbonden."
-"The tax class has been deleted.","De belastingklasse is verwijderd."
-"The tax class has been saved.","De belastingklasse is opgeslagen."
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
+"Subtotal (Excl.Tax)","Subtotaal (Excl.Belasting)"
+"Subtotal (Incl.Tax)","Subtotaal (Incl.Belasting)"
+"Shipping & Handling (Excl.Tax)","Verzending & Behandeling (Excl. Belasting)"
+"Shipping & Handling (Incl.Tax)","Verzending & Behandeling (Incl. Belasting)"
+"Grand Total (Excl.Tax)","Algemeen Totaal (Excl. Belasting)"
+"Grand Total (Incl.Tax)","Algemeen Totaal (Incl. Belasting)"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates","Manage Belasting Tarieven"
+"New Tax Rate","Nieuw Belastingtarief"
+"The tax rate has been saved.","Het belastingniveau is opgeslagen."
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate","Pas Belastingtarief aan"
"The tax rate has been deleted.","Het belastingniveau is verwijderd."
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
"The tax rate has been imported.","Het belastingniveau is geïmporteerd."
-"The tax rate has been saved.","Het belastingniveau is opgeslagen."
-"The tax rule has been deleted.","De belastingregel is verwijderd."
+"Invalid file upload attempt","Ongeldig bestand upload poging"
+"Tax Rules",Belastingregels
+"New Tax Rule","New Tax Rule"
"The tax rule has been saved.","De belastingregel is opgeslagen."
-"This class no longer exists","Deze klasse bestaat niet meer"
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
"This rule no longer exists","Deze regel bestaat niet meer"
-"This rule no longer exists.","Deze regel bestaat niet meer"
-"Total","Totaal"
-"Unit Price","Eenheidsprijs"
-"Whether catalog prices entered by admin include tax.","Of catalogusprijzen opgeschreven door admin inclusief belasting."
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","Of bezorghoeveelheden zijn opgeschreven door admin of verkregen voor gateways inclusief belasting."
-"Yes","Ja"
-"You cannot delete this tax class as it is used for %d customer groups.","U kunt deze belasting niet verwijderen als het is gebruikt voor %d klantgroepen."
-"You cannot delete this tax class as it is used for %d products.","U kunt deze belastingklasse niet verwijderen als het is gebruikt voor %d producten."
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","U kunt deze belastingklasse niet verwijderen als het is gebruikt in Belastingregels. U moet eerst de regels waarin het is gebruikt verwijderen."
-"Zip/Post Code","Postcode"
-"Zip/Post is Range","Post is Verscheiden"
+"The tax rule has been deleted.","De belastingregel is verwijderd."
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
+"Shipping & Handling Tax","Verzending - en verwerkingstax"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available","Aangepaste prijs indien beschikbaar"
+"Original price only","Alleen de oorspronkelijke prijs"
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)","Totaal (Ex. Belasting)"
+"Grand Total (Incl. Tax)","Totaal (Incl. Belasting)"
+"Shipping (Excl. Tax)","Verzending (Excl. Belasting)"
+"Shipping (Incl. Tax)","Verzending (Incl. Belasting)"
+"Before Discount","Voor Korting"
+"After Discount","Na Korting"
+"Excluding Tax","Exclusief Belasting"
+"Including Tax","Inclusief Belasting"
+"Including and Excluding Tax","Inclusief en Exclusief Belasting"
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates","Import Belasting Tarieven"
+"Export Tax Rates","Export Belasting Tarieven"
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class","Voeg Nieuwe Klasse toe"
+"Default Country","Default Country"
+"Tax Calculation Based On","Tax Calculation Based On"
+"Tax Classes","Tax Classes"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,Provincie
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Tax/i18n/pt_BR.csv b/app/code/Magento/Tax/i18n/pt_BR.csv
index b23e2136361..188e7b29719 100644
--- a/app/code/Magento/Tax/i18n/pt_BR.csv
+++ b/app/code/Magento/Tax/i18n/pt_BR.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - corresponde a qualquer; 'xyz*' - corresponde a qualquer que se inicie em 'xyz' e não mais longo que %d."
-"-- Please Select --","- Por Favor Selecione -"
-"Add New Class","Adicionar Nova Classe"
-"Add New Tax Rate","Adicionar Nova Taxa de Imposto"
-"Add New Tax Rule","Adicionar Nova Taxa de Imposto"
-"After Discount","Depois de Desconto"
-"An error occurred while deleting this rate.","Ocorreu um erro ao excluir essa taxa."
-"An error occurred while deleting this rate. Incorrect rate ID.","Ocorreu um erro ao excluir essa taxa. ID incorreto da taxa."
-"An error occurred while deleting this tax class.","Ocorreu um erro ao excluir essa classe de impostos."
-"An error occurred while deleting this tax rule.","Ocorreu um erro ao excluir esta regra fiscal."
-"An error occurred while saving this rate.","Ocorreu um erro ao salvar esta taxa."
-"An error occurred while saving this tax class.","Ocorreu um erro ao salvar esta classe de impostos."
-"An error occurred while saving this tax class. A class with the same name","Ocorreu um erro ao salvar esta classe de taxa. Há uma classe com o mesmo nome"
-"An error occurred while saving this tax rule.","Ocorreu um erro ao salvar esta regra fiscal."
-"Apply Customer Tax","Aplicar Imposto de Cliente"
-"Apply Discount On Prices","Aplicar Desconto Nos Preços"
-"Apply Tax On","Aplicar Imposto Sobre"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Aplicação de desconto sobre o preço incluindo o imposto é calculado com base no imposto da loja, se ""Aplicar Imposto depois do Desconto"" for selecionado."
+None,Nenhum
+Cancel,Cancel
+Back,Voltar
+Subtotal,Subtotal
+"Excl. Tax","Excluir taxas"
+Total,Total
+"Incl. Tax","Incluir taxas"
+Reset,Redefinir
+"Unit Price","Preço Unitário"
+Tax,Taxas
+Save,Save
+Name,Nome
+Code,Código
+"Sort Order","Classificar pedido"
+"Save and Continue Edit","Salvar e continuar a editar"
"Are you sure you want to do this?","Tem certeza de que quer fazer isso?"
-"Back","Voltar"
-"Before Discount","Antes do Desconto"
-"CSV","CSV"
-"Calculation Settings","Configurações de Cálculo"
-"Catalog Prices","Preços de Catálogo"
-"Class Name","Nome da Classe"
-"Code","Código"
-"Country","PaÃs"
-"County","Distrito"
-"Custom price if available","Se disponÃvel, preço aduaneiro"
-"Customer Tax Class","Classe Fiscal do Cliente"
-"Customer Tax Class Information","Informação Sobre Escalão de Imposto do Cliente"
-"Customer Tax Classes","Classes de Taxa do Cliente"
-"Default Country","PaÃs padrão"
-"Default Post Code","Código Postal Padrão"
-"Default State","Estado Padrão"
-"Default Tax Destination Calculation","Cálculo Padrão da Taxa de Destino"
-"Delete Class","Apagar Classe"
-"Delete Rate","Apagar Preço"
-"Delete Rule","Apagar Regra"
-"Display Full Tax Summary","Mostrar Resumo do Imposto Total"
-"Display Prices","Exibir Preços"
-"Display Product Prices In Catalog","Exibir Preço dos Produtos em Catálogo"
-"Display Shipping Amount","Exibir Total Enviado"
-"Display Shipping Prices","Exibir Preços Enviados"
-"Display Subtotal","Exibir Subtotal"
-"Display Zero Tax Subtotal","Mostrar Zero de Taxa no Subtotal"
-"Edit Class","Editar Classe"
-"Edit Class '%s'","Editar Classe '%s'"
+"This rule no longer exists.","Essa regra não existe mais."
+"New Rule","Nova Regra"
+Priority,Prioridade
"Edit Rule","Editar regra"
-"Edit Tax Rate","Editar Taxa de Imposto"
+Country,PaÃs
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,Vendas
+CSV,CSV
"Excel XML","Excel XML"
-"Excl. Tax","Excluir taxas"
-"Excl. Tax:","Excluindo Taxa"
-"Excluding Tax","Excluindo Taxa"
-"Export Tax Rates","Taxa de Imposto de Exportação"
-"Grand Total (Excl. Tax)","Total (Exluindo Taxa)"
-"Grand Total (Excl.Tax)","Total (Exluindo Taxa)"
-"Grand Total (Incl. Tax)","Total (IncluindoTaxa)"
-"Grand Total (Incl.Tax)","Total (IncluindoTaxa)"
+Rate,Taxa
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
"Grand Total Excl. Tax","Total ExcluindoTaxa"
"Grand Total Incl. Tax","Total Incluindo Taxa"
-"Import / Export Tax Rates","Taxa de Imposto de Importação / Exportação"
-"Import Tax Rates","Taxa de Imposto de Importação"
-"Inc. Tax","Incluir Taxa"
-"Incl. Tax","Incluir taxas"
-"Incl. Tax:","Incluir Taxa:"
-"Include Tax In Grand Total","Incluir Taxa no Total"
-"Including Tax","Incluindo Taxa"
-"Including and Excluding Tax","Incluindo e Excluindo Taxa"
-"Invalid file format upload attempt","Tentativa de carregamento de formato de arquivo inválido"
-"Invalid file upload attempt","Tentativa de carregamento de arquivo inválido"
-"Manage Customer Tax Classes","Gerenciar Classes de imposto do cliente"
-"Manage Product Tax Classes","Gerenciar Classes de imposto do produto"
-"Manage Tax Rates","Gerenciar Taxa de Impostos"
-"Manage Tax Rules","Gerenciar Regras de Imposto"
-"Manage Tax Zones & Rates","Gerenciar Zonas de Impostos & Taxas"
-"Name","Nome"
-"New Class","Nova Classe"
-"New Rule","Nova Regra"
-"New Tax Rate","Nova Taxa de Imposto"
-"No","Não"
-"None","Nenhum"
-"One of the country has invalid code.","O paÃs tem código inválido."
-"Orders, Invoices, Credit Memos Display Settings","Encomendas, Faturas, Configurações de VÃdeo de Notas de Crédito"
-"Original price only","Apenas Preço Original"
-"Price Display Settings","Definições de visualização de preço"
-"Priority","Prioridade"
-"Product Tax Class","Classe de Imposto sobre Produtos"
-"Product Tax Class Information","Informação do Escalão de Imposto do Produto"
-"Product Tax Classes","Classe de Imposto do Produto"
+"Subtotal (Excl. Tax)","Subtotal (Excl. Taxa)"
+"Subtotal (Incl. Tax)","Subtotal (Inc. Taxa)"
+"Row Total","Total de Linha"
+"Tax Rate Information","Informação de Taxa de Imposto"
+"Tax Identifier","Identificador de Taxa"
+"Zip/Post is Range","Faixa de Zip/Postal"
+"Zip/Post Code","Zip/Código Postal"
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
"Range From","Faixa de"
"Range To","Faixa Para"
-"Rate","Taxa"
+State,Estado
"Rate Percent","Taxa Percentual"
-"Reset","Redefinir"
-"Row Total","Total de Linha"
-"Sales","Vendas"
-"Save Class","Salvar Classe"
+"Tax Titles","TÃtulos de Impostos"
+"Add New Tax Rate","Adicionar Nova Taxa de Imposto"
+"Delete Rate","Apagar Preço"
"Save Rate","Salvar Preço"
+"Manage Tax Rules","Gerenciar Regras de Imposto"
+"Add New Tax Rule","Adicionar Nova Taxa de Imposto"
"Save Rule","Salvar Regra"
-"Save and Continue Edit","Salvar e continuar a editar"
-"Shipping & Handling (Excl.Tax)","Transporte & Manuseio (Excl.Taxa)"
-"Shipping & Handling (Incl.Tax)","Transporte % Manuseio (Inc.Taxa)"
-"Shipping & Handling Tax","Taxa de Envio & Manuseio"
-"Shipping (Excl. Tax)","Remessa (Exc. Taxa)"
-"Shipping (Incl. Tax)","Remessa (Inc. Taxa)"
-"Shipping Excl. Tax (%s)","Remessa Exc. Taxa (%s)"
-"Shipping Incl. Tax (%s)","Remessa Inc. Taxa (%s)"
-"Shipping Prices","Preços de Remessa"
-"Shopping Cart Display Settings","Definições de visualização do carrinho de compras"
-"Sort Order","Classificar pedido"
-"State","Estado"
-"State/Region","Estado/Região"
-"Subtotal (Excl. Tax)","Subtotal (Excl. Taxa)"
-"Subtotal (Excl.Tax)","Subtotal (Excl. Taxa)"
-"Subtotal (Incl. Tax)","Subtotal (Inc. Taxa)"
-"Subtotal (Incl.Tax)","Subtotal (Inc. Taxa)"
-"Tax","Taxas"
-"Tax Calculation Based On","Cálculo da Taxa Baseado em"
-"Tax Calculation Method Based On","Método de Cálculo da Taxa Baseado em"
-"Tax Class for Shipping","Classe da Taxa para Remessa"
-"Tax Classes","Classes de Taxas"
-"Tax Identifier","Identificador de Taxa"
-"Tax Rate","Taxa de Imposto"
-"Tax Rate Information","Informação de Taxa de Imposto"
+"Delete Rule","Apagar Regra"
"Tax Rule Information","Informações de regras fiscais"
-"Tax Rules","Regras de Impostos"
-"Tax Section","Seção de Imposto"
-"Tax Titles","TÃtulos de Impostos"
-"Tax rate cannot be removed. It exists in tax rule","Taxa de imposto não pode ser removida. Ela existe em regra fiscal"
+"Customer Tax Class","Classe Fiscal do Cliente"
+"Product Tax Class","Classe de Imposto sobre Produtos"
+"Tax Rate","Taxa de Imposto"
"Tax rates at the same priority are added, others are compounded.","Taxas de imposto com a mesma prioridade são adicionadas, outras são compostas."
-"The tax class has been deleted.","A classe fiscal foi eliminada."
-"The tax class has been saved.","A classe fiscal foi salva."
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
+"Subtotal (Excl.Tax)","Subtotal (Excl. Taxa)"
+"Subtotal (Incl.Tax)","Subtotal (Inc. Taxa)"
+"Shipping & Handling (Excl.Tax)","Transporte & Manuseio (Excl.Taxa)"
+"Shipping & Handling (Incl.Tax)","Transporte % Manuseio (Inc.Taxa)"
+"Grand Total (Excl.Tax)","Total (Exluindo Taxa)"
+"Grand Total (Incl.Tax)","Total (IncluindoTaxa)"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates","Gerenciar Taxa de Impostos"
+"New Tax Rate","Nova Taxa de Imposto"
+"The tax rate has been saved.","A taxa de imposto foi salva."
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate","Editar Taxa de Imposto"
"The tax rate has been deleted.","A taxa de imposto foi eliminada."
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
"The tax rate has been imported.","A taxa de imposto foi importada."
-"The tax rate has been saved.","A taxa de imposto foi salva."
-"The tax rule has been deleted.","A regra fiscal foi eliminada."
+"Invalid file upload attempt","Tentativa de carregamento de arquivo inválido"
+"Tax Rules","Regras de Impostos"
+"New Tax Rule","New Tax Rule"
"The tax rule has been saved.","A regra fiscal foi salva."
-"This class no longer exists","Esta classe não existe mais"
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
"This rule no longer exists","A regra não existe mais."
-"This rule no longer exists.","Essa regra não existe mais."
-"Total","Total"
-"Unit Price","Preço Unitário"
-"Whether catalog prices entered by admin include tax.","Se os preços do catálogo entraram por administrador incluem impostos."
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","Se as quantias transportadas entraram por administrador ou obtidas a partir de portais incluem impostos."
-"Yes","Sim"
-"You cannot delete this tax class as it is used for %d customer groups.","Você não pode apagar esta classe de imposto uma vez que é utilizada para %d grupos de clientes."
-"You cannot delete this tax class as it is used for %d products.","Você não pode excluir esta classe de imposto uma vez que é usada para %d produtos."
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","Você não pode apagar esta classe de imposto uma vez que é usada em Regras Fiscais. Você tem que eliminar em primeiro lugar as regras com que é usada."
-"Zip/Post Code","Zip/Código Postal"
-"Zip/Post is Range","Faixa de Zip/Postal"
+"The tax rule has been deleted.","A regra fiscal foi eliminada."
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
+"Shipping & Handling Tax","Taxa de Envio & Manuseio"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available","Se disponÃvel, preço aduaneiro"
+"Original price only","Apenas Preço Original"
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)","Total (Exluindo Taxa)"
+"Grand Total (Incl. Tax)","Total (IncluindoTaxa)"
+"Shipping (Excl. Tax)","Remessa (Exc. Taxa)"
+"Shipping (Incl. Tax)","Remessa (Inc. Taxa)"
+"Before Discount","Antes do Desconto"
+"After Discount","Depois de Desconto"
+"Excluding Tax","Excluindo Taxa"
+"Including Tax","Incluindo Taxa"
+"Including and Excluding Tax","Incluindo e Excluindo Taxa"
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates","Taxa de Imposto de Importação"
+"Export Tax Rates","Taxa de Imposto de Exportação"
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class","Adicionar Nova Classe"
+"Default Country","Default Country"
+"Tax Calculation Based On","Tax Calculation Based On"
+"Tax Classes","Tax Classes"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,Estado/Região
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Tax/i18n/zh_CN.csv b/app/code/Magento/Tax/i18n/zh_CN.csv
index 0ace2ba24e8..f053c0c22be 100644
--- a/app/code/Magento/Tax/i18n/zh_CN.csv
+++ b/app/code/Magento/Tax/i18n/zh_CN.csv
@@ -1,151 +1,163 @@
-"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - 匹é…ä»»æ„ï¼› 'xyz*' - 匹é…以 'xyz' 开头且ä¸é•¿äºŽ %d。"
-"-- Please Select --","-- 请选择 --"
-"Add New Class","æ·»åŠ æ–°ç±»"
-"Add New Tax Rate","æ·»åŠ æ–°ç¨ŽçŽ‡"
-"Add New Tax Rule","æ·»åŠ æ–°ç¨ŽçŽ‡è§„åˆ™"
-"After Discount","折扣åŽ"
-"An error occurred while deleting this rate.","åˆ é™¤è¯¥ç¨ŽçŽ‡æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚"
-"An error occurred while deleting this rate. Incorrect rate ID.","åˆ é™¤è¯¥è´¹çŽ‡æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚é”™è¯¯çš„è´¹çŽ‡ID。"
-"An error occurred while deleting this tax class.","åˆ é™¤è¯¥ç¨ŽåŠ¡ç±»åž‹æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚"
-"An error occurred while deleting this tax rule.","åˆ é™¤è¯¥ç¨ŽåŠ¡è§„åˆ™æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚"
-"An error occurred while saving this rate.","ä¿å˜è¯¥ç¨ŽçŽ‡æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚"
-"An error occurred while saving this tax class.","ä¿å˜è¯¥ç¨ŽåŠ¡ç±»åˆ«æ—¶å‡ºçŽ°äº†é”™è¯¯ã€‚"
-"An error occurred while saving this tax class. A class with the same name","ä¿å˜è¯¥ç¨Žé‡‘类别时出错。已有类别使用该å称"
-"An error occurred while saving this tax rule.","ä¿å˜è¯¥ç¨ŽåŠ¡è§„则时出现了错误。"
-"Apply Customer Tax","应用客户税"
-"Apply Discount On Prices","åœ¨ä»·æ ¼ä¸Šåº”ç”¨æŠ˜æ‰£"
-"Apply Tax On","将税应用于"
-"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","如果选ä¸â€æŠ˜åŽåº”用税率“，则在å«ç¨Žä»·æ ¼ä¸Šåº”ç”¨æŠ˜æ‰£ä¼šæ ¹æ®åº—铺税率计算。"
-"Are you sure you want to do this?","您是å¦ç¡®è®¤è¦è¿™æ ·åšï¼Ÿ"
-"Back","返回"
-"Before Discount","折å‰"
-"CSV","CSV"
-"Calculation Settings","计算设置"
-"Catalog Prices","åˆ†ç±»ä»·æ ¼"
-"Class Name","类型å称"
-"Code","代ç "
-"Country","国家"
-"County","国家"
-"Custom price if available","å¯ç”¨æ—¶çš„è‡ªå®šä¹‰ä»·æ ¼"
-"Customer Tax Class","客户税务类型"
-"Customer Tax Class Information","自定义税费类别信æ¯"
-"Customer Tax Classes","客户税率"
-"Default Country","默认国家"
-"Default Post Code","默认å‘布代ç "
-"Default State","默认州"
-"Default Tax Destination Calculation","默认税é¢è®¡ç®—"
-"Delete Class","åˆ é™¤ç±»"
-"Delete Rate","åˆ é™¤è´¹çŽ‡"
-"Delete Rule","åˆ é™¤è§„åˆ™"
-"Display Full Tax Summary","显示完整文å—摘è¦"
-"Display Prices","æ˜¾ç¤ºä»·æ ¼"
-"Display Product Prices In Catalog","在分类ä¸æ˜¾ç¤ºäº§å“ä»·æ ¼"
-"Display Shipping Amount","显示è¿é€é‡"
-"Display Shipping Prices","显示è¿è´¹"
-"Display Subtotal","显示å°è®¡"
-"Display Zero Tax Subtotal","显示零税é¢å°è®¡"
-"Edit Class","编辑类"
-"Edit Class '%s'","编辑类 '%s'"
-"Edit Rule","修改规则"
-"Edit Tax Rate","编辑税率"
+None,æ—
+Cancel,Cancel
+Back,返回
+Subtotal,Subtotal
+"Excl. Tax",ä¸å«ç¨Ž
+Total,总数
+"Incl. Tax",å«ç¨Ž
+Reset,é‡ç½®çŠ¶æ€
+"Unit Price",å•ä»·
+Tax,ä¼ çœŸ
+Save,Save
+Name,姓å
+Code,代ç
+"Sort Order",排åºé¡ºåº
+"Save and Continue Edit",ä¿å˜å¹¶ç»§ç»ç¼–辑
+"Are you sure you want to do this?",您是å¦ç¡®è®¤è¦è¿™æ ·åšï¼Ÿ
+"This rule no longer exists.",该规则已ä¸å˜åœ¨ã€‚
+"New Rule",新规则
+Priority,优先级
+"Edit Rule",修改规则
+Country,国家
+"Billing Address","Billing Address"
+"Shipping Address","Shipping Address"
+Sales,销售
+CSV,CSV
"Excel XML","Excel XML"
-"Excl. Tax","ä¸å«ç¨Ž"
-"Excl. Tax:","ä¸å«ç¨Žï¼š"
-"Excluding Tax","ä¸å«ç¨Ž"
-"Export Tax Rates","导出税率"
-"Grand Total (Excl. Tax)","åˆè®¡ï¼ˆä¸å«ç¨Žï¼‰"
-"Grand Total (Excl.Tax)","åˆè®¡ï¼ˆä¸å«ç¨Žï¼‰"
-"Grand Total (Incl. Tax)","åˆè®¡ï¼ˆå«ç¨Žï¼‰"
-"Grand Total (Incl.Tax)","åˆè®¡ï¼ˆå«ç¨Žï¼‰"
-"Grand Total Excl. Tax","åˆè®¡ä¸å«ç¨Ž"
-"Grand Total Incl. Tax","åˆè®¡å«ç¨Ž"
-"Import / Export Tax Rates","导入/导出税率"
-"Import Tax Rates","导入税率"
-"Inc. Tax","å«ç¨Ž"
-"Incl. Tax","å«ç¨Ž"
-"Incl. Tax:","å«ç¨Žï¼š"
-"Include Tax In Grand Total","在åˆè®¡ä¸å«ç¨Ž"
-"Including Tax","å«ç¨Ž"
-"Including and Excluding Tax","包å«å’Œä¸åŒ…å«ç¨Ž"
-"Invalid file format upload attempt","æ–‡ä»¶æ ¼å¼æ— æ•ˆçš„ä¸Šä¼ ä¼å›¾"
-"Invalid file upload attempt","æ–‡ä»¶æ— æ•ˆçš„ä¸Šä¼ ä¼å›¾"
-"Manage Customer Tax Classes","管ç†å®¢æˆ·ç¨Žç±»"
-"Manage Product Tax Classes","管ç†äº§å“税类"
-"Manage Tax Rates","管ç†ç¨ŽçŽ‡"
-"Manage Tax Rules","管ç†ç¨ŽåŠ¡è§„则"
-"Manage Tax Zones & Rates","管ç†ç¨ŽåŠ¡åœ°åŒºå’Œç¨ŽçŽ‡"
-"Name","姓å"
-"New Class","æ–°ç±»"
-"New Rule","新规则"
-"New Tax Rate","新税率"
-"No","å¦"
-"None","æ— "
-"One of the country has invalid code.","å…¶ä¸ä¸€ä¸ªå›½å®¶ä»£ç æ— æ•ˆã€‚"
-"Orders, Invoices, Credit Memos Display Settings","订å•ã€æ”¶æ®ã€ä¿¡ç”¨è®°å½•æ˜¾ç¤ºè®¾ç½®"
-"Original price only","仅原价"
-"Price Display Settings","ä»·æ ¼æ˜¾ç¤ºè®¾ç½®"
-"Priority","优先级"
-"Product Tax Class","产å“税务类型"
-"Product Tax Class Information","产å“税费类别信æ¯"
-"Product Tax Classes","产å“税率"
-"Range From","范围从"
-"Range To","范围到"
-"Rate","费率"
-"Rate Percent","税率百分率"
-"Reset","é‡ç½®çŠ¶æ€"
-"Row Total","总行数"
-"Sales","销售"
-"Save Class","ä¿å˜ç±»"
-"Save Rate","ä¿å˜ç¨ŽçŽ‡"
-"Save Rule","ä¿å˜è§„则"
-"Save and Continue Edit","ä¿å˜å¹¶ç»§ç»ç¼–辑"
-"Shipping & Handling (Excl.Tax)","è¿è´¹å’Œæ‰‹ç»è´¹ï¼ˆä¸å«ç¨Žï¼‰"
-"Shipping & Handling (Incl.Tax)","è¿è´¹å’Œæ‰‹ç»è´¹ï¼ˆå«ç¨Žï¼‰"
-"Shipping & Handling Tax","处ç†ã€è¿é€åŠç¨Žé‡‘费用"
-"Shipping (Excl. Tax)","è¿è´¹ï¼ˆä¸å«ç¨Žï¼‰"
-"Shipping (Incl. Tax)","è¿è´¹ï¼ˆå«ç¨Žï¼‰"
-"Shipping Excl. Tax (%s)","è¿è´¹ä¸å«ç¨Žï¼ˆ%s）"
-"Shipping Incl. Tax (%s)","è¿è´¹å«ç¨Žï¼ˆ%s）"
-"Shipping Prices","è¿è´¹"
-"Shopping Cart Display Settings","è´ç‰©è½¦æ˜¾ç¤ºè®¾ç½®"
-"Sort Order","排åºé¡ºåº"
-"State","å·ž"
-"State/Region","州/地区"
-"Subtotal (Excl. Tax)","å°è®¡ï¼ˆä¸å«ç¨Žï¼‰"
-"Subtotal (Excl.Tax)","å°è®¡ï¼ˆä¸å«ç¨Žï¼‰"
-"Subtotal (Incl. Tax)","å°è®¡ï¼ˆå«ç¨Žï¼‰"
-"Subtotal (Incl.Tax)","å°è®¡ï¼ˆå«ç¨Žï¼‰"
-"Tax","ä¼ çœŸ"
-"Tax Calculation Based On","税金的计算基于"
-"Tax Calculation Method Based On","税金的计算方法基于"
-"Tax Class for Shipping","è¿è´¹çš„税类"
-"Tax Classes","税类"
-"Tax Identifier","税务识别符"
-"Tax Rate","税率"
-"Tax Rate Information","税率信æ¯"
-"Tax Rule Information","税务规则信æ¯"
-"Tax Rules","税务规则"
-"Tax Section","纳税项"
-"Tax Titles","ç¨ŽåŠ¡æ ‡é¢˜"
-"Tax rate cannot be removed. It exists in tax rule","税率ä¸èƒ½è¢«åˆ 除。它å˜åœ¨äºŽç¨ŽåŠ¡è§„则ä¸ã€‚"
-"Tax rates at the same priority are added, others are compounded.","åŒä¸€ä¼˜å…ˆçº§çš„ç¨ŽçŽ‡å·²è¢«æ·»åŠ ï¼Œå…¶å®ƒçš„æ˜¯é›†åˆçš„。"
-"The tax class has been deleted.","è¯¥ç¨ŽåŠ¡ç±»åž‹å·²è¢«åˆ é™¤ã€‚"
-"The tax class has been saved.","该税务类型已ä¿å˜ã€‚"
-"The tax rate has been deleted.","è¯¥ç¨ŽçŽ‡å·²è¢«åˆ é™¤ã€‚"
-"The tax rate has been imported.","该税率已被导入。"
-"The tax rate has been saved.","该税率已ä¿å˜ã€‚"
-"The tax rule has been deleted.","è¯¥ç¨ŽåŠ¡è§„åˆ™å·²è¢«åˆ é™¤ã€‚"
-"The tax rule has been saved.","该税务规则已ä¿å˜ã€‚"
-"This class no longer exists","æ¤ç±»åž‹ä¸å†å˜åœ¨ã€‚"
-"This rule no longer exists","该规则ä¸å˜åœ¨ã€‚"
-"This rule no longer exists.","该规则已ä¸å˜åœ¨ã€‚"
-"Total","总数"
-"Unit Price","å•ä»·"
-"Whether catalog prices entered by admin include tax.","ä»»ä½•ç›®å½•ä»·æ ¼åŒ…æ‹¬ç¨Žï¼Œéƒ½ç”±ç®¡ç†å‘˜è¾“入。"
-"Whether shipping amounts entered by admin or obtained from gateways include tax.","任何销售金é¢åŒ…å«ç¨Žï¼Œéƒ½ç”±ç®¡ç†å‘˜è¾“入或从网关获å–。"
-"Yes","是"
-"You cannot delete this tax class as it is used for %d customer groups.","æ— æ³•åˆ é™¤æ¤ç¨ŽåŠ¡ç±»åž‹ï¼Œå®ƒä½¿ç”¨äºŽï¼…d个客户组ä¸ã€‚"
-"You cannot delete this tax class as it is used for %d products.","æ— æ³•åˆ é™¤æ¤ç¨ŽåŠ¡ç±»åž‹ï¼Œå®ƒä½¿ç”¨äºŽ%d个产å“ä¸ã€‚"
-"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","æ— æ³•åˆ é™¤æ¤ç¨ŽåŠ¡ç±»åž‹ï¼Œå®ƒåœ¨ç¨ŽåŠ¡è§„则ä¸è¢«ä½¿ç”¨ã€‚è‹¥è¦åˆ é™¤è¯·å…ˆåˆ é™¤å¯¹åº”çš„è§„åˆ™ã€‚"
-"Zip/Post Code","邮政编ç "
-"Zip/Post is Range","邮编范围"
+Rate,费率
+"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)"
+"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)"
+"Grand Total Excl. Tax",åˆè®¡ä¸å«ç¨Ž
+"Grand Total Incl. Tax",åˆè®¡å«ç¨Ž
+"Subtotal (Excl. Tax)",å°è®¡ï¼ˆä¸å«ç¨Žï¼‰
+"Subtotal (Incl. Tax)",å°è®¡ï¼ˆå«ç¨Žï¼‰
+"Row Total",总行数
+"Tax Rate Information",税率信æ¯
+"Tax Identifier",税务识别符
+"Zip/Post is Range",邮编范围
+"Zip/Post Code",邮政编ç
+"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1.","'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and are not longer than %1."
+"Range From",范围从
+"Range To",范围到
+State,å·ž
+"Rate Percent",税率百分率
+"Tax Titles",ç¨ŽåŠ¡æ ‡é¢˜
+"Add New Tax Rate",æ·»åŠ æ–°ç¨ŽçŽ‡
+"Delete Rate",åˆ é™¤è´¹çŽ‡
+"Save Rate",ä¿å˜ç¨ŽçŽ‡
+"Manage Tax Rules",管ç†ç¨ŽåŠ¡è§„则
+"Add New Tax Rule",æ·»åŠ æ–°ç¨ŽçŽ‡è§„åˆ™
+"Save Rule",ä¿å˜è§„则
+"Delete Rule",åˆ é™¤è§„åˆ™
+"Tax Rule Information",税务规则信æ¯
+"Customer Tax Class",客户税务类型
+"Product Tax Class",产å“税务类型
+"Tax Rate",税率
+"Tax rates at the same priority are added, others are compounded.",åŒä¸€ä¼˜å…ˆçº§çš„ç¨ŽçŽ‡å·²è¢«æ·»åŠ ï¼Œå…¶å®ƒçš„æ˜¯é›†åˆçš„。
+"Calculate Off Subtotal Only","Calculate Off Subtotal Only"
+"Do you really want to delete this tax class?","Do you really want to delete this tax class?"
+"Add New Tax Class","Add New Tax Class"
+"Subtotal (Excl.Tax)",å°è®¡ï¼ˆä¸å«ç¨Žï¼‰
+"Subtotal (Incl.Tax)",å°è®¡ï¼ˆå«ç¨Žï¼‰
+"Shipping & Handling (Excl.Tax)",è¿è´¹å’Œæ‰‹ç»è´¹ï¼ˆä¸å«ç¨Žï¼‰
+"Shipping & Handling (Incl.Tax)",è¿è´¹å’Œæ‰‹ç»è´¹ï¼ˆå«ç¨Žï¼‰
+"Grand Total (Excl.Tax)",åˆè®¡ï¼ˆä¸å«ç¨Žï¼‰
+"Grand Total (Incl.Tax)",åˆè®¡ï¼ˆå«ç¨Žï¼‰
+"Tax Zones and Rates","Tax Zones and Rates"
+"Manage Tax Rates",管ç†ç¨ŽçŽ‡
+"New Tax Rate",新税率
+"The tax rate has been saved.",该税率已ä¿å˜ã€‚
+"Something went wrong saving this rate.","Something went wrong saving this rate."
+"Edit Tax Rate",编辑税率
+"The tax rate has been deleted.",è¯¥ç¨ŽçŽ‡å·²è¢«åˆ é™¤ã€‚
+"Something went wrong deleting this rate.","Something went wrong deleting this rate."
+"Something went wrong deleting this rate because of an incorrect rate ID.","Something went wrong deleting this rate because of an incorrect rate ID."
+"An error occurred while deleting this tax rate.","An error occurred while deleting this tax rate."
+"Import and Export Tax Rates","Import and Export Tax Rates"
+"The tax rate has been imported.",该税率已被导入。
+"Invalid file upload attempt",æ–‡ä»¶æ— æ•ˆçš„ä¸Šä¼ ä¼å›¾
+"Tax Rules",税务规则
+"New Tax Rule","New Tax Rule"
+"The tax rule has been saved.",该税务规则已ä¿å˜ã€‚
+"Something went wrong saving this tax rule.","Something went wrong saving this tax rule."
+"This rule no longer exists",该规则ä¸å˜åœ¨ã€‚
+"The tax rule has been deleted.",è¯¥ç¨ŽåŠ¡è§„åˆ™å·²è¢«åˆ é™¤ã€‚
+"Something went wrong deleting this tax rule.","Something went wrong deleting this tax rule."
+"Something went wrong saving this tax class.","Something went wrong saving this tax class."
+"Something went wrong deleting this tax class.","Something went wrong deleting this tax class."
+"Invalid type of tax class specified.","Invalid type of tax class specified."
+"Invalid name of tax class specified.","Invalid name of tax class specified."
+"Shipping & Handling Tax",处ç†ã€è¿é€åŠç¨Žé‡‘费用
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
+"Maximum zip code length is 9.","Maximum zip code length is 9."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
+"This class no longer exists.","This class no longer exists."
+"You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class because it is used in Tax Rules. You have to delete the rules it is used in first."
+"You cannot delete this tax class because it is used in existing %1(s).","You cannot delete this tax class because it is used in existing %1(s)."
+"Custom price if available",å¯ç”¨æ—¶çš„è‡ªå®šä¹‰ä»·æ ¼
+"Original price only",仅原价
+"Shipping Origin","Shipping Origin"
+"No (price without tax)","No (price without tax)"
+"Yes (only price with tax)","Yes (only price with tax)"
+"Both (without and with tax)","Both (without and with tax)"
+"Grand Total (Excl. Tax)",åˆè®¡ï¼ˆä¸å«ç¨Žï¼‰
+"Grand Total (Incl. Tax)",åˆè®¡ï¼ˆå«ç¨Žï¼‰
+"Shipping (Excl. Tax)",è¿è´¹ï¼ˆä¸å«ç¨Žï¼‰
+"Shipping (Incl. Tax)",è¿è´¹ï¼ˆå«ç¨Žï¼‰
+"Before Discount",折å‰
+"After Discount",折扣åŽ
+"Excluding Tax",ä¸å«ç¨Ž
+"Including Tax",å«ç¨Ž
+"Including and Excluding Tax",包å«å’Œä¸åŒ…å«ç¨Ž
+"Warning tax configuration can result in rounding errors. ","Warning tax configuration can result in rounding errors. "
+"Store(s) affected: ","Store(s) affected: "
+"Click on the link to <a href=""%1"">ignore this notification</a>","Click on the link to <a href=""%1"">ignore this notification</a>"
+"Warning tax discount configuration might result in different discounts
+ than a customer might expect. ","Warning tax discount configuration might result in different discounts
+ than a customer might expect. "
+"Please see <a href=""%1"">documentation</a> for more details. ","Please see <a href=""%1"">documentation</a> for more details. "
+"Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings.","Click here to go to <a href=""%1"">Tax Configuration</a> and change your settings."
+"customer group","customer group"
+product,product
+"Import Tax Rates",导入税率
+"Export Tax Rates",导出税率
+Note:,Note:
+"Leave this field empty if you wish to use the tax identifier.","Leave this field empty if you wish to use the tax identifier."
+"Do you really want to delete this tax rate?","Do you really want to delete this tax rate?"
+"Add New Class",æ·»åŠ æ–°ç±»
+"Default Country","Default Country"
+"Tax Calculation Based On","Tax Calculation Based On"
+"Tax Classes","Tax Classes"
+"Tax Class for Shipping","Tax Class for Shipping"
+"Default Tax Class for Product","Default Tax Class for Product"
+"Default Tax Class for Customer","Default Tax Class for Customer"
+"Calculation Settings","Calculation Settings"
+"Tax Calculation Method Based On","Tax Calculation Method Based On"
+"Catalog Prices","Catalog Prices"
+"This sets whether catalog prices entered by admin include tax.","This sets whether catalog prices entered by admin include tax."
+"Shipping Prices","Shipping Prices"
+"This sets whether shipping amounts entered by admin or obtained from gateways include tax.","This sets whether shipping amounts entered by admin or obtained from gateways include tax."
+"Apply Customer Tax","Apply Customer Tax"
+"Apply Discount On Prices","Apply Discount On Prices"
+"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected."
+"Apply Tax On","Apply Tax On"
+"Enable Cross Border Trade","Enable Cross Border Trade"
+"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
+"Default Tax Destination Calculation","Default Tax Destination Calculation"
+"Default State","Default State"
+"Default Post Code","Default Post Code"
+"Price Display Settings","Price Display Settings"
+"Display Product Prices In Catalog","Display Product Prices In Catalog"
+"Display Shipping Prices","Display Shipping Prices"
+"Shopping Cart Display Settings","Shopping Cart Display Settings"
+"Display Prices","Display Prices"
+"Display Subtotal","Display Subtotal"
+"Display Shipping Amount","Display Shipping Amount"
+"Include Tax In Grand Total","Include Tax In Grand Total"
+"Display Full Tax Summary","Display Full Tax Summary"
+"Display Zero Tax Subtotal","Display Zero Tax Subtotal"
+"Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
+State/Region,州/地区
+"Subtotal Only","Subtotal Only"
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 42d9c7dfb57..98ab0c00ce8 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -49,9 +49,9 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
protected $_customCssFile;
/**
- * @var \Magento\Theme\Helper\Data
+ * @var \Magento\Framework\Encryption\UrlCoder
*/
- protected $helper;
+ protected $urlCoder;
/**
* @param \Magento\Backend\Block\Template\Context $context
@@ -59,7 +59,7 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
* @param \Magento\Framework\Data\FormFactory $formFactory
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Theme\Model\Uploader\Service $uploaderService
- * @param \Magento\Theme\Helper\Data $helper
+ * @param \Magento\Framework\Encryption\UrlCoder $urlCoder
* @param array $data
*/
public function __construct(
@@ -68,12 +68,12 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Framework\ObjectManager $objectManager,
\Magento\Theme\Model\Uploader\Service $uploaderService,
- \Magento\Theme\Helper\Data $helper,
+ \Magento\Framework\Encryption\UrlCoder $urlCoder,
array $data = array()
) {
parent::__construct($context, $registry, $formFactory, $objectManager, $data);
$this->_uploaderService = $uploaderService;
- $this->helper = $helper;
+ $this->urlCoder = $urlCoder;
}
/**
@@ -313,7 +313,7 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
{
return $this->getUrl(
'adminhtml/*/downloadCss',
- array('theme_id' => $themeId, 'file' => $this->helper->urlEncode($fileId))
+ array('theme_id' => $themeId, 'file' => $this->urlCoder->encode($fileId))
);
}
}
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index d5b95184325..1dc1bd5e765 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -168,6 +168,8 @@ class Header extends \Magento\Framework\View\Element\Template
if (!is_null($storeLogoPath) && $this->_isFile($path)) {
$url = $logoUrl;
+ } elseif ($this->getLogoFile()) {
+ $url = $this->getViewFileUrl($this->getLogoFile());
} else {
$url = $this->getViewFileUrl('images/logo.gif');
}
diff --git a/app/code/Magento/Theme/Helper/Data.php b/app/code/Magento/Theme/Helper/Data.php
deleted file mode 100644
index 71d58220697..00000000000
--- a/app/code/Magento/Theme/Helper/Data.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Theme module helper
- */
-namespace Magento\Theme\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
-{
-}
diff --git a/app/code/Magento/Theme/README.md b/app/code/Magento/Theme/README.md
new file mode 100644
index 00000000000..9035df63952
--- /dev/null
+++ b/app/code/Magento/Theme/README.md
@@ -0,0 +1 @@
+The Theme module contains common infrastructure that provides an ability to apply and use themes in Magento application.
\ No newline at end of file
diff --git a/app/code/Magento/Theme/i18n/de_DE.csv b/app/code/Magento/Theme/i18n/de_DE.csv
index 3219b807563..f94c143a968 100644
--- a/app/code/Magento/Theme/i18n/de_DE.csv
+++ b/app/code/Magento/Theme/i18n/de_DE.csv
@@ -1,71 +1,137 @@
-"%s Item(s)","%s Artikel"
-"© 2008 Magento Demo Store. All Rights Reserved.","© 2008 Magento Demo-Store. Alle Rechte vorbehalten."
-"(Shift-)Click or drag to change value","(Umschalt-)Klick oder ziehen, um Wert zu ändern"
-"(ver. %s)","(ver. %s)"
-"- Click on any of the time parts to increase it","- Klicken Sie auf einen der Zeitwerte um den Wert zu erhöhen"
-"- Hold mouse button on any of the above buttons for faster selection.","- Halten Sie einen der Buttons gedrückt für eine Schnellauswahl."
-"- Use the %s buttons to select month","- Benutzen Sie die %s Buttons für die Monatsauswahl"
-"- Use the %s, %s buttons to select year","- Benutzen Sie die %s, %s Buttons für die Jahresauswahl"
-"- or Shift-click to decrease it","- oder Umschalt-Taste gedrückt halten und klicken, um den Wert zu verkleinern"
-"- or click and drag for faster selection.","- oder klicken und ziehen Sie für eine Schnellauswahl."
+Remove,Remove
+Close,Schließen
+"Delete File","Delete File"
"-- Please Select --","-- Bitte auswählen –"
-"1 column","1 Spalte"
-"2 columns with left bar","2 Spalten mit linker Leiste"
-"2 columns with right bar","2 Spalten mit rechter Leiste"
-"3 columns","3 Spalten"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
"About the calendar","Ãœber den Kalender"
-"All Empty Layout Pages","Alle leeren Layout-Seiten"
-"All One-Column Layout Pages","Alle einspaltigen Layout-Seiten"
-"All Pages","Alle Seiten"
-"All Pages (Print Version)","Alle Seiten (Druckversion)"
-"All Three-Column Layout Pages","Alle dreispaltigen Layout-Seiten"
-"All Two-Column Layout Pages (Left Column)","Alle zweispaltigen Layout-Seiten (Linke Spalte)"
-"All Two-Column Layout Pages (Right Column)","Alle zweispaltigen Layout-Seiten (Rechte Spalte)"
-"Allow","Erlauben"
-"Click <a href=""%s"">here</a> if nothing has happened","Klicken Sie <a href=""%s"">hier</a>, wenn nichts passiert ist"
-"Close","Schließen"
-"Close Window","Fenster schließen"
-"DHTML Date/Time Selector","DHTML Date/Time Selektor"
-"Date selection:","Datumsauswahl:"
-"Default Description","Standard Beschreibung"
-"Default welcome msg!","Standard Willkommensnachricht!"
-"Display %s first","Zeige %s zuerst"
-"Distributed under GNU LGPL. See %s for details.","Veröffentlicht unter der GNU LGPL. Mehr Informationen unter %s."
-"Drag to move","Ziehen zum Bewegen"
-"Empty","Leer"
-"For latest version visit: %s","Für die letzte Version besuchen Sie bitte: %s"
"Go Today","Heute aufrufen"
+Previous,Zurück
+Next,Weiter
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page","pro Seite"
+Page,Page
+label,label
+Empty,Leer
+"Close Window","Fenster schließen"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Anzeigen
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs","Melden Sie alle Fehler"
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
"Help Us to Keep Magento Healthy","Helfen Sie uns Magento gesund zu halten"
-"Interface Language","Sprache der Benutzeroberfläche"
-"Items %s to %s of %s total","Artikel %s bis %s von insgesamt %s"
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","JavaScript scheint in Ihrem Browser deaktiviert zu sein."
-"Left Column","Linke Spalte"
-"Main Content Area","Hauptinhaltsbereich"
-"Navigation Bar","Navigationsleiste"
-"Next","Weiter"
-"Next month (hold for menu)","Nächster Monat (gedrückt halten für Menü)"
-"Next year (hold for menu)","Nächstes Jahr (gedrückt halten für Menü)"
-"Page Bottom","Seitenende"
-"Page Footer","Seitenfuß"
-"Page Header","Seitenkopf"
-"Page Top","Seitenanfang"
-"Page:","Seite:"
-"Prev. month (hold for menu)","Vor. Monat (gedrückt halten für Menü)"
-"Prev. year (hold for menu)","Vor. Jahr (gedrückt halten für Menü)"
-"Previous","Zurück"
-"Redirecting...","Umleitung…"
-"Report All Bugs","Melden Sie alle Fehler"
-"Right Column","Rechte Spalte"
-"Select Store","Store auswählen"
-"Select Store:","Store auswählen:"
-"Select date","Datum auswählen"
-"Show","Anzeigen"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Dies ist ein Demo-Store. Jegliche Bestellung in diesem Store wird weder beachtet noch ausgeführt."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","Zur Bereitstellung aller Funktionen ist diese Website auf Cookies angewiesen. Auf unserer <a href=""%s"">Datenschutzseite</a> erfahren Sie mehr über die in den Cookies enthaltenen Daten. Um Cookies von dieser Website zuzulassen, klicken Sie bitte im Folgenden auf „akzeptieren“."
-"Time selection:","Zeitauswahl:"
-"Time:","Zeit:"
-"Welcome, %s!","Willkommen, %s!"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Sie müssen JavaScript in Ihrem Browser aktivieren um alle Funktionen dieser Webseite nutzen zu können."
-"Your Language","Ihre Sprache"
-"Your Language:","Ihre Sprache:"
-"per page","pro Seite"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description","Standard Beschreibung"
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!","Standard Willkommensnachricht!"
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column","1 Spalte"
+"2 columns with left bar","2 Spalten mit linker Leiste"
+"2 columns with right bar","2 Spalten mit rechter Leiste"
+"3 columns","3 Spalten"
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
index 4c01f55ed98..4c98001e69b 100644
--- a/app/code/Magento/Theme/i18n/en_US.csv
+++ b/app/code/Magento/Theme/i18n/en_US.csv
@@ -1,73 +1,137 @@
-"%s Item(s)","%s Item(s)"
-"© 2008 Magento Demo Store. All Rights Reserved.","© 2008 Magento Demo Store. All Rights Reserved."
-"(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
-"(ver. %s)","(ver. %s)"
-"- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"
-"- Hold mouse button on any of the above buttons for faster selection.","- Hold mouse button on any of the above buttons for faster selection."
-"- Use the %s buttons to select month","- Use the %s buttons to select month"
-"- Use the %s, %s buttons to select year","- Use the %s, %s buttons to select year"
-"- or Shift-click to decrease it","- or Shift-click to decrease it"
-"- or click and drag for faster selection.","- or click and drag for faster selection."
+Remove,Remove
+Close,Close
+"Delete File","Delete File"
"-- Please Select --","-- Please Select --"
-"1 column","1 column"
-"2 columns with left bar","2 columns with left bar"
-"2 columns with right bar","2 columns with right bar"
-"3 columns","3 columns"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
"About the calendar","About the calendar"
-"All Empty Layout Pages","All Empty Layout Pages"
-"All One-Column Layout Pages","All One-Column Layout Pages"
-"All Pages","All Pages"
-"All Pages (Print Version)","All Pages (Print Version)"
-"All Three-Column Layout Pages","All Three-Column Layout Pages"
-"All Two-Column Layout Pages (Left Column)","All Two-Column Layout Pages (Left Column)"
-"All Two-Column Layout Pages (Right Column)","All Two-Column Layout Pages (Right Column)"
-"Allow","Allow"
-"Breadcrumbs","Breadcrumbs"
-"Click <a href=""%s"">here</a> if nothing has happened","Click <a href=""%s"">here</a> if nothing has happened"
-"Close","Close"
-"Close Window","Close Window"
-"DHTML Date/Time Selector","DHTML Date/Time Selector"
-"Date selection:","Date selection:"
-"Default Description","Default Description"
-"Default welcome msg!","Default welcome msg!"
-"Display %s first","Display %s first"
-"Distributed under GNU LGPL. See %s for details.","Distributed under GNU LGPL. See %s for details."
-"Drag to move","Drag to move"
-"Empty","Empty"
-"For latest version visit: %s","For latest version visit: %s"
-"Free Shipping on orders over 50$","Free Shipping on orders over 50$"
"Go Today","Go Today"
+Previous,Previous
+Next,Next
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page","per page"
+Page,Page
+label,label
+Empty,Empty
+"Close Window","Close Window"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Show
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs","Report All Bugs"
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
"Help Us to Keep Magento Healthy","Help Us to Keep Magento Healthy"
-"Interface Language","Interface Language"
-"Items %s to %s of %s total","Items %s to %s of %s total"
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser."
-"Left Column","Left Column"
-"Main Content Area","Main Content Area"
-"Navigation Bar","Navigation Bar"
-"Next","Next"
-"Next month (hold for menu)","Next month (hold for menu)"
-"Next year (hold for menu)","Next year (hold for menu)"
-"Page Bottom","Page Bottom"
-"Page Footer","Page Footer"
-"Page Header","Page Header"
-"Page Top","Page Top"
-"Page:","Page:"
-"Prev. month (hold for menu)","Prev. month (hold for menu)"
-"Prev. year (hold for menu)","Prev. year (hold for menu)"
-"Previous","Previous"
-"Redirecting...","Redirecting..."
-"Report All Bugs","Report All Bugs"
-"Right Column","Right Column"
-"Select Store","Select Store"
-"Select Store:","Select Store:"
-"Select date","Select date"
-"Show","Show"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below."
-"Time selection:","Time selection:"
-"Time:","Time:"
-"Welcome, %s!","Welcome, %s!"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","You must have JavaScript enabled in your browser to utilize the functionality of this website."
-"Your Language","Your Language"
-"Your Language:","Your Language:"
-"per page","per page"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description","Default Description"
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!","Default welcome msg!"
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column","1 column"
+"2 columns with left bar","2 columns with left bar"
+"2 columns with right bar","2 columns with right bar"
+"3 columns","3 columns"
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/i18n/es_ES.csv b/app/code/Magento/Theme/i18n/es_ES.csv
index 36ccfada132..1a4040a9d1c 100644
--- a/app/code/Magento/Theme/i18n/es_ES.csv
+++ b/app/code/Magento/Theme/i18n/es_ES.csv
@@ -1,71 +1,137 @@
-"%s Item(s)","%s artÃculo(s)"
-"© 2008 Magento Demo Store. All Rights Reserved.","&copiar; Tienda de demostración de Magengo 2008. Todos los derechos reservados."
-"(Shift-)Click or drag to change value","Pulse (Shift-) o arrastre para modificar el valor"
-"(ver. %s)","(ver. %s)"
-"- Click on any of the time parts to increase it","- Pulse sobre cualquiera de los fragmentos de tiempo para aumentarlo"
-"- Hold mouse button on any of the above buttons for faster selection.","- Mantenga pulsado el botón del ratón sobre cualquiera de los botones de arriba para obtener una selección más rápida."
-"- Use the %s buttons to select month","- Utilice los botones %s para seleccionar el mes"
-"- Use the %s, %s buttons to select year","- Utilice los botones %s, %s para seleccionar el año"
-"- or Shift-click to decrease it","- o pulse Shift para disminuirlo"
-"- or click and drag for faster selection.","- o pulse y arrastre para obtener una selección más rápida."
+Remove,Remove
+Close,Cerrar
+"Delete File","Delete File"
"-- Please Select --","-- Seleccionar, por favor --"
-"1 column","1 columna"
-"2 columns with left bar","2 columnas con barra a la izquierda"
-"2 columns with right bar","2 columnas con barra a la derecha"
-"3 columns","3 columnas"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
"About the calendar","Sobre el calendario"
-"All Empty Layout Pages","Todas las páginas de diseño vacÃas"
-"All One-Column Layout Pages","Todas las páginas de diseño con una columna"
-"All Pages","Todas las páginas"
-"All Pages (Print Version)","Todas las páginas (versión para imprimir)"
-"All Three-Column Layout Pages","Todas las páginas de diseño con tres columnas"
-"All Two-Column Layout Pages (Left Column)","Todas las páginas de diseño con dos columnas (columna a la izquierda)"
-"All Two-Column Layout Pages (Right Column)","Todas las páginas de diseño con dos columnas (columna a la derecha)"
-"Allow","Permitir"
-"Click <a href=""%s"">here</a> if nothing has happened","Haga clic <a href=""%s"">aquÃ</a> si no ha ocurrido nada"
-"Close","Cerrar"
-"Close Window","Cerrar Ventana"
-"DHTML Date/Time Selector","Selector de fecha/hora DHTML"
-"Date selection:","Elección de la fecha:"
-"Default Description","Descripción predeterminada"
-"Default welcome msg!","¡Mensaje por defecto de bienvenida!"
-"Display %s first","Mostrar %s primero"
-"Distributed under GNU LGPL. See %s for details.","Distribuido según la LGPL de GNU. Para más información véase %s."
-"Drag to move","Arrastrar para mover"
-"Empty","VacÃo(a)"
-"For latest version visit: %s","Para la última versión, visitar: %s"
"Go Today","Ir a Hoy"
+Previous,Anterior
+Next,Siguiente
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page","por página"
+Page,Page
+label,label
+Empty,VacÃo(a)
+"Close Window","Cerrar Ventana"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Mostrar
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs","Informar de todos los errores"
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
"Help Us to Keep Magento Healthy","Ayúdenos a que Magento siga funcionando correctamente"
-"Interface Language","Idioma de interfaz"
-"Items %s to %s of %s total","Elementos %s a %s de un total de %s"
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","Puede que JavaScript esté deshabilitado en tu navegador."
-"Left Column","Columna izquierda"
-"Main Content Area","Ãrea de contenido principal"
-"Navigation Bar","Barra de navegación"
-"Next","Siguiente"
-"Next month (hold for menu)","Mes siguiente (mantenga presionado para ver menú)"
-"Next year (hold for menu)","Año siguiente (mantenga presionado para ver menú)"
-"Page Bottom","Parte inferior de la página"
-"Page Footer","Pie de página"
-"Page Header","Encabezado de página"
-"Page Top","Parte superior de la página"
-"Page:","Página:"
-"Prev. month (hold for menu)","Mes anterior (mantenga presionado para ver el menú)"
-"Prev. year (hold for menu)","Año anterior (mantenga presionado para ver el menú)"
-"Previous","Anterior"
-"Redirecting...","Redireccionando..."
-"Report All Bugs","Informar de todos los errores"
-"Right Column","Columna derecha"
-"Select Store","Seleccionar tienda"
-"Select Store:","Seleccionar tienda:"
-"Select date","Seleccionar fecha"
-"Show","Mostrar"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Esta es una tienda de demostración. Cualquier pedido realizado en esta tienda no será aceptado ni completado."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","Este sitio web requiere cookies para que funcionen todas sus caracterÃsticas. Para más información sobre qué datos contienen las cookies, por favor visite nuestra <a href=""%s"">página sobre polÃtica de privacidad</a>. Para aceptar las cookies de este sitio, por favor haga clic en el botón ""aceptar""."
-"Time selection:","Selección de tiempo:"
-"Time:","Hora:"
-"Welcome, %s!","¡Bienvenido, %s!"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Tiene que activar el JavaScript del navegador para utilizar las funciones de este sitio web."
-"Your Language","Su idioma"
-"Your Language:","Su idioma:"
-"per page","por página"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description","Descripción predeterminada"
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!","¡Mensaje por defecto de bienvenida!"
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column","1 columna"
+"2 columns with left bar","2 columnas con barra a la izquierda"
+"2 columns with right bar","2 columnas con barra a la derecha"
+"3 columns","3 columnas"
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/i18n/fr_FR.csv b/app/code/Magento/Theme/i18n/fr_FR.csv
index 284051a55e1..62ff62757e9 100644
--- a/app/code/Magento/Theme/i18n/fr_FR.csv
+++ b/app/code/Magento/Theme/i18n/fr_FR.csv
@@ -1,71 +1,137 @@
-"%s Item(s)","%s article(s)"
-"© 2008 Magento Demo Store. All Rights Reserved.","& copier; Boutique démo Magento 2008. Tous droits réservés."
-"(Shift-)Click or drag to change value","(SHIFT+) Cliquez ou faites glisser pour changer de valeur."
-"(ver. %s)","(ver. %s)"
-"- Click on any of the time parts to increase it","- Cliquez sur n'importe quelle partie de l'heure pour l'augmenter"
-"- Hold mouse button on any of the above buttons for faster selection.","Maintenez le bouton de la souris enfoncé sur n'importe quel des boutons ci-dessus pour sélectionner plus rapidement"
-"- Use the %s buttons to select month","Utilisez les boutons %s pour sélectionner le mois"
-"- Use the %s, %s buttons to select year","- Utilisez les boutons %s, %s pour sélectionner l'année"
-"- or Shift-click to decrease it","- - ou appuyez sur SHIFT en cliquant pour la diminuer"
-"- or click and drag for faster selection.","- ou cliquez et faites glisser pour sélectionner plus rapidement"
+Remove,Remove
+Close,Fermer
+"Delete File","Delete File"
"-- Please Select --","-- Merci de Sélectionner --"
-"1 column","1 colonne"
-"2 columns with left bar","2 colonnes avec barre gauche"
-"2 columns with right bar","2 colonnes avec barre droite"
-"3 columns","3 colonnes"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
"About the calendar","Au sujet du Calendrier"
-"All Empty Layout Pages","Toutes les Pages vides"
-"All One-Column Layout Pages","Toutes les Pages à une Seule Colonne"
-"All Pages","Toutes les Pages"
-"All Pages (Print Version)","Toutes les Pages (Version Imprimable)"
-"All Three-Column Layout Pages","Toutes les Pages à Trois Colonnes"
-"All Two-Column Layout Pages (Left Column)","Toutes les Pages à Deux Colonnes (Colonne de Gauche)"
-"All Two-Column Layout Pages (Right Column)","Toutes les Pages à Deux colonnes (Colonne de Droite)"
-"Allow","Autoriser"
-"Click <a href=""%s"">here</a> if nothing has happened","Cliquez <a href=""%s"">ici</a> si rien ne s'est produit"
-"Close","Fermer"
-"Close Window","Fermer fenêtre"
-"DHTML Date/Time Selector","Sélecteur DHTML Date/Heure"
-"Date selection:","Sélection de la date:"
-"Default Description","Description par défaut"
-"Default welcome msg!","Message de bienvenue par défaut!"
-"Display %s first","Afficher %s en premier"
-"Distributed under GNU LGPL. See %s for details.","Distribué sous GNU LGPL. Voir %s pour plus de détails."
-"Drag to move","Faire glisser"
-"Empty","Vide"
-"For latest version visit: %s","Pour visiter la dernière version: %s"
"Go Today","Aller aujourd'hui"
+Previous,Précédent
+Next,Suivant
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page","par page"
+Page,Page
+label,label
+Empty,Vide
+"Close Window","Fermer fenêtre"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Montrer
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs","Rapporter tous les bugs"
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
"Help Us to Keep Magento Healthy","Aidez-nous à maintenir Magento en forme"
-"Interface Language","Langue de l'Interface"
-"Items %s to %s of %s total","Total des articles %s à %s de %s"
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","Le JavaScript semble être désactivé sur votre navigateur."
-"Left Column","Colonne de Gauche"
-"Main Content Area","Zone Principale"
-"Navigation Bar","Barre de navigation"
-"Next","Suivant"
-"Next month (hold for menu)","Mois suivant (maintenez pour menu)"
-"Next year (hold for menu)","Année Suivante (maintenez pour menu)"
-"Page Bottom","Bas de la page"
-"Page Footer","Pied de page"
-"Page Header","En-tête"
-"Page Top","Haut de la page"
-"Page:","Page:"
-"Prev. month (hold for menu)","Mois précédent (maintenez pour menu)"
-"Prev. year (hold for menu)","Année précédente (maintenez pour menu)"
-"Previous","Précédent"
-"Redirecting...","En cours de redirection..."
-"Report All Bugs","Rapporter tous les bugs"
-"Right Column","Colonne de Droite"
-"Select Store","Sélectionnez Boutique"
-"Select Store:","Sélectionnez la boutique:"
-"Select date","Sélectionnez la date"
-"Show","Montrer"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Ceci est une boutique démo. Toutes les commandes passées via cette boutique ne pourront êtres satisfaites."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","Les cookies doivent être activés pour profiter de toutes les fonctionnalités de ce site Web. Pour plus d'informations sur les données contenues dans les cookies, veuillez visiter notre page relative à la <a href=""%s"">protection de la vie privée</a>. Pour accepter des cookies de ce site, veuillez cliquer sur accepter ci-dessous."
-"Time selection:","Sélection de l'heure:"
-"Time:","Heure:"
-"Welcome, %s!","Bienvenue, %s!"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Javascript doit être activé dans votre navigateur pour que vous puissiez utiliser les fonctionnalités de ce site internet."
-"Your Language","Votre Langue"
-"Your Language:","Votre Langue:"
-"per page","par page"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description","Description par défaut"
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!","Message de bienvenue par défaut!"
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column","1 colonne"
+"2 columns with left bar","2 colonnes avec barre gauche"
+"2 columns with right bar","2 colonnes avec barre droite"
+"3 columns","3 colonnes"
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/i18n/nl_NL.csv b/app/code/Magento/Theme/i18n/nl_NL.csv
index 68bcdd7253e..ccd1f5f6316 100644
--- a/app/code/Magento/Theme/i18n/nl_NL.csv
+++ b/app/code/Magento/Theme/i18n/nl_NL.csv
@@ -1,71 +1,137 @@
-"%s Item(s)","%s Artikel(en)"
-"© 2008 Magento Demo Store. All Rights Reserved.","© 2008 Magento Demo Store. Alle rechten voorbehouden."
-"(Shift-)Click or drag to change value","(Shift-)Klik of sleep om de waarde te veranderen"
-"(ver. %s)","(ver. %s)"
-"- Click on any of the time parts to increase it","- Klik op een van de tijd gedeeltes om deze te verhogen"
-"- Hold mouse button on any of the above buttons for faster selection.","- Houd de muisknop op een van de bovenstaande knoppen om sneller te selecteren"
-"- Use the %s buttons to select month","- Gebruik de %s knoppen om de maand te selecteren"
-"- Use the %s, %s buttons to select year","- Gebruik de %s, %s knoppen om het jaar te selecteren"
-"- or Shift-click to decrease it","- of Shift-klik om het te verlagen"
-"- or click and drag for faster selection.","- of klik en sleep voor snelle selectie."
+Remove,Remove
+Close,Sluiten
+"Delete File","Delete File"
"-- Please Select --","-- Selecteer alstublieft --"
-"1 column","1 kolom"
-"2 columns with left bar","2 kolommen met linkerbalk"
-"2 columns with right bar","2 kolommen met rechterbalk"
-"3 columns","3 kolommen"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
"About the calendar","Over de kalender"
-"All Empty Layout Pages","Alle lege opmaakpagina's"
-"All One-Column Layout Pages","Alle een-kolom opmaakpagina's"
-"All Pages","Alle pagina's"
-"All Pages (Print Version)","Alle pagina's (printversie)"
-"All Three-Column Layout Pages","Alle drie-kolom opmaakpagina's"
-"All Two-Column Layout Pages (Left Column)","Alle twee-kolom opmaakpagina's (linkerbalk)"
-"All Two-Column Layout Pages (Right Column)","Alle twee-kolom opmaakpagina's (rechterbalk)"
-"Allow","Toestaan"
-"Click <a href=""%s"">here</a> if nothing has happened","Klik <a href=""%s"">hier</a> als niets is gebeurd"
-"Close","Sluiten"
-"Close Window","Venster Sluiten"
-"DHTML Date/Time Selector","DHTML Datum/tijd selectie"
-"Date selection:","Datumselectie:"
-"Default Description","Standaard Omschrijving"
-"Default welcome msg!","Standaard welkom bericht!"
-"Display %s first","Geef %s eerst weer"
-"Distributed under GNU LGPL. See %s for details.","Gedistrubueerd onder GNU LGPL. Zie %s voor details."
-"Drag to move","Sleep om te verplaatsen"
-"Empty","Leeg"
-"For latest version visit: %s","Zie voor de laatste versie: %s"
"Go Today","Ga Vandaag"
+Previous,Vorige
+Next,Volgende
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page","per pagina"
+Page,Page
+label,label
+Empty,Leeg
+"Close Window","Venster Sluiten"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Toon
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs","Rapporteer Alle Bugs"
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
"Help Us to Keep Magento Healthy","Help ons Magento gezond te houden"
-"Interface Language","Interface Taal"
-"Items %s to %s of %s total","Onderdelen %s tot %s van totaal %s"
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","JavaScript lijkt uitgeschakeld te zijn in uw browser."
-"Left Column","Linker Kolom"
-"Main Content Area","Area Hoofd Inhoud"
-"Navigation Bar","Navigatiebalk"
-"Next","Volgende"
-"Next month (hold for menu)","Volgende maand (houd ingedrukt voor menu)"
-"Next year (hold for menu)","Volgend jaar (houd ingedrukt voor menu)"
-"Page Bottom","Onderkant pagina"
-"Page Footer","Voetnoot Pagina"
-"Page Header","Kopregel Pagina"
-"Page Top","Bovenkant pagina"
-"Page:","Pagina:"
-"Prev. month (hold for menu)","Vorige maand (vasthouden voor menu)"
-"Prev. year (hold for menu)","Vorig jaar (houd ingedrukt voor menu)"
-"Previous","Vorige"
-"Redirecting...","Doorverwijzen..."
-"Report All Bugs","Rapporteer Alle Bugs"
-"Right Column","Rechterkolom"
-"Select Store","Selecteer winkel"
-"Select Store:","Selecteer winkel:"
-"Select date","Selecteer datum"
-"Show","Toon"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Dit is een demo winkel. Geplaatste bestellingen bij deze winkel worden niet gehonoreerd of uitgevoerd."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","Deze website vereist cookies voor al zijn functies. Voor meer informatie over welke gegevens in de cookies zitten, zie onze <a href=""%s""> privacybeleid pagina </a> om cookies te accepteren van deze site, klik hieronder om te accepteren."
-"Time selection:","Tijdselectie:"
-"Time:","Tijd:"
-"Welcome, %s!","Welkom, %s!"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","U moet JavaScript in uw browser hebben ingeschakeld om de functionaliteit van de website te gebruiken."
-"Your Language","Uw taal"
-"Your Language:","Uw taal:"
-"per page","per pagina"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description","Standaard Omschrijving"
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!","Standaard welkom bericht!"
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column","1 kolom"
+"2 columns with left bar","2 kolommen met linkerbalk"
+"2 columns with right bar","2 kolommen met rechterbalk"
+"3 columns","3 kolommen"
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/i18n/pt_BR.csv b/app/code/Magento/Theme/i18n/pt_BR.csv
index e301bc766b9..0077e120ba4 100644
--- a/app/code/Magento/Theme/i18n/pt_BR.csv
+++ b/app/code/Magento/Theme/i18n/pt_BR.csv
@@ -1,71 +1,137 @@
-"%s Item(s)","%s Item(s)"
-"© 2008 Magento Demo Store. All Rights Reserved.","&cópia; 2008 Magento Demo Store. Todos os direitos reservados."
-"(Shift-)Click or drag to change value","(Shift-)Clique ou arraste para mudar o valor"
-"(ver. %s)","(ver. %s)"
-"- Click on any of the time parts to increase it","- Clique em qualquer uma das partes da hora para a aumentar"
-"- Hold mouse button on any of the above buttons for faster selection.","- Segure o botão do rato sobre qualquer um dos botões acima para selecionar rapidamente."
-"- Use the %s buttons to select month","- Use os botões %s para selecionar o mês"
-"- Use the %s, %s buttons to select year","- Use os botões %s, %s para selecionar o ano"
-"- or Shift-click to decrease it","- Ou clique-Shift para diminuir"
-"- or click and drag for faster selection.","- ou clique e arraste para uma seleção mais rápida."
+Remove,Remove
+Close,Fechar
+"Delete File","Delete File"
"-- Please Select --","- Por Favor Selecione -"
-"1 column","1 coluna"
-"2 columns with left bar","2 colunas com barra à esquerda"
-"2 columns with right bar","2 colunas com barra à direita"
-"3 columns","3 colunas"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
"About the calendar","Sobre o calendário"
-"All Empty Layout Pages","Todas as Páginas de Layout estão Vazias"
-"All One-Column Layout Pages","Todas as Páginas de Layout de Uma Coluna"
-"All Pages","Todas as Páginas"
-"All Pages (Print Version)","Todas as Páginas (Versão para Impressão)"
-"All Three-Column Layout Pages","Todas as Páginas de Layout de Três Colunas"
-"All Two-Column Layout Pages (Left Column)","Todas as Páginas de Layout de Duas Colunas (Coluna à Esquerda)"
-"All Two-Column Layout Pages (Right Column)","Todas as Páginas de Layout de Duas Colunas (Coluna à Direita)"
-"Allow","Permitir"
-"Click <a href=""%s"">here</a> if nothing has happened","Clique <a href=""%s"">aqui</a> se nada ocorreu"
-"Close","Fechar"
-"Close Window","Fechar Janela"
-"DHTML Date/Time Selector","Seletor de Data/Hora DHTML"
-"Date selection:","Seleção de data:"
-"Default Description","Descrição padrão"
-"Default welcome msg!","Mensagem de boas-vindas padrão!"
-"Display %s first","Mostrar primeiro %s"
-"Distributed under GNU LGPL. See %s for details.","DistribuÃdo sob a GNU LGPL. Veja %s para detalhes."
-"Drag to move","Arraste para mover"
-"Empty","Vazio"
-"For latest version visit: %s","Para última versão, visitar: %s"
"Go Today","Ir Hoje"
+Previous,Anterior
+Next,Próximo
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page","por página"
+Page,Page
+label,label
+Empty,Vazio
+"Close Window","Fechar Janela"
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,Mostrar
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs","Reporte Todos os Erros"
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
"Help Us to Keep Magento Healthy","Ajude-nos a manter o Magento Saudável"
-"Interface Language","Linguagem da Interface"
-"Items %s to %s of %s total","Itens %s a %s de um total de %s"
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","O JavaScript parece estar desativado no seu navegador."
-"Left Column","Coluna da esquerda"
-"Main Content Area","Ãrea de Conteúdo Principal"
-"Navigation Bar","Barra de Navegação"
-"Next","Próximo"
-"Next month (hold for menu)","Próximo mês (segurar para menu)"
-"Next year (hold for menu)","Próximo ano (segurar para menu)"
-"Page Bottom","Fim da Página"
-"Page Footer","Rodapé da Página"
-"Page Header","Cabeçalho da Página"
-"Page Top","Topo da Página"
-"Page:","Página:"
-"Prev. month (hold for menu)","Mês prévio (segure para menu)"
-"Prev. year (hold for menu)","Ano anterior (segure para menu)"
-"Previous","Anterior"
-"Redirecting...","Redirecionando..."
-"Report All Bugs","Reporte Todos os Erros"
-"Right Column","Coluna da direita"
-"Select Store","Selecionar Loja"
-"Select Store:","Selecionar Loja:"
-"Select date","Selecione data"
-"Show","Mostrar"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Esta é uma loja de demonstração. Qualquer ordem ou encomenda colocada nesta loja não será honrada ou completa."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","Este site requer fornecimento de cookies para oferecer todas as suas funções. Para mais informações sobre quais dados são armazenados nos cookies, por favor veja nossa <a href=""%s"">página de polÃtica de privacidade</a> Para aceitar cookies deste site, por favor clique abaixo em aceitar."
-"Time selection:","Seleção de tempo:"
-"Time:","Tempo:"
-"Welcome, %s!","Bem-vindo, %s!"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Você deve ativar o Javascript no seu navegador para utilizar as funcionalidades deste site."
-"Your Language","Seu Idioma"
-"Your Language:","Seu Idioma:"
-"per page","por página"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description","Descrição padrão"
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!","Mensagem de boas-vindas padrão!"
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column","1 coluna"
+"2 columns with left bar","2 colunas com barra à esquerda"
+"2 columns with right bar","2 colunas com barra à direita"
+"3 columns","3 colunas"
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/i18n/zh_CN.csv b/app/code/Magento/Theme/i18n/zh_CN.csv
index 97bb5a1bbaf..da8737f17e1 100644
--- a/app/code/Magento/Theme/i18n/zh_CN.csv
+++ b/app/code/Magento/Theme/i18n/zh_CN.csv
@@ -1,71 +1,137 @@
-"%s Item(s)","%s 个项目"
-"© 2008 Magento Demo Store. All Rights Reserved.","© 2008 Magento Demo Store. ä¿ç•™æ‰€æœ‰æƒåˆ©ã€‚"
-"(Shift-)Click or drag to change value","（Shift-）点击或拖拽å³å¯æ›´æ”¹å€¼"
-"(ver. %s)","（版本. %s）"
-"- Click on any of the time parts to increase it","- 点击时间的任何部分å³å¯æ›´æ”¹"
-"- Hold mouse button on any of the above buttons for faster selection.","- åœ¨ä»»ä½•æŒ‰é’®ä¸ŠæŒ‰ä¸‹é¼ æ ‡æŒ‰é”®å³å¯é€‰ä¸ã€‚"
-"- Use the %s buttons to select month","- 使用%s 按钮选择月份"
-"- Use the %s, %s buttons to select year","- 使用%s，%s按钮选择年份"
-"- or Shift-click to decrease it","- 或Shift-点击以å‡å°"
-"- or click and drag for faster selection.","- 或点击并拖拽以快速选ä¸ã€‚"
+Remove,Remove
+Close,å…³é—
+"Delete File","Delete File"
"-- Please Select --","-- 请选择 --"
-"1 column","1æ "
-"2 columns with left bar","2æ 带左边æ "
-"2 columns with right bar","2æ 带å³è¾¹æ "
-"3 columns","3æ "
-"About the calendar","关于日历"
-"All Empty Layout Pages","所有空的布局页é¢"
-"All One-Column Layout Pages","所有一æ 布局页é¢"
-"All Pages","所有页é¢"
-"All Pages (Print Version)","所有页é¢ï¼ˆæ‰“å°ç‰ˆï¼‰"
-"All Three-Column Layout Pages","所有三æ 布局页é¢"
-"All Two-Column Layout Pages (Left Column)","所有两æ 布局页é¢ï¼ˆå·¦æ ）"
-"All Two-Column Layout Pages (Right Column)","所有两æ 布局页é¢ï¼ˆå³æ ）"
-"Allow","å…许"
-"Click <a href=""%s"">here</a> if nothing has happened","如果什么都没有å‘生，请点击 <a href=""%s"">这里</a>"
-"Close","å…³é—"
-"Close Window","å…³é—窗å£"
-"DHTML Date/Time Selector","DHTML 日期/时间选择器"
-"Date selection:","选择日期："
-"Default Description","默认æè¿°"
-"Default welcome msg!","默认欢迎信æ¯ï¼"
-"Display %s first","æ˜¾ç¤ºå‰ %s个"
-"Distributed under GNU LGPL. See %s for details.","在GNU LGPL下分å‘。详情请å‚考 %s。"
-"Drag to move","拖拽以移动"
-"Empty","空"
-"For latest version visit: %s","最新版访问：%s"
-"Go Today","转到今天"
-"Help Us to Keep Magento Healthy","帮助我们ä¿è¯Magentoçš„å¥åº·"
-"Interface Language","ç•Œé¢è¯è¨€"
-"Items %s to %s of %s total","项目 %s 到 %s 共 %s个"
+General,General
+"Save and Continue Edit","Save and Continue Edit"
+"About the calendar",关于日历
+"Go Today",转到今天
+Previous,上一个
+Next,下一个
+WK,WK
+Time,Time
+Hour,Hour
+Minute,Minute
+"per page",æ¯é¡µ
+Page,Page
+label,label
+Empty,空
+"Close Window",å…³é—窗å£
+"%1 Item","%1 Item"
+"%1 Item(s)","%1 Item(s)"
+Show,显示
+"Media Storage","Media Storage"
+"Delete Folder","Delete Folder"
+"Insert File","Insert File"
+"New Folder Name:","New Folder Name:"
+"Are you sure you want to delete this folder?","Are you sure you want to delete this folder?"
+"Are you sure you want to delete this file?","Are you sure you want to delete this file?"
+"Storage Root","Storage Root"
+"We cannot upload the file.","We cannot upload the file."
+"We cannot delete root directory %1.","We cannot delete root directory %1."
+Theme,Theme
+"Custom CSS","Custom CSS"
+"Select JS Files to Upload","Select JS Files to Upload"
+Header,Header
+"Are you sure you want to delete this theme?","Are you sure you want to delete this theme?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+"We cannot upload the CSS file.","We cannot upload the CSS file."
+"We cannot upload the JS file.","We cannot upload the JS file."
+"Browse Files","Browse Files"
+"Create Folder","Create Folder"
+"Report All Bugs",报告所有Bug
+"(ver. %1)","(ver. %1)"
+"Welcome, %1!","Welcome, %1!"
+"Add New Theme","Add New Theme"
+Themes,Themes
+"Theme: %1","Theme: %1"
+"New Theme","New Theme"
+"Theme CSS","Theme CSS"
+"Theme CSS Assets","Theme CSS Assets"
+"Select CSS File to Upload","Select CSS File to Upload"
+"Upload CSS File","Upload CSS File"
+"Download CSS File","Download CSS File"
+Manage,Manage
+"Upload Images","Upload Images"
+"Images Assets","Images Assets"
+"Upload Fonts","Upload Fonts"
+"Fonts Assets","Fonts Assets"
+"Edit custom.css","Edit custom.css"
+"Allowed file types *.css.","Allowed file types *.css."
+"This file will replace the current custom.css file and can't be more than 2 MB.","This file will replace the current custom.css file and can't be more than 2 MB."
+"Max file size to upload %1M","Max file size to upload %1M"
+"Something is wrong with the file upload settings.","Something is wrong with the file upload settings."
+"CSS Editor","CSS Editor"
+"Theme Settings","Theme Settings"
+"Parent Theme","Parent Theme"
+"Theme Path","Theme Path"
+"Theme Version","Theme Version"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","Example: 0.0.0.1 or 123.1.0.25-alpha1"
+"Theme Title","Theme Title"
+"Theme Preview Image","Theme Preview Image"
+"Copy of %1","Copy of %1"
+"Max image size %1M","Max image size %1M"
+"Theme JavaScript","Theme JavaScript"
+"Upload JS Files","Upload JS Files"
+"JS Editor","JS Editor"
+"Allowed file types *.js.","Allowed file types *.js."
+"We cannot find theme ""%1"".","We cannot find theme ""%1""."
+"We cannot find the theme.","We cannot find the theme."
+"Theme isn't editable.","Theme isn't editable."
+"You saved the theme.","You saved the theme."
+"You deleted the theme.","You deleted the theme."
+"We cannot delete the theme.","We cannot delete the theme."
+"We cannot find a theme with id ""%1"".","We cannot find a theme with id ""%1""."
+"We cannot find file","We cannot find file"
+"File not found: ""%1"".","File not found: ""%1""."
+"The CSS file must be less than %1M.","The CSS file must be less than %1M."
+"The JS file must be less than %1M.","The JS file must be less than %1M."
+"Use only standard alphanumeric, dashes and underscores.","Use only standard alphanumeric, dashes and underscores."
+"We found a directory with the same name.","We found a directory with the same name."
+"We cannot find a directory with this name.","We cannot find a directory with this name."
+"We found no files.","We found no files."
+"Help Us to Keep Magento Healthy",帮助我们ä¿è¯Magentoçš„å¥åº·
+"Toggle Nav","Toggle Nav"
"JavaScript seems to be disabled in your browser.","ä½ çš„æµè§ˆå™¨ä¼¼ä¹Žç¦ç”¨äº† JavaScript。"
-"Left Column","å·¦æ "
-"Main Content Area","主内容区域"
-"Navigation Bar","导航æ "
-"Next","下一个"
-"Next month (hold for menu)","下个月（按下å¯æ‰“å¼€èœå•ï¼‰"
-"Next year (hold for menu)","明年（按下å¯æ‰“å¼€èœå•ï¼‰"
-"Page Bottom","页é¢åº•éƒ¨"
-"Page Footer","页é¢è„šæ³¨"
-"Page Header","页é¢å¤´éƒ¨"
-"Page Top","页é¢é¡¶éƒ¨"
-"Page:","页é¢ï¼š"
-"Prev. month (hold for menu)","上个月（按下èœå•ï¼‰"
-"Prev. year (hold for menu)","去年（按下å¯æ‰“å¼€èœå•ï¼‰"
-"Previous","上一个"
-"Redirecting...","æ£åœ¨é‡å®šå‘..."
-"Report All Bugs","报告所有Bug"
-"Right Column","å³æ "
-"Select Store","选择店铺"
-"Select Store:","选择店铺："
-"Select date","选择日期"
-"Show","显示"
-"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","这是一个演示商店。任何在æ¤å•†åº—下的订å•å°†æ— 法被兑现或履行。"
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">privacy policy page</a> To accept cookies from this site, please click accept below.","è¯¥ç½‘ç«™éœ€è¦ Cookie æ‰èƒ½æ供完整功能。è¦äº†è§£ Cookie ä¸ä¿å˜äº†å“ªäº›æ•°æ®ï¼Œè¯·å‚考我们的<a href=""%s"">éšç§ç–略页é¢</a>。è¦æŽ¥å—该站点的 Cookie，请点击下方的接å—。"
-"Time selection:","时间选择："
-"Time:","时间："
-"Welcome, %s!","欢迎，%sï¼"
-"You must have JavaScript enabled in your browser to utilize the functionality of this website.","您必须在æµè§ˆå™¨ä¸å¯ç”¨JavaScriptæ‰èƒ½ä½¿ç”¨æœ¬ç½‘站的功能。"
-"Your Language","您的è¯è¨€"
-"Your Language:","您的è¯è¨€ï¼š"
-"per page","æ¯é¡µ"
+"Enable JavaScript in your browser to get the best experience on our website!","Enable JavaScript in your browser to get the best experience on our website!"
+"Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
+"Enable Local Storage in your browser to get the best experience on our website!","Enable Local Storage in your browser to get the best experience on our website!"
+"This is demo store. All orders will not be transferred.","This is demo store. All orders will not be transferred."
+"We use cookies to make your experience better.","We use cookies to make your experience better."
+"To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.","To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies."
+"<a href=""%1"">Learn more</a>.","<a href=""%1"">Learn more</a>."
+"Allow Cookies","Allow Cookies"
+"Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
+"You're currently reading page","You're currently reading page"
+"We don't recognize this file extension.","We don't recognize this file extension."
+"We cannot detect a size.","We cannot detect a size."
+"Logo Image","Logo Image"
+"Logo Image Alt","Logo Image Alt"
+"HTML Head","HTML Head"
+"Favicon Icon","Favicon Icon"
+"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
+"Default Title","Default Title"
+"Title Prefix","Title Prefix"
+"Title Suffix","Title Suffix"
+"Default Description",默认æè¿°
+"Default Keywords","Default Keywords"
+"Miscellaneous Scripts","Miscellaneous Scripts"
+"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML."
+"Display Demo Store Notice","Display Demo Store Notice"
+"Search Engine Robots","Search Engine Robots"
+"Default Robots","Default Robots"
+"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
+"Reset to Defaults","Reset to Defaults"
+"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
+"Welcome Text","Welcome Text"
+Footer,Footer
+Copyright,Copyright
+"Miscellaneous HTML","Miscellaneous HTML"
+"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
+"Default welcome msg!",默认欢迎信æ¯ï¼
+"© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
+"1 column",1æ
+"2 columns with left bar",2æ 带左边æ
+"2 columns with right bar",2æ 带å³è¾¹æ
+"3 columns",3æ
+"Skip to content","Skip to content"
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 059f50dcc4b..9da2f24aaa6 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -31,7 +31,7 @@
<container name="after_body_start" as="after_body_start" label="Page Top">
<block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="html/notices.phtml"/>
</container>
- <container name="header-container" label="Page Header Container" as="header_container" htmlTag="header" htmlClass="page header">
+ <container name="header-container" label="Page Header Container" as="header_container" htmlTag="header" htmlClass="page-header">
<container name="header.panel" label="Page Header Panel" htmlTag="div" htmlClass="panel header">
<block class="Magento\Framework\View\Element\Template" name="skip_to_content" template="Magento_Theme::html/skip.phtml">
<arguments>
@@ -79,12 +79,12 @@
<container name="content.aside" label="Main Content Aside"/>
<container name="content.bottom" label="Main Content Bottom"/>
</container>
- <container name="left" as="left" label="Left Column"/>
- <container name="right" as="right" label="Right Column"/>
+ <container name="sidebar.main" as="sidebar_main" label="Sidebar Main"/>
+ <container name="sidebar.additional" as="sidebar_additional" label="Sidebar Additional"/>
<container name="page.bottom.container" as="page_bottom" label="Before Page Footer Container" htmlTag="div" htmlClass="page bottom">
<container name="page.bottom" label="Before Page Footer" htmlTag="div" htmlClass="content"/>
</container>
- <container name="footer-container" as="footer" label="Page Footer Container" htmlTag="footer" htmlClass="page footer">
+ <container name="footer-container" as="footer" label="Page Footer Container" htmlTag="footer" htmlClass="page-footer">
<container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="footer content">
<block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" template="switch/stores.phtml"/>
<block class="Magento\Framework\View\Element\Html\Links" name="footer_links">
diff --git a/app/code/Magento/Theme/view/frontend/templates/1column.phtml b/app/code/Magento/Theme/view/frontend/templates/1column.phtml
index 0b2ac06ad08..c84a48ccb63 100644
--- a/app/code/Magento/Theme/view/frontend/templates/1column.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/1column.phtml
@@ -41,7 +41,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php echo $this->getAddAttribute() ?>
data-mage-init='{"loaderAjax": {}, "loader": {}}'>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
+ <div class="page-wrapper">
<?php echo $this->getChildHtml('global_notices') ?>
<?php echo $this->getChildHtml('header_container') ?>
<?php echo $this->getChildHtml('page_top') ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/2columns-left.phtml b/app/code/Magento/Theme/view/frontend/templates/2columns-left.phtml
index fa8ea0aa9cb..9cb8a2a99b5 100644
--- a/app/code/Magento/Theme/view/frontend/templates/2columns-left.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/2columns-left.phtml
@@ -41,7 +41,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php echo $this->getAddAttribute(); ?>
data-mage-init='{"loaderAjax": {}, "loader": {}}'>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
+ <div class="page-wrapper">
<?php echo $this->getChildHtml('global_notices') ?>
<?php echo $this->getChildHtml('header_container') ?>
<?php echo $this->getChildHtml('page_top') ?>
@@ -51,8 +51,11 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php
echo $this->getChildHtml('main');
// Inside of <php> to avoid spaces between tags
- echo '<div class="column left sidebar">';
- echo $this->getChildHtml('left');
+ echo '<div class="sidebar sidebar-main">';
+ echo $this->getChildHtml('sidebar_main');
+ echo '</div>';
+ echo '<div class="sidebar sidebar-additional">';
+ echo $this->getChildHtml('sidebar_additional');
echo '</div>';
?>
</div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/2columns-right.phtml b/app/code/Magento/Theme/view/frontend/templates/2columns-right.phtml
index f227734024e..3426b62b125 100644
--- a/app/code/Magento/Theme/view/frontend/templates/2columns-right.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/2columns-right.phtml
@@ -41,7 +41,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php echo $this->getAddAttribute() ?>
data-mage-init='{"loaderAjax": {}, "loader": {}}'>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
+ <div class="page-wrapper">
<?php echo $this->getChildHtml('global_notices') ?>
<?php echo $this->getChildHtml('header_container') ?>
<?php echo $this->getChildHtml('page_top') ?>
@@ -51,8 +51,11 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php
echo $this->getChildHtml('main');
// Inside of <php> to avoid spaces between tags
- echo '<div class="column right sidebar">';
- echo $this->getChildHtml('right');
+ echo '<div class="sidebar sidebar-main">';
+ echo $this->getChildHtml('sidebar_main');
+ echo '</div>';
+ echo '<div class="sidebar sidebar-additional">';
+ echo $this->getChildHtml('sidebar_additional');
echo '</div>';
?>
</div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/3columns.phtml b/app/code/Magento/Theme/view/frontend/templates/3columns.phtml
index 320b9240ba8..2f14747bc4f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/3columns.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/3columns.phtml
@@ -41,7 +41,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php echo $this->getAddAttribute() ?>
data-mage-init='{"loaderAjax": {}, "loader": {}}'>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
+ <div class="page-wrapper">
<?php echo $this->getChildHtml('global_notices') ?>
<?php echo $this->getChildHtml('header_container') ?>
<?php echo $this->getChildHtml('page_top') ?>
@@ -51,11 +51,11 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php
echo $this->getChildHtml('main');
// Inside of <php> to avoid spaces between tags
- echo '<div class="column left sidebar">';
- echo $this->getChildHtml('left');
+ echo '<div class="sidebar sidebar-main">';
+ echo $this->getChildHtml('sidebar_main');
echo '</div>';
- echo '<div class="column right sidebar">';
- echo $this->getChildHtml('right');
+ echo '<div class="sidebar sidebar-additional">';
+ echo $this->getChildHtml('sidebar_additional');
echo '</div>';
?>
</div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/empty.phtml b/app/code/Magento/Theme/view/frontend/templates/empty.phtml
index cce0aeb042a..37e49474ad0 100644
--- a/app/code/Magento/Theme/view/frontend/templates/empty.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/empty.phtml
@@ -41,7 +41,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php echo $this->getAddAttribute() ?>
data-mage-init='{"loaderAjax": {}, "loader": {}}'>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
+ <div class="page-wrapper">
<?php echo $this->getChildHtml('global_notices') ?>
<section id="maincontent" class="page main">
<?php echo $this->getChildHtml('columns_top') ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
index 700abb5e762..b9a68623ebb 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -34,7 +34,7 @@ if (trim($this->getPageTitle())) {
}
?>
<?php if ($title): ?>
-<div class="page title<?php echo $cssClass; ?>">
+<div class="page-title<?php echo $cssClass; ?>">
<h1 class="title"><?php echo $title ?></h1>
<?php echo $this->getChildHtml(); ?>
</div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/popup.phtml b/app/code/Magento/Theme/view/frontend/templates/popup.phtml
index ed03ba43e84..7a21517ac00 100644
--- a/app/code/Magento/Theme/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/popup.phtml
@@ -41,7 +41,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<?php echo $this->getAddAttribute() ?>
data-mage-init='{"loaderAjax": {}, "loader": {}}'>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
+ <div class="page-wrapper">
<?php echo $this->getChildHtml('main') ?>
</div>
<?php echo $this->getChildHtml('before_body_end') ?>
diff --git a/app/code/Magento/Translation/i18n/de_DE.csv b/app/code/Magento/Translation/i18n/de_DE.csv
new file mode 100644
index 00000000000..56239f74d96
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/de_DE.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Translation/i18n/en_US.csv b/app/code/Magento/Translation/i18n/en_US.csv
new file mode 100644
index 00000000000..f2ad248b857
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/en_US.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Translation/i18n/es_ES.csv b/app/code/Magento/Translation/i18n/es_ES.csv
new file mode 100644
index 00000000000..56239f74d96
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/es_ES.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Translation/i18n/fr_FR.csv b/app/code/Magento/Translation/i18n/fr_FR.csv
new file mode 100644
index 00000000000..56239f74d96
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/fr_FR.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Translation/i18n/nl_NL.csv b/app/code/Magento/Translation/i18n/nl_NL.csv
new file mode 100644
index 00000000000..56239f74d96
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/nl_NL.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Translation/i18n/pt_BR.csv b/app/code/Magento/Translation/i18n/pt_BR.csv
new file mode 100644
index 00000000000..56239f74d96
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/pt_BR.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Translation/i18n/zh_CN.csv b/app/code/Magento/Translation/i18n/zh_CN.csv
new file mode 100644
index 00000000000..56239f74d96
--- /dev/null
+++ b/app/code/Magento/Translation/i18n/zh_CN.csv
@@ -0,0 +1,143 @@
+Close,Close
+Cancel,Cancel
+"Add Products","Add Products"
+No,No
+"Delete File","Delete File"
+Delete,Delete
+Save,Save
+Yes,Yes
+"Please select items.","Please select items."
+Submit,Submit
+Error,Error
+"Please wait...","Please wait..."
+"Please select an option.","Please select an option."
+"This is a required field.","This is a required field."
+"Please enter a valid number in this field.","Please enter a valid number in this field."
+"Please enter a valid date.","Please enter a valid date."
+"Please make sure your passwords match.","Please make sure your passwords match."
+"Please enter a valid zip code.","Please enter a valid zip code."
+"Please select State/Province.","Please select State/Province."
+"Please enter a number greater than 0 in this field.","Please enter a number greater than 0 in this field."
+"Please enter a valid credit card number.","Please enter a valid credit card number."
+"Please wait, loading...","Please wait, loading..."
+"No records found.","No records found."
+Loading...,Loading...
+OK,OK
+"New Option","New Option"
+Import,Import
+"start typing to search category","start typing to search category"
+"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"select all","select all"
+Allow,Allow
+"Please specify at least one search term.","Please specify at least one search term."
+"Delete Folder","Delete Folder"
+Folder,Folder
+"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
+"Sorry, there was an unknown error.","Sorry, there was an unknown error."
+Activate,Activate
+Reauthorize,Reauthorize
+"Create New Wish List","Create New Wish List"
+"Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Edit Order","Edit Order"
+"Please specify a shipping method.","Please specify a shipping method."
+Complete,Complete
+"Upload Security Error","Upload Security Error"
+"Upload HTTP Error","Upload HTTP Error"
+"Upload I/O Error","Upload I/O Error"
+"SSL Error: Invalid or self-signed certificate","SSL Error: Invalid or self-signed certificate"
+TB,TB
+GB,GB
+MB,MB
+kB,kB
+B,B
+"Add Products By SKU","Add Products By SKU"
+"Insert Widget...","Insert Widget..."
+"HTML tags are not allowed","HTML tags are not allowed"
+"The value is not within the specified range.","The value is not within the specified range."
+"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
+"Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
+"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
+"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field."
+"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
+"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please use only visible characters and spaces.","Please use only visible characters and spaces."
+"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
+"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
+"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
+"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
+"Please enter a valid social security number. For example 123-45-6789.","Please enter a valid social security number. For example 123-45-6789."
+"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid zip code. For example 90602 or 90602-1234."
+"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please select one of the above options.","Please select one of the above options."
+"Please select one of the options.","Please select one of the options."
+"Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Card type does not match credit card number.","Card type does not match credit card number."
+"Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%."
+"Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
+"Please enter a number lower than 100.","Please enter a number lower than 100."
+"Please select a file","Please select a file"
+"Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
+"This date is a required value.","This date is a required value."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a valid month (1-12).","Please enter a valid month (1-12)."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid full date","Please enter a valid full date"
+Done,Done
+"File extension not known or unsupported type.","File extension not known or unsupported type."
+"Configure Product","Configure Product"
+"Gift Options for ","Gift Options for "
+"Add Products to New Option","Add Products to New Option"
+"Add Products to Option ""%1""","Add Products to Option ""%1"""
+"Add Selected Products","Add Selected Products"
+"Select type of option.","Select type of option."
+"Please add rows to option.","Please add rows to option."
+"Select Product","Select Product"
+"Add Products to Group","Add Products to Group"
+"Choose existing category.","Choose existing category."
+"Create Category","Create Category"
+"Something went wrong while loading the theme.","Something went wrong while loading the theme."
+"We don't recognize or support this file extension type.","We don't recognize or support this file extension type."
+"No stores were reassigned.","No stores were reassigned."
+"Assign theme to your live store-view:","Assign theme to your live store-view:"
+"Default title","Default title"
+"The URL to assign stores is not defined.","The URL to assign stores is not defined."
+"Some problem with revert action","Some problem with revert action"
+"Error: unknown error.","Error: unknown error."
+"Some problem with save action","Some problem with save action"
+"Are you sure you want to delete the folder named","Are you sure you want to delete the folder named"
+"Method ","Method "
+Translate,Translate
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
+"Please choose to register or to checkout as a guest.","Please choose to register or to checkout as a guest."
+"We are not able to ship to the selected shipping address. Please choose another address or edit the current address.","We are not able to ship to the selected shipping address. Please choose another address or edit the current address."
+"Error happened while creating wishlist. Please try again later","Error happened while creating wishlist. Please try again later"
+"You must select items to move","You must select items to move"
+"You must select items to copy","You must select items to copy"
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?","You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?"
+"Please specify payment method.","Please specify payment method."
+"Use gift registry shipping address","Use gift registry shipping address"
+"You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.","You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout."
+"No confirmation","No confirmation"
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"unselect all","unselect all"
+"Please agree to all Terms and Conditions before placing the orders.","Please agree to all Terms and Conditions before placing the orders."
+"Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
+"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address."
+"Please specify shipping method.","Please specify shipping method."
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+Ok,Ok
+"We can't complete your order because you don't have a payment method available.","We can't complete your order because you don't have a payment method available."
+Translations,Translations
+"Translation files.","Translation files."
diff --git a/app/code/Magento/Ups/i18n/de_DE.csv b/app/code/Magento/Ups/i18n/de_DE.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/de_DE.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/Ups/i18n/en_US.csv b/app/code/Magento/Ups/i18n/en_US.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/en_US.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/Ups/i18n/es_ES.csv b/app/code/Magento/Ups/i18n/es_ES.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/es_ES.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/Ups/i18n/fr_FR.csv b/app/code/Magento/Ups/i18n/fr_FR.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/fr_FR.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/Ups/i18n/nl_NL.csv b/app/code/Magento/Ups/i18n/nl_NL.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/nl_NL.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/Ups/i18n/pt_BR.csv b/app/code/Magento/Ups/i18n/pt_BR.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/pt_BR.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/Ups/i18n/zh_CN.csv b/app/code/Magento/Ups/i18n/zh_CN.csv
new file mode 100644
index 00000000000..93a5ab41bfa
--- /dev/null
+++ b/app/code/Magento/Ups/i18n/zh_CN.csv
@@ -0,0 +1,111 @@
+None,None
+"Sort Order","Sort Order"
+Title,Title
+label,label
+Password,Password
+Pounds,Pounds
+Kilograms,Kilograms
+Ground,Ground
+"Not Required","Not Required"
+status,status
+"Empty response","Empty response"
+Mode,Mode
+"UPS Next Day Air","UPS Next Day Air"
+"UPS Second Day Air","UPS Second Day Air"
+"UPS Ground","UPS Ground"
+"UPS Worldwide Express","UPS Worldwide Express"
+"UPS Worldwide Expedited","UPS Worldwide Expedited"
+"UPS Standard","UPS Standard"
+"UPS Three-Day Select","UPS Three-Day Select"
+"UPS Next Day Air Saver","UPS Next Day Air Saver"
+"UPS Next Day Air Early A.M.","UPS Next Day Air Early A.M."
+"UPS Worldwide Express Plus","UPS Worldwide Express Plus"
+"UPS Second Day Air A.M.","UPS Second Day Air A.M."
+"UPS Saver","UPS Saver"
+"UPS Worldwide Saver","UPS Worldwide Saver"
+"UPS Express","UPS Express"
+"UPS Expedited","UPS Expedited"
+"UPS Express Early A.M.","UPS Express Early A.M."
+"UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
+"UPS Today Standard","UPS Today Standard"
+"UPS Today Dedicated Courrier","UPS Today Dedicated Courrier"
+"UPS Today Intercity","UPS Today Intercity"
+"UPS Today Express","UPS Today Express"
+"UPS Today Express Saver","UPS Today Express Saver"
+"UPS Express Plus","UPS Express Plus"
+"Next Day Air Early AM","Next Day Air Early AM"
+"Next Day Air Early AM Letter","Next Day Air Early AM Letter"
+"Next Day Air","Next Day Air"
+"Next Day Air Letter","Next Day Air Letter"
+"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)"
+"Next Day Air Saver","Next Day Air Saver"
+"Next Day Air Saver Letter","Next Day Air Saver Letter"
+"2nd Day Air AM","2nd Day Air AM"
+"2nd Day Air AM Letter","2nd Day Air AM Letter"
+"2nd Day Air","2nd Day Air"
+"2nd Day Air Letter","2nd Day Air Letter"
+"3 Day Select","3 Day Select"
+"Ground Commercial","Ground Commercial"
+"Ground Residential","Ground Residential"
+"Canada Standard","Canada Standard"
+"Worldwide Express","Worldwide Express"
+"Worldwide Express Saver","Worldwide Express Saver"
+"Worldwide Express Letter","Worldwide Express Letter"
+"Worldwide Express Plus","Worldwide Express Plus"
+"Worldwide Express Plus Letter","Worldwide Express Plus Letter"
+"Worldwide Expedited","Worldwide Expedited"
+"Customer Packaging","Customer Packaging"
+"UPS Letter Envelope","UPS Letter Envelope"
+"Customer Supplied Package","Customer Supplied Package"
+"UPS Tube","UPS Tube"
+PAK,PAK
+"UPS Express Box","UPS Express Box"
+"UPS Worldwide 25 kilo","UPS Worldwide 25 kilo"
+"UPS Worldwide 10 kilo","UPS Worldwide 10 kilo"
+Pallet,Pallet
+"Small Express Box","Small Express Box"
+"Medium Express Box","Medium Express Box"
+"Large Express Box","Large Express Box"
+Residential,Residential
+Commercial,Commercial
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"We can't convert a rate from ""%1-%2"".","We can't convert a rate from ""%1-%2""."
+"Cannot retrieve shipping rates","Cannot retrieve shipping rates"
+error_message,error_message
+"Delivery Confirmation","Delivery Confirmation"
+"Signature Required","Signature Required"
+"Adult Signature Required","Adult Signature Required"
+"United Parcel Service","United Parcel Service"
+"United Parcel Service XML","United Parcel Service XML"
+"User ID","User ID"
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Weight Unit","Weight Unit"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+UPS,UPS
+"Access License Number","Access License Number"
+"Destination Type","Destination Type"
+"Gateway XML URL","Gateway XML URL"
+"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)"
+"Origin of the Shipment","Origin of the Shipment"
+"Pickup Method","Pickup Method"
+"Tracking XML URL","Tracking XML URL"
+"UPS Type","UPS Type"
+"Live account","Live account"
+"Enable Negotiated Rates","Enable Negotiated Rates"
+"Shipper Number","Shipper Number"
+"Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
+"This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
diff --git a/app/code/Magento/UrlRewrite/Model/UrlRewrite.php b/app/code/Magento/UrlRewrite/Model/UrlRewrite.php
index 04f122a16c2..e9ca1cfcbc7 100644
--- a/app/code/Magento/UrlRewrite/Model/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Model/UrlRewrite.php
@@ -1,7 +1,5 @@
<?php
/**
- * URL Rewrite Model
- *
* Magento
*
* NOTICE OF LICENSE
@@ -26,6 +24,8 @@
namespace Magento\UrlRewrite\Model;
/**
+ * URL Rewrite Model
+ *
* @method \Magento\UrlRewrite\Model\UrlRewrite setStoreId(int $value)
* @method int getCategoryId()
* @method \Magento\UrlRewrite\Model\UrlRewrite setCategoryId(int $value)
@@ -46,10 +46,19 @@ namespace Magento\UrlRewrite\Model;
*/
class UrlRewrite extends \Magento\Framework\Model\AbstractModel
{
+ /**
+ * Rewrite type category
+ */
const TYPE_CATEGORY = 1;
+ /**
+ * Rewrite type product
+ */
const TYPE_PRODUCT = 2;
+ /**
+ * Custom rewrite type
+ */
const TYPE_CUSTOM = 3;
/**
@@ -177,11 +186,11 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel
$loadTags = is_array($tags) ? $tags : explode(',', $tags);
$search = $this->getResourceCollection();
- foreach ($loadTags as $k => $t) {
- if (!is_numeric($k)) {
- $t = $k . '=' . $t;
+ foreach ($loadTags as $key => $tag) {
+ if (!is_numeric($key)) {
+ $tag = $key . '=' . $tag;
}
- $search->addTagsFilter($t);
+ $search->addTagsFilter($tag);
}
if (!is_null($this->getStoreId())) {
$search->addStoreFilter($this->getStoreId());
@@ -219,12 +228,12 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel
$addTags = is_array($tags) ? $tags : explode(',', $tags);
- foreach ($addTags as $k => $t) {
- if (!is_numeric($k)) {
- $t = $k . '=' . $t;
+ foreach ($addTags as $key => $tag) {
+ if (!is_numeric($key)) {
+ $tag = $key . '=' . $tag;
}
- if (!in_array($t, $curTags)) {
- $curTags[] = $t;
+ if (!in_array($tag, $curTags)) {
+ $curTags[] = $tag;
}
}
@@ -243,14 +252,14 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel
$removeTags = is_array($tags) ? $tags : explode(',', $tags);
- foreach ($removeTags as $k => $t) {
- if (!is_numeric($k)) {
- $t = $k . '=' . $t;
+ foreach ($removeTags as $key => $tag) {
+ if (!is_numeric($key)) {
+ $tag = $key . '=' . $tag;
}
- $key = array_search($t, $curTags);
- if ($key) {
- unset($curTags[$key]);
+ $tagKey = array_search($tag, $curTags);
+ if ($tagKey) {
+ unset($curTags[$tagKey]);
}
}
@@ -338,23 +347,19 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel
$targetUrl = $request->getBaseUrl() . '/' . $this->getTargetPath();
}
$isRedirectOption = $this->hasOption('R');
+ $isStoreInUrl = $this->_scopeConfig->getValue(
+ \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ );
if ($isRedirectOption || $isPermanentRedirectOption) {
- if ($this->_scopeConfig->getValue(
- 'web/url/use_store',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- ) && ($storeCode = $this->_storeManager->getStore()->getCode())
- ) {
+ if ($isStoreInUrl && ($storeCode = $this->_storeManager->getStore()->getCode())) {
$targetUrl = $request->getBaseUrl() . '/' . $storeCode . '/' . $this->getTargetPath();
}
$this->_sendRedirectHeaders($targetUrl, $isPermanentRedirectOption);
}
- if ($this->_scopeConfig->getValue(
- 'web/url/use_store',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- ) && ($storeCode = $this->_storeManager->getStore()->getCode())
- ) {
+ if ($isStoreInUrl && ($storeCode = $this->_storeManager->getStore()->getCode())) {
$targetUrl = $request->getBaseUrl() . '/' . $storeCode . '/' . $this->getTargetPath();
}
@@ -378,7 +383,7 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel
$queryParams = array();
parse_str($_SERVER['QUERY_STRING'], $queryParams);
$hasChanges = false;
- foreach ($queryParams as $key => $value) {
+ foreach (array_keys($queryParams) as $key) {
if (substr($key, 0, 3) === '___') {
unset($queryParams[$key]);
$hasChanges = true;
diff --git a/app/code/Magento/UrlRewrite/i18n/de_DE.csv b/app/code/Magento/UrlRewrite/i18n/de_DE.csv
index 3f29d50645b..f15cd8d3e28 100644
--- a/app/code/Magento/UrlRewrite/i18n/de_DE.csv
+++ b/app/code/Magento/UrlRewrite/i18n/de_DE.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","Das Doppelkreuz (#) wird beim URL-Überschreiben-Suffix nicht unterstützt"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","Zwei und mehr zusammenhängende Schrägstriche sind im URL-Rewrite-Suffix nicht zulässig"
+"Anchor symbol (#) is not supported in url rewrite suffix","Das Doppelkreuz (#) wird beim URL-Überschreiben-Suffix nicht unterstützt"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/UrlRewrite/i18n/en_US.csv b/app/code/Magento/UrlRewrite/i18n/en_US.csv
index 46243605151..7cf00c7c20b 100644
--- a/app/code/Magento/UrlRewrite/i18n/en_US.csv
+++ b/app/code/Magento/UrlRewrite/i18n/en_US.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","Anchor symbol (#) is not supported in url rewrite suffix"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","Two and more slashes together are not permitted in url rewrite suffix"
+"Anchor symbol (#) is not supported in url rewrite suffix","Anchor symbol (#) is not supported in url rewrite suffix"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/UrlRewrite/i18n/es_ES.csv b/app/code/Magento/UrlRewrite/i18n/es_ES.csv
index f4dfad107e7..748a57814ae 100644
--- a/app/code/Magento/UrlRewrite/i18n/es_ES.csv
+++ b/app/code/Magento/UrlRewrite/i18n/es_ES.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","El sÃmbolo ancla (#) no está soportado en el sufijo de reescritura de url"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","No se permiten dos o más barras juntas en el sufijo de la url"
+"Anchor symbol (#) is not supported in url rewrite suffix","El sÃmbolo ancla (#) no está soportado en el sufijo de reescritura de url"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/UrlRewrite/i18n/fr_FR.csv b/app/code/Magento/UrlRewrite/i18n/fr_FR.csv
index f8cbb549836..23a4c9da125 100644
--- a/app/code/Magento/UrlRewrite/i18n/fr_FR.csv
+++ b/app/code/Magento/UrlRewrite/i18n/fr_FR.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","Le symbole d'ancrage (#) n'est pas pris en charge dans le suffixe de réécriture de l'url"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","Deux slashs ou plus ne sont pas autorisés dans le suffixe de réécriture de l'URL"
+"Anchor symbol (#) is not supported in url rewrite suffix","Le symbole d'ancrage (#) n'est pas pris en charge dans le suffixe de réécriture de l'url"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/UrlRewrite/i18n/nl_NL.csv b/app/code/Magento/UrlRewrite/i18n/nl_NL.csv
index c49b40a3144..c036c1f3411 100644
--- a/app/code/Magento/UrlRewrite/i18n/nl_NL.csv
+++ b/app/code/Magento/UrlRewrite/i18n/nl_NL.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","Anker symbool (#) is niet ondersteund in URL herschrijvings toevoeging"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","Twee of meer schuine strepen zijn niet toegestaan in URL herschrijvings navoeging"
+"Anchor symbol (#) is not supported in url rewrite suffix","Anker symbool (#) is niet ondersteund in URL herschrijvings toevoeging"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/UrlRewrite/i18n/pt_BR.csv b/app/code/Magento/UrlRewrite/i18n/pt_BR.csv
index 4a03c4c3ed5..e84682fb78a 100644
--- a/app/code/Magento/UrlRewrite/i18n/pt_BR.csv
+++ b/app/code/Magento/UrlRewrite/i18n/pt_BR.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","SÃmbolo âncora (#) não é suportado no sufixo url reescrito"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","Duas ou mais barras juntas não são permitidas em sufixo url reescrito"
+"Anchor symbol (#) is not supported in url rewrite suffix","SÃmbolo âncora (#) não é suportado no sufixo url reescrito"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/UrlRewrite/i18n/zh_CN.csv b/app/code/Magento/UrlRewrite/i18n/zh_CN.csv
index e9f47e3a77b..901a6b7b9e3 100644
--- a/app/code/Magento/UrlRewrite/i18n/zh_CN.csv
+++ b/app/code/Magento/UrlRewrite/i18n/zh_CN.csv
@@ -1,2 +1,11 @@
-"Anchor symbol (#) is not supported in url rewrite suffix","URL é‡å†™åŽç¼€ä¸æ”¯æŒå›ºå®šæ ‡å¿— (#)"
+Custom,Custom
+No,No
+System,System
+"Two and more slashes together are not permitted in request path","Two and more slashes together are not permitted in request path"
+"Anchor symbol (#) is not supported in request path","Anchor symbol (#) is not supported in request path"
"Two and more slashes together are not permitted in url rewrite suffix","两个或更多斜æ 在 URL é‡å†™åŽç¼€ä¸ä¸è¢«å…许"
+"Anchor symbol (#) is not supported in url rewrite suffix","URL é‡å†™åŽç¼€ä¸æ”¯æŒå›ºå®šæ ‡å¿— (#)"
+"ID Path for Specified Store","ID Path for Specified Store"
+"Request Path for Specified Store","Request Path for Specified Store"
+"Temporary (302)","Temporary (302)"
+"Permanent (301)","Permanent (301)"
diff --git a/app/code/Magento/User/i18n/de_DE.csv b/app/code/Magento/User/i18n/de_DE.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/de_DE.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/en_US.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/User/i18n/es_ES.csv b/app/code/Magento/User/i18n/es_ES.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/es_ES.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/User/i18n/fr_FR.csv b/app/code/Magento/User/i18n/fr_FR.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/fr_FR.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/User/i18n/nl_NL.csv b/app/code/Magento/User/i18n/nl_NL.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/nl_NL.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/User/i18n/pt_BR.csv b/app/code/Magento/User/i18n/pt_BR.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/pt_BR.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/User/i18n/zh_CN.csv b/app/code/Magento/User/i18n/zh_CN.csv
new file mode 100644
index 00000000000..7168308c5dc
--- /dev/null
+++ b/app/code/Magento/User/i18n/zh_CN.csv
@@ -0,0 +1,97 @@
+All,All
+Custom,Custom
+Back,Back
+ID,ID
+Reset,Reset
+"Account Information","Account Information"
+"User Name","User Name"
+"First Name","First Name"
+"Last Name","Last Name"
+Email,Email
+"User Email","User Email"
+"New Password","New Password"
+"Password Confirmation","Password Confirmation"
+"Interface Locale","Interface Locale"
+Status,Status
+"Are you sure you want to do this?","Are you sure you want to do this?"
+System,System
+"Access denied.","Access denied."
+"Log into Magento Admin Page","Log into Magento Admin Page"
+"Magento Admin Panel","Magento Admin Panel"
+Active,Active
+Role,Role
+Inactive,Inactive
+Password,Password
+"Reset Password","Reset Password"
+"If there is an account associated with %1 you will receive an email with a link to reset your password.","If there is an account associated with %1 you will receive an email with a link to reset your password."
+"Your password reset link has expired.","Your password reset link has expired."
+"Your password has been updated.","Your password has been updated."
+"The first name cannot be empty.","The first name cannot be empty."
+"The last name cannot be empty.","The last name cannot be empty."
+"Please correct this email address: ""%1"".","Please correct this email address: ""%1""."
+"Back to Login","Back to Login"
+"Confirm New Password","Confirm New Password"
+"Reset a Password","Reset a Password"
+"Email Address:","Email Address:"
+"Delete Role","Delete Role"
+"Save Role","Save Role"
+Roles,Roles
+"Add New Role","Add New Role"
+"Role Information","Role Information"
+"Role Users","Role Users"
+"User ID","User ID"
+"Role Resources","Role Resources"
+"Role Info","Role Info"
+"Role Name","Role Name"
+"Add New User","Add New User"
+Users,Users
+"Save User","Save User"
+"Delete User","Delete User"
+"Edit User '%1'","Edit User '%1'"
+"New User","New User"
+"This account is","This account is"
+"Account Status","Account Status"
+"User Roles Information","User Roles Information"
+Assigned,Assigned
+"User Information","User Information"
+"User Info","User Info"
+"User Role","User Role"
+"Please correct this email address:","Please correct this email address:"
+"The email address is empty.","The email address is empty."
+"Please correct the password reset token.","Please correct the password reset token."
+"Please specify the correct account and try again.","Please specify the correct account and try again."
+Permissions,Permissions
+"This user no longer exists.","This user no longer exists."
+"Edit User","Edit User"
+"You saved the user.","You saved the user."
+"You cannot delete your own account.","You cannot delete your own account."
+"You deleted the user.","You deleted the user."
+"We can't find a user to delete.","We can't find a user to delete."
+"Edit Role","Edit Role"
+"New Role","New Role"
+"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
+"You deleted the role.","You deleted the role."
+"An error occurred while deleting this role.","An error occurred while deleting this role."
+"This role no longer exists.","This role no longer exists."
+"You saved the role.","You saved the role."
+"An error occurred while saving this role.","An error occurred while saving this role."
+"A user with the same user name or email already exists.","A user with the same user name or email already exists."
+"User Name is a required field.","User Name is a required field."
+"First Name is a required field.","First Name is a required field."
+"Last Name is a required field.","Last Name is a required field."
+"Please enter a valid email.","Please enter a valid email."
+"The user name cannot be empty.","The user name cannot be empty."
+"Password is required field.","Password is required field."
+"Your password must be at least %1 characters.","Your password must be at least %1 characters."
+"Your password must include both numeric and alphabetic characters.","Your password must include both numeric and alphabetic characters."
+"Your password confirmation must match your password.","Your password confirmation must match your password."
+"This account is inactive.","This account is inactive."
+"Forgot your user name or password?","Forgot your user name or password?"
+"Retrieve Password","Retrieve Password"
+"Forgot your password?","Forgot your password?"
+"Roles Resources","Roles Resources"
+"Resource Access","Resource Access"
+Resources,Resources
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Reset Password Template","Reset Password Template"
diff --git a/app/code/Magento/Usps/i18n/de_DE.csv b/app/code/Magento/Usps/i18n/de_DE.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/de_DE.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Usps/i18n/en_US.csv b/app/code/Magento/Usps/i18n/en_US.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/en_US.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Usps/i18n/es_ES.csv b/app/code/Magento/Usps/i18n/es_ES.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/es_ES.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Usps/i18n/fr_FR.csv b/app/code/Magento/Usps/i18n/fr_FR.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/fr_FR.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Usps/i18n/nl_NL.csv b/app/code/Magento/Usps/i18n/nl_NL.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/nl_NL.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Usps/i18n/pt_BR.csv b/app/code/Magento/Usps/i18n/pt_BR.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/pt_BR.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Usps/i18n/zh_CN.csv b/app/code/Magento/Usps/i18n/zh_CN.csv
new file mode 100644
index 00000000000..9ae0b37ee41
--- /dev/null
+++ b/app/code/Magento/Usps/i18n/zh_CN.csv
@@ -0,0 +1,132 @@
+None,None
+No,No
+Yes,Yes
+"Sort Order","Sort Order"
+Variable,Variable
+Title,Title
+Required,Required
+Password,Password
+Height,Height
+Width,Width
+Regular,Regular
+Documents,Documents
+"Unable to retrieve tracking","Unable to retrieve tracking"
+Sample,Sample
+"Not Required","Not Required"
+"Empty response","Empty response"
+Mode,Mode
+Return,Return
+Size,Size
+Girth,Girth
+Length,Length
+"Sorry, something went wrong. Please try again or contact us and we'll try to help.","Sorry, something went wrong. Please try again or contact us and we'll try to help."
+"User ID","User ID"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"Priority Mail","Priority Mail"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express","Priority Mail Express"
+"Standard Post","Standard Post"
+"Media Mail","Media Mail"
+"Library Mail","Library Mail"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"First-Class Package Service","First-Class Package Service"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail International","Priority Mail International"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"USPS GXG Envelopes","USPS GXG Envelopes"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Package International Service","First-Class Package International Service"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+Letter,Letter
+Flat,Flat
+Parcel,Parcel
+"Flat-Rate Box","Flat-Rate Box"
+"Flat-Rate Envelope","Flat-Rate Envelope"
+Rectangular,Rectangular
+Non-rectangular,Non-rectangular
+Large,Large
+track_summary,track_summary
+"Service type does not match","Service type does not match"
+Merchandise,Merchandise
+Gift,Gift
+Other,Other
+Container,Container
+Debug,Debug
+"Gateway URL","Gateway URL"
+"Enabled for Checkout","Enabled for Checkout"
+"Calculate Handling Fee","Calculate Handling Fee"
+"Handling Applied","Handling Applied"
+"Handling Fee","Handling Fee"
+"Allowed Methods","Allowed Methods"
+"Displayed Error Message","Displayed Error Message"
+"Free Method","Free Method"
+"Free Shipping Amount Threshold","Free Shipping Amount Threshold"
+"Ship to Applicable Countries","Ship to Applicable Countries"
+"Ship to Specific Countries","Ship to Specific Countries"
+"Show Method if Not Applicable","Show Method if Not Applicable"
+"Packages Request Type","Packages Request Type"
+"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
+USPS,USPS
+"Secure Gateway URL","Secure Gateway URL"
+Machinable,Machinable
diff --git a/app/code/Magento/Webapi/Controller/ErrorProcessor.php b/app/code/Magento/Webapi/Controller/ErrorProcessor.php
index fb6519eef84..0e90195ea51 100644
--- a/app/code/Magento/Webapi/Controller/ErrorProcessor.php
+++ b/app/code/Magento/Webapi/Controller/ErrorProcessor.php
@@ -44,6 +44,8 @@ class ErrorProcessor
const DEFAULT_RESPONSE_CHARSET = 'UTF-8';
+ const INTERNAL_SERVER_ERROR_MSG = 'Internal Error. Details are available in Magento log file. Report ID: %s';
+
/**#@+
* Error data representation formats.
*/
@@ -111,8 +113,8 @@ class ErrorProcessor
*/
public function maskException(\Exception $exception)
{
- $stackTrace = ($this->_appState->getMode() === State::MODE_DEVELOPER) ?
- $stackTrace = $exception->getTrace() : null;
+ $isDevMode = $this->_appState->getMode() === State::MODE_DEVELOPER;
+ $stackTrace = $isDevMode ? $exception->getTrace() : null;
if ($exception instanceof LocalizedException) {
// Map HTTP codes for LocalizedExceptions according to exception type
@@ -146,9 +148,18 @@ class ErrorProcessor
} elseif ($exception instanceof WebapiException) {
$maskedException = $exception;
} else {
+ $message = $exception->getMessage();
+ $code = $exception->getCode();
+ //if not in Dev mode, make sure the message and code is masked for unanticipated exceptions
+ if (!$isDevMode) {
+ /** Log information about actual exception */
+ $reportId = $this->_logException($exception);
+ $message = sprintf(self::INTERNAL_SERVER_ERROR_MSG, $reportId);
+ $code = 0;
+ }
$maskedException = new WebapiException(
- $exception->getMessage(),
- $exception->getCode(),
+ $message,
+ $code,
WebapiException::HTTP_INTERNAL_ERROR,
[],
'',
diff --git a/app/code/Magento/Webapi/Controller/Rest.php b/app/code/Magento/Webapi/Controller/Rest.php
index 7bcca2bfe3b..1eee5ed9e7d 100644
--- a/app/code/Magento/Webapi/Controller/Rest.php
+++ b/app/code/Magento/Webapi/Controller/Rest.php
@@ -324,10 +324,6 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
if (!$this->_authorizationService->isAllowed($route->getAclResources(), $userIdentifier)) {
$params = ['resources' => implode(', ', $route->getAclResources())];
- $userParam = $consumerId
- ? ['consumer_id' => $consumerId]
- : ['userType' => $userType, 'userId' => $userId];
- $params = array_merge($params, $userParam);
throw new AuthorizationException(AuthorizationException::NOT_AUTHORIZED, $params);
}
}
diff --git a/app/code/Magento/Webapi/Controller/ServiceArgsSerializer.php b/app/code/Magento/Webapi/Controller/ServiceArgsSerializer.php
index f1fb175ebe7..6ce8b04c2a7 100644
--- a/app/code/Magento/Webapi/Controller/ServiceArgsSerializer.php
+++ b/app/code/Magento/Webapi/Controller/ServiceArgsSerializer.php
@@ -31,6 +31,7 @@ use Zend\Code\Reflection\ParameterReflection;
use Magento\Framework\ObjectManager;
use Magento\Webapi\Model\Config\ClassReflector\TypeProcessor;
use Magento\Webapi\Model\Soap\Wsdl\ComplexTypeStrategy;
+use \Magento\Webapi\DeserializationException;
class ServiceArgsSerializer
{
@@ -159,20 +160,24 @@ class ServiceArgsSerializer
*/
protected function _convertValue($value, $type)
{
+ $isArrayType = $this->_typeProcessor->isArrayType($type);
+ if ($isArrayType && isset($value['item'])) {
+ $value = $this->_removeSoapItemNode($value);
+ }
if ($this->_typeProcessor->isTypeSimple($type)) {
$result = $this->_typeProcessor->processSimpleType($value, $type);
- } elseif ($this->_typeProcessor->isArrayType($type)) {
- if (isset($value['item'])) {
- $value = $this->_removeSoapItemNode($value['item']);
- }
- // Initializing the result for array type else it will return null for empty array
- $result = is_array($value) ? [] : null;
- $itemType = $this->_typeProcessor->getArrayItemType($type);
- foreach ($value as $key => $item) {
- $result[$key] = $this->_createFromArray($itemType, $item);
- }
} else {
- $result = $this->_createFromArray($type, $value);
+ /** Complex type or array of complex types */
+ if ($isArrayType) {
+ // Initializing the result for array type else it will return null for empty array
+ $result = is_array($value) ? [] : null;
+ $itemType = $this->_typeProcessor->getArrayItemType($type);
+ foreach ($value as $key => $item) {
+ $result[$key] = $this->_createFromArray($itemType, $item);
+ }
+ } else {
+ $result = $this->_createFromArray($type, $value);
+ }
}
return $result;
}
@@ -210,9 +215,19 @@ class ServiceArgsSerializer
*
* @param array|mixed $value
* @return array
+ * @throws \InvalidArgumentException
*/
protected function _removeSoapItemNode($value)
{
+ if (isset($value['item'])) {
+ if (is_array($value['item'])) {
+ $value = $value['item'];
+ } else {
+ return [$value['item']];
+ }
+ } else {
+ throw new \InvalidArgumentException('Value must be an array and must contain "item" field.');
+ }
/**
* In case when only one Data object value is passed, it will not be wrapped into a subarray
* within item node. If several Data object values are passed, they will be wrapped into
diff --git a/app/code/Magento/Webapi/Controller/Soap.php b/app/code/Magento/Webapi/Controller/Soap.php
index be6d3304d6a..0ec8cb4e573 100644
--- a/app/code/Magento/Webapi/Controller/Soap.php
+++ b/app/code/Magento/Webapi/Controller/Soap.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Webapi\Controller;
-use Magento\Webapi\ServiceAuthorizationException;
+use Magento\Framework\Exception\AuthorizationException;
use Magento\Webapi\Exception as WebapiException;
use Magento\Webapi\Model\PathProcessor;
@@ -175,7 +175,7 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
* Parse the Authorization header and return the access token e.g. Authorization: Bearer <access-token>
*
* @return string Access token
- * @throws ServiceAuthorizationException
+ * @throws AuthorizationException
*/
protected function _getAccessToken()
{
@@ -185,9 +185,9 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
if (isset($token[1]) && is_string($token[1])) {
return $token[1];
}
- throw new ServiceAuthorizationException(__('Authentication header format is invalid.'));
+ throw new AuthorizationException('Authentication header format is invalid.');
}
- throw new ServiceAuthorizationException(__('Authentication header is absent.'));
+ throw new AuthorizationException('Authentication header is absent.');
}
/**
diff --git a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
index 8650dc1268a..2d35e2a4943 100644
--- a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
+++ b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
@@ -24,13 +24,13 @@
namespace Magento\Webapi\Controller\Soap\Request;
use Magento\Authz\Service\AuthorizationV1Interface as AuthorizationService;
+use Magento\Framework\Exception\AuthorizationException;
use Magento\Framework\Service\Data\AbstractObject;
use Magento\Framework\Service\DataObjectConverter;
-use Magento\Webapi\Model\Soap\Config as SoapConfig;
+use Magento\Webapi\Controller\ServiceArgsSerializer;
use Magento\Webapi\Controller\Soap\Request as SoapRequest;
use Magento\Webapi\Exception as WebapiException;
-use Magento\Webapi\ServiceAuthorizationException;
-use Magento\Webapi\Controller\ServiceArgsSerializer;
+use Magento\Webapi\Model\Soap\Config as SoapConfig;
/**
* Handler of requests to SOAP server.
@@ -95,7 +95,7 @@ class Handler
* @return \stdClass|null
* @throws WebapiException
* @throws \LogicException
- * @throws ServiceAuthorizationException
+ * @throws AuthorizationException
*/
public function __call($operation, $arguments)
{
@@ -119,14 +119,9 @@ class Handler
if (!$isAllowed) {
// TODO: Consider passing Integration ID instead of Consumer ID
- throw new ServiceAuthorizationException(
- "Not Authorized.",
- 0,
- null,
- array(),
- 'authorization',
- "Consumer ID = {$this->_request->getConsumerId()}",
- implode($serviceMethodInfo[SoapConfig::KEY_ACL_RESOURCES], ', ')
+ throw new AuthorizationException(
+ AuthorizationException::NOT_AUTHORIZED,
+ ['resources' => implode($serviceMethodInfo[SoapConfig::KEY_ACL_RESOURCES], ', ')]
);
}
$service = $this->_objectManager->get($serviceClass);
diff --git a/app/code/Magento/Cron/Helper/Data.php b/app/code/Magento/Webapi/DeserializationException.php
similarity index 82%
rename from app/code/Magento/Cron/Helper/Data.php
rename to app/code/Magento/Webapi/DeserializationException.php
index 327d1ea2a75..f9e4db42d4b 100644
--- a/app/code/Magento/Cron/Helper/Data.php
+++ b/app/code/Magento/Webapi/DeserializationException.php
@@ -22,11 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Webapi;
+
/**
- * Cron data helper
+ * Exception to be thrown when there is an issue with deserialization of web API request.
*/
-namespace Magento\Cron\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+class DeserializationException extends \Magento\Framework\Exception\LocalizedException
{
+
}
diff --git a/app/code/Magento/Webapi/Model/PathProcessor.php b/app/code/Magento/Webapi/Model/PathProcessor.php
index 5dc7ed484bb..fcf0a9aeae4 100644
--- a/app/code/Magento/Webapi/Model/PathProcessor.php
+++ b/app/code/Magento/Webapi/Model/PathProcessor.php
@@ -70,10 +70,10 @@ class PathProcessor
if (isset($stores[$storeCode])) {
$this->storeManager->setCurrentStore($storeCode);
$path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
- return $path;
} else {
- // store does not exist
- throw NoSuchEntityException::singleField('storeCode', $storeCode);
+ $this->storeManager->setCurrentStore(\Magento\Store\Model\Store::DEFAULT_CODE);
+ $path = '/' . implode('/', $pathParts);
}
+ return $path;
}
}
diff --git a/app/code/Magento/Webapi/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php
index 462dc6f8895..c2ade496e44 100644
--- a/app/code/Magento/Webapi/Model/Soap/Fault.php
+++ b/app/code/Magento/Webapi/Model/Soap/Fault.php
@@ -130,7 +130,6 @@ class Fault extends \RuntimeException
$this->_soapServer = $soapServer;
$this->_localeResolver = $localeResolver;
$this->appState = $appState;
- $this->_setFaultName($previousException->getName());
}
/**
@@ -173,37 +172,6 @@ class Fault extends \RuntimeException
return $this->_wrappedErrors;
}
- /**
- * Receive SOAP fault name.
- *
- * @return string
- */
- public function getFaultName()
- {
- return $this->_faultName;
- }
-
- /**
- * Define current SOAP fault name. It is used as a name of the wrapper node for SOAP fault details.
- *
- * @param string $exceptionName
- * @return void
- */
- protected function _setFaultName($exceptionName)
- {
- if ($exceptionName) {
- // makes exception name xml safe
- $exceptionName = str_replace(['\\', '/'], '_', $exceptionName);
-
- $contentType = $this->_request->getHeader('Content-Type');
- /** SOAP action is specified in content type header if content type is application/soap+xml */
- if (preg_match('|application/soap\+xml.+action="(.+)".*|', $contentType, $matches)) {
- $soapAction = $matches[1];
- $this->_faultName = ucfirst($soapAction) . ucfirst($exceptionName) . 'Fault';
- }
- }
- }
-
/**
* Add details about current fault.
*
@@ -295,7 +263,7 @@ FAULT_MESSAGE;
if (is_array($details) && !empty($details)) {
$detailsXml = $this->_convertDetailsToXml($details);
if ($detailsXml) {
- $errorDetailsNode = $this->getFaultName() ? $this->getFaultName() :self::NODE_DETAIL_WRAPPER;
+ $errorDetailsNode = self::NODE_DETAIL_WRAPPER;
$detailsXml = "<env:Detail><m:{$errorDetailsNode}>"
. $detailsXml . "</m:{$errorDetailsNode}></env:Detail>";
} else {
diff --git a/app/code/Magento/Webapi/ServiceAuthorizationException.php b/app/code/Magento/Webapi/ServiceAuthorizationException.php
deleted file mode 100644
index 123b65ef5a5..00000000000
--- a/app/code/Magento/Webapi/ServiceAuthorizationException.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Services must throw this exception when encountering an unauthorized operation
- *
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-namespace Magento\Webapi;
-
-class ServiceAuthorizationException extends \Magento\Webapi\ServiceException
-{
- /**
- * Create custom message for authorization exception.
- *
- * @param string $message
- * @param int $code
- * @param \Exception $previous
- * @param array $parameters
- * @param string $name
- * @param string|int|null $userId
- * @param string|int|null $resourceId
- */
- public function __construct(
- $message = '',
- // TODO Specify default exception code when Service \Exception Handling policy is defined
- $code = 0,
- \Exception $previous = null,
- array $parameters = array(),
- $name = 'authorization',
- $userId = null,
- $resourceId = null
- ) {
- if ($userId && $resourceId) {
- $parameters = array_merge($parameters, array('user_id' => $userId, 'resource_id' => $resourceId));
- if (!$message) {
- $message = "User with ID '{$userId}' is not authorized to access resource with ID '{$resourceId}'.";
- }
- }
- parent::__construct($message, $code, $previous, $parameters, $name);
- }
-}
diff --git a/app/code/Magento/Webapi/ServiceResourceNotFoundException.php b/app/code/Magento/Webapi/ServiceResourceNotFoundException.php
deleted file mode 100644
index 7b037d2886f..00000000000
--- a/app/code/Magento/Webapi/ServiceResourceNotFoundException.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Services must throw this exception when not able to locate a resource including lookup failure
- *
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-namespace Magento\Webapi;
-
-class ServiceResourceNotFoundException extends \Magento\Webapi\ServiceException
-{
- /**
- * Create custom message for resource not found exception.
- *
- * @param string $message
- * @param int $code
- * @param \Exception $previous
- * @param array $parameters
- * @param string $name
- * @param string|int|null $resourceId
- */
- public function __construct(
- $message = '',
- // TODO Specify default exception code when Service \Exception Handling policy is defined
- $code = 0,
- \Exception $previous = null,
- array $parameters = array(),
- $name = 'resourceNotFound',
- $resourceId = null
- ) {
- if ($resourceId) {
- $parameters = array_merge($parameters, array('resource_id' => $resourceId));
- if (!$message) {
- $message = "Resource with ID '{$resourceId}' not found.";
- }
- }
- parent::__construct($message, $code, $previous, $parameters, $name);
- }
-}
diff --git a/app/code/Magento/Webapi/i18n/de_DE.csv b/app/code/Magento/Webapi/i18n/de_DE.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/de_DE.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Webapi/i18n/en_US.csv b/app/code/Magento/Webapi/i18n/en_US.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/en_US.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Webapi/i18n/es_ES.csv b/app/code/Magento/Webapi/i18n/es_ES.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/es_ES.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Webapi/i18n/fr_FR.csv b/app/code/Magento/Webapi/i18n/fr_FR.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/fr_FR.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Webapi/i18n/nl_NL.csv b/app/code/Magento/Webapi/i18n/nl_NL.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/nl_NL.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Webapi/i18n/pt_BR.csv b/app/code/Magento/Webapi/i18n/pt_BR.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/pt_BR.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Webapi/i18n/zh_CN.csv b/app/code/Magento/Webapi/i18n/zh_CN.csv
new file mode 100644
index 00000000000..38d04492b4c
--- /dev/null
+++ b/app/code/Magento/Webapi/i18n/zh_CN.csv
@@ -0,0 +1,34 @@
+All,All
+Custom,Custom
+"Resource Access","Resource Access"
+Resources,Resources
+API,API
+"Internal Error. Details are available in Magento log file. Report ID: %1","Internal Error. Details are available in Magento log file. Report ID: %1"
+"Server internal error. See details in report api/%1","Server internal error. See details in report api/%1"
+"Magento is not yet installed","Magento is not yet installed"
+"Operation allowed only in HTTPS","Operation allowed only in HTTPS"
+"Content-Type header is empty.","Content-Type header is empty."
+"Content-Type header is invalid.","Content-Type header is invalid."
+"UTF-8 is the only supported charset.","UTF-8 is the only supported charset."
+"Request method is invalid.","Request method is invalid."
+"Decoding error.","Decoding error."
+"Decoding error: %1%2%3%4","Decoding error: %1%2%3%4"
+"Server cannot understand Accept HTTP header media type.","Server cannot understand Accept HTTP header media type."
+"Request does not match any route.","Request does not match any route."
+"Not allowed parameters: %1. Please use only %2 and %3.","Not allowed parameters: %1. Please use only %2 and %3."
+"Incorrect format of WSDL request URI or Requested services are missing.","Incorrect format of WSDL request URI or Requested services are missing."
+"Operation ""%1"" not found.","Operation ""%1"" not found."
+"Requested service is not available: ""%1""","Requested service is not available: ""%1"""
+"Invalid XML","Invalid XML"
+"Invalid XML: Detected use of illegal DOCTYPE","Invalid XML: Detected use of illegal DOCTYPE"
+"No permissions requested","No permissions requested"
+"Available APIs","Available APIs"
+"Magento Web API","Magento Web API"
+"SOAP Settings","SOAP Settings"
+"Default Response Charset","Default Response Charset"
+"If empty, UTF-8 will be used.","If empty, UTF-8 will be used."
+"Enable WSDL Cache","Enable WSDL Cache"
+"Web Services Configuration","Web Services Configuration"
+"REST and SOAP configurations, generated WSDL file.","REST and SOAP configurations, generated WSDL file."
+"Integrations API Configuration","Integrations API Configuration"
+"Integrations API configuration file.","Integrations API configuration file."
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index fd423abe596..2897ec77cec 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -25,18 +25,12 @@ namespace Magento\Weee\Helper;
use Magento\Store\Model\Store;
use Magento\Store\Model\Website;
-use Magento\Sales\Model\Quote\Item\AbstractItem;
/**
* WEEE data helper
*/
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
- /**
- * Enabled config path
- */
- const XML_PATH_FPT_ENABLED = 'tax/weee/enable';
-
/**
* @var array
*/
@@ -57,16 +51,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_taxData;
/**
- * Core store config
- *
- * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ * @var \Magento\Weee\Model\Tax
*/
- protected $_scopeConfig;
+ protected $_weeeTax;
/**
- * @var \Magento\Weee\Model\Tax
+ * @var \Magento\Weee\Model\Config
*/
- protected $_weeeTax;
+ protected $_weeeConfig;
/**
* @var \Magento\Store\Model\StoreManagerInterface
@@ -77,6 +69,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Weee\Model\Tax $weeeTax
+ * @param \Magento\Weee\Model\Config $weeeConfig
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,15 +78,15 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Framework\App\Helper\Context $context,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Weee\Model\Tax $weeeTax,
+ \Magento\Weee\Model\Config $weeeConfig,
\Magento\Tax\Helper\Data $taxData,
- \Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ \Magento\Framework\Registry $coreRegistry
) {
$this->_storeManager = $storeManager;
$this->_weeeTax = $weeeTax;
$this->_coreRegistry = $coreRegistry;
$this->_taxData = $taxData;
- $this->_scopeConfig = $scopeConfig;
+ $this->_weeeConfig = $weeeConfig;
parent::__construct($context);
}
@@ -105,11 +98,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getPriceDisplayType($store = null)
{
- return $this->_scopeConfig->getValue(
- 'tax/weee/display',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->getPriceDisplayType($store);
}
/**
@@ -120,11 +109,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getListPriceDisplayType($store = null)
{
- return $this->_scopeConfig->getValue(
- 'tax/weee/display_list',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->getListPriceDisplayType($store);
}
/**
@@ -135,11 +120,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getSalesPriceDisplayType($store = null)
{
- return $this->_scopeConfig->getValue(
- 'tax/weee/display_sales',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->getSalesPriceDisplayType($store);
}
/**
@@ -150,11 +131,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getEmailPriceDisplayType($store = null)
{
- return $this->_scopeConfig->getValue(
- 'tax/weee/display_email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->getEmailPriceDisplayType($store);
}
/**
@@ -165,11 +142,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isDiscounted($store = null)
{
- return $this->_scopeConfig->isSetFlag(
- 'tax/weee/discount',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->isDiscounted($store);
}
/**
@@ -180,11 +153,19 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isTaxable($store = null)
{
- return $this->_scopeConfig->isSetFlag(
- 'tax/weee/apply_vat',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->isTaxable($store);
+ }
+
+ /**
+ * Check if weee amount includes tax already
+ * Returns true if weee is taxable and catalog price includes tax
+ *
+ * @param null|string|bool|int|Store $store
+ * @return bool
+ */
+ public function isTaxIncluded($store = null)
+ {
+ return $this->_weeeConfig->isTaxIncluded($store);
}
/**
@@ -195,11 +176,18 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function includeInSubtotal($store = null)
{
- return $this->_scopeConfig->isSetFlag(
- 'tax/weee/include_in_subtotal',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
+ return $this->_weeeConfig->includeInSubtotal($store);
+ }
+
+ /**
+ * Check if fixed taxes are used in system
+ *
+ * @param Store $store
+ * @return bool
+ */
+ public function isEnabled($store = null)
+ {
+ return $this->_weeeConfig->isEnabled($store);
}
/**
@@ -225,8 +213,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param Store $store
* @return bool|int
*/
- public function typeOfDisplay($compareTo = null, $zone = \Magento\Framework\Pricing\Render::ZONE_DEFAULT, $store = null)
- {
+ public function typeOfDisplay(
+ $compareTo = null,
+ $zone = \Magento\Framework\Pricing\Render::ZONE_DEFAULT,
+ $store = null
+ ) {
if (!$this->isEnabled($store)) {
return false;
}
@@ -405,25 +396,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
return 0;
}
- /**
- * Check if fixed taxes are used in system
- *
- * @param Store $store
- * @return bool
- */
- public function isEnabled($store = null)
- {
- return $this->_scopeConfig->getValue(
- self::XML_PATH_FPT_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
- }
-
/**
* Returns all summed WEEE taxes with all local taxes applied
*
- * @param \Magento\Framework\Object[] $attributes Array of \Magento\Framework\Object, result from getProductWeeeAttributes()
+ * @param \Magento\Framework\Object[] $attributes Result from getProductWeeeAttributes()
* @return float
* @throws \Magento\Framework\Exception
*/
@@ -436,45 +412,113 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$amount = 0;
foreach ($attributes as $attribute) {
/* @var $attribute \Magento\Framework\Object */
- $amount += $attribute->getAmount() + $attribute->getTaxAmount();
+ $amount += $attribute->getAmountInclTax();
}
return (float) $amount;
}
/**
- * Set store and base price which will be used during discount calculation to item object
+ * Get the weee tax including tax
*
- * @param AbstractItem $item
- * @param float $basePrice
- * @param float $price
- * @return $this
+ * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+ * @return float
*/
- public function setItemDiscountPrices(AbstractItem $item, $basePrice, $price)
+ public function getWeeeTaxInclTax($item)
{
- $item->setDiscountCalculationPrice($price);
- $item->setBaseDiscountCalculationPrice($basePrice);
- return $this;
+ $weeeTaxAppliedAmounts = $this->getApplied($item);
+ $totalWeeeTaxIncTaxApplied = 0;
+ foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) {
+ $totalWeeeTaxIncTaxApplied += max($weeeTaxAppliedAmount['amount_incl_tax'], 0);
+ }
+ return $totalWeeeTaxIncTaxApplied;
}
/**
- * Add additional amounts to discount calculation prices
+ * Get the total base weee tax
*
- * @param AbstractItem $item
- * @param float $basePrice
- * @param float $price
- * @return $this
+ * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+ * @return float
*/
- public function addItemDiscountPrices(AbstractItem $item, $basePrice, $price)
+ public function getBaseWeeeTaxInclTax($item)
{
- $discountPrice = $item->getDiscountCalculationPrice();
- $baseDiscountPrice = $item->getBaseDiscountCalculationPrice();
+ $weeeTaxAppliedAmounts = $this->getApplied($item);
+ $totalBaseWeeeTaxIncTaxApplied = 0;
+ foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) {
+ $totalBaseWeeeTaxIncTaxApplied += max($weeeTaxAppliedAmount['base_amount_incl_tax'], 0);
+ }
+ return $totalBaseWeeeTaxIncTaxApplied;
+ }
- if ($discountPrice || $baseDiscountPrice || $basePrice || $price) {
- $discountPrice = $discountPrice ? $discountPrice : $item->getCalculationPrice();
- $baseDiscountPrice = $baseDiscountPrice ? $baseDiscountPrice : $item->getBaseCalculationPrice();
- $this->setItemDiscountPrices($item, $baseDiscountPrice + $basePrice, $discountPrice + $price);
+ /**
+ * Get the total weee including tax by row
+ *
+ * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+ * @return float
+ */
+ public function getRowWeeeTaxInclTax($item)
+ {
+ $weeeTaxAppliedAmounts = $this->getApplied($item);
+ $totalWeeeTaxIncTaxApplied = 0;
+ foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) {
+ $totalWeeeTaxIncTaxApplied += max($weeeTaxAppliedAmount['row_amount_incl_tax'], 0);
}
- return $this;
+ return $totalWeeeTaxIncTaxApplied;
+ }
+
+ /**
+ * Get the total base weee including tax by row
+ *
+ * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+ * @return float
+ */
+ public function getBaseRowWeeeTaxInclTax($item)
+ {
+ $weeeTaxAppliedAmounts = $this->getApplied($item);
+ $totalWeeeTaxIncTaxApplied = 0;
+ foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) {
+ $totalWeeeTaxIncTaxApplied += max($weeeTaxAppliedAmount['base_row_amount_incl_tax'], 0);
+ }
+ return $totalWeeeTaxIncTaxApplied;
+ }
+
+ /**
+ * Get the total tax applied on weee by unit
+ *
+ * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+ * @return float
+ */
+ public function getTotalTaxAppliedForWeeeTax($item)
+ {
+ $weeeTaxAppliedAmounts = $this->getApplied($item);
+ $totalTaxForWeeeTax = 0;
+ foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) {
+ $totalTaxForWeeeTax += max(
+ $weeeTaxAppliedAmount['amount_incl_tax']
+ - $weeeTaxAppliedAmount['amount'],
+ 0
+ );
+ }
+ return $totalTaxForWeeeTax;
+ }
+
+ /**
+ * Get the total tax applied on weee by unit
+ *
+ * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+ * @return float
+ */
+ public function getBaseTotalTaxAppliedForWeeeTax($item)
+ {
+ $weeeTaxAppliedAmounts = $this->getApplied($item);
+ $totalTaxForWeeeTax = 0;
+ foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) {
+ $totalTaxForWeeeTax += max(
+ $weeeTaxAppliedAmount['base_amount_incl_tax']
+ - $weeeTaxAppliedAmount['base_amount'],
+ 0
+ );
+ }
+ return $totalTaxForWeeeTax;
}
}
diff --git a/app/code/Magento/Weee/Model/Config.php b/app/code/Magento/Weee/Model/Config.php
new file mode 100644
index 00000000000..0cc476aa960
--- /dev/null
+++ b/app/code/Magento/Weee/Model/Config.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Weee\Model;
+
+use Magento\Store\Model\Store;
+
+/**
+ * WEEE config model
+ */
+class Config
+{
+ /**
+ * Enabled config path
+ */
+ const XML_PATH_FPT_ENABLED = 'tax/weee/enable';
+
+ /**
+ * Core store config
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $scopeConfig;
+
+ /**
+ * @param \Magento\Tax\Helper\Data $taxData
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ */
+ public function __construct(
+ \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+ \Magento\Tax\Helper\Data $taxData
+ ) {
+ $this->taxHelper = $taxData;
+ $this->scopeConfig = $scopeConfig;
+ }
+
+ /**
+ * Get weee amount display type on product view page
+ *
+ * @param null|string|bool|int|Store $store
+ * @return int
+ */
+ public function getPriceDisplayType($store = null)
+ {
+ return $this->scopeConfig->getValue(
+ 'tax/weee/display',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Get weee amount display type on product list page
+ *
+ * @param null|string|bool|int|Store $store
+ * @return int
+ */
+ public function getListPriceDisplayType($store = null)
+ {
+ return $this->scopeConfig->getValue(
+ 'tax/weee/display_list',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Get weee amount display type in sales modules
+ *
+ * @param null|string|bool|int|Store $store
+ * @return int
+ */
+ public function getSalesPriceDisplayType($store = null)
+ {
+ return $this->scopeConfig->getValue(
+ 'tax/weee/display_sales',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Get weee amount display type in email templates
+ *
+ * @param null|string|bool|int|Store $store
+ * @return int
+ */
+ public function getEmailPriceDisplayType($store = null)
+ {
+ return $this->scopeConfig->getValue(
+ 'tax/weee/display_email',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Check if weee amount includes tax already
+ * Returns true if weee is taxable and catalog price includes tax
+ *
+ * @param null|string|bool|int|Store $store
+ * @return bool
+ */
+ public function isTaxIncluded($store = null)
+ {
+ $isFPTTaxable = $this->isTaxable($store);
+
+ $isCatalogPriceIncludeTax = $this->taxHelper->priceIncludesTax($store);
+
+ return $isFPTTaxable && $isCatalogPriceIncludeTax;
+ }
+
+ /**
+ * Check if weee tax amount should be included to subtotal
+ *
+ * @param null|string|bool|int|Store $store
+ * @return bool
+ */
+ public function includeInSubtotal($store = null)
+ {
+ return $this->scopeConfig->isSetFlag(
+ 'tax/weee/include_in_subtotal',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Check if weee tax amount should be discounted
+ *
+ * @param null|string|bool|int|Store $store
+ * @return bool
+ */
+ public function isDiscounted($store = null)
+ {
+ return $this->scopeConfig->isSetFlag(
+ 'tax/weee/discount',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Check if weee tax amount should be taxable
+ *
+ * @param null|string|bool|int|Store $store
+ * @return bool
+ */
+ public function isTaxable($store = null)
+ {
+ return $this->scopeConfig->isSetFlag(
+ 'tax/weee/apply_vat',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+
+ /**
+ * Check if fixed taxes are used in system
+ *
+ * @param Store $store
+ * @return bool
+ */
+ public function isEnabled($store = null)
+ {
+ return $this->scopeConfig->getValue(
+ self::XML_PATH_FPT_ENABLED,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ }
+}
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index c826dbe93b0..49538e54191 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -26,6 +26,7 @@ namespace Magento\Weee\Model;
use Magento\Catalog\Model\Product;
use Magento\Store\Model\Website;
use Magento\Customer\Model\Converter as CustomerConverter;
+use Magento\Tax\Model\Calculation;
class Tax extends \Magento\Framework\Model\AbstractModel
{
@@ -59,13 +60,6 @@ class Tax extends \Magento\Framework\Model\AbstractModel
*/
protected $_productDiscounts = array();
- /**
- * Weee data
- *
- * @var \Magento\Weee\Helper\Data
- */
- protected $_weeeData = null;
-
/**
* Tax data
*
@@ -98,6 +92,13 @@ class Tax extends \Magento\Framework\Model\AbstractModel
*/
protected $customerConverter;
+ /**
+ * Weee config
+ *
+ * @var \Magento\Weee\Model\Config
+ */
+ protected $weeeConfig;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -106,9 +107,9 @@ class Tax extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Tax\Model\CalculationFactory $calculationFactory
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Weee\Helper\Data $weeeData
* @param \Magento\Weee\Model\Resource\Tax $resource
* @param CustomerConverter $customerConverter
+ * @param \Magento\Weee\Model\Config $weeeConfig
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
*/
@@ -120,9 +121,9 @@ class Tax extends \Magento\Framework\Model\AbstractModel
\Magento\Tax\Model\CalculationFactory $calculationFactory,
\Magento\Customer\Model\Session $customerSession,
\Magento\Tax\Helper\Data $taxData,
- \Magento\Weee\Helper\Data $weeeData,
\Magento\Weee\Model\Resource\Tax $resource,
CustomerConverter $customerConverter,
+ \Magento\Weee\Model\Config $weeeConfig,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
@@ -131,8 +132,8 @@ class Tax extends \Magento\Framework\Model\AbstractModel
$this->_calculationFactory = $calculationFactory;
$this->_customerSession = $customerSession;
$this->_taxData = $taxData;
- $this->_weeeData = $weeeData;
$this->customerConverter = $customerConverter;
+ $this->weeeConfig = $weeeConfig;
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
}
@@ -195,7 +196,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
*/
public function getWeeeTaxAttributeCodes($forceEnabled = false)
{
- if (!$forceEnabled && !$this->_weeeData->isEnabled()) {
+ if (!$forceEnabled && !$this->weeeConfig->isEnabled()) {
return array();
}
@@ -229,6 +230,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
}
$websiteId = $this->_storeManager->getWebsite($website)->getId();
+ /** @var \Magento\Store\Model\Store $store */
$store = $this->_storeManager->getWebsite($website)->getDefaultGroup()->getDefaultStore();
/** @var \Magento\Tax\Model\Calculation $calculator */
@@ -245,7 +247,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
$defaultRateRequest = $calculator->getDefaultRateRequest($store);
$discountPercent = 0;
- if (!$ignoreDiscount && $this->_weeeData->isDiscounted($store)) {
+ if (!$ignoreDiscount && $this->weeeConfig->isDiscounted($store)) {
$discountPercent = $this->_getDiscountPercentForProduct($product);
}
@@ -276,7 +278,8 @@ class Tax extends \Magento\Framework\Model\AbstractModel
1
);
- $order = array('state ' . \Magento\Framework\DB\Select::SQL_DESC, 'website_id ' . \Magento\Framework\DB\Select::SQL_DESC);
+ $order = array('state ' . \Magento\Framework\DB\Select::SQL_DESC,
+ 'website_id ' . \Magento\Framework\DB\Select::SQL_DESC);
$attributeSelect->order($order);
$value = $this->getResource()->getReadConnection()->fetchOne($attributeSelect);
@@ -289,18 +292,34 @@ class Tax extends \Magento\Framework\Model\AbstractModel
$taxAmount = $amount = 0;
$amount = $value;
- if ($calculateTax && $this->_weeeData->isTaxable($store)) {
+ if ($calculateTax && $this->weeeConfig->isTaxable($store)) {
/** @var \Magento\Tax\Model\Calculation $calculator */
- $defaultPercent = $this->_calculationFactory->create()->getRate(
+ $defaultPercent = $calculator->getRate(
$defaultRateRequest->setProductClassId($product->getTaxClassId())
);
- $currentPercent = $product->getTaxPercent();
+ $currentPercent = $calculator->getRate(
+ $rateRequest->setProductClassId($product->getTaxClassId())
+ );
if ($this->_taxData->priceIncludesTax($store)) {
- $taxAmount = $this->_storeManager->getStore()->roundPrice(
- $value / (100 + $defaultPercent) * $currentPercent
- );
+ $amountInclTax = $value / (100 + $defaultPercent) * (100 + $currentPercent);
+ //round the "golden price"
+ $amountInclTax = $store->roundPrice($amountInclTax);
+ $taxAmount = $amountInclTax - $amountInclTax / (100 + $currentPercent) * 100;
+ $taxAmount = $store->roundPrice($taxAmount);
} else {
- $taxAmount = $this->_storeManager->getStore()->roundPrice($value * $defaultPercent / 100);
+ $appliedRates = $this->_calculationFactory->create()->getAppliedRates($rateRequest);
+ if (count($appliedRates) > 1) {
+ $taxAmount = 0;
+ foreach ($appliedRates as $appliedRate) {
+ $taxRate = $appliedRate['percent'];
+ $taxAmount += $this->_storeManager->getStore()->roundPrice($value * $taxRate / 100);
+ }
+ } else {
+ $taxAmount = $this->_storeManager->getStore()->roundPrice(
+ $value * $currentPercent / 100
+ );
+ }
+ $taxAmount = $store->roundPrice($value * $currentPercent / 100);
}
}
diff --git a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
index 5b521e5065a..dac3daba06b 100644
--- a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
@@ -61,13 +61,27 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
$totalTax = 0;
$baseTotalTax = 0;
+ $weeeTaxAmount = 0;
+ $baseWeeeTaxAmount = 0;
+
foreach ($creditmemo->getAllItems() as $item) {
if ($item->getOrderItem()->isDummy()) {
continue;
}
- $totalTax += $item->getWeeeTaxAppliedAmount() * $item->getQty();
- $baseTotalTax += $item->getBaseWeeeTaxAppliedAmount() * $item->getQty();
+ $weeeAmountExclTax = ($this->_weeeData->getWeeeTaxInclTax($item) -
+ $this->_weeeData->getTotalTaxAppliedForWeeeTax($item)) * $item->getQty();
+ $totalTax += $weeeAmountExclTax;
+
+ $baseWeeeAmountExclTax = ($this->_weeeData->getBaseWeeeTaxInclTax($item) -
+ $this->_weeeData->getBaseTotalTaxAppliedForWeeeTax($item)) * $item->getQty();
+ $baseTotalTax += $baseWeeeAmountExclTax;
+
+ $item->setWeeeTaxAppliedRowAmount($weeeAmountExclTax);
+ $item->setBaseWeeeTaxAppliedRowAmount($baseWeeeAmountExclTax);
+
+ $weeeTaxAmount += $this->_weeeData->getWeeeTaxInclTax($item)* $item->getQty();
+ $baseWeeeTaxAmount += $this->_weeeData->getBaseWeeeTaxInclTax($item)* $item->getQty();
$newApplied = array();
$applied = $this->_weeeData->getApplied($item);
@@ -93,6 +107,9 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
$creditmemo->setBaseTaxAmount($creditmemo->getBaseTaxAmount() + $baseTotalTax);
}
+ $creditmemo->setSubtotalInclTax($creditmemo->getSubtotalInclTax() + $weeeTaxAmount);
+ $creditmemo->setBaseSubtotalInclTax($creditmemo->getBaseSubtotalInclTax() + $baseWeeeTaxAmount);
+
$creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $totalTax);
$creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $baseTotalTax);
diff --git a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
index 305d404d7fd..09e2e73c4df 100644
--- a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
@@ -59,6 +59,8 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
$totalTax = 0;
$baseTotalTax = 0;
+ $weeeInclTax = 0;
+ $baseWeeeInclTax = 0;
foreach ($invoice->getAllItems() as $item) {
$orderItem = $item->getOrderItem();
@@ -71,6 +73,9 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
$weeeTaxAmount = $item->getWeeeTaxAppliedAmount() * $item->getQty();
$baseWeeeTaxAmount = $item->getBaseWeeeTaxAppliedAmount() * $item->getQty();
+ $weeeTaxAmountInclTax = $this->_weeeData->getWeeeTaxInclTax($item) * $item->getQty();
+ $baseWeeeTaxAmountInclTax = $this->_weeeData->getBaseWeeeTaxInclTax($item) * $item->getQty();
+
$item->setWeeeTaxAppliedRowAmount($weeeTaxAmount);
$item->setBaseWeeeTaxAppliedRowAmount($baseWeeeTaxAmount);
$newApplied = array();
@@ -90,6 +95,9 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
$totalTax += $weeeTaxAmount;
$baseTotalTax += $baseWeeeTaxAmount;
+
+ $weeeInclTax += $weeeTaxAmountInclTax;
+ $baseWeeeInclTax += $baseWeeeTaxAmountInclTax;
}
/*
@@ -121,6 +129,11 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
$invoice->setBaseTaxAmount($invoice->getBaseTaxAmount() + $baseTotalTax);
}
+ if (!$invoice->isLast()) {
+ $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $weeeInclTax);
+ $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseWeeeInclTax);
+ }
+
$invoice->setGrandTotal($invoice->getGrandTotal() + $totalTax);
$invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseTotalTax);
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index ab53d2cfdac..f929e492fb5 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -24,41 +24,33 @@
namespace Magento\Weee\Model\Total\Quote;
use Magento\Store\Model\Store;
+use Magento\Tax\Model\Calculation;
class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
{
/**
- * Weee module helper object
- *
* @var \Magento\Weee\Helper\Data
*/
protected $_weeeData;
-
+
/**
* @var \Magento\Store\Model\Store
*/
protected $_store;
- /**
- * Flag which notify what tax amount can be affected by fixed product tax
- *
- * @var bool
- */
- protected $_isTaxAffected;
-
/**
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Tax\Model\Calculation $calculation
* @param \Magento\Tax\Model\Config $taxConfig
- * @param \Magento\Weee\Helper\Data $weeeData
+ * @param \Magento\Weee\Helper\Data $_weeeData
*/
public function __construct(
\Magento\Tax\Helper\Data $taxData,
\Magento\Tax\Model\Calculation $calculation,
\Magento\Tax\Model\Config $taxConfig,
- \Magento\Weee\Helper\Data $weeeData
+ \Magento\Weee\Helper\Data $_weeeData
) {
- $this->_weeeData = $weeeData;
+ $this->_weeeData = $_weeeData;
parent::__construct($taxData, $calculation, $taxConfig);
$this->setCode('weee');
}
@@ -72,24 +64,30 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
public function collect(\Magento\Sales\Model\Quote\Address $address)
{
\Magento\Sales\Model\Quote\Address\Total\AbstractTotal::collect($address);
- $this->_isTaxAffected = false;
$items = $this->_getAddressItems($address);
if (!count($items)) {
return $this;
}
+
$address->setAppliedTaxesReset(true);
$address->setAppliedTaxes(array());
+
$this->_store = $address->getQuote()->getStore();
foreach ($items as $item) {
- $this->_processItem($item, $address);
- if ($item->isChildrenCalculated()) {
+ if ($item->getParentItemId()) {
+ continue;
+ }
+ $this->_resetItemData($item);
+ if ($item->getHasChildren() && $item->isChildrenCalculated()) {
+ foreach ($item->getChildren() as $child) {
+ $this->_resetItemData($child);
+ $this->_process($address, $child);
+ }
$this->_recalculateParent($item);
+ } else {
+ $this->_process($address, $item);
}
}
- if ($this->_isTaxAffected) {
- $address->unsSubtotalInclTax();
- $address->unsBaseSubtotalInclTax();
- }
return $this;
}
@@ -99,10 +97,14 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
*
* @param \Magento\Sales\Model\Quote\Address $address
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
- * @return array
+ * @return void|$this
*/
protected function _process(\Magento\Sales\Model\Quote\Address $address, $item)
{
+ if (!$this->_weeeData->isEnabled($this->_store)) {
+ return $this;
+ }
+
$attributes = $this->_weeeData->getProductWeeeAttributes(
$item->getProduct(),
$address,
@@ -110,179 +112,176 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
$this->_store->getWebsiteId()
);
- $taxData['applied'] = array();
- $taxData['product_taxes'] = array();
+ $applied = array();
+ $productTaxes = array();
+
+ $defaultRateRequest = $this->_calculator->getRateOriginRequest($this->_store);
+ $rateRequest = $this->_calculator->getRateRequest(
+ $address,
+ $address->getQuote()->getBillingAddress(),
+ $address->getQuote()->getCustomerTaxClassId(),
+ $this->_store
+ );
+
+ $totalValueInclTax = 0;
+ $baseTotalValueInclTax = 0;
+ $totalRowValueInclTax = 0;
+ $baseTotalRowValueInclTax = 0;
- $valuesData['total'] = 0;
- $valuesData['base_total'] = 0;
- $valuesData['total_row'] = 0;
- $valuesData['base_total_row'] = 0;
+ $totalValueExclTax = 0;
+ $baseTotalValueExclTax = 0;
+ $totalRowValueExclTax = 0;
+ $baseTotalRowValueExclTax = 0;
+ $priceIncludesTax = $this->_taxData->priceIncludesTax($this->_store);
+ $calculationAlgorithm = $this->_taxData->getCalculationAgorithm($this->_store);
+ $defaultPercent = $currentPercent = 0; //when FPT is not taxable
foreach ($attributes as $key => $attribute) {
+ $title = $attribute->getName();
+
$baseValue = $attribute->getAmount();
$value = $this->_store->convertPrice($baseValue);
- $rowValue = $value * $item->getTotalQty();
- $baseRowValue = $baseValue * $item->getTotalQty();
- $title = $attribute->getName();
+ $value = $this->_store->roundPrice($value);
+
+ if ($this->_weeeData->isTaxable($this->_store)) {
+ $defaultPercent = $this->_calculator->getRate(
+ $defaultRateRequest->setProductClassId($item->getProduct()->getTaxClassId())
+ );
+ $currentPercent = $this->_calculator->getRate(
+ $rateRequest->setProductClassId($item->getProduct()->getTaxClassId())
+ );
+ }
+
+ if ($priceIncludesTax) {
+ //Make sure that price including tax is rounded first
+ $baseValueInclTax = $baseValue / (100 + $defaultPercent) * (100 + $currentPercent);
+ $baseValueInclTax = $this->_store->roundPrice($baseValueInclTax);
+ $valueInclTax = $value / (100 + $defaultPercent) * (100 + $currentPercent);
+ $valueInclTax = $this->_store->roundPrice($valueInclTax);
+
+ $baseValueExclTax = $baseValueInclTax / (100 + $currentPercent) * 100;
+ $valueExclTax = $valueInclTax / (100 + $currentPercent) * 100;
+ if ($calculationAlgorithm == Calculation::CALC_UNIT_BASE) {
+ $baseValueExclTax = $this->_store->roundPrice($baseValueExclTax);
+ $valueExclTax = $this->_store->roundPrice($valueExclTax);
+ }
+ } else {
+ $valueExclTax = $value;
+ $baseValueExclTax = $baseValue;
+
+ $valueInclTax = $valueExclTax * (100 + $currentPercent) / 100;
+ $baseValueInclTax = $baseValueExclTax * (100 + $currentPercent) / 100;
+ if ($calculationAlgorithm == Calculation::CALC_UNIT_BASE) {
+ $baseValueInclTax = $this->_store->roundPrice($baseValueInclTax);
+ $valueInclTax = $this->_store->roundPrice($valueInclTax);
+ }
+ }
+
+ $rowValueInclTax = $this->_store->roundPrice($valueInclTax * $item->getTotalQty());
+ $baseRowValueInclTax = $this->_store->roundPrice($baseValueInclTax * $item->getTotalQty());
+ $rowValueExclTax = $this->_store->roundPrice($valueExclTax * $item->getTotalQty());
+ $baseRowValueExclTax = $this->_store->roundPrice($baseValueExclTax * $item->getTotalQty());
+
+ //Now, round the unit price just in case
+ $valueExclTax = $this->_store->roundPrice($valueExclTax);
+ $baseValueExclTax = $this->_store->roundPrice($baseValueExclTax);
+ $valueInclTax = $this->_store->roundPrice($valueInclTax);
+ $baseValueInclTax = $this->_store->roundPrice($baseValueInclTax);
- $valuesData['total'] += $value;
- $valuesData['base_total'] += $baseValue;
- $valuesData['total_row'] += $rowValue;
- $valuesData['base_total_row'] += $baseRowValue;
+ $totalValueInclTax += $valueInclTax;
+ $baseTotalValueInclTax += $baseValueInclTax;
+ $totalRowValueInclTax += $rowValueInclTax;
+ $baseTotalRowValueInclTax += $baseRowValueInclTax;
- $taxData['product_taxes'][] = array(
+
+ $totalValueExclTax += $valueExclTax;
+ $baseTotalValueExclTax += $baseValueExclTax;
+ $totalRowValueExclTax += $rowValueExclTax;
+ $baseTotalRowValueExclTax += $baseRowValueExclTax;
+
+ $productTaxes[] = array(
'title' => $title,
- 'base_amount' => $baseValue,
- 'amount' => $value,
- 'row_amount' => $rowValue,
- 'base_row_amount' => $baseRowValue,
- /**
- * Tax value can't be presented as include/exclude tax
- */
- 'base_amount_incl_tax' => $baseValue,
- 'amount_incl_tax' => $value,
- 'row_amount_incl_tax' => $rowValue,
- 'base_row_amount_incl_tax' => $baseRowValue
+ 'base_amount' => $baseValueExclTax,
+ 'amount' => $valueExclTax,
+ 'row_amount' => $rowValueExclTax,
+ 'base_row_amount' => $baseRowValueExclTax,
+ 'base_amount_incl_tax' => $baseValueInclTax,
+ 'amount_incl_tax' => $valueInclTax,
+ 'row_amount_incl_tax' => $rowValueInclTax,
+ 'base_row_amount_incl_tax' => $baseRowValueInclTax,
);
- $taxData['applied'][] = array(
- 'id' => $attribute->getCode(),
- 'percent' => null,
- 'hidden' => $this->_weeeData->includeInSubtotal($this->_store),
- 'rates' => array(
- array(
- 'base_real_amount' => $baseRowValue,
- 'base_amount' => $baseRowValue,
- 'amount' => $rowValue,
- 'code' => $attribute->getCode(),
- 'title' => $title,
- 'percent' => null,
- 'position' => 1,
- 'priority' => -1000 + $key
- )
- )
+ //This include FPT as applied tax, since tax on FPT is calculated separately, we use value excluding tax
+ $applied[] = array(
+ 'id' => $attribute->getCode(),
+ 'percent' => null,
+ 'hidden' => $this->_weeeData->includeInSubtotal($this->_store),
+ 'rates' => array(array(
+ 'base_real_amount'=> $baseRowValueExclTax,
+ 'base_amount' => $baseRowValueExclTax,
+ 'amount' => $rowValueExclTax,
+ 'code' => $attribute->getCode(),
+ 'title' => $title,
+ 'percent' => null,
+ 'position' => 1,
+ 'priority' => -1000 + $key,
+ ))
);
}
- return array('values' => $valuesData, 'tax' => $taxData, 'address' => $address, 'item' => $item);
- }
-
- /**
- * Prepare item data for processing.
- *
- * @param \Magento\Sales\Model\Quote\Address $address
- * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
- * @return $this
- */
- protected function _processItem($item, $address)
- {
- $this->_resetItemDataIfHasParent($item);
- if ($item->getHasChildren() && $item->isChildrenCalculated()) {
- foreach ($item->getChildren() as $child) {
- $this->_resetItemData($child);
- $this->_processDataWithWeeeData($address, $child);
- }
+ $item->setWeeeTaxAppliedAmount($totalValueExclTax)
+ ->setBaseWeeeTaxAppliedAmount($baseTotalValueExclTax)
+ ->setWeeeTaxAppliedRowAmount($totalRowValueExclTax)
+ ->setBaseWeeeTaxAppliedRowAmnt($baseTotalRowValueExclTax);
+
+ $item->setWeeeTaxAppliedAmountInclTax($totalValueInclTax)
+ ->setBaseWeeeTaxAppliedAmountInclTax($baseTotalValueInclTax)
+ ->setWeeeTaxAppliedRowAmountInclTax($totalRowValueInclTax)
+ ->setBaseWeeeTaxAppliedRowAmntInclTax($baseTotalRowValueInclTax);
+
+ if ($priceIncludesTax) {
+ $this->_processTaxSettings(
+ $item,
+ $totalValueInclTax,
+ $baseTotalValueInclTax,
+ $totalRowValueInclTax,
+ $baseTotalRowValueInclTax
+ );
} else {
- $this->_processDataWithWeeeData($address, $item);
- }
- return $this;
- }
-
- /**
- * Process item if weee is enabled.
- *
- * @param \Magento\Sales\Model\Quote\Address $address
- * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
- * @return $this
- */
- protected function _processDataWithWeeeData ($address, $item)
- {
- if ($this->_weeeData->isEnabled($this->_store)) {
- $processData = $this->_process($address, $item);
- $this->_setTax($processData);
- }
- return $this;
- }
-
- /**
- * Reset item data if it have parent
- *
- * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
- * @return $this
- */
- protected function _resetItemDataIfHasParent($item)
- {
- if (!$item->getParentItemId()) {
- $this->_resetItemData($item);
+ $this->_processTaxSettings(
+ $item,
+ $totalValueExclTax,
+ $baseTotalValueExclTax,
+ $totalRowValueExclTax,
+ $baseTotalRowValueExclTax
+ );
}
- return $this;
- }
-
- /**
- * Set tax to item, process tax with total amount and discount settings
- *
- * @param array $processData
- * @return $this
- */
- protected function _setTax($processData)
- {
- $values = $processData['values'];
- $tax = $processData['tax'];
- $item = $processData['item'];
- $address = $processData['address'];
-
- $this->_setAppliedTaxes($item, $values);
- $this->_processTaxSettings(
- $item,
- $values['total'],
- $values['base_total'],
- $values['total_row'],
- $values['base_total_row']
- )->_processTotalAmount(
+ $this->_processTotalAmount(
$address,
- $values['total_row'],
- $values['base_total_row']
- )->_processDiscountSettings(
- $item,
- $values['total'],
- $values['base_total']
+ $totalRowValueExclTax,
+ $baseTotalRowValueExclTax,
+ $totalRowValueInclTax,
+ $baseTotalRowValueInclTax
);
- $this->_weeeData->setApplied($item, array_merge($this->_weeeData->getApplied($item), $tax['product_taxes']));
- if ($tax['applied']) {
+ $this->_weeeData->setApplied($item, array_merge($this->_weeeData->getApplied($item), $productTaxes));
+
+ //Update the applied taxes for the quote
+ if ($applied) {
$this->_saveAppliedTaxes(
$address,
- $tax['applied'],
+ $applied,
$item->getWeeeTaxAppliedAmount(),
$item->getBaseWeeeTaxAppliedAmount(),
null
);
}
- return $this;
- }
-
- /**
- * Set applied taxes to item data.
- *
- * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
- * @param array $values
- * @return $this
- */
- protected function _setAppliedTaxes($item, $values)
- {
- $taxAppliedData = array(
- 'weee_tax_applied_amount' => $values['total'],
- 'base_weee_tax_applied_amount' => $values['base_total'],
- 'weee_tax_applied_row_amount' => $values['total_row'],
- 'base_weee_tax_applied_row_amnt' => $values['base_total_row'],
- );
- $item->addData($taxAppliedData);
- return $this;
}
/**
* Check if discount should be applied to weee and add weee to discounted price
*
+ * @deprecated
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @param float $value
* @param float $baseValue
@@ -309,14 +308,10 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
protected function _processTaxSettings($item, $value, $baseValue, $rowValue, $baseRowValue)
{
if ($this->_weeeData->isTaxable($this->_store) && $rowValue) {
- if (!$this->_config->priceIncludesTax($this->_store)) {
- $item->setExtraTaxableAmount($value)
- ->setBaseExtraTaxableAmount($baseValue)
- ->setExtraRowTaxableAmount($rowValue)
- ->setBaseExtraRowTaxableAmount($baseRowValue);
- }
- $item->unsRowTotalInclTax()->unsBaseRowTotalInclTax()->unsPriceInclTax()->unsBasePriceInclTax();
- $this->_isTaxAffected = true;
+ $item->setExtraTaxableAmount($value)
+ ->setBaseExtraTaxableAmount($baseValue)
+ ->setExtraRowTaxableAmount($rowValue)
+ ->setBaseExtraRowTaxableAmount($baseRowValue);
}
return $this;
}
@@ -325,20 +320,23 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
* Process row amount based on FPT total amount configuration setting
*
* @param \Magento\Sales\Model\Quote\Address $address
- * @param float $rowValue
- * @param float $baseRowValue
+ * @param float $rowValueExclTax
+ * @param float $baseRowValueExclTax
+ * @param float $rowValueInclTax
+ * @param float $baseRowValueInclTax
* @return $this
*/
- protected function _processTotalAmount($address, $rowValue, $baseRowValue)
+ protected function _processTotalAmount($address, $rowValueExclTax, $baseRowValueExclTax, $rowValueInclTax, $baseRowValueInclTax)
{
if ($this->_weeeData->includeInSubtotal($this->_store)) {
- $address->addTotalAmount('subtotal', $rowValue);
- $address->addBaseTotalAmount('subtotal', $baseRowValue);
- $this->_isTaxAffected = true;
+ $address->addTotalAmount('subtotal', $this->_store->roundPrice($rowValueExclTax));
+ $address->addBaseTotalAmount('subtotal', $this->_store->roundPrice($baseRowValueExclTax));
} else {
- $address->setExtraTaxAmount($address->getExtraTaxAmount() + $rowValue);
- $address->setBaseExtraTaxAmount($address->getBaseExtraTaxAmount() + $baseRowValue);
+ $address->setExtraTaxAmount($address->getExtraTaxAmount() + $rowValueExclTax);
+ $address->setBaseExtraTaxAmount($address->getBaseExtraTaxAmount() + $baseRowValueExclTax);
}
+ $address->setSubtotalInclTax($address->getSubtotalInclTax() + $this->_store->roundPrice($rowValueInclTax));
+ $address->setBaseSubtotalInclTax($address->getBaseSubtotalInclTax() + $this->_store->roundPrice($baseRowValueInclTax));
return $this;
}
@@ -346,7 +344,9 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
* Recalculate parent item amounts based on children results
*
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
- * @return null
+ * @return void
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _recalculateParent(\Magento\Sales\Model\Quote\Item\AbstractItem $item)
{
@@ -380,6 +380,8 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return $this
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function fetch(\Magento\Sales\Model\Quote\Address $address)
{
@@ -393,6 +395,8 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
* @param array $config
* @param Store $store
* @return array
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function processConfigArray($config, $store)
{
@@ -402,6 +406,7 @@ class Weee extends \Magento\Tax\Model\Sales\Total\Quote\Tax
/**
* No aggregated label for fixed product tax
*
+ * TODO: fix
* @return string
*/
public function getLabel()
diff --git a/app/code/Magento/Weee/etc/adminhtml/system.xml b/app/code/Magento/Weee/etc/adminhtml/system.xml
index da9733b1b70..a1ffd1f4fcd 100644
--- a/app/code/Magento/Weee/etc/adminhtml/system.xml
+++ b/app/code/Magento/Weee/etc/adminhtml/system.xml
@@ -48,10 +48,6 @@
<label>Display Prices In Emails</label>
<source_model>Magento\Weee\Model\Config\Source\Display</source_model>
</field>
- <field id="discount" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Apply Discounts To FPT</label>
- <source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
- </field>
<field id="apply_vat" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Apply Tax To FPT</label>
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
diff --git a/app/code/Magento/Weee/etc/sales.xml b/app/code/Magento/Weee/etc/sales.xml
index d12bd57f8cc..fd8aa161ea1 100644
--- a/app/code/Magento/Weee/etc/sales.xml
+++ b/app/code/Magento/Weee/etc/sales.xml
@@ -26,7 +26,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Sales/etc/sales.xsd">
<section name="quote">
<group name="totals">
- <item name="weee" instance="Magento\Weee\Model\Total\Quote\Weee" sort_order="350"/>
+ <item name="weee" instance="Magento\Weee\Model\Total\Quote\Weee" sort_order="225"/>
</group>
<group name="nominal_totals">
<item name="nominal_weee" instance="Magento\Weee\Model\Total\Quote\Nominal\Weee" sort_order="600"/>
diff --git a/app/code/Magento/Weee/i18n/de_DE.csv b/app/code/Magento/Weee/i18n/de_DE.csv
index 880d4ded08b..987466b3bf2 100644
--- a/app/code/Magento/Weee/i18n/de_DE.csv
+++ b/app/code/Magento/Weee/i18n/de_DE.csv
@@ -1,19 +1,21 @@
+Action,Action
+Tax,Tax
+Website,Website
"All Websites","Alle Webseiten"
-"Apply Discounts To FPT","Rabatte auf FPT anwenden"
-"Apply Tax To FPT","Steuer auf FPT anwenden"
-"Display Prices In Emails","Preise in E-Mails anzeigen"
-"Display Prices In Product Lists","Preise in Produktlisten anzeigen"
-"Display Prices In Sales Modules","Preise in Verkaufsmdulen anzeigen"
-"Display Prices On Product View Page","Preise auf der Produktansichtseite anzeigen"
-"Enable FPT","FPT aktivieren"
-"Excluding FPT","Ausschließlich FPT"
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
+"Including FPT only","Lediglich einschließlich FPT"
+"Including FPT and FPT description","Einschließlich FPT und FPT-Beschreibung"
"Excluding FPT, FPT description, final price","Ausschließlich FPT, FPT-Beschreibung, Endpreis"
+"Excluding FPT","Ausschließlich FPT"
"Fixed Product Tax","Feste Produktsteuer"
-"Fixed Product Taxes","Feste Produktsteuern"
-"Include FPT In Subtotal","FPT in Zwischensumme einschließen"
-"Including FPT and FPT description","Einschließlich FPT und FPT-Beschreibung"
-"Including FPT and FPT description [incl. FPT VAT]","Einschließlich FPT und FPT-Beschreibung [inkl. FPT-MwSt]"
-"Including FPT only","Lediglich einschließlich FPT"
-"Total","Gesamtbetrag"
-"Total Incl. Tax","Gesamtbetrag inkl. Steuer"
-"Total incl. tax","Gesamtbetrag inkl. Mehrwertsteuer"
+Country/State,Country/State
+"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
+"Include FPT In Subtotal","Include FPT In Subtotal"
diff --git a/app/code/Magento/Weee/i18n/en_US.csv b/app/code/Magento/Weee/i18n/en_US.csv
index 28473a40872..abc96e1cb00 100644
--- a/app/code/Magento/Weee/i18n/en_US.csv
+++ b/app/code/Magento/Weee/i18n/en_US.csv
@@ -1,19 +1,21 @@
+Action,Action
+Tax,Tax
+Website,Website
"All Websites","All Websites"
-"Apply Discounts To FPT","Apply Discounts To FPT"
-"Apply Tax To FPT","Apply Tax To FPT"
-"Display Prices In Emails","Display Prices In Emails"
-"Display Prices In Product Lists","Display Prices In Product Lists"
-"Display Prices In Sales Modules","Display Prices In Sales Modules"
-"Display Prices On Product View Page","Display Prices On Product View Page"
-"Enable FPT","Enable FPT"
-"Excluding FPT","Excluding FPT"
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
+"Including FPT only","Including FPT only"
+"Including FPT and FPT description","Including FPT and FPT description"
"Excluding FPT, FPT description, final price","Excluding FPT, FPT description, final price"
+"Excluding FPT","Excluding FPT"
"Fixed Product Tax","Fixed Product Tax"
+Country/State,Country/State
"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
"Include FPT In Subtotal","Include FPT In Subtotal"
-"Including FPT and FPT description","Including FPT and FPT description"
-"Including FPT and FPT description [incl. FPT VAT]","Including FPT and FPT description [incl. FPT VAT]"
-"Including FPT only","Including FPT only"
-"Total","Total"
-"Total Incl. Tax","Total Incl. Tax"
-"Total incl. tax","Total incl. tax"
diff --git a/app/code/Magento/Weee/i18n/es_ES.csv b/app/code/Magento/Weee/i18n/es_ES.csv
index 43406f0df4e..2295ba06b47 100644
--- a/app/code/Magento/Weee/i18n/es_ES.csv
+++ b/app/code/Magento/Weee/i18n/es_ES.csv
@@ -1,19 +1,21 @@
+Action,Action
+Tax,Tax
+Website,Website
"All Websites","Todos los Sitios Web"
-"Apply Discounts To FPT","Aplicar descuento a FPT"
-"Apply Tax To FPT","Aplicar impuestos a FPT"
-"Display Prices In Emails","Mostrar precios en el correo electrónico"
-"Display Prices In Product Lists","Mostrar precios en la lista de productos"
-"Display Prices In Sales Modules","Mostrar precios en los módulos de ventas"
-"Display Prices On Product View Page","Mostrar precios en la página de vista preliminar del producto"
-"Enable FPT","Activar FPT"
-"Excluding FPT","FPT no incluido"
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
+"Including FPT only","Incluir sólo FPT"
+"Including FPT and FPT description","Inlcuir impuestos y descripción de los impuestos"
"Excluding FPT, FPT description, final price","Excluido FPT, descripción FPT, precio final"
+"Excluding FPT","FPT no incluido"
"Fixed Product Tax","Impuesto fijo del producto"
-"Fixed Product Taxes","Impuesto fijo del producto"
-"Include FPT In Subtotal","Inlcuir impuestos en el subtotal"
-"Including FPT and FPT description","Inlcuir impuestos y descripción de los impuestos"
-"Including FPT and FPT description [incl. FPT VAT]","Inlcuir impuestos y descripción de los impuestos [incl.IVA]"
-"Including FPT only","Incluir sólo FPT"
-"Total","Total"
-"Total Incl. Tax","Total con impuestos incluidos"
-"Total incl. tax","Total con impuestos incluidos"
+Country/State,Country/State
+"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
+"Include FPT In Subtotal","Include FPT In Subtotal"
diff --git a/app/code/Magento/Weee/i18n/fr_FR.csv b/app/code/Magento/Weee/i18n/fr_FR.csv
index 1f01e43584e..bf3732e4b9d 100644
--- a/app/code/Magento/Weee/i18n/fr_FR.csv
+++ b/app/code/Magento/Weee/i18n/fr_FR.csv
@@ -1,19 +1,21 @@
+Action,Action
+Tax,Tax
+Website,Website
"All Websites","Tous les sites web"
-"Apply Discounts To FPT","Appliquer les réductions aux taxes sur les produits fixes"
-"Apply Tax To FPT","Appliquer les taxes sur les produits fixes"
-"Display Prices In Emails","Afficher les prix dans les mails"
-"Display Prices In Product Lists","Afficher les prix dans les listes de produits"
-"Display Prices In Sales Modules","Afficher les prix dans les modules de vente"
-"Display Prices On Product View Page","Afficher les prix sur la page de vue du produit"
-"Enable FPT","Permettre les taxes sur les produits fixes"
-"Excluding FPT","Exclure les taxes sur les produits fixes"
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
+"Including FPT only","Inclure uniquement les taxes sur les produits fixes"
+"Including FPT and FPT description","Inclure les taxes sur les produits fixes et leur description"
"Excluding FPT, FPT description, final price","Exclure les taxes sur les produits fixes, les descriptions, et le prix final"
+"Excluding FPT","Exclure les taxes sur les produits fixes"
"Fixed Product Tax","Taxe sur le produit fixe"
-"Fixed Product Taxes","Taxes sur le produit fixe"
-"Include FPT In Subtotal","Inclure la taxe sur les produits fixes dans le sous-total"
-"Including FPT and FPT description","Inclure les taxes sur les produits fixes et leur description"
-"Including FPT and FPT description [incl. FPT VAT]","Inclure les taxes sur les produits fixes et leur description (incluant la TVA)"
-"Including FPT only","Inclure uniquement les taxes sur les produits fixes"
-"Total","Total"
-"Total Incl. Tax","Total incluant les taxes"
-"Total incl. tax","Total dont taxes"
+Country/State,Country/State
+"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
+"Include FPT In Subtotal","Include FPT In Subtotal"
diff --git a/app/code/Magento/Weee/i18n/nl_NL.csv b/app/code/Magento/Weee/i18n/nl_NL.csv
index f4420461a64..2787ed4e79d 100644
--- a/app/code/Magento/Weee/i18n/nl_NL.csv
+++ b/app/code/Magento/Weee/i18n/nl_NL.csv
@@ -1,19 +1,21 @@
+Action,Action
+Tax,Tax
+Website,Website
"All Websites","Alle Websites"
-"Apply Discounts To FPT","Pas Korting Toe op FPT"
-"Apply Tax To FPT","Pas BTW Toe op FPT"
-"Display Prices In Emails","Toon Prijzen In Emails"
-"Display Prices In Product Lists","Toon Prijzen In Productlijsten"
-"Display Prices In Sales Modules","Toon Prijzen in Verkoopmodules"
-"Display Prices On Product View Page","Toon Prijzen Op Product Weergavepagina"
-"Enable FPT","Activeer FPT"
-"Excluding FPT","Met uitzondering van FPT"
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
+"Including FPT only","Inclusief alleen FPT"
+"Including FPT and FPT description","Inclusief FPT en FPT omschrijving"
"Excluding FPT, FPT description, final price","Met uitzondering van FPT, FPT omschrijving, definitieve prijs"
+"Excluding FPT","Met uitzondering van FPT"
"Fixed Product Tax","Vaste Product Belasting"
-"Fixed Product Taxes","Vaste Product Belastingen"
-"Include FPT In Subtotal","Neem FPT mee in Subtotaal"
-"Including FPT and FPT description","Inclusief FPT en FPT omschrijving"
-"Including FPT and FPT description [incl. FPT VAT]","Inclusief FPT en FPT omschrijving [incl. FPT BTW]"
-"Including FPT only","Inclusief alleen FPT"
-"Total","Totaal"
-"Total Incl. Tax","Totale Inclusieve Belasting"
-"Total incl. tax","Totaal incl. BTW"
+Country/State,Country/State
+"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
+"Include FPT In Subtotal","Include FPT In Subtotal"
diff --git a/app/code/Magento/Weee/i18n/pt_BR.csv b/app/code/Magento/Weee/i18n/pt_BR.csv
index f148ff9615a..b1e49cdafe5 100644
--- a/app/code/Magento/Weee/i18n/pt_BR.csv
+++ b/app/code/Magento/Weee/i18n/pt_BR.csv
@@ -1,19 +1,21 @@
+Action,Action
+Tax,Tax
+Website,Website
"All Websites","Todos os sites"
-"Apply Discounts To FPT","Aplicar descontos ao FPT"
-"Apply Tax To FPT","Aplicar imposto ao FPT"
-"Display Prices In Emails","Exibir preços em Emails"
-"Display Prices In Product Lists","Exibir preços em listas de produtos"
-"Display Prices In Sales Modules","Exibir preços em módulos de vendas"
-"Display Prices On Product View Page","Exibir Preços em Página de Visualização do Produto"
-"Enable FPT","Habilitar FPT"
-"Excluding FPT","Excluindo FPT"
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
+"Including FPT only","Incluindo somente FPT"
+"Including FPT and FPT description","Incluindo FPT e descrição de FPT"
"Excluding FPT, FPT description, final price","Excluindo FPT, descrição de FPT, preço final"
+"Excluding FPT","Excluindo FPT"
"Fixed Product Tax","Imposto fixo do produto"
-"Fixed Product Taxes","Impostos fixos do produto"
-"Include FPT In Subtotal","Incluir FPT no subtotal"
-"Including FPT and FPT description","Incluindo FPT e descrição de FPT"
-"Including FPT and FPT description [incl. FPT VAT]","Incluindo FPT e descrição de FPT [incluindo FPT IVA]"
-"Including FPT only","Incluindo somente FPT"
-"Total","Total"
-"Total Incl. Tax","Total incluindo imposto"
-"Total incl. tax","Total incluindo taxas"
+Country/State,Country/State
+"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
+"Include FPT In Subtotal","Include FPT In Subtotal"
diff --git a/app/code/Magento/Weee/i18n/zh_CN.csv b/app/code/Magento/Weee/i18n/zh_CN.csv
index af60ba8dd83..17e7ffe826f 100644
--- a/app/code/Magento/Weee/i18n/zh_CN.csv
+++ b/app/code/Magento/Weee/i18n/zh_CN.csv
@@ -1,19 +1,21 @@
-"All Websites","所有网站"
-"Apply Discounts To FPT","应用折扣到 FPT"
-"Apply Tax To FPT","应用税费到 FPT"
-"Display Prices In Emails","在电åé‚®ä»¶ä¸“ç”¨æ˜¾ç¤ºä»·æ ¼"
-"Display Prices In Product Lists","在产å“列表ä¸æ˜¾ç¤ºä»·æ ¼"
-"Display Prices In Sales Modules","在销售模å—ä¸æ˜¾ç¤ºä»·æ ¼"
-"Display Prices On Product View Page","在产å“查看页é¢ä¸æ˜¾ç¤ºä»·æ ¼"
-"Enable FPT","å¯ç”¨ FPT"
-"Excluding FPT","ä¸åŒ…å« FPT"
-"Excluding FPT, FPT description, final price","ä¸åŒ…å« FPT，FPT æè¿°ï¼Œæœ€ç»ˆä»·æ ¼"
-"Fixed Product Tax","固定产å“税费"
-"Fixed Product Taxes","固定产å“税费"
-"Include FPT In Subtotal","在å°è®¡ä¸åŒ…å« FPT"
-"Including FPT and FPT description","åŒ…å« FPT å’Œ FPT æè¿°"
-"Including FPT and FPT description [incl. FPT VAT]","åŒ…å« FPT å’Œ FPT æè¿° [åŒ…å« FPT VAT]"
+Action,Action
+Tax,Tax
+Website,Website
+"All Websites",所有网站
+"Add Tax","Add Tax"
+"Delete Tax","Delete Tax"
+"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
"Including FPT only","ä»…åŒ…å« FPT"
-"Total","总数"
-"Total Incl. Tax","å«ç¨Žæ€»è®¡"
-"Total incl. tax","总价å«ç¨Ž"
+"Including FPT and FPT description","åŒ…å« FPT å’Œ FPT æè¿°"
+"Excluding FPT, FPT description, final price","ä¸åŒ…å« FPT，FPT æè¿°ï¼Œæœ€ç»ˆä»·æ ¼"
+"Excluding FPT","ä¸åŒ…å« FPT"
+"Fixed Product Tax",固定产å“税费
+Country/State,Country/State
+"Fixed Product Taxes","Fixed Product Taxes"
+"Enable FPT","Enable FPT"
+"Display Prices In Product Lists","Display Prices In Product Lists"
+"Display Prices On Product View Page","Display Prices On Product View Page"
+"Display Prices In Sales Modules","Display Prices In Sales Modules"
+"Display Prices In Emails","Display Prices In Emails"
+"Apply Tax To FPT","Apply Tax To FPT"
+"Include FPT In Subtotal","Include FPT In Subtotal"
diff --git a/app/code/Magento/Widget/README.md b/app/code/Magento/Widget/README.md
new file mode 100644
index 00000000000..4d70d3b6838
--- /dev/null
+++ b/app/code/Magento/Widget/README.md
@@ -0,0 +1 @@
+The Widget module allows Magento application to be extended with custom widget blocks.
\ No newline at end of file
diff --git a/app/code/Magento/Widget/i18n/de_DE.csv b/app/code/Magento/Widget/i18n/de_DE.csv
index 33577873416..15390c51039 100644
--- a/app/code/Magento/Widget/i18n/de_DE.csv
+++ b/app/code/Magento/Widget/i18n/de_DE.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,Alle
+Close,Schließen
+Products,Produkte
+Apply,Anwenden
+"Design Theme","Design Theme"
"-- Please Select --","-- Bitte auswählen --"
-"Actions","Aktionen"
-"Add Layout Update","Layout-Update hinzufügen"
-"Add New Widget Instance","Neue Widget-Instanz hinzufügen"
-"All","Alle"
-"All Pages","Alle Seiten"
-"All Product Types","Alle Produkttypen"
-"Anchor Categories","Grundkategorien"
-"Apply","Anwenden"
-"Assign to Store Views","Zu Shopansichten zuweisen"
-"Big Image","Größeres Bild"
-"Block Reference","Blockreferenz"
-"CMS","CMS"
-"Categories","Kategorien"
-"Choose...","Auswählen..."
-"Close","Schließen"
-"Continue","Fortsetzen"
-"Default Template","Standardvorlage"
-"Delete","Löschen"
-"Design Package/Theme","Design-Paket/Theme"
-"Export to:","Exportieren nach:"
-"Frontend Properties","Oberflächeneigenschaften"
-"Generic Pages","Generische Seiten"
-"Images","Bilder"
+"Sort Order",Sortierreihenfolge
+"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
+Type,Typ
+Page,Seite
+label,label
+"Frontend Properties",Oberflächeneigenschaften
+Categories,Kategorien
+name,name
+Continue,Fortsetzen
+CMS,CMS
+%1,%1
+"Open Chooser","Chooser öffnen (Auswählfunktion öffnen)"
+Settings,Einstellungen
+Template,Vorlage
+"Not Selected","Nicht ausgewählt"
+"Widget Insertion",Widget-Einbindung
"Insert Widget","Widgt einfügen"
-"Insert Widget...","Widget einfügen..."
-"Layout Updates","Layout-Updates"
+Choose...,Auswählen...
+Widget,Widget
+"Widget Type",Widget-Typ
"Manage Widget Instances","Widget-Instanzen verwalten"
-"New Instance","Neue Instanz"
+"Add New Widget Instance","Neue Widget-Instanz hinzufügen"
+"Widget ""%1""","Widget ""%1"""
"New Widget Instance","Neue Widget-Instanz"
-"Next page","Nächste Seite"
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
+"Design Package/Theme",Design-Paket/Theme
+"Widget Instance Title",Widget-Instanz-Titel
+"Assign to Store Views","Zu Shopansichten zuweisen"
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates",Layout-Updates
+"Anchor Categories",Grundkategorien
"Non-Anchor Categories","nicht grundlegende Kategorien"
-"Not Selected","Nicht ausgewählt"
-"Open Chooser","Chooser öffnen (Auswählfunktion öffnen)"
-"Page","Seite"
-"Please Select Block Reference First","Bitte erst Blockreferenz auswählen"
-"Previous page","Vorhergehende Seite"
-"Products","Produkte"
-"Remove Layout Update","Layout-Update entfernen"
-"Save and Continue Edit","Speichern und Bearbeitung fortsetzen"
-"Select All","Alle auswählen"
-"Select Visible","Sichtbare auswählen"
-"Settings","Einstellungen"
-"Sort Order","Sortierreihenfolge"
-"Sort Order of widget instances in the same block reference","Sortierreihenfolge der Widget-Instanzen in der gleichen Blockreferenz"
-"Specific %s","Spezifische %s"
+"All Product Types","Alle Produkttypen"
+"Generic Pages","Generische Seiten"
+"All Pages","Alle Seiten"
"Specified Page","Bestimmte Seite"
-"Template","Vorlage"
-"The information in this tab has been changed.","Die Informationen in diesem Tab wurden geändert."
-"The widget instance has been deleted.","Die Widget-Instanz wurde gelöscht."
+"Add Layout Update","Layout-Update hinzufügen"
+"Remove Layout Update","Layout-Update entfernen"
+"Widget Options",Widget-Optionen
+"Widget Instance",Widget-Instanz
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
"The widget instance has been saved.","Die Widget-Instanz wurde gespeichert."
-"This tab contains invalid data. Please solve the problem before saving.","Der Tab enthält ungültige Daten. Bitte das Problem vor dem Speichern beheben."
-"Thumbnail","Miniaturansicht"
-"Total %d records found","Gesamtzahl von %d Einträgen gefunden"
-"Type","Typ"
-"Undefined Design Package or Theme.","Undefiniertes Designpaket oder Design"
-"Unselect All","Alle abwählen"
-"Unselect Visible","Sichtbare abwählen"
-"View","Anzeigen"
-"Widget","Widget"
-"Widget ""%s""","Grafikobjekt ""%s"" "
-"Widget ID","Widget-ID"
-"Widget Insertion","Widget-Einbindung"
-"Widget Instance","Widget-Instanz"
-"Widget Instance Title","Widget-Instanz-Titel"
-"Widget Options","Widget-Optionen"
-"Widget Type","Widget-Typ"
-"Widget Type is not specified","Widget-Typ nicht festgelegt"
-"Widget instance is not full complete to create.","Widget-Instanz nicht zur Erstellung vollständig."
-"Widgets","Widgets"
-"Wrong widget instance specified.","Falsche Widget Instanz angegeben."
-"items selected","Objekte ausgewählt"
-"of %s pages","von %s Seiten"
-"per page","pro Seite"
+"The widget instance has been deleted.","Die Widget-Instanz wurde gelöscht."
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
+"Widget ID",Widget-ID
diff --git a/app/code/Magento/Widget/i18n/en_US.csv b/app/code/Magento/Widget/i18n/en_US.csv
index deb443ad013..4223b3f8eb6 100644
--- a/app/code/Magento/Widget/i18n/en_US.csv
+++ b/app/code/Magento/Widget/i18n/en_US.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,All
+Close,Close
+Products,Products
+Apply,Apply
+"Design Theme","Design Theme"
"-- Please Select --","-- Please Select --"
-"Actions","Actions"
-"Add Layout Update","Add Layout Update"
-"Add New Widget Instance","Add New Widget Instance"
-"All","All"
-"All Pages","All Pages"
-"All Product Types","All Product Types"
-"Anchor Categories","Anchor Categories"
-"Apply","Apply"
-"Assign to Store Views","Assign to Store Views"
-"Big Image","Big Image"
-"Block Reference","Block Reference"
-"CMS","CMS"
-"Categories","Categories"
-"Choose...","Choose..."
-"Close","Close"
-"Continue","Continue"
-"Default Template","Default Template"
-"Delete","Delete"
-"Design Package/Theme","Design Package/Theme"
-"Export to:","Export to:"
+"Sort Order","Sort Order"
+"Save and Continue Edit","Save and Continue Edit"
+Type,Type
+Page,Page
+label,label
"Frontend Properties","Frontend Properties"
-"Generic Pages","Generic Pages"
-"Images","Images"
+Categories,Categories
+name,name
+Continue,Continue
+CMS,CMS
+%1,%1
+"Open Chooser","Open Chooser"
+Settings,Settings
+Template,Template
+"Not Selected","Not Selected"
+"Widget Insertion","Widget Insertion"
"Insert Widget","Insert Widget"
-"Insert Widget...","Insert Widget..."
-"Layout Updates","Layout Updates"
+Choose...,Choose...
+Widget,Widget
+"Widget Type","Widget Type"
"Manage Widget Instances","Manage Widget Instances"
-"New Instance","New Instance"
+"Add New Widget Instance","Add New Widget Instance"
+"Widget ""%1""","Widget ""%1"""
"New Widget Instance","New Widget Instance"
-"Next page","Next page"
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
+"Design Package/Theme","Design Package/Theme"
+"Widget Instance Title","Widget Instance Title"
+"Assign to Store Views","Assign to Store Views"
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates","Layout Updates"
+"Anchor Categories","Anchor Categories"
"Non-Anchor Categories","Non-Anchor Categories"
-"Not Selected","Not Selected"
-"Open Chooser","Open Chooser"
-"Page","Page"
-"Please Select Block Reference First","Please Select Block Reference First"
-"Previous page","Previous page"
-"Products","Products"
-"Remove Layout Update","Remove Layout Update"
-"Save and Continue Edit","Save and Continue Edit"
-"Select All","Select All"
-"Select Visible","Select Visible"
-"Settings","Settings"
-"Sort Order","Sort Order"
-"Sort Order of widget instances in the same block reference","Sort Order of widget instances in the same block reference"
-"Specific %s","Specific %s"
+"All Product Types","All Product Types"
+"Generic Pages","Generic Pages"
+"All Pages","All Pages"
"Specified Page","Specified Page"
-"Template","Template"
-"The information in this tab has been changed.","The information in this tab has been changed."
-"The widget instance has been deleted.","The widget instance has been deleted."
+"Add Layout Update","Add Layout Update"
+"Remove Layout Update","Remove Layout Update"
+"Widget Options","Widget Options"
+"Widget Instance","Widget Instance"
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
"The widget instance has been saved.","The widget instance has been saved."
-"This tab contains invalid data. Please solve the problem before saving.","This tab contains invalid data. Please solve the problem before saving."
-"Thumbnail","Thumbnail"
-"Total %d records found","Total %d records found"
-"Type","Type"
-"Undefined Design Package or Theme.","Undefined Design Package or Theme."
-"Unselect All","Unselect All"
-"Unselect Visible","Unselect Visible"
-"View","View"
-"Widget","Widget"
-"Widget ""%s""","Widget ""%s"""
+"The widget instance has been deleted.","The widget instance has been deleted."
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
"Widget ID","Widget ID"
-"Widget Insertion","Widget Insertion"
-"Widget Instance","Widget Instance"
-"Widget Instance Title","Widget Instance Title"
-"Widget Options","Widget Options"
-"Widget Type","Widget Type"
-"Widget Type is not specified","Widget Type is not specified"
-"Widget instance is not full complete to create.","Widget instance is not full complete to create."
-"Widgets","Widgets"
-"Wrong widget instance specified.","Wrong widget instance specified."
-"items selected","items selected"
-"of %s pages","of %s pages"
-"per page","per page"
diff --git a/app/code/Magento/Widget/i18n/es_ES.csv b/app/code/Magento/Widget/i18n/es_ES.csv
index 12d8d91a47b..4cc5e9f5faf 100644
--- a/app/code/Magento/Widget/i18n/es_ES.csv
+++ b/app/code/Magento/Widget/i18n/es_ES.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,Todo
+Close,Cerrar
+Products,Productos
+Apply,Confirmar
+"Design Theme","Design Theme"
"-- Please Select --","-- Seleccionar, por favor --"
-"Actions","Acciones"
-"Add Layout Update","Agregar actualización de diseño"
-"Add New Widget Instance","Agregar nueva instancia de aplicación"
-"All","Todo"
-"All Pages","Todas las páginas"
-"All Product Types","Todos los tipos de productos"
-"Anchor Categories","CategorÃas de ancla"
-"Apply","Confirmar"
-"Assign to Store Views","Asignar a vistas de tienda"
-"Big Image","Imagen grande"
-"Block Reference","Referencia de bloque"
-"CMS","CMS"
-"Categories","CategorÃas"
-"Choose...","Elegir..."
-"Close","Cerrar"
-"Continue","Continuar"
-"Default Template","Plantilla por Defecto"
-"Delete","Eliminar"
-"Design Package/Theme","Diseñar paquete/tema"
-"Export to:","Exportar a:"
+"Sort Order","Ordenar Pedido"
+"Save and Continue Edit","Guardar y continuar editando"
+Type,Tipo
+Page,Página
+label,label
"Frontend Properties","Propiedades del frontend"
-"Generic Pages","Páginas genéricas"
-"Images","Imágenes"
+Categories,CategorÃas
+name,name
+Continue,Continuar
+CMS,CMS
+%1,%1
+"Open Chooser","Abrir el buscador"
+Settings,Configuración
+Template,Plantilla
+"Not Selected","No seleccionado"
+"Widget Insertion","Inserción del widget"
"Insert Widget","Insertar aplicación"
-"Insert Widget...","Insertar aplicación..."
-"Layout Updates","Actualizaciones de diseño"
+Choose...,Elegir...
+Widget,Aplicación
+"Widget Type","Tipo de aplicación"
"Manage Widget Instances","Administrar instancias de aplicación"
-"New Instance","Nueva instancia"
+"Add New Widget Instance","Agregar nueva instancia de aplicación"
+"Widget ""%1""","Widget ""%1"""
"New Widget Instance","Nueva instancia de aplicación"
-"Next page","Página siguiente"
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
+"Design Package/Theme","Diseñar paquete/tema"
+"Widget Instance Title","TÃtulo de instancia de aplicación"
+"Assign to Store Views","Asignar a vistas de tienda"
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates","Actualizaciones de diseño"
+"Anchor Categories","CategorÃas de ancla"
"Non-Anchor Categories","CategorÃas no de ancla"
-"Not Selected","No seleccionado"
-"Open Chooser","Abrir el buscador"
-"Page","Página"
-"Please Select Block Reference First","Seleccione primero la referencia de bloque"
-"Previous page","Página anterior"
-"Products","Productos"
-"Remove Layout Update","Eliminar actualización de diseño"
-"Save and Continue Edit","Guardar y continuar editando"
-"Select All","Seleccionar Todo"
-"Select Visible","Seleccionar Visible"
-"Settings","Configuración"
-"Sort Order","Ordenar Pedido"
-"Sort Order of widget instances in the same block reference","Establecer orden de instancias de aplicación en la misma referencia de bloque"
-"Specific %s","%s especÃfico"
+"All Product Types","Todos los tipos de productos"
+"Generic Pages","Páginas genéricas"
+"All Pages","Todas las páginas"
"Specified Page","Página especificada"
-"Template","Plantilla"
-"The information in this tab has been changed.","Se ha cambiado la información de esta etiqueta."
-"The widget instance has been deleted.","Se eliminó la instancia de aplicación."
+"Add Layout Update","Agregar actualización de diseño"
+"Remove Layout Update","Eliminar actualización de diseño"
+"Widget Options","Opciones de aplicación"
+"Widget Instance","Instancia de aplicación"
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
"The widget instance has been saved.","Se guardó la instancia de aplicación."
-"This tab contains invalid data. Please solve the problem before saving.","Esta etiqueta contiene datos no válidos. Por favor, resuelva el problema antes de guardar."
-"Thumbnail","Miniatura"
-"Total %d records found","Se ha encontrado un total de %d registros"
-"Type","Tipo"
-"Undefined Design Package or Theme.","Paquete de diseño o tema no definido."
-"Unselect All","Deseleccionar Todo"
-"Unselect Visible","Deseleccionar lo Visible"
-"View","Ver"
-"Widget","Aplicación"
-"Widget ""%s""","Widget ""%s"""
+"The widget instance has been deleted.","Se eliminó la instancia de aplicación."
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
"Widget ID","ID de aplicación"
-"Widget Insertion","Inserción del widget"
-"Widget Instance","Instancia de aplicación"
-"Widget Instance Title","TÃtulo de instancia de aplicación"
-"Widget Options","Opciones de aplicación"
-"Widget Type","Tipo de aplicación"
-"Widget Type is not specified","No se especificó el tipo de aplicación"
-"Widget instance is not full complete to create.","La instancia de aplicación no está completa para crear."
-"Widgets","Aplicaciones"
-"Wrong widget instance specified.","La instancia de widget especificada es errónea."
-"items selected","ArtÃculos elegidos"
-"of %s pages","de %s páginas"
-"per page","por página"
diff --git a/app/code/Magento/Widget/i18n/fr_FR.csv b/app/code/Magento/Widget/i18n/fr_FR.csv
index 5383c105de5..3fe4f814188 100644
--- a/app/code/Magento/Widget/i18n/fr_FR.csv
+++ b/app/code/Magento/Widget/i18n/fr_FR.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,Tous
+Close,Fermer
+Products,Produits
+Apply,Appliquer
+"Design Theme","Design Theme"
"-- Please Select --","-- Veuillez sélectionner --"
-"Actions","Action"
-"Add Layout Update","Ajouter une mise à jour"
-"Add New Widget Instance","Ajouter un nouveau widget"
-"All","Tous"
-"All Pages","Toutes les pages"
-"All Product Types","Tous les types de produits"
-"Anchor Categories","Catégories fixes"
-"Apply","Appliquer"
-"Assign to Store Views","Assigner aux vues de la boutique"
-"Big Image","Grande image"
-"Block Reference","Bloc référence"
-"CMS","CMS"
-"Categories","Catégories"
-"Choose...","Choisir"
-"Close","Fermer"
-"Continue","Continuer"
-"Default Template","Modèle par défaut"
-"Delete","Supprimer"
-"Design Package/Theme","Thème visuel"
-"Export to:","Exporter vers"
+"Sort Order","Trier les widgets"
+"Save and Continue Edit","Sauvegarder et continuer l'édition"
+Type,Type
+Page,Page
+label,label
"Frontend Properties","Propriétés de l'interface"
-"Generic Pages","Pages génériques"
-"Images","Images"
+Categories,Catégories
+name,name
+Continue,Continuer
+CMS,CMS
+%1,%1
+"Open Chooser","Ouvrir le sélecteur"
+Settings,Options
+Template,"Modèle visuel"
+"Not Selected","Non sélectionné"
+"Widget Insertion","Insertion de widgets "
"Insert Widget","Insérer un widget"
-"Insert Widget...","Insérer un widget..."
-"Layout Updates","Mise à jour de la disposition"
+Choose...,Choisir
+Widget,Widget
+"Widget Type","Type de widget"
"Manage Widget Instances","Gérer les widgets lancés"
-"New Instance","Nouvelle fenêtre"
+"Add New Widget Instance","Ajouter un nouveau widget"
+"Widget ""%1""","Widget ""%1"""
"New Widget Instance","Nouveau widget"
-"Next page","Page suivante"
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
+"Design Package/Theme","Thème visuel"
+"Widget Instance Title","Titre du widget"
+"Assign to Store Views","Assigner aux vues de la boutique"
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates","Mise à jour de la disposition"
+"Anchor Categories","Catégories fixes"
"Non-Anchor Categories","Catégories non fixes"
-"Not Selected","Non sélectionné"
-"Open Chooser","Ouvrir le sélecteur"
-"Page","Page"
-"Please Select Block Reference First","Veuillez sélectionner le bloc de référence en premier"
-"Previous page","Page précédente"
-"Products","Produits"
-"Remove Layout Update","Supprimer la mise à jour de la disposition"
-"Save and Continue Edit","Sauvegarder et continuer l'édition"
-"Select All","Tout sélectionner"
-"Select Visible","Sélectionner le widget visible"
-"Settings","Options"
-"Sort Order","Trier les widgets"
-"Sort Order of widget instances in the same block reference","Trier l'ordre des widgets dans le même bloc de référence"
-"Specific %s","%s spécifique"
+"All Product Types","Tous les types de produits"
+"Generic Pages","Pages génériques"
+"All Pages","Toutes les pages"
"Specified Page","Page spécifiée"
-"Template","Modèle visuel"
-"The information in this tab has been changed.","L'information sur cet onglet a été changée."
-"The widget instance has been deleted.","Ce widget a été supprimé."
+"Add Layout Update","Ajouter une mise à jour"
+"Remove Layout Update","Supprimer la mise à jour de la disposition"
+"Widget Options","Options des widgets"
+"Widget Instance",Widget
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
"The widget instance has been saved.","Ce widget a été sauvegardé."
-"This tab contains invalid data. Please solve the problem before saving.","Cet onglet contient des données invalides. Veuillez résoudre ce problème avant d'enregistrer."
-"Thumbnail","Miniature"
-"Total %d records found","%d total d'enregistrements trouvés"
-"Type","Type"
-"Undefined Design Package or Theme.","Bloc de design ou thème non défini."
-"Unselect All","Tout dé sélectionner"
-"Unselect Visible","Désélectionner"
-"View","Vue"
-"Widget","Widget"
-"Widget ""%s""","Widget ""%s"""
+"The widget instance has been deleted.","Ce widget a été supprimé."
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
"Widget ID","Identifiant du widget"
-"Widget Insertion","Insertion de widgets "
-"Widget Instance","Widget"
-"Widget Instance Title","Titre du widget"
-"Widget Options","Options des widgets"
-"Widget Type","Type de widget"
-"Widget Type is not specified","Le type de widget n'est pas précisé"
-"Widget instance is not full complete to create.","Le widget ne peut pas être crée car il n'est pas complet."
-"Widgets","Widgets"
-"Wrong widget instance specified.","Erreur sur la spécification de l'instance de widget."
-"items selected","objets sélectionnés"
-"of %s pages","de %s des pages"
-"per page","par page"
diff --git a/app/code/Magento/Widget/i18n/nl_NL.csv b/app/code/Magento/Widget/i18n/nl_NL.csv
index 9c44874bf30..950ec4c0df5 100644
--- a/app/code/Magento/Widget/i18n/nl_NL.csv
+++ b/app/code/Magento/Widget/i18n/nl_NL.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,Alles
+Close,Sluiten
+Products,Producten
+Apply,Toepassen
+"Design Theme","Design Theme"
"-- Please Select --","-- Selecteer alstublieft --"
-"Actions","Acties"
-"Add Layout Update","Voeg Update Layout toe"
-"Add New Widget Instance","Voeg Nieuwe Widgets toe"
-"All","Alles"
-"All Pages","Alle pagina's"
-"All Product Types","Alle Product Types"
-"Anchor Categories","Anker Categorieën"
-"Apply","Toepassen"
-"Assign to Store Views","Wijs toe aan Store Views"
-"Big Image","Grote Afbeelding"
-"Block Reference","Block Referentie"
-"CMS","CMS"
-"Categories","Categoriën"
-"Choose...","Kies..."
-"Close","Sluiten"
-"Continue","Doorgaan"
-"Default Template","Vaststaand Sjabloon"
-"Delete","Verwijderen"
-"Design Package/Theme","Ontwerp Pakket/Thema"
-"Export to:","Exporteer naar:"
+"Sort Order","Sorteer Bestelling"
+"Save and Continue Edit","Opslaan en doorgaan met bewerken"
+Type,Type
+Page,Pagina
+label,label
"Frontend Properties","Front end Eigenschappen"
-"Generic Pages","Generieke Pagina's"
-"Images","Afbeeldingen"
+Categories,Categoriën
+name,name
+Continue,Doorgaan
+CMS,CMS
+%1,%1
+"Open Chooser","Open Kiezer"
+Settings,Instellingen
+Template,Sjabloon
+"Not Selected","Niet Geselecteerd"
+"Widget Insertion","Widget Invoeging"
"Insert Widget","Voeg Widget in"
-"Insert Widget...","Voeg widget in..."
-"Layout Updates","Lay-out Updates"
+Choose...,Kies...
+Widget,Widget
+"Widget Type","Widget type"
"Manage Widget Instances","Beheer Widget Gevallen"
-"New Instance","Nieuw Voorbeeld"
+"Add New Widget Instance","Voeg Nieuwe Widgets toe"
+"Widget ""%1""","Widget ""%1"""
"New Widget Instance","Nieuw Widget Voorbeeld"
-"Next page","Volgende pagina"
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
+"Design Package/Theme","Ontwerp Pakket/Thema"
+"Widget Instance Title","Widget instantie titel"
+"Assign to Store Views","Wijs toe aan Store Views"
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates","Lay-out Updates"
+"Anchor Categories","Anker Categorieën"
"Non-Anchor Categories","Niet-Verankerde Categorieën"
-"Not Selected","Niet Geselecteerd"
-"Open Chooser","Open Kiezer"
-"Page","Pagina"
-"Please Select Block Reference First","Selecteer Alstublieft Eerst de Blokreferentie"
-"Previous page","Vorige pagina"
-"Products","Producten"
-"Remove Layout Update","Verwijder Lay-out Update"
-"Save and Continue Edit","Opslaan en doorgaan met bewerken"
-"Select All","Selecteer Alles"
-"Select Visible","Selecteer Zichtbaar"
-"Settings","Instellingen"
-"Sort Order","Sorteer Bestelling"
-"Sort Order of widget instances in the same block reference","Sorteer Volgorde van widget instanties in dezelfde blokreferentie"
-"Specific %s","Specifieke %s"
+"All Product Types","Alle Product Types"
+"Generic Pages","Generieke Pagina's"
+"All Pages","Alle pagina's"
"Specified Page","Specifieke Pagina"
-"Template","Sjabloon"
-"The information in this tab has been changed.","De informatie in deze tab is veranderd."
-"The widget instance has been deleted.","De widget instantie is verwijderd."
+"Add Layout Update","Voeg Update Layout toe"
+"Remove Layout Update","Verwijder Lay-out Update"
+"Widget Options","Widget opties"
+"Widget Instance","Widget instantie"
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
"The widget instance has been saved.","De widget instantie is opgeslagen."
-"This tab contains invalid data. Please solve the problem before saving.","Deze tab bevat ongeldige data. Los alstublieft dit probleem op voor het opslaan."
-"Thumbnail","Miniatuur"
-"Total %d records found","In totaal %d verslagen gevonden."
-"Type","Type"
-"Undefined Design Package or Theme.","Ongedefinieerd Ontwerp Pakket of Thema."
-"Unselect All","Deselecteer Alles"
-"Unselect Visible","Deselecteer Zichtbaar"
-"View","Bekijk"
-"Widget","Widget"
-"Widget ""%s""","Widget ""%s"""
+"The widget instance has been deleted.","De widget instantie is verwijderd."
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
"Widget ID","Widget ID"
-"Widget Insertion","Widget Invoeging"
-"Widget Instance","Widget instantie"
-"Widget Instance Title","Widget instantie titel"
-"Widget Options","Widget opties"
-"Widget Type","Widget type"
-"Widget Type is not specified","Widget type is niet gespecificeerd"
-"Widget instance is not full complete to create.","Widget instantie is niet volledig compleet om het aan te maken"
-"Widgets","Widgets"
-"Wrong widget instance specified.","Verkeerd widget bijvoorbeeld gespecificeerd."
-"items selected","geselecteerde artikelen"
-"of %s pages","van %s pagina's"
-"per page","per pagina"
diff --git a/app/code/Magento/Widget/i18n/pt_BR.csv b/app/code/Magento/Widget/i18n/pt_BR.csv
index d5bcb8144a5..1e2eef700c5 100644
--- a/app/code/Magento/Widget/i18n/pt_BR.csv
+++ b/app/code/Magento/Widget/i18n/pt_BR.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,Todos
+Close,Fechar
+Products,Produtos
+Apply,Solicitar
+"Design Theme","Design Theme"
"-- Please Select --","- Por Favor Selecione -"
-"Actions","Ações"
-"Add Layout Update","Adicionar Atualização de Layout"
-"Add New Widget Instance","Adicionar Novo Exemplo de Widget"
-"All","Todos"
-"All Pages","Todas as Páginas"
-"All Product Types","Todos Tipos de Produtos"
-"Anchor Categories","Categorias Âncora"
-"Apply","Solicitar"
-"Assign to Store Views","Atribuir a visualizações da loja"
-"Big Image","Imagem grande"
-"Block Reference","Bloco de Referência"
-"CMS","SGC"
-"Categories","Categorias"
-"Choose...","Escolha..."
-"Close","Fechar"
-"Continue","Continue"
-"Default Template","Modelo padrão"
-"Delete","Excluir"
-"Design Package/Theme","Pacote de Design/Tema"
-"Export to:","Exportar para:"
+"Sort Order","Classificar pedido"
+"Save and Continue Edit","Salvar e continuar a editar"
+Type,Tipo
+Page,Página
+label,label
"Frontend Properties","Propriedades de interface inicial"
-"Generic Pages","Páginas genéricas"
-"Images","Imagens"
+Categories,Categorias
+name,name
+Continue,Continue
+CMS,SGC
+%1,%1
+"Open Chooser","Abrir Seletor"
+Settings,Configurações
+Template,Modelo
+"Not Selected","Não selecionado"
+"Widget Insertion","Inserção de Widget"
"Insert Widget","Inserir Widget"
-"Insert Widget...","Insira o Widget..."
-"Layout Updates","Atualizações de layout"
+Choose...,Escolha...
+Widget,Widget
+"Widget Type","Widget Tipo"
"Manage Widget Instances","Gerenciar exemplos de widget"
-"New Instance","Novo exemplo"
+"Add New Widget Instance","Adicionar Novo Exemplo de Widget"
+"Widget ""%1""","Widget ""%1"""
"New Widget Instance","Novo exemplo de Widget"
-"Next page","Próxima página"
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
+"Design Package/Theme","Pacote de Design/Tema"
+"Widget Instance Title","Widget Exemplo TÃtulo"
+"Assign to Store Views","Atribuir a visualizações da loja"
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates","Atualizações de layout"
+"Anchor Categories","Categorias Âncora"
"Non-Anchor Categories","Categorias Não-Âncoras"
-"Not Selected","Não selecionado"
-"Open Chooser","Abrir Seletor"
-"Page","Página"
-"Please Select Block Reference First","Por favor, primeiramente selecione bloco de referência"
-"Previous page","Página anterior"
-"Products","Produtos"
-"Remove Layout Update","Remover atualização do layout"
-"Save and Continue Edit","Salvar e continuar a editar"
-"Select All","Selecionar Tudo"
-"Select Visible","Selecione VisÃvel"
-"Settings","Configurações"
-"Sort Order","Classificar pedido"
-"Sort Order of widget instances in the same block reference","Classificar a ordem de exemplos de widget no mesmo bloco de referência"
-"Specific %s","%s EspecÃfico"
+"All Product Types","Todos Tipos de Produtos"
+"Generic Pages","Páginas genéricas"
+"All Pages","Todas as Páginas"
"Specified Page","Página especificada"
-"Template","Modelo"
-"The information in this tab has been changed.","As informações contidas neste guia foram alteradas."
-"The widget instance has been deleted.","O exemplo de widget foi deletado."
+"Add Layout Update","Adicionar Atualização de Layout"
+"Remove Layout Update","Remover atualização do layout"
+"Widget Options","Widget Opções"
+"Widget Instance","Widget Exemplo"
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
"The widget instance has been saved.","O exemplo de widget foi salvo."
-"This tab contains invalid data. Please solve the problem before saving.","Este guia contém dados inválidos. Por favor resolva o problema antes de salvar."
-"Thumbnail","Miniatura"
-"Total %d records found","Total de %d registros encontrados"
-"Type","Tipo"
-"Undefined Design Package or Theme.","Pacote de Desenho ou Tema Não Definido"
-"Unselect All","Desselecionar Todos"
-"Unselect Visible","Desselecionar VisÃveis"
-"View","Ver"
-"Widget","Widget"
-"Widget ""%s""","Widget ""%s"""
+"The widget instance has been deleted.","O exemplo de widget foi deletado."
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
"Widget ID","ID do Widget"
-"Widget Insertion","Inserção de Widget"
-"Widget Instance","Widget Exemplo"
-"Widget Instance Title","Widget Exemplo TÃtulo"
-"Widget Options","Widget Opções"
-"Widget Type","Widget Tipo"
-"Widget Type is not specified","Tipo de Widget não foi especificado"
-"Widget instance is not full complete to create.","O exemplo de Widget não foi completo totalmente para criar"
-"Widgets","Widgets"
-"Wrong widget instance specified.","Exemplo de widget errado especificado."
-"items selected","itens selecionados"
-"of %s pages","de %s páginas"
-"per page","por página"
diff --git a/app/code/Magento/Widget/i18n/zh_CN.csv b/app/code/Magento/Widget/i18n/zh_CN.csv
index b742114960e..e72d535776a 100644
--- a/app/code/Magento/Widget/i18n/zh_CN.csv
+++ b/app/code/Magento/Widget/i18n/zh_CN.csv
@@ -1,75 +1,59 @@
-"%s","%s"
+All,全部
+Close,å…³é—
+Products,产å“
+Apply,应用
+"Design Theme","Design Theme"
"-- Please Select --","-- 请选择 --"
-"Actions","æ“作"
-"Add Layout Update","æ·»åŠ å¸ƒå±€æ›´æ–°"
-"Add New Widget Instance","æ·»åŠ æ–°å°å·¥å…·å®žä¾‹"
-"All","全部"
-"All Pages","所有页é¢"
-"All Product Types","所有产å“类型"
-"Anchor Categories","锚点分类"
-"Apply","应用"
-"Assign to Store Views","分é…到店铺视图"
-"Big Image","大图片"
-"Block Reference","å—引用"
-"CMS","CMS"
-"Categories","分类"
-"Choose...","选择..."
-"Close","å…³é—"
-"Continue","继ç»"
-"Default Template","默认模æ¿"
-"Delete","åˆ é™¤"
+"Sort Order",排åºé¡ºåº
+"Save and Continue Edit",ä¿å˜å¹¶ç»§ç»ç¼–辑
+Type,类型
+Page,页é¢
+label,label
+"Frontend Properties",å‰ç«¯å±žæ€§
+Categories,分类
+name,name
+Continue,继ç»
+CMS,CMS
+%1,%1
+"Open Chooser",打开选择器
+Settings,设置
+Template,模æ¿
+"Not Selected",éžæ‰€é€‰
+"Widget Insertion",å°å·¥å…·æ’å…¥
+"Insert Widget",æ’å…¥å°å·¥å…·
+Choose...,选择...
+Widget,å°å·¥å…·
+"Widget Type",å°å·¥å…·ç±»åž‹
+"Manage Widget Instances",管ç†å°å·¥å…·å®žä¾‹
+"Add New Widget Instance",æ·»åŠ æ–°å°å·¥å…·å®žä¾‹
+"Widget ""%1""","Widget ""%1"""
+"New Widget Instance",æ–°å°å·¥å…·å®žä¾‹
+"Custom Layouts","Custom Layouts"
+"Page Layouts","Page Layouts"
+"Please Select Container First","Please Select Container First"
"Design Package/Theme","设计 包裹/主题"
-"Export to:","导出到："
-"Frontend Properties","å‰ç«¯å±žæ€§"
-"Generic Pages","通用页é¢"
-"Images","图åƒ"
-"Insert Widget","æ’å…¥å°å·¥å…·"
-"Insert Widget...","æ’å…¥å°å·¥å…·..."
-"Layout Updates","布局更新"
-"Manage Widget Instances","管ç†å°å·¥å…·å®žä¾‹"
-"New Instance","新实例"
-"New Widget Instance","æ–°å°å·¥å…·å®žä¾‹"
-"Next page","下一页"
-"Non-Anchor Categories","éžé”šç‚¹åˆ†ç±»"
-"Not Selected","éžæ‰€é€‰"
-"Open Chooser","打开选择器"
-"Page","页é¢"
-"Please Select Block Reference First","请首先选择å—引用"
-"Previous page","上一页"
-"Products","产å“"
-"Remove Layout Update","åˆ é™¤å¸ƒå±€æ›´æ–°"
-"Save and Continue Edit","ä¿å˜å¹¶ç»§ç»ç¼–辑"
-"Select All","全选"
-"Select Visible","选择å¯è§æ€§"
-"Settings","设置"
-"Sort Order","排åºé¡ºåº"
-"Sort Order of widget instances in the same block reference","用相åŒçš„å—应用对订å•çš„å°å·¥å…·å®žä¾‹è¿›è¡ŒæŽ’åº"
-"Specific %s","指定的 %s"
-"Specified Page","指定的页é¢"
-"Template","模æ¿"
-"The information in this tab has been changed.","该选项å¡ä¸çš„ä¿¡æ¯å·²å˜æ›´ã€‚"
-"The widget instance has been deleted.","该å°å·¥å…·å®žä¾‹å·²è¢«åˆ 除。"
-"The widget instance has been saved.","该å°å·¥å…·å®žä¾‹å·²è¢«ä¿å˜ã€‚"
-"This tab contains invalid data. Please solve the problem before saving.","该选项å¡åŒ…å«æ— 效数æ®ã€‚请在ä¿å˜å‰è§£å†³é—®é¢˜ã€‚"
-"Thumbnail","缩略图"
-"Total %d records found","共找到 %sæ¡è®°å½•"
-"Type","类型"
-"Undefined Design Package or Theme.","未定义的设计包或主题。"
-"Unselect All","全部å选"
-"Unselect Visible","å选å¯è§æ€§"
-"View","查看"
-"Widget","å°å·¥å…·"
-"Widget ""%s""","å°å·¥å…· ""%s"""
-"Widget ID","å°å·¥å…·ID"
-"Widget Insertion","å°å·¥å…·æ’å…¥"
-"Widget Instance","å°å·¥å…·å®žä¾‹"
-"Widget Instance Title","å°å·¥å…·å®žä¾‹æ ‡é¢˜"
-"Widget Options","å°å·¥å…·é€‰é¡¹"
-"Widget Type","å°å·¥å…·ç±»åž‹"
-"Widget Type is not specified","å°å·¥å…·ç±»åž‹æœªæŒ‡å®š"
-"Widget instance is not full complete to create.","å°å·¥å…·å®žä¾‹å¹¶æœªå®Œå…¨åˆ›å»ºã€‚"
-"Widgets","å°å·¥å…·"
-"Wrong widget instance specified.","指定的å°å·¥å…·å®žä¾‹æœ‰è¯¯ã€‚"
-"items selected","以选项"
-"of %s pages","共 %s 页"
-"per page","æ¯é¡µ"
+"Widget Instance Title",å°å·¥å…·å®žä¾‹æ ‡é¢˜
+"Assign to Store Views",分é…到店铺视图
+"Sort Order of widget instances in the same container","Sort Order of widget instances in the same container"
+"Layout Updates",布局更新
+"Anchor Categories",锚点分类
+"Non-Anchor Categories",éžé”šç‚¹åˆ†ç±»
+"All Product Types",所有产å“类型
+"Generic Pages",通用页é¢
+"All Pages",所有页é¢
+"Specified Page",指定的页é¢
+"Add Layout Update",æ·»åŠ å¸ƒå±€æ›´æ–°
+"Remove Layout Update",åˆ é™¤å¸ƒå±€æ›´æ–°
+"Widget Options",å°å·¥å…·é€‰é¡¹
+"Widget Instance",å°å·¥å…·å®žä¾‹
+"Please specify a Widget Type.","Please specify a Widget Type."
+"Frontend Apps","Frontend Apps"
+"Please specify a correct widget.","Please specify a correct widget."
+"New Frontend App Instance","New Frontend App Instance"
+"The widget instance has been saved.",该å°å·¥å…·å®žä¾‹å·²è¢«ä¿å˜ã€‚
+"The widget instance has been deleted.",该å°å·¥å…·å®žä¾‹å·²è¢«åˆ 除。
+description,description
+"We cannot create the widget instance because it is missing required information.","We cannot create the widget instance because it is missing required information."
+Container,Container
+"Specific %1","Specific %1"
+"Widget ID",å°å·¥å…·ID
diff --git a/app/code/Magento/Wishlist/i18n/de_DE.csv b/app/code/Magento/Wishlist/i18n/de_DE.csv
index 0fd1fd086ef..f73d9f1b6bd 100644
--- a/app/code/Magento/Wishlist/i18n/de_DE.csv
+++ b/app/code/Magento/Wishlist/i18n/de_DE.csv
@@ -1,98 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s wurde zu Ihrer Wunschliste hinzugefügt. Klicken Sie <a href=""%2$s"">hier</a>, um Ihren Einkauf fortzusetzen."
-"%1$s has been updated in your wishlist.","%1$s wurde in Ihrer Wunschliste aktualisiert."
-"%d product(s) have been added to shopping cart: %s.","%d Produkt(e) wurden zum Warenkorb hinzugefügt: %s."
-"%s for ""%s"".","%s für ""%s""."
-"%s has been moved to wishlist %s","%s befindet sich nun auf der Wunschliste %s."
-"%s's Wishlist","%ss Wunschzettel"
-"* Required Fields","* Notwendige Felder"
-"Add All to Cart","Alle zum Warenkorb hinzufügen"
+Back,Zurück
+Product,Produkt
+Quantity,Quantity
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Action
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Bearbeiten
+"Remove item","Artikel löschen"
"Add to Cart","Zum Warenkobrn hinzufügen"
-"Add to Compare","Zum Vergleich hinzufügen"
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields","* Notwendige Felder"
+Availability,Availability
+"In stock","Auf Lager"
+"Out of stock","Nicht lieferbar"
+"Click for price","Klicken für den Preis"
+"What's this?","Was ist das?"
+"1 item","1 item"
+"%1 items","%1 items"
"Add to Wishlist","Zum Wunschzettel hinzufügen"
+"Remove This Item","Dieses Objekt entfernen"
+"Add to Compare","Zum Vergleich hinzufügen"
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details","Details anzeigen"
+"Options Details","Optionen Details"
+Comment,Kommentar
"Add Locale","Hinzugefügt von"
-"An error occurred while adding item to wishlist.","Ein Fehler trat auf beim Hinzufügen des Objekts zum Wunschzettel."
-"An error occurred while adding item to wishlist: %s","Ein Fehler trat auf beim Hinzufügen des Objekts zum Wunschzettel: %s"
-"An error occurred while deleting the item from wishlist.","Ein Fehler trat auf beim Löschen des Objekts vom Wunschzettel."
-"An error occurred while deleting the item from wishlist: %s","Ein Fehler trat auf beim Löschen des Objekts vom Wunschzettel: %s"
-"An error occurred while updating wishlist.","Beim Aktualisieren der Wunschliste ist ein Fehler aufgetreten."
-"Are you sure you want to remove this product from your wishlist?","Sind Sie sicher, dass Sie dieses Produkt von Ihrem Wunschzettel entfernen möchten?"
-"Are you sure you would like to remove this item from the wishlist?","Sind Sie sicher, dass Sie dieses Objekt von Ihrem Wunschzettel entfernen möchten?"
-"Back","Zurück"
+"Add Date","Datum hinzugefügt"
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,Nachricht
+"Email Template","Email Template"
+"Remove Item","Objekt entfernen"
+"Sharing Information",Sharing-Information
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.","Bitte geben Sie eine gültige E-Mail-Adresse ein."
+"RSS Feed",RSS-Feed
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
"Can't delete item from wishlist","Artikel kann nicht aus Wunschliste gelöscht werden"
-"Can't save description %s","Kann Beschreibung nicht sichern %s"
-"Can't update wishlist","Kann Wunschzettel nicht aktualisieren"
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
"Cannot add item to shopping cart","Kann Objekt nicht zum Warenkorb hinzufügen"
-"Cannot add the following product(s) to shopping cart: %s.","Der Warenkorb kann nicht um das/die folgende(n) Produkt(e) erweitert werden: %s."
-"Cannot add the item to shopping cart.","Kann das Objekt nicht zum Warenkorb hinzufügen."
-"Cannot configure product","Produkt kann nicht konfiguriert werden"
-"Cannot load wishlist item","Artikel aus Wunschliste kann nicht geladen werden"
-"Cannot move item to wishlist","Artikel kann nicht auf die Wunschliste gesetzt werden."
-"Cannot specify product.","Kann Produkt nicht bestimmen."
-"Cannot specify wishlist item.","Artikel aus Wunschliste kann nicht spezifiziert werden."
-"Cannot specify wishlist.","Kann Wunschzettel nicht bestimmen."
-"Cannot update wishlist","Kann Wunschzettel nicht aktualisieren"
-"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Dieses Kästchen aktivieren, wenn Sie einen RSS-Feed-Link zu Ihrem Wunschzettel hinzufügen möchten."
-"Click for price","Klicken für den Preis"
-"Comment","Kommentar"
-"Comment:","Kommentar"
-"Configure Wishlist Item","Wunschlistenartikel konfigurieren"
-"Configured Price:","Konfigurierter Preis:"
-"Could not find such wishlist","Eine derartige Wunschliste konnte nicht aufgefunden werden."
-"Could not find wishlist","Wunschliste konnte nicht aufgefunden werden."
-"Customer My Account My Wishlist","Kunde Mein Konto Mein Wunschzettel"
-"Customer My Account Wishlist Sharing Form","Kunde Mein Konto Wunschzettel Sharing-Formular"
-"Customer Shared Wishlist View","Kunde Geteilter Wunschzettel Anzeigen"
-"Add Date","Datum hinzugefügt"
-"Days in Wishlist","Tage in Wunschliste"
-"Display Wishlist Summary","Zusammenfassung der Wunschliste anzeigen"
-"Edit","Bearbeiten"
-"Email Sender","E-Mail-Absender"
-"Email Template","E-Mail-Vorlage"
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
"Email address can't be empty.","E-Mail-Adressfeld darf nicht leer sein."
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
+"Cannot specify product.","Kann Produkt nicht bestimmen."
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart","Alle zum Warenkorb hinzufügen"
+"Update Wish List","Update Wish List"
+"View Product","Produkt anzeigen"
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
"Email addresses, separated by commas","E-Mail-Adressen, durch Komma getrennt"
-"Enabled","Aktiviert"
-"General Options","Allgemeine Optionen"
-"Go to Wishlist","Zum Wunschzettel gehen"
-"Helper for wishlist options rendering doesn't implement required interface.","Hilfsprogramm für die Darstellung der Wunschlistenoptionen implementiert die erforderliche Schnittstelle nicht."
-"In stock","Auf Lager"
-"Last Added Items","Zuletzt hinzugefügte Objekte"
-"Message","Nachricht"
-"My Wishlist","Mein Wunschzettel"
-"My Wishlist (%d item)","Mein Wunschzettel (%d Objekt)"
-"My Wishlist (%d items)","Mein Wunschzettel (%d Objekte)"
-"My Wishlist <small>(%d)</small>","Mein Wunschzettel <small>(%d)</small>"
-"My Wishlist Link","Link ""Meine Wunschliste"""
-"Options Details","Optionen Details"
-"Out of stock","Nicht lieferbar"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Bitte geben Sie gültige E-Mail-Adressen ein, durch Komma getrennt, wie z.B. johndoe@domain.com, johnsmith@domain.com."
-"Please input a valid email address.","Bitte geben Sie eine gültige E-Mail-Adresse ein."
-"Please, enter your comments...","Bitte geben Sie Ihre Kommentare ein..."
-"Product","Produkt"
-"Product Details and Comment","Produktangaben und Kommentare"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","Produkt(e) %s haben notwendige Optionen. Jedes kann nur einzeln zum Warenkob hinzugefügt werden."
-"Product(s) %s have required options. Each product can only be added individually.","Produkt(e) %s verfügt/en über die gewünschten Optionen. Jedes Produkt kann nur einzeln hinzugefügt werden."
-"RSS Feed","RSS-Feed"
-"RSS link to %s's wishlist","RSS-Link zu %ss Wunschzettel"
-"Remove Item","Objekt entfernen"
-"Remove This Item","Dieses Objekt entfernen"
-"Remove item","Artikel löschen"
-"Requested cart item doesn't exist","Der gewünschte Warenkorbartikel existiert nicht."
-"Requested wishlist doesn't exist","Die gewünschte Wunschliste existiert nicht."
-"Share Options","Optionen teilen"
+"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Dieses Kästchen aktivieren, wenn Sie einen RSS-Feed-Link zu Ihrem Wunschzettel hinzufügen möchten."
"Share Wishlist","Wunschzettel teilen"
-"Share Your Wishlist","Ihren Wunschzettel teilen"
-"Sharing Information","Sharing-Information"
-"This product(s) is currently out of stock","Diese(s) Produkt(e) ist/sind gerade nicht lieferbar."
-"Unable to add the following product(s) to shopping cart: %s.","Das/die folgende(n) Produkt(e) kann/können nicht zum Warenkorb hinzugefügt werden: %s."
-"Update Wishlist","Wunschzettel aktualisieren"
+"Last Added Items","Zuletzt hinzugefügte Objekte"
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?","Sind Sie sicher, dass Sie dieses Produkt von Ihrem Wunschzettel entfernen möchten?"
+"Email Sender","Email Sender"
+"General Options","General Options"
+"Share Options","Share Options"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
"User description","Anwender Beschreibung"
-"View Details","Details anzeigen"
-"View Product","Produkt anzeigen"
-"What's this?","Was ist das?"
-"Wishlist","Wunschzettel"
-"Wishlist Section","Wunschzettelauswahl"
-"Wishlist Sharing","Teilen des Wunschzettels"
-"Wishlist could not be created.","Wunschliste konnte nicht erstellt werden."
-"Wishlist is empty now.","Der Wunschzettel ist jetzt leer."
-"You have no items in your wishlist.","Sie haben keine Objekte auf Ihrem Wunschzettel."
-"Your Wishlist has been shared.","Ihr Wunschzettel wurde geteilt."
+"Product Details and Comment","Produktangaben und Kommentare"
diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
index 09319942c36..f87bcc62d78 100644
--- a/app/code/Magento/Wishlist/i18n/en_US.csv
+++ b/app/code/Magento/Wishlist/i18n/en_US.csv
@@ -1,99 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping."
-"%1$s has been updated in your wishlist.","%1$s has been updated in your wishlist."
-"%d product(s) have been added to shopping cart: %s.","%d product(s) have been added to shopping cart: %s."
-"%s for ""%s"".","%s for ""%s""."
-"%s has been moved to wishlist %s","%s has been moved to wishlist %s"
-"%s's Wishlist","%s's Wishlist"
-"* Required Fields","* Required Fields"
-"Add All to Cart","Add All to Cart"
+Back,Back
+Product,Product
+Quantity,Quantity
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Action
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Edit
+"Remove item","Remove item"
"Add to Cart","Add to Cart"
-"Add to Compare","Add to Compare"
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields","* Required Fields"
+Availability,Availability
+"In stock","In stock"
+"Out of stock","Out of stock"
+"Click for price","Click for price"
+"What's this?","What's this?"
+"1 item","1 item"
+"%1 items","%1 items"
"Add to Wishlist","Add to Wishlist"
+"Remove This Item","Remove This Item"
+"Add to Compare","Add to Compare"
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details","View Details"
+"Options Details","Options Details"
+Comment,Comment
"Add Locale","Add Locale"
-"An error occurred while adding item to wishlist.","An error occurred while adding item to wishlist."
-"An error occurred while adding item to wishlist: %s","An error occurred while adding item to wishlist: %s"
-"An error occurred while deleting the item from wishlist.","An error occurred while deleting the item from wishlist."
-"An error occurred while deleting the item from wishlist: %s","An error occurred while deleting the item from wishlist: %s"
-"An error occurred while updating wishlist.","An error occurred while updating wishlist."
-"Are you sure you want to remove this product from your wishlist?","Are you sure you want to remove this product from your wishlist?"
-"Are you sure you would like to remove this item from the wishlist?","Are you sure you would like to remove this item from the wishlist?"
-"Back","Back"
+"Add Date","Add Date"
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,Message
+"Email Template","Email Template"
+"Remove Item","Remove Item"
+"Sharing Information","Sharing Information"
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.","Please input a valid email address."
+"RSS Feed","RSS Feed"
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
"Can't delete item from wishlist","Can't delete item from wishlist"
-"Can't save description %s","Can't save description %s"
-"Can't update wishlist","Can't update wishlist"
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
"Cannot add item to shopping cart","Cannot add item to shopping cart"
-"Cannot add the following product(s) to shopping cart: %s.","Cannot add the following product(s) to shopping cart: %s."
-"Cannot add the item to shopping cart.","Cannot add the item to shopping cart."
-"Cannot configure product","Cannot configure product"
-"Cannot load wishlist item","Cannot load wishlist item"
-"Cannot move item to wishlist","Cannot move item to wishlist"
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
+"Email address can't be empty.","Email address can't be empty."
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
"Cannot specify product.","Cannot specify product."
-"Cannot specify wishlist item.","Cannot specify wishlist item."
-"Cannot specify wishlist.","Cannot specify wishlist."
-"Cannot update wishlist","Cannot update wishlist"
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart","Add All to Cart"
+"Update Wish List","Update Wish List"
+"View Product","View Product"
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
+"Email addresses, separated by commas","Email addresses, separated by commas"
"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Check this checkbox if you want to add a link to an rss feed to your wishlist."
-"Click for price","Click for price"
-"Comment","Comment"
-"Comment:","Comment:"
-"Configure Wishlist Item","Configure Wishlist Item"
-"Configured Price:","Configured Price:"
-"Could not find such wishlist","Could not find such wishlist"
-"Could not find wishlist","Could not find wishlist"
-"Customer My Account My Wishlist","Customer My Account My Wishlist"
-"Customer My Account Wishlist Sharing Form","Customer My Account Wishlist Sharing Form"
-"Customer Shared Wishlist View","Customer Shared Wishlist View"
-"Add Date","Add Date"
-"Days in Wishlist","Days in Wishlist"
-"Display Wishlist Summary","Display Wishlist Summary"
-"Edit","Edit"
+"Share Wishlist","Share Wishlist"
+"Last Added Items","Last Added Items"
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?","Are you sure you want to remove this product from your wishlist?"
"Email Sender","Email Sender"
-"Email Template","Email Template"
-"Email address can't be empty.","Email address can't be empty."
-"Email addresses, separated by commas","Email addresses, separated by commas"
-"Enabled","Enabled"
"General Options","General Options"
-"Go to Wishlist","Go to Wishlist"
-"Helper for wishlist options rendering doesn't implement required interface.","Helper for wishlist options rendering doesn't implement required interface."
-"In stock","In stock"
-"Last Added Items","Last Added Items"
-"Message","Message"
-"My Wishlist","My Wishlist"
-"My Wishlist (%d item)","My Wishlist (%d item)"
-"My Wishlist (%d items)","My Wishlist (%d items)"
-"My Wishlist <small>(%d)</small>","My Wishlist <small>(%d)</small>"
-"My Wishlist Link","My Wishlist Link"
-"Options Details","Options Details"
-"Out of stock","Out of stock"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com."
-"Please input a valid email address.","Please input a valid email address."
-"Please, enter your comments...","Please, enter your comments..."
-"Product","Product"
-"Product Details and Comment","Product Details and Comment"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","Product(s) %s have required options. Each of them can be added to cart separately only."
-"Product(s) %s have required options. Each product can only be added individually.","Product(s) %s have required options. Each product can only be added individually."
-"RSS Feed","RSS Feed"
-"RSS link to %s's wishlist","RSS link to %s's wishlist"
-"Remove Item","Remove Item"
-"Remove This Item","Remove This Item"
-"Remove item","Remove item"
-"Requested cart item doesn't exist","Requested cart item doesn't exist"
-"Requested wishlist doesn't exist","Requested wishlist doesn't exist"
"Share Options","Share Options"
-"Share Wishlist","Share Wishlist"
-"Share Your Wishlist","Share Your Wishlist"
-"Sharing Information","Sharing Information"
-"This Wishlist has no Items","This Wishlist has no Items"
-"This product(s) is currently out of stock","This product(s) is currently out of stock"
-"Unable to add the following product(s) to shopping cart: %s.","Unable to add the following product(s) to shopping cart: %s."
-"Update Wishlist","Update Wishlist"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
"User description","User description"
-"View Details","View Details"
-"View Product","View Product"
-"What's this?","What's this?"
-"Wishlist","Wishlist"
-"Wishlist Section","Wishlist Section"
-"Wishlist Sharing","Wishlist Sharing"
-"Wishlist could not be created.","Wishlist could not be created."
-"Wishlist is empty now.","Wishlist is empty now."
-"You have no items in your wishlist.","You have no items in your wishlist."
-"Your Wishlist has been shared.","Your Wishlist has been shared."
+"Product Details and Comment","Product Details and Comment"
diff --git a/app/code/Magento/Wishlist/i18n/es_ES.csv b/app/code/Magento/Wishlist/i18n/es_ES.csv
index 16387ec19ce..8b59b17ff17 100644
--- a/app/code/Magento/Wishlist/i18n/es_ES.csv
+++ b/app/code/Magento/Wishlist/i18n/es_ES.csv
@@ -1,98 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","Se ha añadido %1$s a su lista de la compra. Pulse <a href=""%2$s"">aquÃ</a> para continuar comprando."
-"%1$s has been updated in your wishlist.","Se ha actualizado %1$s en su lista de la compra."
-"%d product(s) have been added to shopping cart: %s.","%d artÃculo(s) se ha(n) añadido a la cesta de la compra: %s."
-"%s for ""%s"".","%s por ""%s""."
-"%s has been moved to wishlist %s","%s se ha movido a la lista de favoritos %s"
-"%s's Wishlist","%s's Lista"
-"* Required Fields","* Campos Requeridos"
-"Add All to Cart","Añadir Todo al Carrito"
+Back,Volver
+Product,Producto
+Quantity,Quantity
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Action
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Editar
+"Remove item","Eliminar artÃculo"
"Add to Cart","Añadir al Carrito"
-"Add to Compare","Agregar para comparar"
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields","* Campos Requeridos"
+Availability,Availability
+"In stock","En existencias"
+"Out of stock",Agotado
+"Click for price","Clic para precio"
+"What's this?","¿Qué es esto?"
+"1 item","1 item"
+"%1 items","%1 items"
"Add to Wishlist","Añadir a lista que quieres."
+"Remove This Item","Eliminar Este ArtÃculo"
+"Add to Compare","Agregar para comparar"
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details","Ver detalles"
+"Options Details","Detalles de las opciones"
+Comment,Comentario
"Add Locale","Agregar desde"
-"An error occurred while adding item to wishlist.","Se ha producido un error al añadir el artÃculo a la lista."
-"An error occurred while adding item to wishlist: %s","Se ha producido un error al añadir el artÃculo a la lista: %s"
-"An error occurred while deleting the item from wishlist.","Se ha producido un error al cancelar el artÃculo de la lista."
-"An error occurred while deleting the item from wishlist: %s","Se ha producido un error al cancelar el artÃculo de la lista: %s"
-"An error occurred while updating wishlist.","Ocurrió un error mientras se actualizaba la lista de la compra."
-"Are you sure you want to remove this product from your wishlist?","¿Está seguro que desea retirar este producto de su lista de deseos?"
-"Are you sure you would like to remove this item from the wishlist?","¿Está seguro de querer eliminar este artÃculo de su lista?"
-"Back","Volver"
+"Add Date","Fecha de subida"
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,Mensaje
+"Email Template","Email Template"
+"Remove Item","Eliminar elemento"
+"Sharing Information","Compartiendo Información"
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.","Por favor, introducir una dirección de email válida."
+"RSS Feed","Fuente RSS"
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
"Can't delete item from wishlist","No se puede eliminar el artÃculo de la lista de la compra"
-"Can't save description %s","Imposible guardar la descripción %s"
-"Can't update wishlist","Imposible actualizar la lista"
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
"Cannot add item to shopping cart","No se pudo añadir el artÃculo al carrito de compra"
-"Cannot add the following product(s) to shopping cart: %s.","No se pueden añadir el (los) siguiente(s) producto(s) a la cesta de la compra: %s."
-"Cannot add the item to shopping cart.","Imposible añadir el artÃculo a la cesta de la compra."
-"Cannot configure product","No se puede configurar el producto"
-"Cannot load wishlist item","No se puede cargar el artÃculo de la lista de la compra"
-"Cannot move item to wishlist","No se puede mover el artÃculo a la lista de favoritos"
-"Cannot specify product.","No se pudo especificar producto."
-"Cannot specify wishlist item.","No se puede especificar el artÃculo de la lista de la compra."
-"Cannot specify wishlist.","Imposible especificar Favoritos"
-"Cannot update wishlist","Imposible actualizar la lista"
-"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Marque esta casilla si desea añadir a su lista un enlace a una fuente RSS."
-"Click for price","Clic para precio"
-"Comment","Comentario"
-"Comment:","Comentarios:"
-"Configure Wishlist Item","Configurar artÃculo de la lista de la compra"
-"Configured Price:","Precio configurado:"
-"Could not find such wishlist","No se pudo encontrar tal lista de favoritos"
-"Could not find wishlist","No se pudo encontrar la lista de favoritos"
-"Customer My Account My Wishlist","Cliente Mi Cuenta Mis favoritos"
-"Customer My Account Wishlist Sharing Form","Cliente Mi Cuenta Formulario para compartir Favoritos"
-"Customer Shared Wishlist View","Vista de Favoritos compartidos por el cliente"
-"Add Date","Fecha de subida"
-"Days in Wishlist","DÃas en la lista de la compra"
-"Display Wishlist Summary","Mostrar resumen de la lista de la compra"
-"Edit","Editar"
-"Email Sender","Remitente del email"
-"Email Template","Plantilla de email"
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
"Email address can't be empty.","El campo Dirección de correo electrónico no puede estar vacÃo."
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
+"Cannot specify product.","No se pudo especificar producto."
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart","Añadir Todo al Carrito"
+"Update Wish List","Update Wish List"
+"View Product","Vista del producto"
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
"Email addresses, separated by commas","Direcciones de correo electrónico, separadas por comas"
-"Enabled","Habilitado"
-"General Options","Opciones Generales"
-"Go to Wishlist","Ir a Favoritos"
-"Helper for wishlist options rendering doesn't implement required interface.","El asistente para el renderizado de las opciones de la lista de la compra no implementa la interfaz necesaria."
-"In stock","En existencias"
-"Last Added Items","Últimos elementos añadidos"
-"Message","Mensaje"
-"My Wishlist","Mi Lista de Deseos:"
-"My Wishlist (%d item)","Mis Favoritos (%d elemento)"
-"My Wishlist (%d items)","Mis Favoritos (%d elemento)"
-"My Wishlist <small>(%d)</small>","Mis Favoritos <small>(%d)</small>"
-"My Wishlist Link","Enlace a mi lista de la compra"
-"Options Details","Detalles de las opciones"
-"Out of stock","Agotado"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Por favor, introduzca una o más direcciones válidas de correo electrónico, separadas por comas. Ejemplo johndoe@domain.com, johnsmith@domain.com."
-"Please input a valid email address.","Por favor, introducir una dirección de email válida."
-"Please, enter your comments...","Por favor, introduzca sus comentarios..."
-"Product","Producto"
-"Product Details and Comment","Detalles del producto y comentarios"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","Los productos cumplen los requisitos necesarios. Sólo pueden ser añadidos a la cesta cada uno por separado."
-"Product(s) %s have required options. Each product can only be added individually.","El (los) producto(s) %s requieren opciones. Cada producto solo se puede añadir de manera individual."
-"RSS Feed","Fuente RSS"
-"RSS link to %s's wishlist","Enlace RSS a %s's favoritos"
-"Remove Item","Eliminar elemento"
-"Remove This Item","Eliminar Este ArtÃculo"
-"Remove item","Eliminar artÃculo"
-"Requested cart item doesn't exist","El artÃculo solicitado de la cesta no existe"
-"Requested wishlist doesn't exist","No existe la lista de favoritos solicitada"
-"Share Options","Opciones para compartir"
+"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Marque esta casilla si desea añadir a su lista un enlace a una fuente RSS."
"Share Wishlist","Compartir Lista de Deseos"
-"Share Your Wishlist","Comparte tus Favoritos"
-"Sharing Information","Compartiendo Información"
-"This product(s) is currently out of stock","Este artÃculo(s) está agotado actualmente"
-"Unable to add the following product(s) to shopping cart: %s.","Imposible añadir el siguiente producto(s) a la cesta de la compra: %s."
-"Update Wishlist","Actualizar la lista de peticiones"
+"Last Added Items","Últimos elementos añadidos"
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?","¿Está seguro que desea retirar este producto de su lista de deseos?"
+"Email Sender","Email Sender"
+"General Options","General Options"
+"Share Options","Share Options"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
"User description","Descripción del usuario"
-"View Details","Ver detalles"
-"View Product","Vista del producto"
-"What's this?","¿Qué es esto?"
-"Wishlist","Lista de deseos"
-"Wishlist Section","Sección Favoritos"
-"Wishlist Sharing","Compartir Favoritos"
-"Wishlist could not be created.","No se pudo crear la lista de favoritos."
-"Wishlist is empty now.","Favoritos está vacÃo."
-"You have no items in your wishlist.","No tiene artÃculos en su lista de peticiones."
-"Your Wishlist has been shared.","Sus Favoritos han sido compartidos."
+"Product Details and Comment","Detalles del producto y comentarios"
diff --git a/app/code/Magento/Wishlist/i18n/fr_FR.csv b/app/code/Magento/Wishlist/i18n/fr_FR.csv
index 3f84708c19e..2728681ff84 100644
--- a/app/code/Magento/Wishlist/i18n/fr_FR.csv
+++ b/app/code/Magento/Wishlist/i18n/fr_FR.csv
@@ -1,98 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s a été ajouté à votre liste de souhaits. Cliquez <a href=""%2$s"">ici</a> pour continuer vos achats."
-"%1$s has been updated in your wishlist.","%1$s a été mis à jour dans votre liste de souhaits."
-"%d product(s) have been added to shopping cart: %s.","%d produit(s) a(ont) été ajouté(s) au caddy: %s."
-"%s for ""%s"".","%s pour ""%s""."
-"%s has been moved to wishlist %s","%s a été déplacé dans la liste de voeux %s"
-"%s's Wishlist","%s de la liste de vœux"
-"* Required Fields","* Champs requis"
-"Add All to Cart","Tout ajouter au caddy"
+Back,Retour
+Product,Produit
+Quantity,Quantity
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Action
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Éditer
+"Remove item","Supprimer l'objet"
"Add to Cart","Ajouter au caddy"
-"Add to Compare","Ajouter pour comparer"
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields","* Champs requis"
+Availability,Availability
+"In stock","En stock"
+"Out of stock","Pas en stock"
+"Click for price","Cliquez pour le prix"
+"What's this?","Qu'est-ce ?"
+"1 item","1 item"
+"%1 items","%1 items"
"Add to Wishlist","Ajouter à liste de vœux"
+"Remove This Item","Enlever cet article"
+"Add to Compare","Ajouter pour comparer"
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details","Vue détails"
+"Options Details","Informations options"
+Comment,Commentaires
"Add Locale","Formulaire ajouté"
-"An error occurred while adding item to wishlist.","Une erreur s'est produit lors de l'ajout de l'article à la liste de vœux."
-"An error occurred while adding item to wishlist: %s","Une erreur s'est produite lors de l'ajout de l'article à la liste de vœux: %s"
-"An error occurred while deleting the item from wishlist.","Une erreur s'est produite lors de l'effacement de l'article de la liste de vœux."
-"An error occurred while deleting the item from wishlist: %s","Une erreur s'est produite lors de l'effacement de l'article de la liste de vœux: %s"
-"An error occurred while updating wishlist.","Une erreur s'est produite lors de la mise à jour de la liste de souhaits."
-"Are you sure you want to remove this product from your wishlist?","Êtes-vous sûr(e) de vouloir enlever ce produit de votre liste de vœux?"
-"Are you sure you would like to remove this item from the wishlist?","Êtes-vous sûr(e) de vouloir enlever ce produit de la liste de vœux?"
-"Back","Retour"
+"Add Date","Date ajoutée"
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,Message
+"Email Template","Email Template"
+"Remove Item","Enlever article"
+"Sharing Information","Partager infos"
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.","Veuillez entrer une adresse courriel valide."
+"RSS Feed","Flux RSS"
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
"Can't delete item from wishlist","Impossible de supprimer l'article de la liste de souhaits."
-"Can't save description %s","Ne peut sauvegarder la description %s"
-"Can't update wishlist","Ne peut mettre à jour la liste de vœux"
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
"Cannot add item to shopping cart","Ne peut ajouter l'article au caddy"
-"Cannot add the following product(s) to shopping cart: %s.","Impossible d'ajouter le(s) produit(s) suivant(s) au panier d'achat virtuel : %s."
-"Cannot add the item to shopping cart.","Ne peut ajouter l'article au caddy."
-"Cannot configure product","Impossible de configurer le produit."
-"Cannot load wishlist item","Impossible de charger l'article de la liste de souhaits."
-"Cannot move item to wishlist","Impossible de déplacer l'objet dans la liste de voeux"
-"Cannot specify product.","Ne peut spécifier produit."
-"Cannot specify wishlist item.","Impossible de spécifier l'article de la liste de souhaits."
-"Cannot specify wishlist.","Ne peut spécifier liste de vœux."
-"Cannot update wishlist","Ne peut mettre à jour liste de vœux"
-"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Cochez cette case si vous voulez ajouter un lien vers un flux rss à votre liste de vœux."
-"Click for price","Cliquez pour le prix"
-"Comment","Commentaires"
-"Comment:","Commentaires:"
-"Configure Wishlist Item","Configurer un article de la liste de souhaits."
-"Configured Price:","Prix configuré :"
-"Could not find such wishlist","Impossible de trouver une telle liste de voeux"
-"Could not find wishlist","Impossible de trouver la liste de voeux"
-"Customer My Account My Wishlist","Mon compte Ma liste de vœux client"
-"Customer My Account Wishlist Sharing Form","Formulaire partage liste de vœux Mon compte client"
-"Customer Shared Wishlist View","Client a partagé vue liste de vœux"
-"Add Date","Date ajoutée"
-"Days in Wishlist","Jours dans la liste de souhaits"
-"Display Wishlist Summary","Afficher résumé liste de souhaits"
-"Edit","Éditer"
-"Email Sender","Envoyez courriel à l'expéditeur"
-"Email Template","Modèle courriel"
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
"Email address can't be empty.","Adresse courriel ne peut être vide."
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
+"Cannot specify product.","Ne peut spécifier produit."
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart","Tout ajouter au caddy"
+"Update Wish List","Update Wish List"
+"View Product","Voir produit"
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
"Email addresses, separated by commas","Adresses courriel, séparées par virgules"
-"Enabled","Activé"
-"General Options","Options générales"
-"Go to Wishlist","Aller à liste de vœux"
-"Helper for wishlist options rendering doesn't implement required interface.","L'assistant pour les options de la liste de souhaits n'implante pas l'interface requise."
-"In stock","En stock"
-"Last Added Items","Derniers articles ajoutés"
-"Message","Message"
-"My Wishlist","Ma liste de vœux"
-"My Wishlist (%d item)","Ma liste de vœux (%d article)"
-"My Wishlist (%d items)","Ma liste de vœux (%d articles)"
-"My Wishlist <small>(%d)</small>","Ma liste de vœux <petit>(%d)</petit>"
-"My Wishlist Link","Lien Ma Liste de souhaits"
-"Options Details","Informations options"
-"Out of stock","Pas en stock"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Veuillez entrer des adresses courriel valides, séparées par des virgules. Par exemple lucdassier@domaine.com, pierremaitre@domaine.com"
-"Please input a valid email address.","Veuillez entrer une adresse courriel valide."
-"Please, enter your comments...","Veuillez entrer vos commentaires..."
-"Product","Produit"
-"Product Details and Comment","Détails et commentaires sur le produit"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","Produit(s) %s requiert(èrent) option(s). Chacun d'eux peut être ajouté au caddy de façon séparée seulement."
-"Product(s) %s have required options. Each product can only be added individually.","Le(s) produit(s) %s possède(nt) des options requises. Chaque produit peut uniquement être ajouté individuellement."
-"RSS Feed","Flux RSS"
-"RSS link to %s's wishlist","Lien RSS vers %s de liste de vœux"
-"Remove Item","Enlever article"
-"Remove This Item","Enlever cet article"
-"Remove item","Supprimer l'objet"
-"Requested cart item doesn't exist","Le panier demandé n'existe pas"
-"Requested wishlist doesn't exist","La liste de voeux demandée n'existe pas"
-"Share Options","Options de partage"
+"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Cochez cette case si vous voulez ajouter un lien vers un flux rss à votre liste de vœux."
"Share Wishlist","Partager liste de vœux"
-"Share Your Wishlist","Partagez votre liste de vœux"
-"Sharing Information","Partager infos"
-"This product(s) is currently out of stock","Ce(s) produit(s) n'est(ne sont) actuellement pas disponible(s)"
-"Unable to add the following product(s) to shopping cart: %s.","Incapable d'ajouter le(s) produit(s) suivant(s) au caddy: %s."
-"Update Wishlist","Mettre à jour liste de vœux"
+"Last Added Items","Derniers articles ajoutés"
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?","Êtes-vous sûr(e) de vouloir enlever ce produit de votre liste de vœux?"
+"Email Sender","Email Sender"
+"General Options","General Options"
+"Share Options","Share Options"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
"User description","Description utilisateur"
-"View Details","Vue détails"
-"View Product","Voir produit"
-"What's this?","Qu'est-ce ?"
-"Wishlist","Liste de vœux"
-"Wishlist Section","Section liste de vœux"
-"Wishlist Sharing","Partager liste de vœux"
-"Wishlist could not be created.","La liste de voeux n'a pas pu être créée."
-"Wishlist is empty now.","Liste de vœux maintenant vide"
-"You have no items in your wishlist.","Vous n'avez pas d'articles dans votre liste de vœux."
-"Your Wishlist has been shared.","Votre liste de vœux a été partagée."
+"Product Details and Comment","Détails et commentaires sur le produit"
diff --git a/app/code/Magento/Wishlist/i18n/nl_NL.csv b/app/code/Magento/Wishlist/i18n/nl_NL.csv
index b67d7dbe2dd..1cc87637e22 100644
--- a/app/code/Magento/Wishlist/i18n/nl_NL.csv
+++ b/app/code/Magento/Wishlist/i18n/nl_NL.csv
@@ -1,98 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s is toegevoegd aan uw wensenlijst. Klik <a href=""%2$s"">hier</a> om verder te gaan met winkelen."
-"%1$s has been updated in your wishlist.","%1$s is geüpdatet in uw wensenlijst."
-"%d product(s) have been added to shopping cart: %s.","%d product(en) zijn toegevoegd aan het winkelwagentje: %s."
-"%s for ""%s"".","%s voor ""%s""."
-"%s has been moved to wishlist %s","%s is verplaatst naar verlanglijstje %s"
-"%s's Wishlist","%s's Verlanglijstje"
-"* Required Fields","* Vereiste velden"
-"Add All to Cart","Voeg Alles Toe aan Winkelwagentje"
+Back,Terug
+Product,Product
+Quantity,Quantity
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Action
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Bewerken
+"Remove item","Verwijder artikel"
"Add to Cart","Aan mandje toevoegen"
-"Add to Compare","Voeg toe om te Vergelijken"
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields","* Vereiste velden"
+Availability,Availability
+"In stock","In voorraad"
+"Out of stock","Uit voorraad"
+"Click for price","Klik voor de prijs"
+"What's this?","Wat is dit?"
+"1 item","1 item"
+"%1 items","%1 items"
"Add to Wishlist","Aan verlanglijst toevoegen"
+"Remove This Item","Verwijder Dit Item"
+"Add to Compare","Voeg toe om te Vergelijken"
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details","Details bekijken"
+"Options Details","Instellingen Details"
+Comment,Commentaar
"Add Locale","Toegevoegd Vanuit"
-"An error occurred while adding item to wishlist.","Er heeft een fout plaatsgevonden tijdens het toevoegen van dit voorwerp in uw wensenlijst."
-"An error occurred while adding item to wishlist: %s","Er is een fout opgetreden bij het toevoegen van het item aan het verlanglijstje: %s"
-"An error occurred while deleting the item from wishlist.","Er is een fout opgetreden bij het verwijderen van het item van het verlanglijstje: %s"
-"An error occurred while deleting the item from wishlist: %s","Er is een fout opgetreden bij het verwijderen van het item van het verlanglijstje."
-"An error occurred while updating wishlist.","Er is fout opgetreden in het updaten van uw wensenlijst."
-"Are you sure you want to remove this product from your wishlist?","Weet u zeker dat u dit product wilt verwijderen van uw verlanglijstje?"
-"Are you sure you would like to remove this item from the wishlist?","Weet u zeker dat u dit item graag van de verlanglijst wilt verwijderen?"
-"Back","Terug"
+"Add Date","Datum Toegevoegd"
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,Boodschap
+"Email Template","Email Template"
+"Remove Item","Artikel verwijderen"
+"Sharing Information","Informatie over Delen"
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.","Voer alstublieft een geldig email adres in."
+"RSS Feed","RSS Feed"
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
"Can't delete item from wishlist","Kan het item niet verwijderen van het verlanglijstje"
-"Can't save description %s","Kan omschrijving %s niet opslaan"
-"Can't update wishlist","Kan het verlanglijstje niet updaten"
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
"Cannot add item to shopping cart","Kan het item niet toevoegen aan het winkelwagentje"
-"Cannot add the following product(s) to shopping cart: %s.","Kan de volgende producten niet toevoegen aan winkelwagen: %s."
-"Cannot add the item to shopping cart.","Kan het item niet toevoegen aan het winkelwagentje."
-"Cannot configure product","Kan product niet aanpassen"
-"Cannot load wishlist item","Kan wensenlijst voorwerp niet laden"
-"Cannot move item to wishlist","Kan object niet verplaatsen naar verlanglijst"
-"Cannot specify product.","Kan Product Niet Specificeren."
-"Cannot specify wishlist item.","Kan dit wensenlijst voorwerpen specificeren."
-"Cannot specify wishlist.","Kan Wensenlijst Niet Specificeren."
-"Cannot update wishlist","Kan Wensenlijst Niet Updaten"
-"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Klik op deze checkbox als u een link naar een RSS feed aan uw wensenlijst wilt toevoegen."
-"Click for price","Klik voor de prijs"
-"Comment","Commentaar"
-"Comment:","Commentaar:"
-"Configure Wishlist Item","Pas Wensenlijst Voorwerp aan"
-"Configured Price:","Aangepaste Prijs:"
-"Could not find such wishlist","Kan niet zo'n verlanglijstje vinden"
-"Could not find wishlist","Kon verlanglijstje niet vinden"
-"Customer My Account My Wishlist","Klant Mijn Account Mijn Wensenlijst"
-"Customer My Account Wishlist Sharing Form","Klant Mijn Account Wensenlijst Deel Formulier"
-"Customer Shared Wishlist View","Klant Gedeelde Wensenlijst Zien"
-"Add Date","Datum Toegevoegd"
-"Days in Wishlist","Dagen in Wensenlijst"
-"Display Wishlist Summary","Laat Wensenlijst Samenvatting Zien"
-"Edit","Bewerken"
-"Email Sender","E-mail Verzender"
-"Email Template","E-mail Sjabloon"
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
"Email address can't be empty.","E-mailadres mag niet leeg zijn."
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
+"Cannot specify product.","Kan Product Niet Specificeren."
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart","Voeg Alles Toe aan Winkelwagentje"
+"Update Wish List","Update Wish List"
+"View Product","Product Bekijken"
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
"Email addresses, separated by commas","E-mailadressen, gedeeld door komma's"
-"Enabled","Aan"
-"General Options","Algemene opties"
-"Go to Wishlist","Ga naar Verlanglijstje"
-"Helper for wishlist options rendering doesn't implement required interface.","Helper voor wensenlijst instellingen weergave kan het benodigde interface niet implementeren."
-"In stock","In voorraad"
-"Last Added Items","Laatst Toegevoegde Items"
-"Message","Boodschap"
-"My Wishlist","Mijn verlanglijst"
-"My Wishlist (%d item)","Mijn Verlanglijstje (%d item)"
-"My Wishlist (%d items)","Mijn Verlanglijstje (%d items)"
-"My Wishlist <small>(%d)</small>","Mijn Verlanglijstje <small>(%d)</small>"
-"My Wishlist Link","Mijn Wensenlijst Link"
-"Options Details","Instellingen Details"
-"Out of stock","Uit voorraad"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Vul alstublieft geldige email adressen in, gescheiden door komma's. Bijvoorbeeld johndoe@domain.com, johnsmith@domain.com."
-"Please input a valid email address.","Voer alstublieft een geldig email adres in."
-"Please, enter your comments...","Alstublieft, vul uw commentaar in..."
-"Product","Product"
-"Product Details and Comment","Product Details en het Commentaar"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","Product(en) %s hebben verplichte opties. Elk van deze producten kan alleen afzonderlijk aan het winkelwagentje toegevoegd worden."
-"Product(s) %s have required options. Each product can only be added individually.","Product(en) %s hebben vereiste opties. Elk product kan alleen afzonderlijk worden toegevoegd."
-"RSS Feed","RSS Feed"
-"RSS link to %s's wishlist","RSS link naar %s's verlanglijstje"
-"Remove Item","Artikel verwijderen"
-"Remove This Item","Verwijder Dit Item"
-"Remove item","Verwijder artikel"
-"Requested cart item doesn't exist","Aangevraagde winkelwagen item bestaat niet"
-"Requested wishlist doesn't exist","Aangevraagde verlanglijstje bestaat niet"
-"Share Options","Deel Opties"
+"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Klik op deze checkbox als u een link naar een RSS feed aan uw wensenlijst wilt toevoegen."
"Share Wishlist","Deel Verlanglijstje"
-"Share Your Wishlist","Deel Uw Verlanglijstje"
-"Sharing Information","Informatie over Delen"
-"This product(s) is currently out of stock","Dit product(en) is momenteel niet op voorraad"
-"Unable to add the following product(s) to shopping cart: %s.","Niet mogelijk om het volgende product(en) toe te voegen aan uw bestelling: %s."
-"Update Wishlist","Bijwerken Verlanglijst"
+"Last Added Items","Laatst Toegevoegde Items"
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?","Weet u zeker dat u dit product wilt verwijderen van uw verlanglijstje?"
+"Email Sender","Email Sender"
+"General Options","General Options"
+"Share Options","Share Options"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
"User description","Gebruikers beschrijving"
-"View Details","Details bekijken"
-"View Product","Product Bekijken"
-"What's this?","Wat is dit?"
-"Wishlist","Verlanglijst"
-"Wishlist Section","Onderdeel Verlanglijst"
-"Wishlist Sharing","Verlanglijst Delen"
-"Wishlist could not be created.","Verlanglijst kan niet worden gemaakt."
-"Wishlist is empty now.","Verlanglijst is nu leeg."
-"You have no items in your wishlist.","U heeft geen onderdelen in uw verlanglijst."
-"Your Wishlist has been shared.","Uw Verlanglijst is gedeeld."
+"Product Details and Comment","Product Details en het Commentaar"
diff --git a/app/code/Magento/Wishlist/i18n/pt_BR.csv b/app/code/Magento/Wishlist/i18n/pt_BR.csv
index f14f808bf43..166bb8a6061 100644
--- a/app/code/Magento/Wishlist/i18n/pt_BR.csv
+++ b/app/code/Magento/Wishlist/i18n/pt_BR.csv
@@ -1,101 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s foi adicionado à sua lista de desejos. Clique <a href=""%2$s"">aqui</a> para continuar comprando."
-"%1$s has been updated in your wishlist.","%1$s foi atualizado em sua lista de desejos."
-"%d product(s) have been added to shopping cart: %s.","%d produto(s) foram adicionados ao carrinho de compras: %s."
-"%s for ""%s"".","%s para ""%s""."
-"%s has been moved to wishlist %s","%s foi movido para a lista de desejos"
-"%s's Wishlist","Lista de Desejos %s"
-"* Required Fields","* Campos obrigatórios"
-"Add All to Cart","Adicione Todos ao Carrinho de Compras"
+Back,Voltar
+Product,Produto
+Quantity,Quant.
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Ação
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,Editar
+"Remove item","Remover item"
"Add to Cart","Adicionar ao carrinho"
-"Add to Compare","Adicionar para Comparar"
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields","* Campos obrigatórios"
+Availability,Availability
+"In stock","Em estoque"
+"Out of stock","Fora de estoque"
+"Click for price","Clique para o preço"
+"What's this?","O que é isso?"
+"1 item","1 item"
+"%1 items","%1 items"
"Add to Wishlist","Adicionar à Lista de Desejos"
+"Remove This Item","Remover Este Item"
+"Add to Compare","Adicionar para Comparar"
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details","Visualizar Detalhes"
+"Options Details","Detalhes de opções"
+Comment,Comentário
"Add Locale","Adicionado De"
-"An error occurred while adding item to wishlist.","Ocorreu um erro enquanto adicionando item na lista de desejos."
-"An error occurred while adding item to wishlist: %s","Ocorreu um erro enquanto adicionando item na lista de desejos: %s"
-"An error occurred while deleting the item from wishlist.","Ocorreu um erro enquanto excluindo item na lista de desejos"
-"An error occurred while deleting the item from wishlist: %s","Ocorreu um erro enquanto excluindo item na lista de desejos: %s"
-"An error occurred while updating wishlist.","Ocorreu um erro enquanto atualizando lista de desejos"
-"Are you sure you want to remove this product from your wishlist?","Tem certeza de que deseja remover este produto da sua lista de desejos?"
-"Are you sure you would like to remove this item from the wishlist?","Você tem certeza de que deseja remover este item da lista de desejos?"
-"Back","Voltar"
+"Add Date","Data de Adição"
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,Mensagem
+"Email Template","Email Template"
+"Remove Item","Remover Item"
+"Sharing Information","Compartilhando Informação"
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.","Por favor coloque um email válido."
+"RSS Feed","Lista RSS"
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
"Can't delete item from wishlist","Não é possÃvel excluir item da lista de desejos"
-"Can't save description %s","Não é possÃvel salvar descrição %s"
-"Can't update wishlist","Não é possÃvel atualizar sua lista de desejos"
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
"Cannot add item to shopping cart","Não é possÃvel adicionar item ao carrinho de compras"
-"Cannot add the following product(s) to shopping cart: %s.","Não foi possÃvel adicionar o(s) seguinte(s) produto(s) ao carrinho de compras: %s"
-"Cannot add the item to shopping cart.","ImpossÃvel adicionar item ao carrinho."
-"Cannot configure product","Não é possÃvel configurar o produto"
-"Cannot load wishlist item","Não é possÃvel carregar o item da Lista de Desejos"
-"Cannot move item to wishlist","Não foi possÃvel mover item para a lista de desejos"
-"Cannot specify product.","Não é possÃvel especificar produto."
-"Cannot specify wishlist item.","Não é possÃvel especificar item da Lista de Desejos."
-"Cannot specify wishlist.","Não é possÃvel especificar Lista de Desejos."
-"Cannot update wishlist","Não é possÃvel carregar Lista de Desejos"
-"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Checar esta caixa de verificação se você quiser adicionar um link a um feed rss para sua Lista de Desejos."
-"Click for price","Clique para o preço"
-"Comment","Comentário"
-"Comment:","Comentário:"
-"Configure Wishlist Item","Configurar item da Lista de Desejos"
-"Configured Price:","Preço Configurado:"
-"Could not find such wishlist","Não foi possÃvel encontrar essa lista de desejos"
-"Could not find wishlist","Não foi possÃvel encontrar lista de desejos"
-"Customer My Account My Wishlist","Cliente Minha Conta Minha Lista de Desejos"
-"Customer My Account Wishlist Sharing Form","Cliente Minha Conta Lista de Desejos Formulário Compartilhado"
-"Customer Shared Wishlist View","Panorama da Lista de Favoritos Compartilhada do Cliente"
-"Add Date","Data de Adição"
-"Days in Wishlist","Dias na Lista de Desejos"
-"Display Wishlist Summary","Mostrar Resumo da Lista de Desejos"
-"Edit","Editar"
-"Email Sender","Remetente do e-mail:"
-"Email Template","Modelo de e-mail"
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
"Email address can't be empty.","O endereço de email não pode ficar vazio."
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
+"Cannot specify product.","Não é possÃvel especificar produto."
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart","Adicione Todos ao Carrinho de Compras"
+"Update Wish List","Update Wish List"
+"View Product","Ver Produto"
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
"Email addresses, separated by commas","Endereços de email, separados por vÃrgulas"
-"Enabled","Ativado"
-"General Options","Opções gerais"
-"Go to Wishlist","Ir para a lista de presentes"
-"Helper for wishlist options rendering doesn't implement required interface.","A intepretação de opções de ajudante para lista de presentes não implementa a interface exigida."
-"In stock","Em estoque"
-"Last Added Items","Últimos itens adicionados"
-"Message","Mensagem"
-"My Wishlist","Minha lista de presentes"
-"My Wishlist (%d item)","Minha lista de presentes (%d item)"
-"My Wishlist (%d items)","Minha lista de presente (%d itens)"
-"My Wishlist <small>(%d)</small>","Minha lista de presentes <small>(%d)</small>"
-"My Wishlist Link","Link da minha lista de presentes"
-"Options Details","Detalhes de opções"
-"Out of stock","Fora de estoque"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Digite endereços de e-mail válidos, separados por vÃrgula. Por exemplo: johndoe@domain.com, johnsmith@domain.com."
-"Please input a valid email address.","Por favor coloque um email válido."
-"Please, enter your comments...","Insira seus comentários..."
-"Product","Produto"
-"Product Details and Comment","Detalhes de produto e comentários"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","O(s) Produto(s) %s exige(m) opções. Cada um deles só pode ser adicionado ao carrinho de compras separadamente."
-"Product(s) %s have required options. Each product can only be added individually.","O(s) produto(s) %s tem opções requeridas. Cada produto só pode ser adicionado individualmente."
-"Product name","Nome do produto"
-"Quantity","Quant."
-"Action","Ação"
-"RSS Feed","Lista RSS"
-"RSS link to %s's wishlist","Link RSS para a lista de presentes de %s"
-"Remove Item","Remover Item"
-"Remove This Item","Remover Este Item"
-"Remove item","Remover item"
-"Requested cart item doesn't exist","O item de carrinho solicitado não existe"
-"Requested wishlist doesn't exist","A lista de desejos solicitada não existe."
-"Share Options","Compartilhar opções"
+"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Checar esta caixa de verificação se você quiser adicionar um link a um feed rss para sua Lista de Desejos."
"Share Wishlist","Compartilhar Lista de Desejos"
-"Share Your Wishlist","Compartilhar a sua lista de presentes"
-"Sharing Information","Compartilhando Informação"
-"This product(s) is currently out of stock","Este(s) produto(s) está(estão) esgotado(s)"
-"Unable to add the following product(s) to shopping cart: %s.","Não é possÃvel adicionar o(s) seguinte(s) produto(s) ao carrinho de compras: %s."
-"Update Wishlist","Atualizar Lista de Desejos"
+"Last Added Items","Últimos itens adicionados"
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?","Tem certeza de que deseja remover este produto da sua lista de desejos?"
+"Email Sender","Email Sender"
+"General Options","General Options"
+"Share Options","Share Options"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
"User description","Descrição do usuário"
-"View Details","Visualizar Detalhes"
-"View Product","Ver Produto"
-"What's this?","O que é isso?"
-"Wishlist","Lista de presentes"
-"Wishlist Section","Seção da Lista de Desejos"
-"Wishlist Sharing","Compartilhamento da Lista de Desejos"
-"Wishlist could not be created.","A lista de desejos não pôde ser criada."
-"Wishlist is empty now.","A lista de desejos está vazia agora."
-"You have no items in your wishlist.","Você não tem itens na sua lista de desejos."
-"Your Wishlist has been shared.","A sua Lista de Desejos foi compartilhada."
+"Product Details and Comment","Detalhes de produto e comentários"
diff --git a/app/code/Magento/Wishlist/i18n/zh_CN.csv b/app/code/Magento/Wishlist/i18n/zh_CN.csv
index 9a8f2b1ee89..1311c54dc87 100644
--- a/app/code/Magento/Wishlist/i18n/zh_CN.csv
+++ b/app/code/Magento/Wishlist/i18n/zh_CN.csv
@@ -1,98 +1,103 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s å·²æ·»åŠ åˆ°æ‚¨çš„æ„¿æœ›æ¸…å•ã€‚å•å‡»<a href=""%2$s"">这里</a>æ¥ç»§ç»è´ç‰©ã€‚"
-"%1$s has been updated in your wishlist.","%1$s 已在您的愿望清å•ä¸æ›´æ–°ã€‚"
-"%d product(s) have been added to shopping cart: %s.","%d 个产å“å·²æ·»åŠ åˆ°è´ç‰©è½¦ï¼š%s。"
-"%s for ""%s"".","%s 对 “%sâ€ã€‚"
-"%s has been moved to wishlist %s","%s å·²è¢«ç§»åŠ¨åˆ°æ„¿æœ›æ¸…å• %s"
-"%s's Wishlist","%s 的愿望清å•"
-"* Required Fields","*å¿…è¦å—段"
-"Add All to Cart","å…¨éƒ¨æ·»åŠ åˆ°è´ç‰©è½¦"
-"Add to Cart","æ·»åŠ åˆ°è´ç‰©è½¦"
-"Add to Compare","æ·»åŠ å¹¶æ¯”è¾ƒ"
-"Add to Wishlist","æ·»åŠ åˆ°æ”¶è—"
-"Add Locale","å·²æ·»åŠ ï¼Œæ¥è‡ª"
-"An error occurred while adding item to wishlist.","å½“æ·»åŠ é¡¹ç›®åˆ°æ„¿æœ›æ¸…å•æ—¶å‘生错误。"
-"An error occurred while adding item to wishlist: %s","å½“æ·»åŠ é¡¹ç›®åˆ°æ„¿æœ›æ¸…å• %s æ—¶å‘生错误"
-"An error occurred while deleting the item from wishlist.","当从愿望清å•åˆ 除项目时å‘生错误。"
-"An error occurred while deleting the item from wishlist: %s","å½“ä»Žæ„¿æœ›æ¸…å• %s åˆ é™¤é¡¹ç›®æ—¶å‘生错误"
-"An error occurred while updating wishlist.","更新愿望清å•æ—¶å‘生错误。"
-"Are you sure you want to remove this product from your wishlist?","您是å¦ç¡®è®¤è¦ä»Žæ„¿æœ›æ¸…å•ä¸åˆ 除该产å“？"
-"Are you sure you would like to remove this item from the wishlist?","您确认è¦ä»Žæ„¿æœ›æ¸…å•ä¸åˆ 除该项目？"
-"Back","返回"
-"Can't delete item from wishlist","æ— æ³•ä»Žæ„¿æœ›æ¸…å•ä¸åˆ 除项目"
-"Can't save description %s","æ— æ³•ä¿å˜æè¿° %s"
-"Can't update wishlist","æ— æ³•æ›´æ–°æ„¿æœ›æ¸…å•"
-"Cannot add item to shopping cart","æ— æ³•æ·»åŠ å†…å®¹åˆ°è´ç‰©è½¦"
-"Cannot add the following product(s) to shopping cart: %s.","æ— æ³•å°†ä¸‹åˆ—äº§å“æ·»åŠ åˆ°è´ç‰©è½¦ï¼š%s。"
-"Cannot add the item to shopping cart.","æ— æ³•æ·»åŠ è¯¥é¡¹ç›®åˆ°è´ç‰©è½¦ã€‚"
-"Cannot configure product","æ— æ³•é…置产å“"
-"Cannot load wishlist item","æ— æ³•åŠ è½½æ„¿æœ›æ¸…å•å†…容"
-"Cannot move item to wishlist","æ— æ³•å°†å†…å®¹æ·»åŠ åˆ°æ„¿æœ›æ¸…å•"
-"Cannot specify product.","æ— æ³•æŒ‡å®šäº§å“。"
-"Cannot specify wishlist item.","æ— æ³•æŒ‡å®šæ„¿æœ›æ¸…å•å†…容"
-"Cannot specify wishlist.","æ— æ³•æŒ‡å®šæ„¿æœ›æ¸…å•ã€‚"
-"Cannot update wishlist","æ— æ³•æ›´æ–°æ„¿æœ›æ¸…å•"
-"Check this checkbox if you want to add a link to an rss feed to your wishlist.","如果希望将到RSSæºçš„é“¾æŽ¥æ·»åŠ åˆ°æ‚¨çš„æ„¿æœ›æ¸…å•ï¼Œå°±é€‰ä¸è¯¥é€‰é¡¹ã€‚"
-"Click for price","å•å‡»èŽ·å–ä»·æ ¼"
-"Comment","评论"
-"Comment:","评论："
-"Configure Wishlist Item","é…置愿望清å•å†…容"
-"Configured Price:","é…ç½®ä»·æ ¼ï¼š"
-"Could not find such wishlist","找ä¸åˆ°è¯¥æ„¿æœ›æ¸…å•"
-"Could not find wishlist","找ä¸åˆ°æ„¿æœ›æ¸…å•"
-"Customer My Account My Wishlist","客户我的å¸æˆ·æˆ‘的愿望清å•"
-"Customer My Account Wishlist Sharing Form","客户我的å¸æˆ·æ„¿æœ›æ¸…å•å…±äº«è¡¨å•"
-"Customer Shared Wishlist View","客户共享愿望清å•è§†å›¾"
-"Add Date","æ·»åŠ æ—¥æœŸ"
-"Days in Wishlist","ä½äºŽæ„¿æœ›æ¸…å•çš„天数"
-"Display Wishlist Summary","显示愿望清å•æ‘˜è¦"
-"Edit","编辑"
-"Email Sender","电å邮件å‘é€äºº"
-"Email Template","电å邮件模æ¿"
-"Email address can't be empty.","邮件地å€ä¸èƒ½ä¸ºç©ºã€‚"
-"Email addresses, separated by commas","邮件地å€ï¼Œä½¿ç”¨é€—å·åˆ†éš”"
-"Enabled","å·²å¯ç”¨"
-"General Options","常规选项"
-"Go to Wishlist","转到愿望清å•"
-"Helper for wishlist options rendering doesn't implement required interface.","愿望清å•é€‰é¡¹æ¸²æŸ“助手没有实施必è¦çš„ç•Œé¢ã€‚"
-"In stock","现货"
-"Last Added Items","最åŽæ·»åŠ 的内容"
-"Message","ä¿¡æ¯"
-"My Wishlist","我的收è—"
-"My Wishlist (%d item)","我的愿望清å•ï¼ˆ%d 件商å“）"
-"My Wishlist (%d items)","æˆ‘çš„æ„¿æœ›æ¸…å• ï¼ˆ%d 件商å“）"
-"My Wishlist <small>(%d)</small>","我的愿望清å•<small>(%d)</small>"
-"My Wishlist Link","我的愿望清å•é“¾æŽ¥"
-"Options Details","选项详情"
-"Out of stock","缺货"
-"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","请输入有效电å邮件地å€ï¼Œå¹¶ä½¿ç”¨é€—å·åˆ†éš”。例如johndoe@domain.com, johnsmith@domain.com"
-"Please input a valid email address.","请输入有效电å邮件地å€ã€‚"
-"Please, enter your comments...","请输入您的评论..."
-"Product","产å“"
-"Product Details and Comment","产å“详情与评论"
-"Product(s) %s have required options. Each of them can be added to cart separately only.","äº§å“ %s 有必è¦é€‰é¡¹ã€‚æ¯ä¸ªé€‰é¡¹éƒ½åªèƒ½å•ç‹¬æ·»åŠ 到è´ç‰©è½¦ã€‚"
-"Product(s) %s have required options. Each product can only be added individually.","äº§å“ %s 有必填选项。æ¯ä¸ªäº§å“å¿…é¡»åˆ†åˆ«æ·»åŠ ã€‚"
-"RSS Feed","RSSæº"
-"RSS link to %s's wishlist","到 %s 的与啊unwangqingdande链接"
-"Remove Item","åˆ é™¤é¡¹ç›®"
-"Remove This Item","åˆ é™¤è¯¥å†…å®¹"
-"Remove item","åˆ é™¤é¡¹ç›®"
-"Requested cart item doesn't exist","请求的è´ç‰©è½¦é¡¹ç›®ä¸å˜åœ¨"
-"Requested wishlist doesn't exist","请求的愿望清å•ä¸å˜åœ¨"
-"Share Options","共享选项"
-"Share Wishlist","分享愿望清å•"
-"Share Your Wishlist","共享您的愿望清å•"
-"Sharing Information","分享信æ¯"
-"This product(s) is currently out of stock","该产å“ç›®å‰ç¼ºè´§"
-"Unable to add the following product(s) to shopping cart: %s.","æ— æ³•æ·»åŠ ä¸‹åˆ—äº§å“到è´ç‰©è½¦ï¼š%s。"
-"Update Wishlist","更新愿望清å•"
-"User description","用户æè¿°"
-"View Details","查看详情"
-"View Product","查看产å“"
-"What's this?","这是什么？"
-"Wishlist","愿望清å•"
-"Wishlist Section","愿望清å•åŒºåŸŸ"
-"Wishlist Sharing","愿望清å•åˆ†äº«"
-"Wishlist could not be created.","æ— æ³•åˆ›å»ºæ„¿æœ›æ¸…å•ã€‚"
-"Wishlist is empty now.","愿望清å•ç›®å‰ä¸ºç©ºã€‚"
-"You have no items in your wishlist.","您的愿望清å•æ˜¯ç©ºçš„。"
-"Your Wishlist has been shared.","您的愿望清å•å·²åˆ†äº«ã€‚"
+Back,返回
+Product,产å“
+Quantity,Quantity
+Configure,Configure
+"You added %1 to your shopping cart.","You added %1 to your shopping cart."
+Action,Action
+"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
+Edit,编辑
+"Remove item",åˆ é™¤é¡¹ç›®
+"Add to Cart",æ·»åŠ åˆ°è´ç‰©è½¦
+Delete,Delete
+Enabled,Enabled
+"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
+"* Required Fields",*å¿…è¦å—段
+Availability,Availability
+"In stock",现货
+"Out of stock",缺货
+"Click for price",å•å‡»èŽ·å–ä»·æ ¼
+"What's this?",这是什么？
+"1 item","1 item"
+"%1 items","%1 items"
+"Add to Wishlist",æ·»åŠ åˆ°æ”¶è—
+"Remove This Item",åˆ é™¤è¯¥å†…å®¹
+"Add to Compare",æ·»åŠ å¹¶æ¯”è¾ƒ
+"The product does not exist.","The product does not exist."
+"Display item quantities","Display item quantities"
+"View Details",查看详情
+"Options Details",选项详情
+Comment,评论
+"Add Locale",å·²æ·»åŠ ï¼Œæ¥è‡ª
+"Add Date",æ·»åŠ æ—¥æœŸ
+"Days in Wish List","Days in Wish List"
+Wishlist,Wishlist
+"Wish List","Wish List"
+Message,ä¿¡æ¯
+"Email Template","Email Template"
+"Remove Item",åˆ é™¤é¡¹ç›®
+"Sharing Information",分享信æ¯
+"This product(s) is out of stock.","This product(s) is out of stock."
+"An item option with code %1 already exists.","An item option with code %1 already exists."
+"%1's Wish List","%1's Wish List"
+"Product(s) %1 have required options. Each product can only be added individually.","Product(s) %1 have required options. Each product can only be added individually."
+"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2."
+"Please input a valid email address.",请输入有效电å邮件地å€ã€‚
+"RSS Feed",RSSæº
+"Wish List Sharing","Wish List Sharing"
+"My Wish List","My Wish List"
+"%1 for ""%2"".","%1 for ""%2""."
+"We couldn't add the following product(s) to the shopping cart: %1.","We couldn't add the following product(s) to the shopping cart: %1."
+"We can't update wish list.","We can't update wish list."
+"The requested wish list doesn't exist.","The requested wish list doesn't exist."
+"Wish List could not be created.","Wish List could not be created."
+"We can't specify a product.","We can't specify a product."
+"%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping."
+"An error occurred while adding item to wish list: %1","An error occurred while adding item to wish list: %1"
+"An error occurred while adding item to wish list.","An error occurred while adding item to wish list."
+"We can't load the wish list item.","We can't load the wish list item."
+"We can't configure the product.","We can't configure the product."
+"%1 has been updated in your wish list.","%1 has been updated in your wish list."
+"An error occurred while updating wish list.","An error occurred while updating wish list."
+"Can't delete item from wishlist",æ— æ³•ä»Žæ„¿æœ›æ¸…å•ä¸åˆ 除项目
+"Can't save description %1","Can't save description %1"
+"Can't update wish list","Can't update wish list"
+"An error occurred while deleting the item from wish list: %1","An error occurred while deleting the item from wish list: %1"
+"An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
+"Cannot add item to shopping cart",æ— æ³•æ·»åŠ å†…å®¹åˆ°è´ç‰©è½¦
+"The requested cart item doesn't exist.","The requested cart item doesn't exist."
+"%1 has been moved to wish list %2","%1 has been moved to wish list %2"
+"We can't move the item to the wish list.","We can't move the item to the wish list."
+"Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
+"Email address can't be empty.",邮件地å€ä¸èƒ½ä¸ºç©ºã€‚
+"This wishlist can be shared %1 more times.","This wishlist can be shared %1 more times."
+"Your wish list has been shared.","Your wish list has been shared."
+"Please enter your comments.","Please enter your comments."
+"Display number of items in wish list","Display number of items in wish list"
+"We can't specify a wish list.","We can't specify a wish list."
+"Cannot specify product.",æ— æ³•æŒ‡å®šäº§å“。
+"Invalid item option format.","Invalid item option format."
+"We can't specify a wish list item.","We can't specify a wish list item."
+"Share Wish List","Share Wish List"
+"Add All to Cart",å…¨éƒ¨æ·»åŠ åˆ°è´ç‰©è½¦
+"Update Wish List","Update Wish List"
+"View Product",查看产å“
+"RSS link to %1's wishlist","RSS link to %1's wishlist"
+"This Wish List has no Items","This Wish List has no Items"
+"Wish List is empty now.","Wish List is empty now."
+"Email addresses, separated by commas",邮件地å€ï¼Œä½¿ç”¨é€—å·åˆ†éš”
+"Check this checkbox if you want to add a link to an rss feed to your wishlist.",如果希望将到RSSæºçš„é“¾æŽ¥æ·»åŠ åˆ°æ‚¨çš„æ„¿æœ›æ¸…å•ï¼Œå°±é€‰ä¸è¯¥é€‰é¡¹ã€‚
+"Share Wishlist",分享愿望清å•
+"Last Added Items",最åŽæ·»åŠ 的内容
+"Go to Wish List","Go to Wish List"
+"You have no items in your wish list.","You have no items in your wish list."
+"Are you sure you want to remove this product from your wishlist?",您是å¦ç¡®è®¤è¦ä»Žæ„¿æœ›æ¸…å•ä¸åˆ 除该产å“？
+"Email Sender","Email Sender"
+"General Options","General Options"
+"Share Options","Share Options"
+"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"Email Text Length Limit","Email Text Length Limit"
+"My Wish List Link","My Wish List Link"
+"Display Wish List Summary","Display Wish List Summary"
+"No Items Found","No Items Found"
+"User description",用户æè¿°
+"Product Details and Comment",产å“详情与评论
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
index ad9772e7480..41b2f3a8a32 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -30,7 +30,7 @@
<referenceBlock name="top.links">
<block class="Magento\Wishlist\Block\Link" name="wish-list-link" after="my-account-link"/>
</referenceBlock>
- <referenceContainer name="right">
+ <referenceContainer name="sidebar.additional">
<block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
index a477b243567..ae0a34517b9 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
@@ -73,7 +73,7 @@
</action>
</referenceBlock>
<referenceContainer name="content">
- <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle options container" after="product.info.media"/>
+ <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/>
<move element="product.info" destination="bundle.options.container" before="-"/>
</referenceContainer>
<referenceContainer name="product.info.type">
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 67f80b68114..85299fdcd36 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -30,14 +30,14 @@ $product = $item->getProduct();
<?php foreach ($this->getChildNames() as $childName): ?>
<?php echo $this->getLayout()->renderElement($childName, false); ?>
<?php endforeach;?>
-<div class="box tocart">
+<div class="box-tocart">
<?php if ($item->canHaveQty() && $product->isVisibleInSiteVisibility()): ?>
<input type="number" data-role="qty" class="input-text qty" data-validate="{required:true,'validate-greater-than-zero':true}"
name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>">
<?php endif; ?>
<?php if ($product->isSaleable()): ?>
- <button type="button" data-role="tocart" title="<?php echo __('Add to Cart') ?>" data-item-id="<?php echo $item->getId()?>" class="action tocart">
+ <button type="button" data-role="tocart" title="<?php echo __('Add to Cart') ?>" data-item-id="<?php echo $item->getId()?>" class="action tocart primary">
<span><?php echo __('Add to Cart') ?></span>
</button>
<?php else: ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
index 1fe89ca1018..742ca9673b1 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
@@ -23,7 +23,7 @@
*/
?>
-<div class="product addto links" data-role="add-to-links">
+<div class="product-addto-links" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
<a href="#" data-post='<?php echo $this->getUpdateParams(); ?>' class="action towishlist updated" data-action="add-to-wishlist">
<span><?php echo __('Update Wish List') ?></span>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
index 77974db9753..c540f0b0440 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
@@ -81,7 +81,7 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
</table>
</div>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<?php if($this->isSaleable()):?>
<div class="primary">
<button type="button"
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
index 75de1fd8a4c..3ae93968181 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
@@ -56,7 +56,7 @@
</div>
<?php endif; ?>
</fieldset>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<button type="submit" title="<?php echo __('Share Wishlist') ?>" class="action submit primary">
<span><?php echo __('Share Wishlist') ?></span>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 53112bdd2f4..f95a99dc897 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -61,13 +61,13 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
<div class="product actions">
<?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
<?php if ($product->getTypeInstance()->hasRequiredOptions($product)): ?>
- <div class="primary"><a href="<?php echo $this->getItemAddToCartUrl($item) ?>" class="action tocart"><span><?php echo __('Add to Cart') ?></span></a></div>
+ <div class="primary"><a href="<?php echo $this->getItemAddToCartUrl($item) ?>" class="action tocart primary"><span><?php echo __('Add to Cart') ?></span></a></div>
<?php else: ?>
<?php
$postDataHelper = $this->helper('Magento\Core\Helper\PostData');
$postData = $postDataHelper->getPostData($this->getItemAddToCartUrl($item), ['product' => $product->getEntityId()])
?>
- <div class="primary"><button type="button" class="action tocart" data-post='<?php echo $postData; ?>'><span><?php echo __('Add to Cart') ?></span></button></div>
+ <div class="primary"><button type="button" class="action tocart primary" data-post='<?php echo $postData; ?>'><span><?php echo __('Add to Cart') ?></span></button></div>
<?php endif; ?>
<?php endif; ?>
<div class="secondary">
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index b0a32da2843..0818726eb12 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -54,7 +54,7 @@
<div class="message info empty"><span><?php echo __('You have no items in your wish list.') ?></span></div>
<?php endif ?>
<?php echo $this->getChildHtml('bottom'); ?>
- <div class="actions toolbar">
+ <div class="actions-toolbar">
<div class="primary">
<?php echo $this->getChildHtml('control_buttons');?>
</div>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module.less
index 1c58ab846ef..6656889ea14 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module.less
@@ -259,6 +259,17 @@
}
}
}
+@-moz-document url-prefix() {
+ .locale-switcher-select {
+ background-image: none;
+ }
+}
+
+@-moz-document url-prefix() {
+ .locale-switcher-select {
+ background-image: none;
+ }
+}
.autocomplete-results {
}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index 98e9e939692..eaaa2648aa3 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -30,6 +30,12 @@
// Base
+html {
+ font-size: 62.5%;
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
+}
+
body,
html {
height: 100%;
@@ -38,7 +44,10 @@ html {
body {
color: @baseColor;
- font: @baseFontWeight @baseFontSize/@baseLineHeight @baseFont;
+ font-family: @baseFont;
+ line-height: @baseLineHeight;
+ font-weight: @baseFontWeight;
+ .font-size(@baseFontSize);
background: @primary7;
}
diff --git a/app/design/adminhtml/Magento/backend/i18n/en_US.csv b/app/design/adminhtml/Magento/backend/i18n/en_US.csv
deleted file mode 100644
index 88faa919186..00000000000
--- a/app/design/adminhtml/Magento/backend/i18n/en_US.csv
+++ /dev/null
@@ -1,201 +0,0 @@
-"Credit Card Type","Credit Card Type"
-"Add New User","Add New User"
-"Items that you don","Items that you don"
-"State/Province","State/Province"
-"Magento Commerce - Administrative Panel","Magento Commerce - Administrative Panel"
-"3 stars","3 stars"
-"Credit Memo Date","Credit Memo Date"
-"Double click on a group to rename it","Double click on a group to rename it"
-"Rating Not Available","Rating Not Available"
-"Gift Certificate","Gift Certificate"
-"Assigned Answers","Assigned Answers"
-"Fax","Fax"
-"Magento Admin","Magento Admin"
-"Newsletter Message Preview","Newsletter Message Preview"
-"4 stars","4 stars"
-"Company","Company"
-"Invoice Date","Invoice Date"
-"Qty Returned","Qty Returned"
-"Add New Customer Group","Add New Customer Group"
-"Visitors","Visitors"
-"Shipping Method","Shipping Method"
-"Subtotal","Subtotal"
-"5 stars","5 stars"
-"Choose Store","Choose Store"
-"Import Tax Rates","Import Tax Rates"
-"Roles","Roles"
-"If you do not specify an option value for a store then the default value will be used.","If you do not specify an option value for a store then the default value will be used."
-"Shipping","Shipping"
-"Select from existing customer addresses:","Select from existing customer addresses:"
-"Products","Products"
-"Edit User ","Edit User "
-"Item Status","Item Status"
-"Set as default billing address","Set as default billing address"
-"Position","Position"
-"Items Ordered","Items Ordered"
-"Fixed","Fixed"
-"%s","%s"
-"Same as Billing Address","Same as Billing Address"
-"Product In Stores","Product In Stores"
-"Working...","Working..."
-"Apply coupon code","Apply coupon code"
-"per page","per page"
-"Tax","Tax"
-"Telephone","Telephone"
-"Wishlist","Wishlist"
-"Magento","Magento"
-"Expiration Date","Expiration Date"
-"Add New Class","Add New Class"
-"Super product attributes configuration","Super product attributes configuration"
-"Previous page","Previous page"
-"Something went wrong...","Something went wrong..."
-"Lifetime Sales","Lifetime Sales"
-"SKU","SKU"
-"Log Out","Log Out"
-"Failed","Failed"
-"Billing Address","Billing Address"
-"Log into Magento Admin Page","Log into Magento Admin Page"
-"Invoice Status","Invoice Status"
-"CC Type","CC Type"
-"Percentage","Percentage"
-"Are you sure?","Are you sure?"
-"Email","Email"
-"Customer Group:","Customer Group:"
-"Option","Option"
-"Primary Billing Address","Primary Billing Address"
-"Create Backup","Create Backup"
-"Manage Options (values for your attribute)","Manage Options (values for your attribute)"
-"Total Due","Total Due"
-"Copyright 2007","Copyright 2007"
-"Newsletter Subscribers","Newsletter Subscribers"
-"CC Number","CC Number"
-"Add New Tax Rate","Add New Tax Rate"
-"Product Name","Product Name"
-"Country","Country"
-"Purchase order number","Purchase order number"
-"Date and Time","Date and Time"
-"Categories","Categories"
-"Qty Cancelled","Qty Cancelled"
-"Card Verification Number","Card Verification Number"
-"Order Date","Order Date"
-"This tab contains invalid data. Please correct before saving.","This tab contains invalid data. Please correct before saving."
-"Customer Balance","Customer Balance"
-"Update Qty","Update Qty"
-"Customer Groups","Customer Groups"
-"Export to","Export to"
-"configuration","configuration"
-"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
-"Options","Options"
-"Attribute Name","Attribute Name"
-"Total <strong>%d</strong> records found","Total <strong>%d</strong> records found"
-"Comment","Comment"
-"Set as default shipping address","Set as default shipping address"
-"Last Name","Last Name"
-"of","of"
-"Newsletter Problem Reports","Newsletter Problem Reports"
-"Sales Statistics","Sales Statistics"
-"Qty To Return","Qty To Return"
-"New Customer Address","New Customer Address"
-"Roles Resources","Roles Resources"
-"Zip/Post Code","Zip/Post Code"
-"Order Status","Order Status"
-"Store","Store"
-"Product Categories","Product Categories"
-"Online Customers","Online Customers"
-"Next page","Next page"
-"Items Shipped","Items Shipped"
-"Unassigned Attributes","Unassigned Attributes"
-"Not Charged Yet","Not Charged Yet"
-"This group contains system attributes.\nPlease, move system attributes to another group and try again.","This group contains system attributes.\nPlease, move system attributes to another group and try again."
-"copy data from","copy data from"
-"Add","Add"
-"Total Payed","Total Payed"
-"Shopping Cart","Shopping Cart"
-"Order History","Order History"
-"Empty","Empty"
-"Unable to complete request. Please, try again later.","Unable to complete request. Please, try again later."
-"Customers","Customers"
-"Customer does not have any addresses","Customer does not have any addresses"
-"Add New Role","Add New Role"
-"Street Address","Street Address"
-"Are You Sure?","Are You Sure?"
-"Shipping Address","Shipping Address"
-"Paid","Paid"
-"Page","Page"
-"Discount","Discount"
-"Set root category for this store in","Set root category for this store in"
-"Groups","Groups"
-"View","View"
-"Qty Ordered","Qty Ordered"
-"Global Record Search","Global Record Search"
-"Card Number","Card Number"
-"PO Number","PO Number"
-"Grand Total","Grand Total"
-"Please select one or more attributes.","Please select one or more attributes."
-"Dashboard","Dashboard"
-"Are you sure you want to do this?","Are you sure you want to do this?"
-"Please add one or more options","Please add one or more options"
-"Role Users","Role Users"
-"Add New Tax Rule","Add New Tax Rule"
-"Subscribe to newsletter","Subscribe to newsletter"
-"Dashboard Control","Dashboard Control"
-"Default Shipping","Default Shipping"
-"Qty","Qty"
-"Add to Queue","Add to Queue"
-"Average Sale","Average Sale"
-"Cancel","Cancel"
-"All stores","All stores"
-"Personal Information","Personal Information"
-"City","City"
-"Export Tax Rates","Export Tax Rates"
-"1 star","1 star"
-"Current Configuration Scope","Current Configuration Scope"
-"Add New Template","Add New Template"
-"Move to:","Move to:"
-"First Name","First Name"
-"Change Order Status","Change Order Status"
-"Are you sure you want to delete this address?","Are you sure you want to delete this address?"
-"Are you sure you want to do it?","Are you sure you want to do it?"
-"Add to Order","Add to Order"
-"Product ID","Product ID"
-"Payment Method","Payment Method"
-"What is this?","What is this?"
-"Users","Users"
-"Customer Addresses","Customer Addresses"
-"Qty Backordered","Qty Backordered"
-"You can not remove system attribute from this set.","You can not remove system attribute from this set."
-"Price","Price"
-"Who","Who"
-"Rating Not Alvailable","Rating Not Alvailable"
-"Order Comment","Order Comment"
-"Edit Role","Edit Role"
-"Tax Rates Import / Export","Tax Rates Import / Export"
-"Magento Logo","Magento Logo"
-"A name is required","A name is required"
-"Assigned options","Assigned options"
-"Please Enter New Group Name","Please Enter New Group Name"
-"Name","Name"
-"Email Preview","Email Preview"
-"Newsletter Queue","Newsletter Queue"
-"Remove","Remove"
-"Last Log In:","Last Log In:"
-"Logged in as <strong>%s</strong>","Logged in as <strong>%s</strong>"
-"Name on Card","Name on Card"
-"All Stores","All Stores"
-"Send comment to customer","Send comment to customer"
-"Account Created on:","Account Created on:"
-"Backups Control","Backups Control"
-"Add New Address","Add New Address"
-"Account Created in:","Account Created in:"
-"Default Billing","Default Billing"
-"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
-"Please confirm site switching. All data not saved will be lost.","Please confirm site switching. All data not saved will be lost."
-"Please select from each ratings above","Please select from each ratings above"
-"Qty Shipped","Qty Shipped"
-"Are you sure you want to cancel add this address?","Are you sure you want to cancel add this address?"
-"The information in this tab has been changed.","The information in this tab has been changed."
-"2 stars","2 stars"
-"Apply","Apply"
-"Total","Total"
-"User roles","User roles"
-"Wishlist Report","Wishlist Report"
diff --git a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less
index 0702d4a95fd..3d5f3b03652 100644
--- a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less
@@ -22,14 +22,14 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
-.actions.bundle {
- margin: @indent-s-base 0;
- .action.primary.customize {
- .button-l();
+.bundle-actions {
+ &:extend(.abstract-box-tocart all);
+ .action.primary {
+ &:extend(.abstract-button-l all);
}
}
-.bundle.options.container {
+.bundle-options-container {
clear: both;
margin-bottom: @indent-xl-base;
@@ -37,7 +37,7 @@
.heading(h2);
}
- .product.add.form {
+ .product-add-form {
display: none;
}
@@ -45,11 +45,11 @@
&:extend(.input-qty all);
}
- .product.options.wrapper {
+ .product-options-wrapper {
margin-bottom: @indent-l-base;
}
- .product.options.bottom {
+ .product-options-bottom {
clear: both;
}
@@ -60,17 +60,20 @@
}
}
- .block.bundle.summary {
+ .block-bundle-summary {
padding: @indent-s-base @indent-base;
background: @color-secondary;
&:extend(.add-box-sizing all);
- > .title > strong{
+ > .title > strong {
.heading(h2);
}
- .bundle.summary {
+ .bundle-summary {
margin-top: @indent-l-base;
+ &.empty {
+ display: none;
+ }
> .subtitle {
.heading(h3);
display: block;
@@ -84,17 +87,17 @@
}
}
- .tocart {
+ .box-tocart {
.actions {
- margin: @indent-s-base 0;
+ margin-bottom: @indent-s-base;
}
.action.primary {
+ &:extend(.abstract-button-l all);
}
}
- .addto.links {
- .action {
- .button();
- margin-bottom: @indent-xs-base;
+ .product-addto-links {
+ > .action {
+ &:extend(.abstract-action-addto all);
}
}
}
@@ -107,25 +110,25 @@
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .bundle.options.container {
+ .bundle-options-container {
.legend.title {
&:extend(.reset-left-margin all);
}
- .product.options.wrapper {
+ .product-options-wrapper {
float: left;
width: 57%;
}
- .product.options.bottom {
+ .product-options-bottom {
width: 57%;
}
- .block.bundle.summary {
+ .block-bundle-summary {
float: right;
width: 40%;
position: relative;
}
- .product.options.wrapper,
- .product.options.bottom,
- .block.bundle.summary {
+ .product-options-wrapper,
+ .product-options-bottom,
+ .block-bundle-summary {
.layout-2-left &,
.layout-2-right &,
.layout-3 & {
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less
index 866ed7d623b..f527eb55d11 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less
@@ -83,7 +83,7 @@
}
.actual.price {
- font-weight: @font-weight-bold;
+ font-weight: @font-weight-bold;
}
.product.name a {
@@ -91,15 +91,15 @@
}
.category {
- &.image {
+ &-image {
.image {
max-width: 100%;
height: auto;
display: block;
}
}
- &.image,
- &.description {
+ &-image,
+ &-description {
margin-bottom: @indent-base;
}
}
@@ -141,6 +141,32 @@
//
// Product grid and list item
//--------------------------------------
+
+.product-image {
+ &-container {
+ display: inline-block;
+ max-width: 100%;
+ }
+ &-wrapper {
+ height: 0;
+ display: block;
+ position: relative;
+ z-index: 1;
+ overflow: hidden;
+ }
+ &-photo {
+ display: block;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+ height: auto;
+ max-width: 100%;
+ }
+}
+
.products {
&.list.items {
&:extend(.reset-list all);
@@ -149,8 +175,6 @@
position: relative;
vertical-align: top;
}
- .product.photo {
- }
.img.container {
max-width: 100%;
> .image {
@@ -163,13 +187,11 @@
display: block;
}
.price-box {
- margin-top: @indent-s-base;
+ margin-top: 17px;
.price {
font-weight: @font-weight-bold;
}
}
- .details {
- }
.description {
padding-top: @indent-l-base;
color: @text-color-intense;
@@ -177,13 +199,14 @@
.actions {
> .secondary {
display: none;
+ vertical-align: top;
}
> .primary,
> .secondary {
margin: @indent-s-base 0 0 0;
}
.stock.unavailable {
- margin: 20px 5px 0 0;
+ margin: 7px 5px 0 0;
}
}
.action {
@@ -207,8 +230,6 @@
@_icon-font-line-height: normal
);
}
- &.tocart {
- }
}
}
&.wrapper.list {
@@ -220,9 +241,6 @@
.product.photo {
display: block;
}
- .img.container {
- margin: 0 auto;
- }
.details {
text-align: center;
}
@@ -230,12 +248,6 @@
font-size: @font-size-l;
margin-bottom: @indent-base;
}
- .description {
- }
- .actions {
- > .primary {
- }
- }
}
}
&.wrapper.grid {
@@ -245,17 +257,9 @@
padding: @product-grid-items-padding;
margin: @product-grid-items-margin;
}
- .product.photo {
- }
.img.container {
margin-bottom: @indent-base;
}
- .details {
- }
- .name {
- }
- .description {
- }
.actions {
> .primary {
display: inline-block;
@@ -287,9 +291,10 @@
}
.mode {
border: 1px solid @border-color-base;
- width: floor(@toolbar-mode-icon-font-size * @line-height-base);
- text-align: center;
+ font-weight: @font-weight-base;
color: @text-color-muted;
+ text-align: center;
+ width: floor(@toolbar-mode-icon-font-size * @line-height-base);
.icon-text-hide();
&.active {
background: #e5e5e5;
@@ -302,15 +307,15 @@
}
.mode.grid {
.icon-font(
- @icon-grid,
- @_icon-font-size: @toolbar-mode-icon-font-size
- );
+ @icon-grid,
+ @_icon-font-size: @toolbar-mode-icon-font-size
+ );
}
.mode.list {
.icon-font(
- @icon-list,
- @_icon-font-size: @toolbar-mode-icon-font-size
- );
+ @icon-list,
+ @_icon-font-size: @toolbar-mode-icon-font-size
+ );
}
}
.sorter {
@@ -320,18 +325,17 @@
}
.action.sort.asc {
.icon-font(
- @icon-arrow-down,
- @_icon-font-size: 27px,
- @_icon-font-color: @text-color-muted
- );
+ @icon-arrow-down,
+ @_icon-font-size: 27px,
+ @_icon-font-color: @text-color-muted
+ );
.icon-text-hide();
-
}
.action.sort.desc {
.icon-font(
- @icon-arrow-up,
- @_icon-font-size: 27px,
- @_icon-font-color: @text-color-muted
+ @icon-arrow-up,
+ @_icon-font-size: 27px,
+ @_icon-font-color: @text-color-muted
);
.icon-text-hide();
}
@@ -352,68 +356,6 @@
}
}
-.block.filter {
- .title {
- margin-bottom: 20px;
- strong {
- font-size: 18px;
- }
- }
- .subtitle {
- display: none;
- }
- .options {
- margin: 0;
- > dt {
- .heading(h4);
- margin: 0 0 10px 0;
- }
- > dd {
- margin: 0 0 25px;
-
- .item {
- margin-bottom: 3px;
- }
- }
- .count {
- color: @text-color-muted;
- &:before {
- content: "(";
- }
- &:after {
- content: ")";
- }
- }
- }
- .items {
- &:extend(.reset-list all);
- }
- .filtered {
- .items {
- margin: 15px 0;
- }
- .item {
- position: relative;
- padding-left: 22px;
- margin-bottom: 6px;
-
- .label {
- font-weight: @font-weight-bold;
- }
- .action.remove {
- &:extend(.remove-button-for-blocks all);
-
- position: absolute;
- left: -6px;
- top: 0;
- }
- }
- & + .actions {
- margin-bottom: 35px;
- }
- }
-}
-
//
// Product view
//--------------------------------------
@@ -460,14 +402,16 @@
}
}
-.product.info.main {
+.product-info-main {
.stock {
&.available,
&.unavailable {
display: inline-block;
- vertical-align: top;
+ font-weight: @font-weight-bold;
margin-bottom: @indent-xs-base;
margin-right: @indent-base;
+ text-transform: uppercase;
+ vertical-align: top;
}
}
.product {
@@ -491,17 +435,14 @@
}
}
- .price {
- font-weight: @font-weight-bold;
- }
-
.price-box {
.price {
font-size: @font-size-l;
+ font-weight: @font-weight-bold;
}
}
- .box.tocart {
+ .box-tocart {
display: table;
margin: @indent-base 0;
.field.qty {
@@ -525,12 +466,14 @@
.button-l();
}
}
- .addto {
+ .product-addto-links {
margin: @indent-base 0;
}
.action.tocompare {
- &:extend(.action-link-button all);
- .button-s();
+ &:extend(.abstract-action-addto all);
+ }
+ .product.reviews.summary .reviews.actions {
+ .font-size(@font-size-base);
}
}
@@ -552,14 +495,14 @@
// Category page layout
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .product.info.main {
+ .product-info-main {
float: right;
}
.product.media {
float: left;
}
.layout-1 {
- .product.info.main {
+ .product-info-main {
width: 40%;
}
.product.media {
@@ -569,7 +512,7 @@
.layout-2-left,
.layout-2-right,
.layout-3 {
- .product.info.main {
+ .product-info-main {
width: 48%;
}
.product.media {
@@ -584,10 +527,22 @@
.map.popup {
.popup(
@_popup-margin-top: @indent-s-base,
- @_popup-margin-left: 0,
- @_popup-content-margin: 10px 0 0
+ @_popup-margin-left: false,
+ @_popup-content-margin: 10px 0 0,
+ @_popup-position-top: false,
+ @_popup-position-left: false,
+ @_popup-position: absolute
);
- position: absolute;
+ .ui-dialog & {
+ padding: 22px;
+ }
+ .map.add.form {
+ &:extend(.add-clearfix all);
+ margin-bottom: 15px;
+ .price-box {
+ float: left;
+ }
+ }
.form.map.checkout {
float: right;
}
@@ -597,7 +552,7 @@
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .product.add.form {
+ .product-add-form {
&:extend(.revert-field-type-desktop all);
}
.products {
@@ -616,8 +571,6 @@
.pager {
text-align: right;
}
- .pages {
- }
.modes,
.sorter,
.limiter {
@@ -656,11 +609,6 @@
width: 30%;
padding-right: 1.75 * @indent-base;
}
- .img.container {
- margin: 0;
- }
- .name {
- }
.price-box {
width: 30%;
margin-right: 2%;
@@ -751,10 +699,6 @@ body.catalog-product-compare-index {
text-align: center;
display: block;
margin: 0 auto 15px;
-
- .img.photo.container {
- display: inline-block !important;
- }
}
.actions,
@@ -765,10 +709,7 @@ body.catalog-product-compare-index {
margin: 15px 0;
}
- .action.tocart {
- }
-
- .addto.links {
+ .product-addto-links {
margin-top: 15px;
.action.split,
@@ -821,7 +762,7 @@ body.catalog-product-compare-index {
font-size: 12px;
white-space: nowrap;
}
- .actions.toolbar {
+ .actions-toolbar {
margin: 17px 0;
max-width: 178px;
}
diff --git a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/module.less
index f687a20fd91..c524da6c6f3 100644
--- a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/module.less
@@ -29,7 +29,6 @@
@autocomplete-item-amount-color: #999;
.block.search {
- position: relative;
.title {
display: none;
}
@@ -53,7 +52,7 @@
.control {
border-top: 1px solid @border-color-base;
clear: both;
- margin: 0 -90px -1px -20px;
+ margin: 0 -20px -1px;
padding: 0 20px;
}
@@ -72,39 +71,41 @@
}
.search.autocomplete {
- position: absolute;
- top: 31px;
- left: 15px;
- z-index: 3;
- background: @autocomplete-background;
- border: @autocomplete-border;
- border-top: 0;
- overflow: hidden;
- display: none;
- &:extend(.add-box-sizing all);
- ul {
- li {
- border-top: @autocomplete-item-border;
- cursor: pointer;
- padding: 5px 40px 5px 10px;
- margin: 0;
- position: relative;
- text-align: left;
- white-space: normal;
- &:first-child {
- border-top: none;
- }
- &:hover, &.selected {
- background: @autocomplete-item-hover;
- }
- .amount {
- color: @autocomplete-item-amount-color;
- position: absolute;
- right: 7px;
- top: 5px;
- }
+ display: none;
+ position: absolute;
+ z-index: 3;
+ overflow: hidden;
+ margin-top: -15px;
+ &:extend(.add-box-sizing all);
+ ul {
+ li {
+ &:not(:empty) {
+ background: @autocomplete-background;
+ border: @autocomplete-border;
+ border-top: 0;
+ }
+ border-top: @autocomplete-item-border;
+ cursor: pointer;
+ padding: 5px 40px 5px 10px;
+ margin: 0;
+ position: relative;
+ text-align: left;
+ white-space: normal;
+ &:first-child {
+ border-top: none;
+ }
+ &:hover,
+ &.selected {
+ background: @autocomplete-item-hover;
+ }
+ .amount {
+ color: @autocomplete-item-amount-color;
+ position: absolute;
+ right: 7px;
+ top: 5px;
+ }
+ }
}
- }
}
.form.search.advanced {
@@ -154,6 +155,7 @@
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
.block.search {
+ position: relative;
float: right;
padding-left: 15px;
width: 250px;
@@ -198,8 +200,6 @@
}
}
.search.autocomplete {
- top: 100%;
- left: 15px;
margin-top: 0;
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
index 6c02a73ccc2..ee7e15122e2 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
@@ -27,8 +27,8 @@
xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/layout_single.xsd">
<update handle="page_one_column" />
<referenceContainer name="checkout.cart.items">
- <container name="checkout.cart.container" label="invisible" htmlTag="div" htmlClass="cart container" before="-">
- <container name="cart.summary" label="Cart Summary Container" htmlTag="div" htmlClass="cart summary" after="-">
+ <container name="checkout.cart.container" label="invisible" htmlTag="div" htmlClass="cart-container" before="-">
+ <container name="cart.summary" label="Cart Summary Container" htmlTag="div" htmlClass="cart-summary" after="-">
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.summary.title" before="-" template="Magento_Core::text.phtml">
<arguments>
<argument translate="true" name="text" xsi:type="string">Summary</argument>
@@ -42,8 +42,10 @@
</container>
</container>
</referenceContainer>
- <move element="checkout.cart.form" destination="checkout.cart.container"/>
- <move element="checkout.cart.shipping" destination="cart.summary"/>
+ <move element="checkout.cart.form.before" destination="checkout.cart.container" before="cart.summary" />
+ <move element="checkout.cart.form" destination="checkout.cart.container" after="cart.summary" />
+ <move element="checkout.cart.widget" destination="checkout.cart.container" after="checkout.cart.form" />
+ <move element="checkout.cart.shipping" destination="cart.summary" after="checkout.cart.summary.title" />
<move element="checkout.cart.coupon" destination="cart.summary" />
<move element="checkout.cart.totals" destination="cart.summary"/>
<move element="checkout.cart.methods.bottom" destination="cart.summary"/>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less
new file mode 100644
index 00000000000..8d79a752015
--- /dev/null
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less
@@ -0,0 +1,376 @@
+// /**
+// // * Magento
+// *
+// * NOTICE OF LICENSE
+// *
+// * This source file is subject to the Academic Free License (AFL 3.0)
+// * that is bundled with this package in the file LICENSE_AFL.txt.
+// * It is also available through the world-wide-web at this URL:
+// * http://opensource.org/licenses/afl-3.0.php
+// * If you did not receive a copy of the license and are unable to
+// * obtain it through the world-wide-web, please send an email
+// * to license@magentocommerce.com so we can send you a copy immediately.
+// *
+// * DISCLAIMER
+// *
+// * Do not edit or add to this file if you wish to upgrade Magento to newer
+// * versions in the future. If you wish to customize Magento for your
+// * needs please refer to http://www.magentocommerce.com for more information.
+// *
+// * @category design
+// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+// */
+
+//
+// Shopping cart
+//--------------------------------------
+.cart {
+ // Summary block
+ &-summary {
+ &:extend(.add-box-sizing all);
+ background: @sidebar-background;
+ margin-bottom: 25px;
+ padding: 1px 15px 25px;
+ > .title {
+ .heading(h3);
+ display: block;
+ }
+ .block {
+ margin-bottom: 0;
+ > .title {
+ .icon-font(
+ @_icon-font-content: @icon-down,
+ @_icon-font-size: 30px,
+ @_icon-font-position: after
+ );
+ border-top: @border-width-base solid @border-color-base;
+ cursor: pointer;
+ display: block;
+ font-weight: @font-weight-semibold;
+ line-height: 36px;
+ margin-bottom: 0;
+ padding: 0 20px 0 5px;
+ position: relative;
+ &:after {
+ position: absolute;
+ right: 0;
+ top: 0;
+ }
+ strong {
+ .column.main & {
+ font-weight: @font-weight-base;
+ .font-size(18);
+ }
+ }
+ }
+ &.active {
+ .content {
+ display: block;
+ }
+ > .title {
+ .icon-font-symbol(
+ @_icon-font-content: @icon-prev,
+ @_icon-font-position: after
+ );
+ }
+ }
+ .item.options {
+ margin-left: 0;
+ }
+ .fieldset {
+ margin: 15px 0 25px 5px;
+ .field {
+ margin: 0 0 @indent-s-base;
+ &.note {
+ font-size: @font-size-s;
+ }
+ }
+ }
+ }
+ .actions-toolbar {
+ > .primary {
+ button {
+ &:extend(.abstract-revert-secondary-color all);
+ }
+ }
+ }
+ }
+
+ // Totals block
+ &-totals {
+ border-top: 1px solid @border-color-base;
+ padding-top: 10px;
+ .mark {
+ padding-left: 4px;
+ }
+ .amount {
+ padding-right: 4px;
+ text-align: right;
+ }
+ .grand .mark,
+ .grand .amount {
+ padding-top: 25px;
+ }
+ .grand .mark strong {
+ font-weight: @font-weight-base;
+ }
+ .msrp {
+ margin-bottom: @indent-s-base;
+ }
+ }
+
+ // Products table
+ &.table.wrapper {
+ thead {
+ .col.price,
+ .col.subtotal {
+ display: none;
+ }
+ }
+ .cart.items {
+ .action {
+ &:extend(button all);
+ .link-as-button();
+ margin-left: 10px;
+ &:first-child {
+ margin-left: 0;
+ }
+ &.help.map {
+ &:extend(.abstract-action-button-as-link all);
+ font-weight: @font-weight-base;
+ }
+ }
+ thead + .cart.item {
+ border-top: @border-width-base solid @border-color-base;
+ }
+ > .item.cart {
+ border-bottom: @border-width-base solid @border-color-base;
+ display: block;
+ position: relative;
+ }
+ }
+ .col.price,
+ .col.subtotal {
+ display: block;
+ text-align: left;
+ white-space: nowrap;
+ &:before {
+ content: attr(data-th) ":";
+ color: @color-primary-lighter;
+ display: inline-block;
+ font-size: @font-size-s;
+ padding-left: 5px;
+ }
+ }
+ .col.qty {
+ right: 0;
+ position: absolute;
+ width: 45px;
+ }
+ .item {
+ .col {
+ &.item {
+ display: block;
+ padding: 25px 70px 10px 75px;
+ position: relative;
+ min-height: 75px;
+ }
+ &.qty {
+ top: 0;
+ padding-top: 20px;
+ .input-text {
+ &:extend(.input-qty all);
+ }
+ }
+ }
+ &.actions td {
+ padding-bottom: 20px;
+ }
+ }
+ .product {
+ &.photo {
+ display: block;
+ max-width: 60px;
+ left: 0;
+ padding: 0;
+ position: absolute;
+ top: 15px;
+ width: 100%;
+ }
+ &.details {
+ display: table-cell;
+ vertical-align: top;
+ width: 99%;
+ .product.name {
+ font-weight: @font-weight-base;
+ }
+ }
+ }
+ // Product options
+ .item.options {
+ font-size: @font-size-s;
+ margin-top: @indent-s-base;
+ margin-bottom: @indent-s-base;
+ &:extend(.product-options-list all);
+ &:extend(.add-clearfix all);
+ }
+ }
+ &-container {
+ .form.cart {
+ .actions.main {
+ text-align: center;
+ }
+ .action {
+ &.continue {
+ .link-as-button();
+ .button(
+ @_button-padding: 0 15px 0 5px,
+ @_button-icon-use: true,
+ @_button-font-content: @icon-prev,
+ @_button-icon-font-size: 32px,
+ @_button-icon-font-position: before
+ );
+ border-radius: 3px;
+ font-weight: bold;
+ &:active {
+ box-shadow: inset 0 3px 1px rgba(0,0,0,.29);
+ }
+ }
+ &.update {
+ .button-icon(
+ @icon-update,
+ @_icon-font-size: 32px
+ );
+ padding-left: 5px;
+ }
+ &.update,
+ &.continue,
+ &.clear {
+ margin: 0 auto 10px;
+ }
+ &.update,
+ &.clear {
+ display: block;
+ }
+ }
+ }
+ .checkout.methods {
+ &:extend(.reset-list all);
+ text-align: center;
+ margin-top: @indent-s-base;
+ .action.primary {
+ .button-l();
+ margin-bottom: 20px;
+ width: 100%;
+ }
+ }
+ }
+}
+
+//
+// Cross sell
+//--------------------------------------
+
+.block.crosssell {
+ margin-top: 70px;
+}
+
+//
+// Desktop
+//--------------------------------------
+.responsive(@break) when (@break = @break-point-1) {
+ .cart {
+ &-container {
+ &:extend(.add-clearfix-desktop all);
+ .form.cart {
+ float: left;
+ width: 73%;
+ position: relative;
+ .actions.main {
+ text-align: left;
+ }
+ .action {
+ margin-bottom: 0;
+ &.continue {
+ float: left;
+ }
+ &.update {
+ float: right;
+ }
+ &.clear {
+ float: right;
+ margin-right: 10px;
+ }
+ }
+ }
+ .widget {
+ float: left;
+ }
+ }
+ &-summary {
+ position: relative;
+ float: right;
+ width: 23%;
+ .actions-toolbar {
+ .column.main & {
+ margin-left: 0;
+ > .secondary {
+ float: none;
+ }
+ }
+ }
+ .block {
+ .fieldset {
+ .field {
+ .form-field-type-revert(@_type: block);
+ margin: 0 0 @indent-s-base;
+ }
+ }
+ }
+ }
+
+ &.table.wrapper {
+ thead {
+ .col.price,
+ .col.subtotal {
+ display: table-cell;
+ }
+ }
+ .cart.items > .item.cart {
+ display: table-row-group;
+ }
+ .col {
+ &.price,
+ &.subtotal {
+ display: table-cell;
+ text-align: center;
+ padding-top: 27px;
+ &:before {
+ display: none;
+ }
+ }
+ &.qty {
+ position: static;
+ }
+ }
+
+ .item {
+ .col.item {
+ padding: 27px 8px 10px;
+ }
+ &.actions td {
+ text-align: right;
+ }
+ }
+ .product.photo {
+ display: table-cell;
+ padding-right: 20px;
+ vertical-align: top;
+ width: 1%;
+ position: static;
+ max-width: 100%;
+ }
+ }
+ }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less
new file mode 100644
index 00000000000..8f6e6f75b93
--- /dev/null
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less
@@ -0,0 +1,224 @@
+// /**
+// // * Magento
+// *
+// * NOTICE OF LICENSE
+// *
+// * This source file is subject to the Academic Free License (AFL 3.0)
+// * that is bundled with this package in the file LICENSE_AFL.txt.
+// * It is also available through the world-wide-web at this URL:
+// * http://opensource.org/licenses/afl-3.0.php
+// * If you did not receive a copy of the license and are unable to
+// * obtain it through the world-wide-web, please send an email
+// * to license@magentocommerce.com so we can send you a copy immediately.
+// *
+// * DISCLAIMER
+// *
+// * Do not edit or add to this file if you wish to upgrade Magento to newer
+// * versions in the future. If you wish to customize Magento for your
+// * needs please refer to http://www.magentocommerce.com for more information.
+// *
+// * @category design
+// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+// */
+
+//
+// Minicart
+//--------------------------------------
+
+.block.minicart {
+ .subtotal {
+ border-top: 1px solid @color-secondary;
+ padding-top: 10px;
+ .amount {
+ font-size: @font-size-xl;
+ .incl.tax {
+ display: block;
+ }
+ }
+ }
+ .subtitle {
+ .heading(h3);
+ display: inline-block;
+ margin-top: 0;
+ font-weight: 500;
+ }
+ .subtitle.empty {
+ display: block;
+ padding: 30px 0 20px;
+ text-align: center;
+ font-size: 14px;
+ }
+ > .content > .actions {
+ margin-top: 10px;
+ > .secondary,
+ > .primary {
+ padding-right: 20px;
+ display: inline;
+ }
+ }
+}
+
+.minicart-wrapper {
+ .dropdown(
+ @_toggle-selector: ~".action.showcart",
+ @_options-selector: ~".block.minicart",
+ @_dropdown-toggle-icon-content: @icon-cart,
+ @_dropdown-toggle-active-icon-content: @icon-cart,
+ @_dropdown-list-item-padding: false,
+ @_dropdown-list-item-hover: false,
+ @_icon-font-position: before,
+ @_icon-font-size: 35px,
+ @_icon-font-line-height: 33px,
+ @_icon-font-color: @color-primary,
+ @_icon-font-color-hover: @color-primary,
+ @_icon-font-color-active: @color-primary
+ );
+ float: right;
+ .block.minicart {
+ right: -15px;
+ width: 320px;
+ padding: 15px;
+ > .title {
+ display: none;
+ }
+ &:before,
+ &:after {
+ left: auto;
+ right: 25px;
+ }
+ &:before {
+ right: 26px;
+ }
+ }
+ .product.actions {
+ text-align: right;
+ > .primary,
+ > .secondary {
+ display: inline;
+ }
+ }
+ .pricing.details {
+ display: table;
+ .rate,
+ .details.qty {
+ display: table-row;
+ }
+ .value,
+ .label {
+ padding-right:10px;
+ display: table-cell;
+ }
+ .label:after {
+ content: ":";
+ }
+ }
+ .action.edit {
+ .icon-font(
+ @icon-settings,
+ @_icon-font-size: 28px,
+ @_icon-font-line-height: 28px,
+ @_icon-font-text-hide: true,
+ @_icon-font-color: #303030,
+ @_icon-font-color-hover: #303030,
+ @_icon-font-color-active: #303030
+ );
+ }
+ .action.close {
+ position: absolute;
+ right: 14px;
+ top: 6px;
+ .icon-font(
+ @icon-remove,
+ @_icon-font-size: 33px,
+ @_icon-font-line-height: 33px,
+ @_icon-font-color: @text-color-muted,
+ @_icon-font-text-hide: true
+ );
+ .button-reset();
+ }
+ .action.showcart {
+ .text {
+ &:extend(.visually-hidden all);
+ }
+ .icon-font(
+ @_icon-font-content: @icon-cart,
+ @_icon-font-position: before,
+ @_icon-font-size: 35px,
+ @_icon-font-line-height: 33px,
+ @_icon-font-vertical-align: top,
+ @_icon-font-color: @color-primary,
+ @_icon-font-color-hover: @color-primary,
+ @_icon-font-color-active: @color-primary
+ );
+ white-space: nowrap;
+ .counter.qty {
+ &.empty {
+ display: none;
+ }
+ background: @color-active;
+ border-radius: 2px;
+ color: #fff;
+ clip: none;
+ display: inline-block;
+ height: 26px;
+ line-height: 26px;
+ margin: 3px 0 0;
+ max-width: 2em;
+ min-width: 20px;
+ padding: 0 3px;
+ overflow: hidden;
+ text-align: center;
+ white-space: normal;
+ }
+ }
+ .ui-dialog {
+ .action.close {
+ right: 0;
+ top: 46px;
+ z-index: 100;
+ }
+ }
+}
+
+.minilist {
+ .list-reset-styles(0, 0);
+ .item {
+ border-top: 1px solid @color-secondary;
+ padding: 15px 0;
+ z-index: 1;
+ }
+ .item > .product {
+ &:extend(.add-clearfix all);
+ }
+ .product.photo {
+ float: left;
+ }
+ .product.details {
+ padding-left: 88px;
+ }
+ .action.delete {
+ .icon-font(
+ @icon-trash,
+ @_icon-font-size: 28px,
+ @_icon-font-line-height: 28px,
+ @_icon-font-text-hide: true,
+ @_icon-font-color: #303030,
+ @_icon-font-color-hover: #303030,
+ @_icon-font-color-active: #303030
+ );
+ }
+}
+
+//
+// Desktop
+//--------------------------------------
+
+.responsive(@break) when (@break = @break-point-1) {
+ .minicart-wrapper {
+ margin-left: 30px;
+ .block.minicart {
+ width: 380px;
+ }
+ }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less
index 9904ec69c6e..6b321311f25 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less
@@ -22,296 +22,31 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
-//
-// Shopping cart
-//--------------------------------------
-.cart {
- // Shopping cart - summary block
- &.summary {
- &:extend(.add-box-sizing all);
- background: @sidebar-background;
- margin-bottom: 25px;
- padding: 1px 15px 25px;
- > .title {
- .heading(h3);
- display: block;
- }
- .block {
- margin-bottom: 0;
- > .title {
- .icon-font(
- @_icon-font-content: @icon-down,
- @_icon-font-size: 30px,
- @_icon-font-position: after
- );
- border-top: @border-width-base solid @border-color-base;
- cursor: pointer;
- display: block;
- font-weight: @font-weight-semibold;
- line-height: 36px;
- margin-bottom: 0;
- padding: 0 20px 0 5px;
- position: relative;
- &:after {
- position: absolute;
- right: 0;
- top: 0;
- }
- strong {
- font-weight: @font-weight-base;
- }
- }
- &.active {
- .content {
- display: block;
- }
- .title {
- .icon-font-symbol(
- @_icon-font-content: @icon-prev,
- @_icon-font-position: after
- );
- }
- }
- .item.options {
- margin-left: 0;
- }
- .fieldset {
- margin: 15px 0 25px 5px;
- .field {
- margin: 0 0 @indent-s-base;
- &.note {
- font-size: @font-size-s;
- }
- }
- }
- }
- .actions.toolbar {
- > .primary {
- button {
- .button-revert-secondary-color();
- }
- }
- }
- }
-
- &.totals {
- border-top: 1px solid @border-color-base;
- padding-top: 10px;
- .mark {
- padding-left: 4px;
- }
- .amount {
- padding-right: 4px;
- text-align: right;
- }
- .grand .mark,
- .grand .amount {
- padding-top: 25px;
- }
- .grand .mark strong {
- font-weight: @font-weight-base;
- }
- .msrp {
- margin-bottom: @indent-s-base;
- }
- }
-
- .checkout.methods {
- &:extend(.reset-list all);
- text-align: center;
- .action.primary {
- .button-l();
- margin-bottom: 20px;
- width: 100%;
- }
- }
-
- // Shopping cart - products table
- &.table.wrapper {
- thead {
- .col.price,
- .col.subtotal {
- display: none;
- }
- }
- .cart.items {
- .action {
- &:extend(button all);
- .link-as-button();
- margin-left: 10px;
- &:first-child {
- margin-left: 0;
- }
- &.help.map {
- .button-as-link();
- font-weight: @font-weight-base;
- }
- }
- thead + .cart.item {
- border-top: @border-width-base solid @border-color-base;
- }
- > .item.cart {
- border-bottom: @border-width-base solid @border-color-base;
- display: block;
- position: relative;
- }
- }
- .col.price,
- .col.subtotal {
- display: block;
- text-align: left;
- white-space: nowrap;
- &:before {
- content: attr(data-th) ":";
- color: @color-primary-lighter;
- display: inline-block;
- font-size: @font-size-s;
- padding-left: 5px;
- }
- }
- .col.qty {
- right: 0;
- position: absolute;
- width: 45px;
- }
- .item {
- .col {
- &.item {
- display: block;
- padding: 25px 70px 10px 75px;
- position: relative;
- min-height: 75px;
- }
- &.qty {
- top: 0;
- padding-top: 20px;
- .input-text {
- width: 3.3em;
- text-align: center;
- }
- }
- }
- &.actions td {
- padding-bottom: 20px;
- }
- }
- .product {
- &.photo {
- display: block;
- max-width: 60px;
- left: 0;
- padding: 0;
- position: absolute;
- top: 15px;
- width: 100%;
- .container,
- .container .image {
- max-width: 100%;
- bottom: inherit !important;
- }
- }
- &.details {
- display: table-cell;
- vertical-align: top;
- width: 99%;
- }
- }
- // Product options
- .item.options {
- font-size: @font-size-s;
- margin-top: 10px;
- &:extend(.product-options-list all);
- }
- }
- &.container {
- .form.cart {
- .actions.main {
- text-align: center;
- }
- .action {
- &.continue {
- .link-as-button();
- .button(
- @_button-padding: 0 15px 0 5px,
- @_button-icon-use: true,
- @_button-font-content: @icon-prev,
- @_button-icon-font-size: 32px,
- @_button-icon-font-position: before
- );
- border-radius: 3px;
- font-weight: bold;
- &:active {
- box-shadow: inset 0 3px 1px rgba(0,0,0,.29);
- }
- }
- &.update {
- .button-icon(
- @icon-update,
- @_icon-font-size: 32px
- );
- padding-left: 5px;
- }
- &.update,
- &.continue,
- &.clear {
- margin: 0 auto 10px;
- }
- &.update,
- &.clear {
- display: block;
- }
- }
- }
- }
-}
-
-// Shopping cart - cross sell
-.block.crosssell {
- margin-top: 70px;
-}
+@import "cart.less";
+@import "minicart.less";
//
-// Checkout
+// One Page Checkout
//--------------------------------------
-.block.progress.onepage {
- background: @sidebar-background;
- margin-bottom: @indent-l-base;
- padding: 1px 15px 5px;
- > .title {
- .heading(h3);
- margin-bottom: 20px;
- strong {
- font-weight: @font-weight-base;
- }
- }
- .content {
- dd.complete {
- margin: 0 0 15px;
- overflow: hidden;
- .content {
- margin: 0;
- }
- }
- .action,
- .payment.method .title {
- font-weight: @font-weight-base;
- }
- .data.table {
- font-size: @font-size-s;
- }
- }
-}
-
-.opc.wrapper {
+.opc-wrapper {
+ &:extend(.add-box-sizing all);
+ .css(padding-bottom, @indent-xl-base);
> .opc {
&:extend(.reset-list all);
}
- .section.allow > .title {
- cursor: pointer;
+ .section {
+ &.allow .step-title {
+ cursor: pointer;
+ }
+ &.active .step-title {
+ color: @color-primary-darker;
+ cursor: default;
+ }
}
.step {
- &.title {
+ &-title {
+ color: @color-primary-lighter;
line-height: 50px;
h2,
.number {
@@ -323,7 +58,7 @@
}
border-bottom: @border-width-base solid @border-color-base;
}
- &.content {
+ &-content {
padding: 20px 25px 40px;
position: relative;
.addresses .control {
@@ -331,128 +66,66 @@
}
.fieldset {
margin-bottom: 0;
+ &.login {
+ .form-hasrequired(bottom);
+ &:after {
+ margin-top: 35px;
+ text-align: center;
+ }
+ }
}
.form {
.form-hasrequired(bottom);
&:after {
- text-align: right;
+ text-align: center;
+ }
+ > .choice {
+ margin-top: @form-field-vertical-indent;
}
- }
- .form > .choice {
- margin-top: @form-field-type-inline-vertical-margin;
}
.actions {
margin-top: 40px;
}
- .fieldset.login {
- .form-hasrequired(bottom);
- &:after {
- margin-top: 35px;
- text-align: center;
- }
- }
}
}
// Shipping and payment mathods
- .items.methods {
- .content {
- margin-left: 20px;
- }
+ .methods-shipping,
+ .methods-payment {
img {
vertical-align: middle;
}
.field.month {
padding-right: 10px;
}
- &.payment {
- .content {
- margin-bottom: 0;
- .fieldset {
- padding: 15px 0;
- }
- .label {
- font-weight: @font-weight-base;
- }
- }
- }
}
- // Gift messages
- .fieldset.gift.message {
- > legend {
- margin-left: 0;
- padding: 0;
+ // Shipping methods
+ .methods-shipping {
+ .item-title {
+ &:extend(.abstract-shipping-methods-title all);
}
- .field.choice {
- font-weight: @font-weight-base;
- margin: 0 0 20px 20px;
- &:before {
- display: none;
- }
+ .item-content {
+ margin: 0 0 10px 20px;
}
- .block.items {
- background: @sidebar-background;
- display: block;
- padding: 20px 30px;
- margin: 20px 0 0;
- > .title {
- margin-top: 10px;
- margin-bottom: 0;
- }
- > .options {
- margin: 0 0 20px 20px;
- }
- .block.message {
- margin-bottom: 10px;
- }
- }
- }
-
- // Gift wrapping
- .field.wrapping {
- .label {
- display: inline-block;
- margin-bottom: 5px;
- }
- .design {
- margin: 10px 0;
- &:extend(.add-clearfix all);
- > img {
- float: left;
- max-width: 100px;
- max-height: 100px;
- margin-right: 10px;
+ .price.box {
+ margin-left: 20px;
+ .regular .price {
+ font-weight: @font-weight-bold;
}
}
}
- .options.individual {
- margin-top: 10px;
- ol > .item {
- border-bottom: @border-width-base solid @border-color-base;
- padding-bottom: 10px;
- margin-bottom: 20px;
- .product {
- &:extend(.add-clearfix all);
- margin-bottom: 10px;
- .img {
- float: left;
- margin-right: 20px;
- }
+ .methods-payment {
+ .content {
+ margin-bottom: 0;
+ .fieldset {
+ padding: 15px 0;
}
- &:last-child {
- border-bottom: 0;
- padding-bottom: 0;
+ .label {
+ font-weight: @font-weight-base;
}
}
- .number {
- font-size: @font-size-s;
- }
- }
- .activate.message {
- display: inline-block;
- margin: 10px 0;
}
// Order review
@@ -473,6 +146,9 @@
white-space: nowrap;
}
}
+ th.col.subtotal {
+ text-align: center;
+ }
.amount {
text-align: right;
}
@@ -482,7 +158,7 @@
tbody tr:last-child td {
border-bottom: @border-width-base solid @border-color-base;
}
- .review.item.options {
+ .review-item-options {
font-size: @font-size-s;
margin: 10px 0 0;
&:extend(.add-clearfix all);
@@ -498,7 +174,7 @@
}
// Customer login
- .step.login.wrapper {
+ .login-wrapper {
.block {
> .title {
&:extend(.login-block-title all);
@@ -511,124 +187,85 @@
}
}
}
- .extra-options-container {
- .price.box {
- font-weight: normal;
- margin-left: 20px;
- &.no-display {
- display: none;
- }
- }
+
+ .actions-toolbar {
+ margin: 40px 0 0;
}
}
//
-// Minicart
+// Checkout Progress
//--------------------------------------
-.block.minicart {
- .subtotal {
- border-top: 1px solid @color-secondary;
- padding-top: 10px;
- .amount {
- font-size: @font-size-xl;
- }
- }
- .subtitle {
+.opc-block-progress {
+ &:extend(.add-box-sizing all);
+ margin-bottom: @indent-l-base;
+ > .title {
+ background: @sidebar-background;
.heading(h3);
- display: inline-block;
- margin-top: 0;
- font-weight: 500;
+ margin: 0;
+ padding: 15px 15px 20px;
+ strong {
+ font-weight: @font-weight-base;
+ }
}
- .subtitle.empty {
- display: block;
- padding: 30px 0 20px;
- text-align: center;
- font-size: 14px;
+ > .content {
+ background: @sidebar-background;
+ padding: 0 15px 5px;
+ .item-content.complete {
+ margin: 0 0 15px;
+ overflow: hidden;
+ }
+ .action,
+ .payment.method .title {
+ font-weight: @font-weight-base;
+ }
+ .data.table {
+ font-size: @font-size-s;
+ }
}
- > .content > .actions {
- margin-top: 10px;
- > .secondary,
- > .primary {
- padding-right:20px;
- display: inline;
+ .payment-method {
+ > .title {
+ font-weight: @font-weight-light;
+ }
+ > .content {
+ margin: 0 0 10px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ .items-cards {
+ margin: 0;
+ > .content {
+ margin: 0;
+ }
+ }
+ .data.table {
+ th {
+ padding: 5px 10px 5px 0;
+ }
+ td {
+ padding: 5px 0;
+ }
}
}
}
-.minicart.wrapper {
- .ui-dialog {
- .action.close {
- right: 0;
- top: 46px;
- z-index: 100;
- }
- }
- right: 10px;
- position: absolute;
- .action.showcart {
- .text {
- .visually-hidden();
- }
- .icon-font(
- @_icon-font-content: @icon-cart,
- @_icon-font-position: before,
- @_icon-font-size: 35px,
- @_icon-font-line-height: 33px,
- @_icon-font-vertical-align: top,
- @_icon-font-color: @color-primary,
- @_icon-font-color-hover: @color-primary,
- @_icon-font-color-active: @color-primary
- );
- white-space: nowrap;
- .counter.qty {
- background: @color-active;
- border-radius: 2px;
- color: #fff;
- clip: none;
- display: inline-block;
- height: 26px;
- line-height: 26px;
- margin: 3px 0 0;
- max-width: 2em;
- min-width: 20px;
- padding: 0 3px;
- overflow: hidden;
- text-align: center;
- white-space: normal;
+//
+// Checkout Success
+//--------------------------------------
+
+.checkout-onepage-success {
+ .page-title {
+ .print {
+ display: none;
}
}
- .block.minicart {
- display: none;
- }
}
-.minilist {
- .list-reset-styles(0, 0);
- .item {
- border-top: 1px solid @color-secondary;
- padding: 15px 0;
- z-index: 1;
- }
- .item > .product {
- &:extend(.add-clearfix all);
- }
- .product.photo {
- float: left;
- }
- .product.details {
- padding-left: 88px;
- }
- .action.delete {
- .icon-font(
- @icon-trash,
- @_icon-font-size: 28px,
- @_icon-font-line-height: 28px,
- @_icon-font-text-hide: true,
- @_icon-font-color: #303030,
- @_icon-font-color-hover: #303030,
- @_icon-font-color-active: #303030
- );
+.checkout-success {
+ .actions-toolbar {
+ margin-top: 40px;
}
}
@@ -636,100 +273,44 @@
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .minicart.wrapper {
- position: relative;
- right: inherit;
- float: right;
- margin-left: 30px;
- .dropdown(
- @_toggle-selector: ~".action.showcart",
- @_options-selector: ~".block.minicart",
- @_dropdown-toggle-icon-content: @icon-cart,
- @_dropdown-toggle-active-icon-content: @icon-cart,
- @_dropdown-list-item-padding: false,
- @_dropdown-list-item-hover: false,
- @_icon-font-position: before,
- @_icon-font-size: 35px,
- @_icon-font-line-height: 33px,
- @_icon-font-color: @color-primary,
- @_icon-font-color-hover: @color-primary,
- @_icon-font-color-active: @color-primary
- );
- .block.minicart {
- right: -15px;
- width: 380px;
- padding: 15px 15px 15px;
- > .title {
- display: none;
- }
- &:before,
- &:after {
- left: auto;
- right: 25px;
- }
- &:before {
- right: 26px;
- }
- }
- .product.actions {
- text-align: right;
- > .primary,
- > .secondary {
- display: inline;
- }
- }
- .pricing.details {
- display: table;
- .rate,
- .details.qty {
- display: table-row;
+
+ .checkout-onepage-index .column.main {
+ &:extend(.add-clearfix-desktop all);
+ }
+
+ .opc-wrapper {
+ .layout-column(2, 2, @layout-column-checkout-main-width);
+ &:extend(.add-box-sizing-desktop all);
+ .step-content {
+ .form {
+ &:after {
+ text-align: right;
+ }
}
- .value,
- .label {
- padding-right:10px;
- display: table-cell;
+ .form:not(.login) .actions-toolbar {
+ &:extend(.reset-left-margin-desktop all);
}
- .label:after {
- content: ":";
+ .fieldset.login {
+ &:after {
+ &:extend(.margin-for-forms-desktop all);
+ text-align: left;
+ }
}
}
- .action.edit {
- .icon-font(
- @icon-settings,
- @_icon-font-size: 28px,
- @_icon-font-line-height: 28px,
- @_icon-font-text-hide: true,
- @_icon-font-color: #303030,
- @_icon-font-color-hover: #303030,
- @_icon-font-color-active: #303030
- );
- }
- .action.close {
- position: absolute;
- right: 14px;
- top: 6px;
- .icon-font(
- @icon-remove,
- @_icon-font-size: 33px,
- @_icon-font-line-height: 33px,
- @_icon-font-color: @text-color-muted
- );
- .button-reset();
- .icon-text-hide();
- }
}
- .minicart.wrapper {
- position: relative;
- right: inherit;
+ .opc-block-progress {
+ .layout-column(2, 1, @layout-column-checkout-left-width);
+ padding-right: @layout-column-main-sidebar-offset;
+ &:extend(.add-box-sizing-desktop all);
}
- .step.login.wrapper {
+ .login-wrapper {
&:extend(.add-clearfix-desktop all);
.block {
&:extend(.blocks-2columns all);
}
- .field.choice {
+ .field.choice:not(.persistent) {
&:before {
display: none;
}
@@ -741,108 +322,14 @@
}
}
- .opc.wrapper {
- .step {
- .actions.toolbar {
- &:extend(.reset-left-margin-desktop all);
- }
- &.content {
- .fieldset.login {
- &:after {
- &:extend(.margin-for-forms-desktop all);
- text-align: left;
- }
- }
- }
- }
- }
-
- // Shopping cart - responsive
- .cart {
- &.container {
- &:extend(.add-clearfix-desktop all);
- .form.cart {
- float: left;
- width: 73%;
- position: relative;
- .actions.main {
- text-align: left;
- }
- .action {
- margin-bottom: 0;
- &.continue {
- float: left;
- }
- &.update {
- float: right;
- }
- &.clear {
- float: right;
- margin-right: 10px;
- }
- }
- }
- }
- &.summary {
- position: relative;
- float: right;
- width: 23%;
- .fieldset .actions.toolbar {
- margin-left: 0;
- > .secondary {
- float: none;
- }
- }
- .block {
- .fieldset {
- .field {
- .form-field-type-revert(@_type: block);
- margin: 0 0 @indent-s-base;
- }
- }
- }
- }
-
- &.table.wrapper {
- thead {
- .col.price,
- .col.subtotal {
- display: table-cell;
- }
- }
- .cart.items > .item.cart {
- display: table-row-group;
- }
- .col {
- &.price,
- &.subtotal {
- display: table-cell;
- text-align: center;
- padding-top: 27px;
- &:before {
- display: none;
- }
- }
- &.qty {
- position: static;
- }
- }
-
- .item {
- .col.item {
- padding: 27px 8px 10px;
- }
- &.actions td {
- text-align: right;
- }
- }
- .product.photo {
- display: table-cell;
- padding-right: 20px;
- vertical-align: top;
- width: 1%;
- position: static;
- max-width: 100%;
+ // Checkout success
+ .checkout-onepage-success {
+ .page-title {
+ .print {
+ display: none;
+ display: inline-block;
+ margin-left: 40px;
+ .font-size(14);
}
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less
index 0ba40287189..c7a50d4a76c 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less
@@ -25,7 +25,7 @@
.login.container {
.block {
&.new {
- .actions.toolbar {
+ .actions-toolbar {
margin-top: 25px;
}
}
@@ -203,17 +203,14 @@
}
}
-.widget,
-.block {
- ol, ul {
- .list-reset-styles();
- li {
- margin-bottom: 6px;
- }
- strong {
- font-weight: normal;
- }
+.control.captcha-image {
+ .captcha-img {
+ float: left;
+ margin: 0 20px 0 0;
+ }
+ .action.reload {
+ margin: 10px 0 0;
}
}
@@ -226,7 +223,7 @@
.block {
&:extend(.blocks-2columns all);
&.login {
- .actions.toolbar {
+ .actions-toolbar {
> .primary {
margin-bottom: 0;
margin-right: 30px;
@@ -260,7 +257,8 @@
// My account
.account.layout-2-left {
- .column.sidebar {
+ .sidebar-main,
+ .sidebar-additional {
width: 22.3%;
}
.column.main {
diff --git a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less
new file mode 100644
index 00000000000..43377499ac7
--- /dev/null
+++ b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less
@@ -0,0 +1,119 @@
+// /**
+// // * Magento
+// *
+// * NOTICE OF LICENSE
+// *
+// * This source file is subject to the Academic Free License (AFL 3.0)
+// * that is bundled with this package in the file LICENSE_AFL.txt.
+// * It is also available through the world-wide-web at this URL:
+// * http://opensource.org/licenses/afl-3.0.php
+// * If you did not receive a copy of the license and are unable to
+// * obtain it through the world-wide-web, please send an email
+// * to license@magentocommerce.com so we can send you a copy immediately.
+// *
+// * DISCLAIMER
+// *
+// * Do not edit or add to this file if you wish to upgrade Magento to newer
+// * versions in the future. If you wish to customize Magento for your
+// * needs please refer to http://www.magentocommerce.com for more information.
+// *
+// * @category design
+// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+// */
+
+.opc-wrapper {
+ .gift-message {
+ > legend {
+ margin-left: 0;
+ padding: 0;
+ }
+ .field.choice {
+ font-weight: @font-weight-base;
+ margin: 0 0 20px 20px;
+ &:before {
+ display: none;
+ }
+ }
+ .activate.message {
+ display: inline-block;
+ margin: 0 0 10px;
+ }
+ .options-items {
+ background: @sidebar-background;
+ display: block;
+ margin: 20px 0 0;
+ padding: 20px 20px 20px 10px;
+ .order-title {
+ margin-top: 10px;
+ margin-bottom: 0;
+ }
+ .order-options {
+ margin: 0 0 20px 20px;
+ }
+ .block.message {
+ margin-bottom: 10px;
+ }
+ .items {
+ .list-reset-styles();
+ .item {
+ border-bottom: @border-width-base solid @border-color-base;
+ margin-bottom: 20px;
+ padding-bottom: 10px;
+ .product {
+ .photo {
+ margin: 10px 0;
+ }
+ }
+ &:last-child {
+ border-bottom: 0;
+ padding-bottom: 0;
+ }
+ }
+ }
+ .number {
+ font-size: @font-size-s;
+ }
+ }
+ }
+}
+
+.responsive(@break) when (@break = @break-point-1) {
+ .opc-wrapper {
+ .gift-message {
+ .options-items .order-options {
+ margin-left: 45px;
+ }
+ .item {
+ border-bottom: @border-width-base solid @border-color-base;
+ margin-bottom: 20px;
+ padding-bottom: 10px;
+ &:extend(.add-clearfix-desktop all);
+ .product {
+ float: left;
+ margin-right: 20px;
+ .photo {
+ margin: 10px 0;
+ }
+ .name {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ max-width: 145px;
+ }
+ }
+ .options {
+ overflow: hidden;
+ }
+ }
+ .price.box > .price {
+ display: block;
+ }
+ }
+ .extra-options-container {
+ .price.box {
+ font-weight: normal;
+ margin-left: 45px;
+ }
+ }
+ }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/module.less
new file mode 100644
index 00000000000..a485e180fe2
--- /dev/null
+++ b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/module.less
@@ -0,0 +1,84 @@
+// /**
+// // * Magento
+// *
+// * NOTICE OF LICENSE
+// *
+// * This source file is subject to the Academic Free License (AFL 3.0)
+// * that is bundled with this package in the file LICENSE_AFL.txt.
+// * It is also available through the world-wide-web at this URL:
+// * http://opensource.org/licenses/afl-3.0.php
+// * If you did not receive a copy of the license and are unable to
+// * obtain it through the world-wide-web, please send an email
+// * to license@magentocommerce.com so we can send you a copy immediately.
+// *
+// * DISCLAIMER
+// *
+// * Do not edit or add to this file if you wish to upgrade Magento to newer
+// * versions in the future. If you wish to customize Magento for your
+// * needs please refer to http://www.magentocommerce.com for more information.
+// *
+// * @category design
+// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+// */
+
+.block.filter {
+ margin-bottom: 40px;
+ .title {
+ margin-bottom: 20px;
+ strong {
+ font-size: 18px;
+ }
+ }
+ .subtitle {
+ display: none;
+ }
+ .options {
+ margin: 0;
+ > dt {
+ .heading(h4);
+ margin: 0 0 10px;
+ }
+ > dd {
+ margin: 0 0 25px;
+
+ .item {
+ margin-bottom: 3px;
+ }
+ }
+ .count {
+ color: @text-color-muted;
+ &:before {
+ content: "(";
+ }
+ &:after {
+ content: ")";
+ }
+ }
+ }
+ .items {
+ &:extend(.reset-list all);
+ }
+ .filtered {
+ .items {
+ margin: 15px 0;
+ }
+ .item {
+ position: relative;
+ padding-left: 22px;
+ margin-bottom: 6px;
+ .label {
+ font-weight: @font-weight-bold;
+ }
+ .action.remove {
+ &:extend(.remove-button-for-blocks all);
+ position: absolute;
+ left: -6px;
+ top: 0;
+ }
+ }
+ & + .actions {
+ margin-bottom: 35px;
+ }
+ }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less
index 800cb376d65..bbc04cd2f03 100644
--- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less
@@ -81,32 +81,32 @@
}
> .title {
- &:extend(.opc.wrapper .step.title all);
+ &:extend(.opc-wrapper .step.title all);
}
.fieldset.gift.message {
- &:extend(.opc.wrapper .fieldset.gift.message all);
+ &:extend(.opc-wrapper .fieldset.gift.message all);
margin: 0;
}
.field.wrapping {
- &:extend(.opc.wrapper .field.wrapping all);
+ &:extend(.opc-wrapper .field.wrapping all);
}
.activate.message {
- &:extend(.opc.wrapper .activate.message all);
+ &:extend(.opc-wrapper .activate.message all);
}
.hidden {
- &:extend(.opc.wrapper .hidden all);
+ &:extend(.opc-wrapper .hidden all);
}
.options.individual {
- &:extend(.opc.wrapper .options.individual all);
+ &:extend(.opc-wrapper .options.individual all);
}
.items.methods {
- &:extend(.opc.wrapper .items.methods all);
+ &:extend(.opc-wrapper .items.methods all);
}
.block.billing {
@@ -120,10 +120,10 @@
.data.table {
.col.subtotal {
- &:extend(.opc.wrapper .data.table .col.subtotal all);
+ &:extend(.opc-wrapper .data.table .col.subtotal all);
}
.amount {
- &:extend(.opc.wrapper .data.table .amount all);
+ &:extend(.opc-wrapper .data.table .amount all);
}
}
@@ -171,13 +171,13 @@
vertical-align: middle;
}
}
- .actions.toolbar {
+ .actions-toolbar {
.primary .action {
margin-right: 10px;
}
}
.column.main & {
- .actions.toolbar {
+ .actions-toolbar {
&:extend(.reset-left-margin-desktop all);
}
.block:not(.widget):not(.widget) .content .box.items {
@@ -198,5 +198,8 @@
.checkout.review .grand.totals {
&:extend(.add-clearfix-desktop all);
}
+ &.success {
+ overflow: hidden;
+ }
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/module.less
index 86cfd26a12f..7d6f02d9ec8 100644
--- a/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/module.less
@@ -81,6 +81,9 @@
.block.newsletter {
width: 32%;
.field {
+ .control {
+ width: 100%;
+ }
margin-right: 5px;
}
.action.subscribe {
diff --git a/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less
index b73c94a93fb..31afa08f51c 100644
--- a/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less
@@ -43,7 +43,7 @@
}
.form.new.agreement {
- .actions.toolbar {
+ .actions-toolbar {
&:extend(.reset-left-margin all);
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/module.less
index 1684472a4f1..8b07a3b0fc1 100644
--- a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/module.less
@@ -100,6 +100,8 @@
a {
margin-right: @indent-xs-base;
}
+ .action.view span {
+ }
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less
index 65e8cb503ed..b6e4b22ad5d 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less
@@ -79,11 +79,12 @@
vertical-align: baseline;
}
}
- .actions.toolbar {
+ .actions-toolbar {
margin: 17px 0;
max-width: 178px;
}
- .column.sidebar & .subtitle {
+ .sidebar-main & .subtitle,
+ .sidebar-additional & .subtitle {
display: none;
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
index e67563b85ad..b238107f16f 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
+++ b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
@@ -35,6 +35,11 @@
<argument name="file" xsi:type="string">mage/dropdowns.js</argument>
</arguments>
</block>
+ <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-terms">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/terms.js</argument>
+ </arguments>
+ </block>
<block class="Magento\Theme\Block\Html\Head\Script" name="js-matchmedia-js">
<arguments>
<argument name="file" xsi:type="string">matchMedia.js</argument>
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less
index f4252512b6c..f4003fdb502 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less
@@ -45,7 +45,7 @@ body {
//
// Header
//--------------------------------------
-.page.header {
+.page-header {
.css(background-color, @header-bg-color);
border-bottom: 1px solid @border-color-base;
margin-bottom: 20px;
@@ -55,10 +55,6 @@ body {
&.content {
padding-top: 10px;
position: relative;
- padding-right: 90px;
- }
- .switcher {
- display: none;
}
}
@@ -76,7 +72,7 @@ body {
}
.page.main {
- > .page.title {
+ > .page-title {
margin-bottom: @indent-xl-base;
.title + .action {
margin-top: @indent-l-base;
@@ -88,20 +84,6 @@ body {
.visually-hidden();
}
-.action.toggle.nav {
- .icon-font(
- @icon-menu,
- @_icon-font-size: 28px
- );
- .icon-text-hide();
- position: absolute;
- top: 12px;
- left: 15px;
- font-size: 0;
- z-index: 14;
- cursor: pointer;
-}
-
//
// Global notice
//--------------------------------------
@@ -124,9 +106,6 @@ body {
.actions {
margin-top: @indent-s-base;
}
- .action.allow {
- .button-primary();
- }
}
&.demo {
.message(@_message-type: global-caution);
@@ -141,17 +120,19 @@ body {
@footer-bg-color: false;
-.footer {
- &.page {
+.page-footer {
margin-top: 25px;
.css(background-color, @footer-bg-color);
}
+
+.footer {
&.content {
padding-top: 25px;
padding-bottom: 25px;
border-top: 1px solid @border-color-base;
ul {
- .list-reset-styles(0, 0 50px 0 0);
+ &:extend(.reset-list all);
+ padding: 0 50px 0 0;
}
.links {
display: inline-block;
@@ -167,9 +148,6 @@ body {
margin: 0 0 30px 0;
}
}
- .copyright {
- .clearer();
- }
.copyright,
.bugs {
display: block;
@@ -177,8 +155,8 @@ body {
}
}
-.page.header,
-.page.footer {
+.page-header,
+.page-footer {
.switcher {
margin-right: 10px;
.options {
@@ -219,7 +197,28 @@ body {
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .page.header {
+ .header {
+ &.panel {
+ > .header.links {
+ float: right;
+ .list-inline();
+ > li {
+ margin: 0 0 0 15px;
+ &.welcome,
+ a {
+ line-height: 1.4;
+ }
+ }
+ margin-left: auto;
+ }
+ }
+ &.content {
+ padding: 30px 20px 0;
+ &:extend(.add-clearfix-desktop all);
+ }
+ }
+
+ .page-header {
border: 0;
margin-bottom: 0;
.panel.wrapper {
@@ -236,7 +235,7 @@ body {
}
.page.main {
- > .page.title {
+ > .page-title {
margin-bottom: @indent-l-base;
.title {
display: inline-block;
@@ -248,42 +247,6 @@ body {
}
}
- .header {
- &.panel {
- > .header.links {
- float: right;
- position: relative;
- left: 0;
- background: none;
- height: auto;
- width: auto;
- -webkit-box-shadow: none;
- box-shadow: none;
- .list-inline();
- > li {
- margin: 0 0 0 15px;
- &.welcome,
- a {
- line-height: 1.4;
- }
- }
- margin-left: auto;
- a {
- .link();
- }
- }
- }
- &.content {
- padding: 30px 20px 0;
- &:extend(.add-clearfix-desktop all);
- }
- .links,
- .switcher,
- .panel {
- display: block;
- }
- }
-
.logo {
margin: -8px auto 25px 0;
img {
@@ -291,13 +254,12 @@ body {
}
}
- .page.wrapper {
+ .page-wrapper {
position: relative;
width: 100%;
float: right;
margin: 0;
.transition(margin .3s ease-out 0);
- left: 0 !important;
}
.footer {
@@ -311,9 +273,9 @@ body {
vertical-align: top;
}
}
- }
- .action.toggle.nav {
- display: none;
+ .copyright {
+ &:extend(.add-clearfix all);
+ }
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less
index 5c6ad54fdb7..de10fd08903 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less
@@ -23,30 +23,60 @@
// */
.form.wishlist.items {
- .actions.toolbar {
+ .actions-toolbar {
&:extend(.reset-left-margin all);
}
}
-.product.info.main {
+.product-info-main,
+.block-bundle-summary {
.action.towishlist {
- &:extend(.action-link-button all);
- .button-s();
+ &:extend(.abstract-action-addto all);
}
}
-.data.table.wishlist {
+.account .table.wrapper .data.table.wishlist {
+ .table-bordered(@_type: horizontal);
+ thead > tr > th {
+ border-bottom: 0;
+ }
+ tbody > tr:last-child > td {
+ border-bottom: 1px solid @table-border-color;
+ }
.product.name {
display: inline-block;
margin-bottom: @indent-s-base;
}
- .box.tocart {
+ .box-tocart {
margin: @indent-s-base 0;
.qty {
vertical-align: middle;
&:extend(.input-qty all);
}
}
+ .col {
+ &.item {
+ width: 50%;
+ }
+ &.photo {
+ max-width: 150px;
+ }
+ &.selector {
+ max-width: 15px;
+ }
+ }
+ textarea {
+ margin: 10px 0;
+ }
+ .input-text.qty {
+ margin-bottom: 10px;
+ }
+ .action.primary {
+ vertical-align: top;
+ }
+ .price {
+ font-weight: @font-weight-bold;
+ }
}
.block.wishlist {
@@ -80,19 +110,19 @@
a.action.tocart {
.link-as-button();
}
- .action.tocart {
- padding: 0 7px;
- }
}
.text {
margin-right: 8px;
}
.counter.qty {
- color: #999999;
+ color: #999;
font-size: 12px;
white-space: nowrap;
}
- .column.sidebar & .subtitle {
- display: none;
+ .sidebar-main &,
+ .sidebar-additional & {
+ .subtitle {
+ display: none;
+ }
}
}
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
index 3630532eb21..64f596f5538 100644
--- a/app/design/frontend/Magento/blank/etc/view.xml
+++ b/app/design/frontend/Magento/blank/etc/view.xml
@@ -175,9 +175,9 @@
<var name="cart_cross_sell_products:height">290</var>
<var name="gift_messages_checkout_thumbnail:type">thumbnail</var>
- <var name="gift_messages_checkout_thumbnail:width">75</var>
+ <var name="gift_messages_checkout_thumbnail:width">100</var>
<var name="gift_messages_checkout_thumbnail:ratio">1</var>
- <var name="gift_messages_checkout_thumbnail:height">75</var>
+ <var name="gift_messages_checkout_thumbnail:height">100</var>
<var name="gift_messages_checkout_small_image:type">small_image</var>
<var name="gift_messages_checkout_small_image:width">75</var>
diff --git a/app/design/frontend/Magento/blank/i18n/de_DE.csv b/app/design/frontend/Magento/blank/i18n/de_DE.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/de_DE.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/en_US.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/i18n/es_ES.csv b/app/design/frontend/Magento/blank/i18n/es_ES.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/es_ES.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/i18n/fr_FR.csv b/app/design/frontend/Magento/blank/i18n/fr_FR.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/fr_FR.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/i18n/nl_NL.csv b/app/design/frontend/Magento/blank/i18n/nl_NL.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/nl_NL.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/i18n/pt_BR.csv b/app/design/frontend/Magento/blank/i18n/pt_BR.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/pt_BR.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/i18n/zh_CN.csv b/app/design/frontend/Magento/blank/i18n/zh_CN.csv
new file mode 100644
index 00000000000..a982e1632ca
--- /dev/null
+++ b/app/design/frontend/Magento/blank/i18n/zh_CN.csv
@@ -0,0 +1 @@
+Summary,Summary
diff --git a/app/design/frontend/Magento/blank/web/css/print.less b/app/design/frontend/Magento/blank/web/css/print.less
index c6b6105e80b..300de673c8d 100644
--- a/app/design/frontend/Magento/blank/web/css/print.less
+++ b/app/design/frontend/Magento/blank/web/css/print.less
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/* Magento/blank */
+// Magento/blank
diff --git a/app/design/frontend/Magento/blank/web/css/source/abstract.less b/app/design/frontend/Magento/blank/web/css/source/abstract.less
index 5c6adcba0e0..3bde20e922e 100644
--- a/app/design/frontend/Magento/blank/web/css/source/abstract.less
+++ b/app/design/frontend/Magento/blank/web/css/source/abstract.less
@@ -124,7 +124,7 @@
// Input quantity
//--------------------------------------
.input-qty {
- .form-element-size(@_width: 50px);
+ .form-element-size(@_width: 47px);
text-align: center;
}
@@ -201,7 +201,7 @@
// Action with icon remove with text for desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .action-remove-desktop {
+ .action-remove-desktop when not (@form-field-type-inline-label-width = false) and not (@form-field-type-inline-label-width = '') {
top: 6px;
margin-left: @form-field-type-inline-label-width + 50%;
}
@@ -225,7 +225,7 @@
&:extend(.action-remove all);
}
}
- .actions.toolbar {
+ .actions-toolbar {
> .secondary {
.action.add {
margin-top: @indent-l-base;
@@ -234,7 +234,7 @@
}
}
.fields {
- .actions.toolbar {
+ .actions-toolbar {
margin: 0;
}
}
@@ -263,7 +263,7 @@
// Margin for forms
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .margin-for-forms-desktop {
+ .margin-for-forms-desktop when not (@form-field-type-inline-label-width = false) and not (@form-field-type-inline-label-width = '') {
margin-left: @form-field-type-inline-label-width;
}
}
@@ -325,7 +325,7 @@
.icon-font(
@_icon-font-content: @icon-down,
@_icon-font-size: 34px,
- @_icon-font-line-height: @icon-font-line-height,
+ @_icon-font-line-height: 1.2,
@_icon-font-position: after,
@_icon-font-display: block
);
@@ -335,3 +335,61 @@
top: 0;
}
}
+
+//
+// Split button
+//--------------------------------------
+
+.abstract-split-button {
+ .dropdown-split(
+ @_options-selector : ~".items",
+ @_dropdown-split-button-border-radius-fix: true
+ );
+ vertical-align: middle;
+}
+
+//
+// Action addto
+//--------------------------------------
+.abstract-action-addto {
+ &:extend(.action-link-button all);
+ .button-s();
+}
+
+//
+// Large button
+//--------------------------------------
+.abstract-button-l {
+ .button-l();
+}
+
+//
+// Button as a link
+//--------------------------------------
+.abstract-action-button-as-link {
+ .button-as-link();
+ border-radius: 0;
+ font-weight: @font-weight-base;
+ font-size: inherit;
+}
+
+//
+// Button revert secondary color
+//--------------------------------------
+.abstract-revert-secondary-color {
+ .button-revert-secondary-color();
+}
+
+//
+// Button revert secondary size
+//--------------------------------------
+.abstract-revert-secondary-size {
+ .button-revert-secondary-size();
+}
+
+//
+// Box-tocart block
+//--------------------------------------
+.abstract-box-tocart {
+ margin: @indent-s-base 0;
+}
diff --git a/app/design/frontend/Magento/blank/web/css/source/actions-toolbar.less b/app/design/frontend/Magento/blank/web/css/source/actions-toolbar.less
index 1ad23a9da12..11bf0c1f149 100644
--- a/app/design/frontend/Magento/blank/web/css/source/actions-toolbar.less
+++ b/app/design/frontend/Magento/blank/web/css/source/actions-toolbar.less
@@ -22,7 +22,7 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
-.actions.toolbar {
+.actions-toolbar {
> .primary,
> .secondary {
text-align: center;
@@ -44,7 +44,7 @@
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .actions.toolbar {
+ .actions-toolbar {
.actions-toolbar();
> .primary,
> .secondary {
@@ -56,8 +56,9 @@
}
}
form {
- .actions.toolbar {
- .column:not(.sidebar) & {
+ .actions-toolbar {
+ .column:not(.sidebar-main) &,
+ .column:not(.sidebar-additional) & {
&:extend(.margin-for-forms-desktop all);
}
}
diff --git a/app/design/frontend/Magento/blank/web/css/source/forms.less b/app/design/frontend/Magento/blank/web/css/source/forms.less
index ffd2fac21c8..1e8a6def1b9 100644
--- a/app/design/frontend/Magento/blank/web/css/source/forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/forms.less
@@ -27,16 +27,17 @@
.legend + div {
clear: both;
}
+ .legend {
+ strong {
+ margin-left: @indent-xs-base;
+ }
+ }
.form-fieldset();
&:last-child {
margin-bottom: 0;
}
- > .field,
- .fields > .field {
+ > .field {
.form-field();
- &:not(:first-child):last-of-type {
- margin-bottom: 0;
- }
&.no-label {
> .label {
.visually-hidden();
@@ -48,7 +49,6 @@
}
}
.label {
- &:extend(.add-box-sizing all);
.column:not(.main) & {
font-weight: normal;
}
@@ -60,6 +60,10 @@
}
}
}
+ fieldset.field {
+ border: 0;
+ padding: 0;
+ }
}
div.mage-error[generated] {
@@ -83,18 +87,12 @@ select:focus ~ .tooltip .tooltip-content { display: block; }
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- .column.main {
- .fieldset {
- > .legend {
- &:extend(.margin-for-forms-desktop all);
- }
- > .field,
- .fields > .field {
- .form-field-type-revert();
- &:not(:first-child):last-of-type {
- margin-bottom: 0;
- }
- }
+ .fieldset {
+ .legend {
+ &:extend(.margin-for-forms-desktop all);
+ }
+ > .field {
+ .form-field-type-revert();
}
}
}
diff --git a/app/design/frontend/Magento/blank/web/css/source/layout.less b/app/design/frontend/Magento/blank/web/css/source/layout.less
index efb644ff4a5..8e64a62adb6 100644
--- a/app/design/frontend/Magento/blank/web/css/source/layout.less
+++ b/app/design/frontend/Magento/blank/web/css/source/layout.less
@@ -22,23 +22,23 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
-@layout-column-left-offset: 2%;
-@layout-column-right-offset: @layout-column-left-offset;
+@layout-column-main-sidebar-offset: 2%;
+@layout-column-additional-sidebar-offset: @layout-column-main-sidebar-offset;
.navigation > ul,
.breadcrumbs,
-.page.header .header.panel,
+.page-header .header.panel,
.header.content,
.footer.content,
.page.main,
-.page.wrapper > .widget,
-.page.wrapper > .page.bottom,
+.page-wrapper > .widget,
+.page-wrapper > .page.bottom,
.block.category.event {
- padding-left: @layout-indent;
- padding-right: @layout-indent;
+ padding-left: @layout-width-xs-indent;
+ padding-right: @layout-width-xs-indent;
}
-.page.wrapper {
+.page-wrapper {
position: relative;
left: 0;
-webkit-transition: all .25s ease-out;
@@ -46,7 +46,7 @@
transition: all .25s ease-out;
}
-.page.wrapper.open{
+.page-wrapper.open{
left: 86%;
-webkit-transition: all .25s ease-on;
-moz-transition: all .25s ease-out;
@@ -55,16 +55,26 @@
.columns {
#layout-columns();
- > .column {
+ .column.main {
&:extend(.add-box-sizing all);
+ .mix-flex-flex(@_basis: 100%);
.css(padding-bottom, @indent-xl-base);
- }
- .column.main {
min-height: 300px;
+ .mix-flex-order(1);
+ }
+ .sidebar-main {
+ &:extend(.add-box-sizing all);
+ .mix-flex-flex(@_basis: 100%);
+ .mix-flex-order(0);
+ }
+ .sidebar-additional {
+ &:extend(.add-box-sizing all);
+ .mix-flex-flex(@_basis: 100%);
+ .mix-flex-order(2);
}
}
-.page.header {
+.page-header {
.panel.wrapper {
position: absolute;
top: 0;
@@ -86,32 +96,56 @@
.responsive(@break) when (@break = @break-point-1) {
.navigation > ul,
.breadcrumbs,
- .page.header .header.panel,
+ .page-header .header.panel,
.header.content,
.footer.content,
.page.main,
- .page.wrapper > .widget,
- .page.wrapper > .page.bottom,
+ .page-wrapper > .widget,
+ .page-wrapper > .page.bottom,
.block.category.event {
- margin: 0 auto;
+ margin-left: auto;
+ margin-right: auto;
width: auto;
max-width: @layout-max-width;
}
+ .columns {
+ display: block;
+ }
+
.column.main {
#layout-columns > .main();
+ &:extend(.add-box-sizing-desktop all);
}
- .column.left {
+ .sidebar-main {
#layout-columns > .left();
- padding-right: @layout-column-left-offset;
+ padding-right: @layout-column-main-sidebar-offset;
+ &:extend(.add-box-sizing-desktop all);
+ }
+
+ .layout-2-right .sidebar-main {
+ padding-right: 0;
+ padding-left: @layout-column-main-sidebar-offset;
}
- .column.right {
+ .sidebar-additional {
#layout-columns > .right();
- padding-left: @layout-column-right-offset;
+ padding-left: @layout-column-additional-sidebar-offset;
+ clear: right;
+ &:extend(.add-box-sizing-desktop all);
}
- .page.header {
+
+ .layout-2-left {
+ .sidebar-additional {
+ padding-right: @layout-column-additional-sidebar-offset;
+ padding-left: 0;
+ clear: left;
+ float: left;
+ }
+ }
+
+ .page-header {
.panel.wrapper {
position: relative;
top: 0;
diff --git a/app/design/frontend/Magento/blank/web/css/source/loaders.less b/app/design/frontend/Magento/blank/web/css/source/loaders.less
index 23cf21d1738..36c63fb9be2 100644
--- a/app/design/frontend/Magento/blank/web/css/source/loaders.less
+++ b/app/design/frontend/Magento/blank/web/css/source/loaders.less
@@ -31,14 +31,14 @@
}
.loading-mask {
- .loading-mask();
- background: none repeat scroll 0 0 rgba(255, 255, 255, 0.5);
- .loader {
- > img {
- .loading-mask();
+ .loading-mask();
+ background: rgba(255, 255, 255, 0.5);
+ .loader {
+ > img {
+ .loading-mask();
+ }
+ > p {
+ display: none;
+ }
}
- > p {
- display: none;
- }
- }
-}
\ No newline at end of file
+}
diff --git a/app/design/frontend/Magento/blank/web/css/source/navigation.less b/app/design/frontend/Magento/blank/web/css/source/navigation.less
index b73ca7b44d2..3bbc7113641 100644
--- a/app/design/frontend/Magento/blank/web/css/source/navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/navigation.less
@@ -22,134 +22,105 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
-html.opened {
+html.open {
overflow: hidden;
}
body {
.css(background-color, @page-bg-color);
- &.opened {
- -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
- position: relative;
- height: 100%;
- width: 100%;
+ &.open {
overflow: hidden;
- .navigation {
- left: 0;
- -webkit-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.5);
- box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.5);
- .transition(left .3s ease-out 0);
- }
- .page.wrapper {
- cursor: pointer;
- float: right;
- margin-right: -86%;
- position: relative;
- width: 100%;
- }
}
}
-.header.links {
- padding: 10px 20px;
+.action.toggle.nav {
+ .icon-font(
+ @icon-menu,
+ @_icon-font-size: 28px
+ );
+ .icon-text-hide();
display: block;
- li {
- display: block;
- margin: 0;
- a {
- display: block;
- line-height: 35px;
- color: #575757;
- &:hover {
- color: #333;
- text-decoration: none;
- }
- }
- &.welcome {
- line-height: 35px;
- }
- }
+ position: absolute;
+ top: 12px;
+ left: 15px;
+ font-size: 0;
+ z-index: 14;
+ cursor: pointer;
}
.navigation {
- .settings.panel {
- > .title {
- cursor: pointer;
- .font-size(@font-size-l);
- font-weight: @font-weight-semibold;
- padding: 10px 20px;
- position: relative;
- &:extend(.navigation-icon all);
- }
- &.active {
- > .title:after {
- content: @icon-prev;
- }
+ .switcher {
+ display: block;
+ margin: 0;
+ padding: 0;
+ &:first-child {
+ padding-bottom: 0;
}
- > .content {
- display: none;
- margin: 0;
- padding: 10px 20px;
+ .label {
+ display: block;
+ font-weight: @font-weight-base;
+ .font-size(16);
+ padding: 8px 20px;
}
- .switcher {
+ .options {
display: block;
- margin: 0;
- padding: 0;
- &:first-child {
- padding-bottom: 0;
- }
- .label {
+ .action.toggle {
+ cursor: pointer;
display: block;
- font-weight: @font-weight-base;
- .font-size(16);
- padding: 8px 0;
- }
- strong {
- font-weight: @font-weight-base;
+ position: relative;
+ padding: 8px 20px;
+ &:extend(.navigation-icon all);
+ &.active:after {
+ content: @icon-prev;
+ }
}
- .options {
- display: block;
- .action.toggle {
- cursor: pointer;
- display: block;
- position: relative;
- padding: 8px 20px;
- &:extend(.navigation-icon all);
- &.active:after {
- content: @icon-prev;
+ ul.dropdown {
+ display: none;
+ li {
+ a {
+ display: block;
+ color: @navigation-level0-item-color;
+ padding: 8px 20px;
+ text-decoration: none;
}
}
+ }
+ .ui-dialog {
+ background: none;
+ box-shadow: none;
ul.dropdown {
- display: none;
- li {
- a {
- display: block;
- color: @navigation-level0-item-color;
- padding: 8px 20px;
- text-decoration: none;
- }
- }
+ padding: 0;
}
- .ui-dialog {
- background: none;
- box-shadow: none;
- ul.dropdown {
- padding: 0;
- }
- }
- &.active {
- ul {
- display: block;
- }
+ }
+ &.active {
+ ul {
+ display: block;
}
}
}
- &.active {
- > .content {
+ }
+ &.active {
+ > .content {
+ display: block;
+ }
+ }
+
+ .header.links {
+ padding: 10px 20px;
+ li {
+ display: block;
+ margin: 0;
+ a {
display: block;
+ line-height: 35px;
+ .css(color, @navigation-level0-item-color);
+ }
+ &.welcome {
+ line-height: 35px;
}
}
}
+
.nav {
.parent {
> a {
@@ -162,6 +133,48 @@ body {
}
}
}
+
+.navigation-tabs {
+ .data-accordion(
+ @_accordion-control-color: #333,
+ @_accordion-control-color-visited: #333,
+ @_accordion-control-color-hover: #333,
+ @_accordion-control-color-active: #333,
+ @_accordion-control-padding-left: 10px,
+ @_accordion-control-padding-right: 20px,
+ @_accordion-control-height: 45px,
+ @_accordion-control-line-height: 45px,
+ @_accordion-control-bg: #fff,
+ @_accordion-content-border: none,
+ @_accordion-control-border-top: none,
+ @_accordion-control-bg-active: #fff,
+ @_accordion-content-padding: 0,
+ @_accordion-content-bg: transparent,
+ @_accordion-control-margin-bottom: 0,
+ @_accordion-content-margin: 0
+ );
+ .item.title {
+ > .switch {
+ .icon-font(
+ @_icon-font-content: @icon-down,
+ @_icon-font-size: 36px
+ );
+ display: block;
+ }
+ &.active {
+ > .switch:before {
+ content: @icon-up
+ }
+ }
+ }
+ .item.content {
+ .css(border-bottom, @tab-content-border);
+ .nav > .level0:first-child {
+ border-top: none;
+ }
+ }
+}
+
.main-navigation();
.main-navigation-desktop();
@@ -169,23 +182,17 @@ body {
// Desktop
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
- html.opened {
+ html.open {
overflow: inherit;
}
body {
- &.opened {
+ &.open {
overflow: inherit;
- .navigation {
- left: auto;
- box-shadow: none;
- }
- .page.wrapper {
- margin: 0;
- cursor: default;
- float: none;
- }
}
}
+ .action.toggle.nav {
+ display: none;
+ }
.navigation {
margin-bottom: 30px;
padding-left: 20px;
@@ -196,5 +203,25 @@ body {
text-transform: uppercase;
}
}
+ .parent.more {
+ .parent {
+ > .submenu {
+ position: relative;
+ margin-top: 0;
+ ul {
+ margin: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+ border: none;
+ box-shadow: none;
+ background: transparent;
+ &:after,
+ &:before {
+ display: none;
+ }
+ }
+ }
+ }
+ }
}
}
diff --git a/app/design/frontend/Magento/blank/web/css/source/pages.less b/app/design/frontend/Magento/blank/web/css/source/pages.less
index 5b88e772e72..783b90d34a3 100644
--- a/app/design/frontend/Magento/blank/web/css/source/pages.less
+++ b/app/design/frontend/Magento/blank/web/css/source/pages.less
@@ -24,4 +24,13 @@
.pages {
.pager();
+ .action {
+ width: 34px;
+ &.previous {
+ margin-right: 12px;
+ }
+ &.next {
+ margin-left: 12px;
+ }
+ }
}
diff --git a/app/design/frontend/Magento/blank/web/css/source/popups.less b/app/design/frontend/Magento/blank/web/css/source/popups.less
index 2b62cfa959d..03d9335b10e 100644
--- a/app/design/frontend/Magento/blank/web/css/source/popups.less
+++ b/app/design/frontend/Magento/blank/web/css/source/popups.less
@@ -21,3 +21,33 @@
// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
+
+// Popup working with dropdown dialog
+.ui-dialog.popup {
+ width: 420px;
+ .action.close {
+ position: @popup-button-close-position;
+ ._popup-button-close-icon(
+ @popup-button-close-icon,
+ @popup-icon-font-content,
+ @popup-icon-font,
+ @popup-icon-font-size,
+ @popup-icon-font-line-height,
+ @popup-icon-font-color,
+ @popup-icon-font-color-hover,
+ @popup-icon-font-color-active,
+ @popup-icon-font-margin,
+ @popup-icon-font-vertical-align,
+ @popup-icon-font-position,
+ @popup-icon-font-text-hide
+ );
+ ._popup-button-close-reset(
+ @popup-button-close-reset
+ );
+ .css(top, @popup-button-close-position-top);
+ .css(right, @popup-button-close-position-right);
+ .css(bottom, @popup-button-close-position-bottom);
+ .css(left, @popup-button-close-position-left);
+ z-index: 1001;
+ }
+}
diff --git a/app/design/frontend/Magento/blank/web/css/source/price.less b/app/design/frontend/Magento/blank/web/css/source/price.less
index daa876ef5bd..4d2b5da5d10 100644
--- a/app/design/frontend/Magento/blank/web/css/source/price.less
+++ b/app/design/frontend/Magento/blank/web/css/source/price.less
@@ -22,6 +22,8 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
+
+// Prices
.price-style-1() {
.price {
&-container {}
diff --git a/app/design/frontend/Magento/blank/web/css/source/sections.less b/app/design/frontend/Magento/blank/web/css/source/sections.less
index 8c66efcacdc..a30483dfbb9 100644
--- a/app/design/frontend/Magento/blank/web/css/source/sections.less
+++ b/app/design/frontend/Magento/blank/web/css/source/sections.less
@@ -18,13 +18,13 @@
// * needs please refer to http://www.magentocommerce.com for more information.
// *
// * @category design
-// * @package magento2_reference
// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
.product.data.items {
.data-accordion();
+ margin-bottom: @indent-base;
}
//
diff --git a/app/design/frontend/Magento/blank/web/css/source/tables.less b/app/design/frontend/Magento/blank/web/css/source/tables.less
index 5535281349a..04a1c24ad5d 100644
--- a/app/design/frontend/Magento/blank/web/css/source/tables.less
+++ b/app/design/frontend/Magento/blank/web/css/source/tables.less
@@ -24,6 +24,7 @@
.wrapper.table {
.table-overflow();
+ position: relative; // to hide unnecessary horizontal scrollbar in Safari
> table {
.table-caption(@_table-caption-hide: true);
}
@@ -35,6 +36,8 @@
//--------------------------------------
.responsive(@break) when (@break = @break-point-1) {
.wrapper.table {
+ overflow-y: visible;
+ overflow-x: visible;
> table {
> thead,
> tbody,
diff --git a/app/design/frontend/Magento/blank/web/css/source/typography.less b/app/design/frontend/Magento/blank/web/css/source/typography.less
index 860d6350d28..bd6a35d8c19 100644
--- a/app/design/frontend/Magento/blank/web/css/source/typography.less
+++ b/app/design/frontend/Magento/blank/web/css/source/typography.less
@@ -61,3 +61,7 @@
font-size: @h1-font-size-desktop;
}
}
+
+.items {
+ .list-reset-styles();
+}
diff --git a/app/design/frontend/Magento/blank/web/css/styles.less b/app/design/frontend/Magento/blank/web/css/styles.less
index 2c559daeaf3..5c19da97417 100644
--- a/app/design/frontend/Magento/blank/web/css/styles.less
+++ b/app/design/frontend/Magento/blank/web/css/styles.less
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/* Magento/blank */
+// Magento/blank
.magento-reset(); // Reset default styles with magento_reset
diff --git a/app/design/frontend/Magento/blank/web/js/navigation-menu.js b/app/design/frontend/Magento/blank/web/js/navigation-menu.js
index 29c55a1cd70..77bd5a7945e 100644
--- a/app/design/frontend/Magento/blank/web/js/navigation-menu.js
+++ b/app/design/frontend/Magento/blank/web/js/navigation-menu.js
@@ -304,9 +304,9 @@
$.widget('mage.navigationMenu', $.mage.navigationMenu, {
options: {
responsive: false,
- origNavPlaceholder: '.page.header',
+ origNavPlaceholder: '.page-header',
mainContainer: 'body',
- pageWrapper: '.page.wrapper',
+ pageWrapper: '.page-wrapper',
openedMenuClass: 'opened',
toggleActionPlaceholder: '.block.search',
itemWithSubmenu: 'li.parent',
@@ -321,6 +321,19 @@
'<li class="action all">' +
'<a href="${ categoryURL }"><span>All ${ category }</span></a>' +
'</li>' +
+ '</script>',
+ navigationSectionsWrapperTemplate:
+ '<script type="text/x-jquery-tmpl">' +
+ '<dl class="navigation-tabs" data-sections="tabs">' +
+ '</dl>' +
+ '</script>',
+ navigationItemWrapperTemplate:
+ '<script type="text/x-jquery-tmpl">' +
+ '<dt class="item title {{if active}}active{{/if}}" data-section="title">' +
+ '<a class="switch" data-toggle="switch" href="#TODO">${ title }</a>' +
+ '</dt>' +
+ '<dd class="item content {{if active}}active{{/if}}" data-section="content">' +
+ '</dd>' +
'</script>'
},
@@ -434,6 +447,7 @@
this.mainContainer.prepend(this.mobileNav);
this.mobileNav.find('> ul').addClass('nav');
this._insertExtraItems();
+ this._wrapItemsInSections();
this.mobileNav.scroll($.proxy(
function() {
this._fixedBackLink();
@@ -462,42 +476,66 @@
_insertExtraItems: function() {
if ($('.header.panel .switcher').length) {
- var settings = $('.header.panel')
+ var settings = $('.header.panel .switcher')
.clone()
.addClass('settings');
this.mobileNav.prepend(settings);
+ }
- settings.wrapInner('<div class="content"></div>');
- settings.prepend('<div class="title">Settings</div>');
-
- settings.find('> .title')
- .dropdown({
- autoclose: false,
- menu: '> .content'
- });
-
- settings.find('.switcher.language .options > strong')
- .dropdown({
- autoclose: false,
- menu: '.switcher.language .options > ul'
- });
+ if ($('.footer .switcher').length) {
+ var footerSettings = $('.footer .switcher')
+ .clone()
+ .addClass('settings');
- settings.find('.switcher.currency .options > strong')
- .dropdown({
- autoclose: false,
- menu: '.switcher.currency .options > ul'
- });
+ this.mobileNav.prepend(footerSettings);
}
- if ($('.header.links li').length) {
- var account = $('.page.header .header.links')
+
+ if ($('.header.panel .header.links li').length) {
+ var account = $('.header.panel > .header.links')
.clone()
.addClass('account');
this.mobileNav.prepend(account);
+ }
+ },
+
+ _wrapItemsInSections: function() {
+ var account = $('> .account', this.mobileNav),
+ settings = $('> .settings', this.mobileNav),
+ nav = $('> .nav', this.mobileNav),
+ navigationSectionsWrapper = $(this.options.navigationSectionsWrapperTemplate).tmpl(),
+ navigationItemWrapper;
+
+ this.mobileNav.append(navigationSectionsWrapper);
+
+ if (nav.length) {
+ navigationItemWrapper = $(this.options.navigationItemWrapperTemplate).tmpl({
+ title: 'Menu'
+ });
+ navigationSectionsWrapper.append(navigationItemWrapper);
+ navigationItemWrapper.eq(1).append(nav);
+ }
+
+ if (account.length) {
+ navigationItemWrapper = $(this.options.navigationItemWrapperTemplate).tmpl({
+ title: 'Account'
+ });
+ navigationSectionsWrapper.append(navigationItemWrapper);
+ navigationItemWrapper.eq(1).append(account);
+ }
+ if (settings.length) {
+ navigationItemWrapper = $(this.options.navigationItemWrapperTemplate).tmpl({
+ title: 'Settings'
+ });
+ navigationSectionsWrapper.append(navigationItemWrapper);
+ navigationItemWrapper.eq(1).append(settings);
}
+
+ navigationSectionsWrapper.addClass("navigation-tabs-" + navigationSectionsWrapper.find('[data-section="title"]').length);
+ navigationSectionsWrapper.terms();
},
_fixedBackLink: function() {
diff --git a/app/design/frontend/Magento/blank/web/js/responsive.js b/app/design/frontend/Magento/blank/web/js/responsive.js
index b432e624f44..fb7c54441ca 100644
--- a/app/design/frontend/Magento/blank/web/js/responsive.js
+++ b/app/design/frontend/Magento/blank/web/js/responsive.js
@@ -30,12 +30,9 @@
media: '(min-width: 768px)',
// Switch to Desktop Version
entry: function() {
- // minicart
- $('.action.showcart').removeClass('is-disabled');
-
(function() {
- var productInfoMain = $('.product.info.main'),
+ var productInfoMain = $('.product-info-main'),
productInfoAdditional = $("#product-info-additional");
if(productInfoAdditional.length) {
@@ -61,15 +58,6 @@
},
// Switch to Mobile Version
exit: function() {
- // minicart
- $('.action.showcart').addClass('is-disabled');
-
- $('.action.showcart').on( "click", function() {
- if ($(this).hasClass('is-disabled')) {
- window.location = $(this).attr("href");
- }
- });
-
$('.action.toggle.checkout.progress')
.on('click.gotoCheckoutProgress', function(e){
var myWrapper = '#checkout-progress-wrapper';
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
index da34098763d..d7ca70dccca 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
@@ -92,7 +92,14 @@ class MultiselectgrouplistElement extends MultiselectElement
*
* @var string
*/
- protected $optionByNumber = './/optgroup[%d]/option[%d]';
+ protected $childOptionByNumber = './/optgroup[%d]/option[%d]';
+
+ /**
+ * Locator for search parent option
+ *
+ * @var string
+ */
+ protected $optionByNumber = './option[%d]';
/**
* Indent, four symbols non breaking space
@@ -271,19 +278,27 @@ class MultiselectgrouplistElement extends MultiselectElement
{
$options = [];
+ $countOption = 1;
+ $option = $this->find(sprintf($this->optionByNumber, $countOption), Locator::SELECTOR_XPATH);
+ while ($option->isVisible()) {
+ $options[] = $option;
+ ++$countOption;
+ $option = $this->find(sprintf($this->optionByNumber, $countOption), Locator::SELECTOR_XPATH);
+ }
+
$countOptgroup = 1;
$optgroup = $this->find(sprintf($this->optgroupByNumber, $countOptgroup), Locator::SELECTOR_XPATH);
while ($optgroup->isVisible()) {
$countOption = 1;
$option = $this->find(
- sprintf($this->optionByNumber, $countOptgroup, $countOption),
+ sprintf($this->childOptionByNumber, $countOptgroup, $countOption),
Locator::SELECTOR_XPATH
);
while ($option->isVisible()) {
$options[] = $option;
++$countOption;
$option = $this->find(
- sprintf($this->optionByNumber, $countOptgroup, $countOption),
+ sprintf($this->childOptionByNumber, $countOptgroup, $countOption),
Locator::SELECTOR_XPATH
);
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
new file mode 100644
index 00000000000..aca42a1d95f
--- /dev/null
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Mtf\Client\Driver\Selenium\Element;
+
+use Mtf\Client\Element\Locator;
+use Mtf\Client\Driver\Selenium\Element;
+
+/**
+ * Class SuggestElement
+ * General class for suggest elements.
+ */
+class SuggestElement extends Element
+{
+ /**
+ * Selector suggest input
+ *
+ * @var string
+ */
+ protected $suggest = '.mage-suggest-inner > .search';
+
+ /**
+ * Selector search result
+ *
+ * @var string
+ */
+ protected $searchResult = '.mage-suggest-dropdown > ul';
+
+ /**
+ * Selector item of search result
+ *
+ * @var string
+ */
+ protected $resultItem = './/*[contains(@class,"mage-suggest-dropdown")]/ul/li/a[text()="%s"]';
+
+ /**
+ * Set value
+ *
+ * @param string $value
+ * @return void
+ */
+ public function setValue($value)
+ {
+ $this->find($this->suggest)->setValue($value);
+ $this->waitResult();
+ $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->click();
+ }
+
+ /**
+ * Wait for search result is visible
+ *
+ * @return void
+ */
+ public function waitResult()
+ {
+ $browser = $this;
+ $selector = $this->searchResult;
+ $browser->waitUntil(
+ function () use ($browser, $selector) {
+ return $browser->find($selector)->isVisible() ? true : null;
+ }
+ );
+ }
+
+ /**
+ * Get value
+ *
+ * @return string
+ */
+ public function getValue()
+ {
+ return $this->find($this->suggest)->getValue();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
new file mode 100644
index 00000000000..eae53e60d1a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @spi
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\Test\Block;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Class Menu
+ * Class top menu navigation block
+ */
+class Menu extends Block
+{
+ /**
+ * Top Elements of menu
+ *
+ * @var string
+ */
+ protected $navigationMenuItems = "/li";
+
+ /**
+ * Check menu items count
+ *
+ * @param int $number
+ * @return bool
+ */
+ public function assertNavigationMenuItemsCount($number)
+ {
+ $selector = $this->navigationMenuItems . '[' . ($number + 1) . ']';
+ return !$this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
+ }
+
+ /**
+ * Returns array of parent menu items present on dashboard menu
+ *
+ * @return array
+ */
+ public function getTopMenuItems()
+ {
+ $navigationMenu = $this->_rootElement;
+ $menuItems = [];
+ $counter = 1;
+ $textSelector = 'a span';
+ while ($navigationMenu->find('li.parent.level-0:nth-of-type(' . $counter . ')')->isVisible()) {
+ $menuItems[] = strtolower(
+ $navigationMenu->find('li.parent.level-0:nth-of-type(' . $counter . ')')
+ ->find($textSelector)
+ ->getText()
+ );
+ $counter++;
+ }
+ return $menuItems;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
index 2c04739f4b3..fa0096e185d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
@@ -118,15 +118,8 @@ abstract class Conditions extends Curl
*/
protected function prepareCondition($conditions)
{
- $conditions = $this->decodeValue($conditions);
- $defaultCondition = [
- 1 => [
- 'type' => 'Magento\SalesRule\Model\Rule\Condition\Combine',
- 'aggregator' => 'all',
- 'value' => '1'
- ]
- ];
- return $defaultCondition + $this->convertMultipleCondition($conditions);
+ $conditions = $this->decodeValue("{Conditions combination:[{$conditions}]}");
+ return $this->convertMultipleCondition($conditions);
}
/**
@@ -140,7 +133,7 @@ abstract class Conditions extends Curl
private function convertConditionsCombination($combination, $conditions, $nesting)
{
$combination = [$nesting => $this->convertSingleCondition($combination)];
- $conditions = $this->convertMultipleCondition($conditions, $nesting);
+ $conditions = $this->convertMultipleCondition($conditions, $nesting, 1);
return $combination + $conditions;
}
@@ -152,15 +145,16 @@ abstract class Conditions extends Curl
* @param int $count
* @return array
*/
- private function convertMultipleCondition(array $conditions, $nesting = 1, $count = 1)
+ private function convertMultipleCondition(array $conditions, $nesting = 1, $count = 0)
{
$result = [];
foreach ($conditions as $key => $condition) {
+ $curNesting = $nesting . ($count ? ('--' . $count) : '');
+
if (!is_numeric($key)) {
- $nesting = $nesting . '--' . $count;
- $result += $this->convertConditionsCombination($key, $condition, $nesting);
+ $result += $this->convertConditionsCombination($key, $condition, $curNesting);
} elseif (is_string($condition)) {
- $result[$nesting . '--' . $count] = $this->convertSingleCondition($condition);
+ $result[$curNesting] = $this->convertSingleCondition($condition);
} else {
$result += $this->convertMultipleCondition($condition, $nesting, $count);
}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
index e1a07a4a27c..1323c48d39f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
@@ -51,7 +51,7 @@ class AdminAuthLogin extends Page
*
* @var string
*/
- protected $headerBlock = '.page-header';
+ protected $headerBlock = '.page-header .admin-user';
/**
* Global messages block
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Dashboard.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Dashboard.php
index 98a6d5e8481..82c4ff5f278 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Dashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Dashboard.php
@@ -54,6 +54,13 @@ class Dashboard extends Page
*/
protected $titleBlock = '.page-title';
+ /**
+ * Top menu selector
+ *
+ * @var string
+ */
+ protected $menuBlock = '.navigation';
+
/**
* Constructor
*/
@@ -85,4 +92,16 @@ class Dashboard extends Page
$this->_browser->find($this->titleBlock, Locator::SELECTOR_CSS)
);
}
+
+ /**
+ * Get Menu block
+ *
+ * @return \Magento\Backend\Test\Block\Menu
+ */
+ public function getMenuBlock()
+ {
+ return Factory::getBlockFactory()->getMagentoBackendMenu(
+ $this->_browser->find($this->menuBlock, Locator::SELECTOR_CSS)
+ );
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
index 8f995fdd802..536093cdb38 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
@@ -53,9 +53,9 @@ class Bundle extends Product
{
parent::__construct($configuration, $placeholders);
- $this->_placeholders['item1_simple1::getProductName'] = array($this, 'productProvider');
+ $this->_placeholders['item1_simple1::getName'] = array($this, 'productProvider');
$this->_placeholders['item1_simple1::getProductId'] = array($this, 'productProvider');
- $this->_placeholders['item1_virtual2::getProductName'] = array($this, 'productProvider');
+ $this->_placeholders['item1_virtual2::getName'] = array($this, 'productProvider');
$this->_placeholders['item1_virtual2::getProductId'] = array($this, 'productProvider');
}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle/Selections.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle/Selections.php
index bbd9539f78a..0bb0afe523e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle/Selections.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle/Selections.php
@@ -178,7 +178,7 @@ class Selections implements FixtureInterface
'assigned_products' => [
0 => [
'search_data' => [
- 'name' => '%item1::getProductName%',
+ 'name' => '%item1::getName%',
],
'data' => [
'selection_qty' => [
@@ -191,7 +191,7 @@ class Selections implements FixtureInterface
],
1 => [
'search_data' => [
- 'name' => '%item2::getProductName%',
+ 'name' => '%item2::getName%',
],
'data' => [
'selection_qty' => [
@@ -224,7 +224,7 @@ class Selections implements FixtureInterface
'assigned_products' => [
0 => [
'search_data' => [
- 'name' => '%item1::getProductName%',
+ 'name' => '%item1::getName%',
],
'data' => [
'selection_qty' => [
@@ -240,7 +240,7 @@ class Selections implements FixtureInterface
],
1 => [
'search_data' => [
- 'name' => '%item2::getProductName%',
+ 'name' => '%item2::getName%',
],
'data' => [
'selection_qty' => [
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
index 820836a4392..8d6d0772a47 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
@@ -98,7 +98,7 @@ class BundleDynamic extends Bundle
'assigned_products' => array(
'assigned_product_0' => array(
'search_data' => array(
- 'name' => '%item1_simple1::getProductName%',
+ 'name' => '%item1_simple1::getName%',
),
'data' => array(
'selection_qty' => array(
@@ -111,7 +111,7 @@ class BundleDynamic extends Bundle
),
'assigned_product_1' => array(
'search_data' => array(
- 'name' => '%item1_virtual2::getProductName%',
+ 'name' => '%item1_virtual2::getName%',
),
'data' => array(
'selection_qty' => array(
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
index 77172bed75d..41f9c2001a7 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
@@ -114,7 +114,7 @@ class BundleFixed extends Bundle
'assigned_products' => array(
'assigned_product_0' => array(
'search_data' => array(
- 'name' => '%item1_simple1::getProductName%',
+ 'name' => '%item1_simple1::getName%',
),
'data' => array(
'selection_price_value' => array(
@@ -135,7 +135,7 @@ class BundleFixed extends Bundle
),
'assigned_product_1' => array(
'search_data' => array(
- 'name' => '%item1_virtual2::getProductName%',
+ 'name' => '%item1_virtual2::getName%',
),
'data' => array(
'selection_price_value' => array(
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
index 771e737c60d..54c801aa0cb 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
@@ -107,11 +107,11 @@ class BundleDynamicTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $this->assertSame($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertSame($product->getName(), $productViewBlock->getProductName());
$this->assertEquals($product->getProductPrice(), $productViewBlock->getProductPrice());
// @TODO: add click on "Customize and Add To Cart" button and assert options count
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
index efa6cc081d9..bdb76ea8d8a 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
@@ -107,11 +107,11 @@ class BundleFixedTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $this->assertSame($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertSame($product->getName(), $productViewBlock->getProductName());
$this->assertEquals($product->getProductPrice(), $productViewBlock->getProductPrice());
// @TODO: add click on "Customize and Add To Cart" button and assert options count
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
index 25961f99bd2..5626dee51a5 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
@@ -135,11 +135,11 @@ class EditBundleTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($categoryName);
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $this->assertSame($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertSame($product->getName(), $productViewBlock->getProductName());
$this->assertEquals($product->getProductPrice(), $productViewBlock->getProductPrice());
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 945ded51fd1..c2d27a7285d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -25,14 +25,16 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
use Mtf\Block\Block;
use Mtf\Factory\Factory;
use Mtf\Client\Element\Locator;
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Fixture\InjectableFixture;
/**
* Class Tree
* Categories tree block
- *
*/
class Tree extends Block
{
@@ -78,6 +80,8 @@ class Tree extends Block
/**
* Press 'Add Subcategory' button
+ *
+ * @return void
*/
public function addSubcategory()
{
@@ -88,17 +92,88 @@ class Tree extends Block
/**
* Select Default category
*
- * @param string $path
+ * @param FixtureInterface $category
+ * @return void
*/
- public function selectCategory($path)
+ public function selectCategory(FixtureInterface $category)
{
+ if ($category instanceof InjectableFixture) {
+ $parentPath = $this->prepareFullCategoryPath($category);
+ $path = implode('/', $parentPath);
+ } else {
+ $path = $category->getCategoryPath();
+ }
+
$this->expandAllCategories();
$this->_rootElement->find($this->treeElement, Locator::SELECTOR_CSS, 'tree')->setValue($path);
$this->getTemplateBlock()->waitLoader();
}
+ /**
+ * Prepare category path
+ *
+ * @param CatalogCategory $category
+ * @return array
+ */
+ protected function prepareFullCategoryPath(CatalogCategory $category)
+ {
+ $path = [];
+ if ($category->getDataFieldConfig('parent_id')['source']->getParentCategory() != null) {
+ $path = $this->prepareFullCategoryPath(
+ $category->getDataFieldConfig('parent_id')['source']->getParentCategory()
+ );
+ }
+ return array_filter(array_merge($path, [$category->getPath(), $category->getName()]));
+ }
+
+ /**
+ * Find category name in array
+ *
+ * @param array $structure
+ * @param array $category
+ * @return bool
+ */
+ protected function inTree(array $structure, array &$category)
+ {
+ $element = array_shift($category);
+ foreach ($structure as $item) {
+ $result = strpos($item['name'], $element);
+ if ($result !== false && !empty($item['subnodes'])) {
+ return $this->inTree($item['subnodes'], $category);
+ } elseif ($result !== false && empty($category)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Check category in category tree
+ *
+ * @param $category
+ * @return bool
+ */
+ public function isCategoryVisible($category)
+ {
+ $categoryPath = $this->prepareFullCategoryPath($category);
+ $structure = $this->_rootElement->find($this->treeElement, Locator::SELECTOR_CSS, 'tree')->getStructure();
+ $result = false;
+ $element = array_shift($categoryPath);
+ foreach ($structure as $item) {
+ $searchResult = strpos($item['name'], $element);
+ if ($searchResult !== false && !empty($item['subnodes'])) {
+ $result = $this->inTree($item['subnodes'], $categoryPath);
+ } elseif ($searchResult !== false && empty($categoryPath)) {
+ $result = true;
+ }
+ }
+ return $result;
+ }
+
/**
* Expand all categories tree
+ *
+ * @return void
*/
protected function expandAllCategories()
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/AffectedAttributeSetForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/AffectedAttributeSetForm.php
index 1ada4332728..97788285960 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/AffectedAttributeSetForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/AffectedAttributeSetForm.php
@@ -35,13 +35,19 @@ use Magento\Backend\Test\Block\Widget\Form as ParentForm;
*/
class AffectedAttributeSetForm extends ParentForm
{
+ /**
+ * 'Confirm' button container locator
+ *
+ * @var string
+ */
+ protected $confirmButtonContainer = '//parent::div[div[@id="affected-attribute-set-form"]]';
+
/**
* 'Confirm' button locator
*
* @var string
*/
- protected $confirmButton =
- '//parent::div[div[@id="affected-attribute-set-form"]]//button[contains(@id,"confirm-button")]';
+ protected $confirmButton = '//button[contains(@id,"confirm-button")]';
/**
* Locator buttons new name attribute set
@@ -76,8 +82,16 @@ class AffectedAttributeSetForm extends ParentForm
*/
public function confirm()
{
- if ($this->_rootElement->find($this->confirmButton, Locator::SELECTOR_XPATH)->isVisible()) {
- $this->_rootElement->find($this->confirmButton, Locator::SELECTOR_XPATH)->click();
+ $isVisible = $this->_rootElement->find(
+ $this->confirmButtonContainer . $this->confirmButton,
+ Locator::SELECTOR_XPATH
+ )->isVisible();
+
+ if ($isVisible) {
+ $this->_rootElement->find(
+ $this->confirmButtonContainer . $this->confirmButton,
+ Locator::SELECTOR_XPATH
+ )->click();
}
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.xml
index 7aa0f91f53f..b7634dec080 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.xml
@@ -44,18 +44,6 @@
<class>\Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options</class>
<selector>#product_attribute_tabs_main</selector>
<strategy>css selector</strategy>
- <fields>
- <is_default>
- <selector>[name="default[]"]</selector>
- <input>checkbox</input>
- </is_default>
- <admin>
- <selector>[name="option[value][option_0][0]"]</selector>
- </admin>
- <view>
- <selector>[name="option[value][option_0][1]"]</selector>
- </view>
- </fields>
</manage-options>
<advanced-properties>
<class>\Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced</class>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index b2b2b1d91d1..a1791fd2c4a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -53,7 +53,7 @@ class Options extends Tab
$this->_rootElement->find($this->addOption)->click();
$this->blockFactory->create(
'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option',
- ['element' => $this->_rootElement->find('.ui-sortable tr:nth-child(1)')]
+ ['element' => $this->_rootElement->find('.ui-sortable tr:last-child')]
)->fillOptions($field);
}
return $this;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.xml
index dee0b7f0941..296a6f5ca6e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.xml
@@ -30,10 +30,10 @@
<input>checkbox</input>
</is_default>
<admin>
- <selector>[name="option[value][option_0][0]"]</selector>
+ <selector>[name$="[0]"]</selector>
</admin>
<view>
- <selector>[name="option[value][option_0][1]"]</selector>
+ <selector>[name$="[1]"]</selector>
</view>
</fields>
</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Grid.php
index ce938b54e42..588eee966f4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Grid.php
@@ -49,9 +49,36 @@ class Grid extends AbstractGrid
'attribute_code' => [
'selector' => 'input[name="attribute_code"]'
],
+ 'frontend_label' => [
+ 'selector' => 'input[name="frontend_label"]'
+ ],
+ 'is_required' => [
+ 'selector' => 'select[name="is_required"]',
+ 'input' => 'select'
+ ],
'is_user_defined' => [
'selector' => 'select[name="is_user_defined"]',
'input' => 'select'
],
+ 'is_visible' => [
+ 'selector' => 'select[name="is_visible"]',
+ 'input' => 'select'
+ ],
+ 'is_global' => [
+ 'selector' => 'select[name="is_global"]',
+ 'input' => 'select'
+ ],
+ 'is_searchable' => [
+ 'selector' => 'select[name="is_searchable"]',
+ 'input' => 'select'
+ ],
+ 'is_filterable' => [
+ 'selector' => 'select[name="is_filterable"]',
+ 'input' => 'select'
+ ],
+ 'is_comparable' => [
+ 'selector' => 'select[name="is_comparable"]',
+ 'input' => 'select'
+ ],
];
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/FormPageActions.php
new file mode 100644
index 00000000000..a6a178968c4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/FormPageActions.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
+
+use Magento\Backend\Test\Block\FormPageActions as AbstractFormPageActions;
+
+/**
+ * Class Form
+ * Catalog Product Attribute form
+ */
+class FormPageActions extends AbstractFormPageActions
+{
+ /**
+ * "Save" button
+ *
+ * @var string
+ */
+ protected $saveButton = '.save-attribute-set';
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Grid.php
new file mode 100644
index 00000000000..5f84d112f9d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Grid.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
+
+use Mtf\Client\Element;
+use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
+
+/**
+ * Class Grid
+ * Attribute Set grid
+ */
+class Grid extends AbstractGrid
+{
+ /**
+ * Locator value for link in action column
+ *
+ * @var string
+ */
+ protected $editLink = 'td[data-column="set_name"]';
+
+ /**
+ * Filters array mapping
+ *
+ * @var array
+ */
+ protected $filters = [
+ 'set_name' => [
+ 'selector' => 'input[name="set_name"]'
+ ],
+ ];
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/GridPageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/GridPageActions.php
new file mode 100644
index 00000000000..1b48a44f762
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/GridPageActions.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
+
+use Magento\Backend\Test\Block\GridPageActions as AbstractGridPageActions;
+
+/**
+ * Class GridPageActions
+ * Grid page actions block on Product Templates page
+ */
+class GridPageActions extends AbstractGridPageActions
+{
+ /**
+ * "Add New" button
+ *
+ * @var string
+ */
+ protected $addNewButton = '[data-ui-id="page-actions-toolbar-addbutton"]';
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
new file mode 100644
index 00000000000..627f5469f01
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Class Main
+ * Attribute Set Main block
+ */
+class Main extends Block
+{
+ /**
+ * Attribute Groups
+ *
+ * @var string
+ */
+ protected $groups = './/*[contains(@class,"x-tree-root-node")]//li[@class="x-tree-node"]/div/a/span[text()="%s"]';
+
+ /**
+ * Attribute that will be added to the group
+ *
+ * @var string
+ */
+ protected $attribute = './/*[contains(@class,"x-tree-root-node")]//div/a/span[text()="%s"]';
+
+ /**
+ * Move Attribute to Attribute Group
+ *
+ * @param array $attributeData
+ * @param string $attributeGroup
+ * @return void
+ */
+ public function moveAttribute($attributeData, $attributeGroup)
+ {
+ if (isset($attributeData['attribute_code'])) {
+ $attribute = $attributeData['attribute_code'];
+ } else {
+ $attribute = strtolower($attributeData['frontend_label']);
+ }
+
+ $attributeGroupLocator = sprintf($this->groups, $attributeGroup);
+ $target = $this->_rootElement->find($attributeGroupLocator, Locator::SELECTOR_XPATH);
+
+ $attributeLabelLocator = sprintf($this->attribute, $attribute);
+ $this->_rootElement->find($attributeLabelLocator, Locator::SELECTOR_XPATH)->dragAndDrop($target);
+ }
+
+ /**
+ * Get AttributeSet name from product_set edit page
+ *
+ * @return string
+ */
+ public function getAttributeSetName()
+ {
+ return $this->_rootElement->find("#attribute_set_name", Locator::SELECTOR_CSS)->getValue();
+ }
+
+ /**
+ * Checks present Product Attribute on product_set Groups
+ *
+ * @param $attributeLabel
+ * @return bool
+ */
+ public function checkProductAttribute($attributeLabel)
+ {
+ $attributeLabelLocator = sprintf(
+ ".//*[contains(@class,'x-tree-root-node')]//li[@class='x-tree-node']/div/a/span[text()='%s']",
+ $attributeLabel
+ );
+
+ return $this->_rootElement->find($attributeLabelLocator, Locator::SELECTOR_XPATH)->isVisible();
+ }
+}
diff --git a/app/code/Magento/GiftMessage/Helper/Data.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
similarity index 82%
rename from app/code/Magento/GiftMessage/Helper/Data.php
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
index 43e62e03f59..39533cf0a92 100644
--- a/app/code/Magento/GiftMessage/Helper/Data.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
@@ -22,11 +22,15 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main;
+
+use Mtf\Block\Form as AbstractForm;
+
/**
- * GiftMessage data helper
+ * Class Form
+ * Attribute Set form
*/
-namespace Magento\GiftMessage\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+class AttributeSetForm extends AbstractForm
{
+ //
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.xml
new file mode 100644
index 00000000000..50893cddcc5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<mapping strict="0">
+ <fields>
+ <attribute_set_name />
+ <skeleton_set>
+ <input>select</input>
+ </skeleton_set>
+ </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/CustomOptionsTab/OptionField.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/CustomOptionsTab/OptionField.php
index 702715d0ba8..a23bb8728c6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/CustomOptionsTab/OptionField.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/CustomOptionsTab/OptionField.php
@@ -28,7 +28,8 @@ use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Options;
/**
* Class OptionField
- * Form "Text field" on tab product "Custom options"
+ *
+ * @package Magento\Catalog\Test\Block\Adminhtml\Product\Edit\CustomOptionsTab
*/
class OptionField extends Options
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
new file mode 100644
index 00000000000..1adb87f8cc4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes;
+
+use Mtf\Client\Element;
+use Mtf\Client\Driver\Selenium\Element\SuggestElement;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+
+/**
+ * Class FormAttributeSearch
+ * Form Attribute Search on Product page
+ */
+class Search extends SuggestElement
+{
+ /**
+ * Attribute Set locator
+ *
+ * @var string
+ */
+ protected $value = '.action-toggle > span';
+
+ /**
+ * Attribute Set button
+ *
+ * @var string
+ */
+ protected $actionToggle = '.action-toggle';
+
+ /**
+ * Search attribute result locator
+ *
+ * @var string
+ */
+ protected $searchResult = '.mage-suggest-dropdown .ui-corner-all';
+
+ /**
+ * Set value
+ *
+ * @param string $value
+ * @return void
+ */
+ public function setValue($value)
+ {
+ $this->find($this->actionToggle)->click();
+ parent::setValue($value);
+ }
+
+ /**
+ * Get value
+ *
+ * @return string
+ */
+ public function getValue()
+ {
+ return $this->find($this->value)->getText();
+ }
+
+ /**
+ * Checking not exist attribute in search result
+ *
+ * @param CatalogProductAttribute $productAttribute
+ * @return bool
+ */
+ public function isExistAttributeInSearchResult($productAttribute)
+ {
+ $this->find($this->actionToggle)->click();
+ $this->find($this->suggest)->setValue($productAttribute->getFrontendLabel());
+ $this->waitResult();
+ if ($this->find($this->searchResult)->getText() == $productAttribute->getFrontendLabel()) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/app/code/Magento/Webapi/ServiceException.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
similarity index 54%
rename from app/code/Magento/Webapi/ServiceException.php
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
index bc955d7f201..c75209a30aa 100644
--- a/app/code/Magento/Webapi/ServiceException.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
@@ -1,7 +1,5 @@
<?php
/**
- * Generic exception for usage in services implementation
- *
* Magento
*
* NOTICE OF LICENSE
@@ -23,53 +21,53 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Webapi;
-class ServiceException extends \Magento\Framework\Model\Exception
-{
- /** @var array */
- protected $_parameters;
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
+
+use Mtf\Client\Element;
+use Mtf\Client\Driver\Selenium\Element\SuggestElement;
+/**
+ * Class AttributeSet
+ * Set and Get Attribute Set on the Product form
+ */
+class AttributeSet extends SuggestElement
+{
/**
- * Exception name.
+ * Attribute Set locator
*
* @var string
*/
- protected $_name;
+ protected $value = '.action-toggle > span';
/**
- * {@inheritdoc}
- * @param array $parameters - Array of optional exception parameters.
+ * Attribute Set button
+ *
+ * @var string
*/
- public function __construct(
- $message = "",
- $code = 0,
- \Exception $previous = null,
- array $parameters = array(),
- $name = ''
- ) {
- parent::__construct($message, $code, $previous);
- $this->_parameters = $parameters;
- $this->_name = $name;
- }
+ protected $actionToggle = '.action-toggle';
/**
- * Return the optional list of parameters.
+ * Set value
*
- * @return array
+ * @param string $value
+ * @return void
*/
- public function getParameters()
+ public function setValue($value)
{
- return $this->_parameters;
+ if ($value !== $this->find($this->actionToggle)->getText()) {
+ $this->find($this->actionToggle)->click();
+ parent::setValue($value);
+ }
}
/**
- * Retrieve exception name.
+ * Get value
*
* @return string
*/
- public function getName()
+ public function getValue()
{
- return $this->_name;
+ return $this->find($this->value)->getText();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index 757925811cd..5f54bf33a3f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -34,6 +34,7 @@ use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\Catalog\Test\Fixture\ConfigurableProduct;
use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
/**
* Class ProductForm
@@ -90,6 +91,20 @@ class ProductForm extends FormTabs
*/
protected $category;
+ /**
+ * Attribute on the Product page
+ *
+ * @var string
+ */
+ protected $attribute = './/*[contains(@class,"label")]/span[text()="%s"]';
+
+ /**
+ * Attribute Search locator the Product page
+ *
+ * @var string
+ */
+ protected $attributeSearch = '#product-attribute-search-container';
+
/**
* Fill the product form
*
@@ -109,9 +124,9 @@ class ProductForm extends FormTabs
if ($fixture instanceof InjectableFixture) {
$status = $fixture->getStatus();
if (($status === 'Product offline'
- && $this->_rootElement->find(sprintf($this->onlineSwitcher, ':checked'))->isVisible())
+ && $this->_rootElement->find(sprintf($this->onlineSwitcher, ':checked'))->isVisible())
|| ($status === 'Product online'
- && $this->_rootElement->find(sprintf($this->onlineSwitcher, ':not(:checked)'))->isVisible())
+ && $this->_rootElement->find(sprintf($this->onlineSwitcher, ':not(:checked)'))->isVisible())
) {
$this->_rootElement->find(sprintf($this->onlineSwitcher, ''))->click();
}
@@ -120,22 +135,6 @@ class ProductForm extends FormTabs
return parent::fill($fixture, $element);
}
- /**
- * Fill product variations
- *
- * @param ConfigurableProduct $variations
- * @return void
- */
- public function fillVariations(ConfigurableProduct $variations)
- {
- $variationsBlock = Factory::getBlockFactory()->getMagentoCatalogAdminhtmlProductEditTabSuperConfig(
- $this->_rootElement->find($this->variationsWrapper)
- );
- $variationsBlock->fillAttributeOptions($variations->getConfigurableAttributes());
- $variationsBlock->generateVariations();
- $variationsBlock->fillVariationsMatrix($variations->getVariationsMatrix());
- }
-
/**
* Select category
*
@@ -326,4 +325,35 @@ class ProductForm extends FormTabs
return $data;
}
+
+ /**
+ * Check visibility of the attribute on the product page
+ *
+ * @param mixed $productAttribute
+ * @return bool
+ */
+ public function checkAttributeLabel($productAttribute)
+ {
+ $frontendLabel = (is_array($productAttribute))
+ ? $productAttribute['frontend_label']
+ : $productAttribute->getFrontendLabel();
+ $attributeLabelLocator = sprintf($this->attribute, $frontendLabel);
+
+ return $this->_rootElement->find($attributeLabelLocator, Locator::SELECTOR_XPATH)->isVisible();
+ }
+
+ /**
+ * Call method that checking present attribute in search result
+ *
+ * @param CatalogProductAttribute $productAttribute
+ * @return bool
+ */
+ public function checkAttributeInSearchAttributeForm($productAttribute)
+ {
+ return $this->_rootElement->find(
+ $this->attributeSearch,
+ Locator::SELECTOR_CSS,
+ 'Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes\Search'
+ )->isExistAttributeInSearchResult($productAttribute);
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
index 1b3b0cd0a9b..98a84c8f89e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
@@ -30,6 +30,14 @@
<strategy>css selector</strategy>
<wrapper>product</wrapper>
<fields>
+ <attribute_set_id>
+ <selector>#product-template-suggest-container</selector>
+ <class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails\AttributeSet</class>
+ </attribute_set_id>
+ <attribute_id>
+ <selector>#product-attribute-search-container</selector>
+ <class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes\Search</class>
+ </attribute_id>
<tax_class_id>
<input>select</input>
</tax_class_id>
@@ -55,10 +63,10 @@
<strategy>css selector</strategy>
<wrapper>product</wrapper>
<fields>
- <product_website_1>
+ <website_ids>
<selector>[name='product[website_ids][]']</selector>
<input>checkbox</input>
- </product_website_1>
+ </website_ids>
</fields>
</websites>
<advanced-pricing>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Backend/AddNewSplitButton.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
similarity index 61%
rename from dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Backend/AddNewSplitButton.php
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
index b93f3c04c19..e107aed5108 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Backend/AddNewSplitButton.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
@@ -17,38 +17,42 @@
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
- *
+ *
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Catalog\Test\Block\Backend;
+namespace Magento\Catalog\Test\Block\Category;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
-class AddNewSplitButton extends Block
+/**
+ * Class ProductPagination
+ * Pagination page product list
+ *
+ * @package Magento\Catalog\Test\Block\Category
+ */
+class ProductPagination extends Block
{
/**
- * Product type list
+ * Selector next active element
*
* @var string
*/
- protected $typeList = '[data-ui-id=products-list-add-new-button-dropdown-menu]';
+ protected $nextPageSelector = '.item.current + .item a';
/**
- * Product toggle button
+ * Getting the active element to go to the next page
*
- * @var string
+ * @return \Mtf\Client\Element|null
*/
- protected $toggleButton = '[data-ui-id=products-list-add-new-button-dropdown]';
-
- public function getTypeList()
+ public function getNextPage()
{
- $this->_rootElement->find($this->toggleButton, Locator::SELECTOR_CSS)->click();
- return $this->_rootElement->find(
- $this->typeList,
- Locator::SELECTOR_CSS
- )->getText();
+ $nextPageItem = $this->_rootElement->find($this->nextPageSelector);
+ if ($nextPageItem->isVisible()) {
+ return $nextPageItem;
+ } else {
+ return null;
+ }
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
index 6791f38620a..6958549d155 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
@@ -54,7 +54,7 @@ class ListProduct extends Block
*
* @var string
*/
- protected $productDetailsSelector = '//*[@class="product details" and .//*[@title="%s"]]';
+ protected $productDetailsSelector = '//*[contains(@class, "product details") and .//*[@title="%s"]]';
/**
* Product name
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 721a1ddb748..0b5c6aead82 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -211,7 +211,7 @@ class Price extends Block
/**
* Get Minimum Advertised Price value
*
- * @return string
+ * @return array|string
*/
public function getOldPrice()
{
@@ -229,7 +229,7 @@ class Price extends Block
{
//@TODO it have to rewrite when will be possibility to divide it to different blocks(by product type)
$prices = explode("\n", trim($this->_rootElement->find($this->actualPrice, Locator::SELECTOR_CSS)->getText()));
- if (count($prices) === 1) {
+ if (count($prices) == 1) {
return floatval(trim($prices[0], $currency));
}
return $this->formatPricesData($prices, $currency);
@@ -259,7 +259,7 @@ class Price extends Block
/**
* Get price from
*
- * @return string
+ * @return array|string
*/
public function getPriceFrom()
{
@@ -269,7 +269,7 @@ class Price extends Block
/**
* Get price to
*
- * @return string
+ * @return array|string
*/
public function getPriceTo()
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
index 9c7056b9d07..cd31e793b68 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
@@ -53,12 +53,7 @@ class Crosssell extends Block
*/
public function verifyProductCrosssell(FixtureInterface $crosssell)
{
- $productName = ($crosssell instanceof InjectableFixture)
- /** @var CatalogProductSimple $crosssell */
- ? $crosssell->getName()
- /** @var Product $crosssell */
- : $crosssell->getProductName();
- $match = $this->_rootElement->find(sprintf($this->linkSelector, $productName), Locator::SELECTOR_CSS);
+ $match = $this->_rootElement->find(sprintf($this->linkSelector, $crosssell->getName()), Locator::SELECTOR_CSS);
return $match->isVisible();
}
@@ -71,7 +66,7 @@ class Crosssell extends Block
public function clickLink($product)
{
$this->_rootElement->find(
- sprintf($this->linkSelector, $product->getProductName()),
+ sprintf($this->linkSelector, $product->getName()),
Locator::SELECTOR_CSS
)->click();
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 8b5df2cbb41..627382ba707 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -70,7 +70,7 @@ class View extends Block
*
* @var string
*/
- protected $productName = '.page.title.product span';
+ protected $productName = '.page-title.product span';
/**
* Product sku element
@@ -162,7 +162,7 @@ class View extends Block
protected function getPriceBlock()
{
return Factory::getBlockFactory()->getMagentoCatalogProductPrice(
- $this->_rootElement->find('.product.info.main .price-box')
+ $this->_rootElement->find('.product-info-main .price-box')
);
}
@@ -349,7 +349,7 @@ class View extends Block
public function fillOptions(FixtureInterface $product)
{
$configureButton = $this->_rootElement->find($this->customizeButton);
- $configureSection = $this->_rootElement->find('.product.options.wrapper');
+ $configureSection = $this->_rootElement->find('.product-options-wrapper');
if ($configureButton->isVisible()) {
$configureButton->click();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 4e544bc808e..c48b11994b6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -97,14 +97,14 @@ class CustomOptions extends Block
*
* @var string
*/
- protected $optionByValueLocator = '//*[@class="product options wrapper"]//option[text()="%s"]/..';
+ protected $optionByValueLocator = '//*[@class="product-options-wrapper"]//option[text()="%s"]/..';
/**
* Select XPath locator by title
*
* @var string
*/
- protected $selectByTitleLocator = '//*[*[@class="product options wrapper"]//span[text()="%s"]]//select';
+ protected $selectByTitleLocator = '//*[*[@class="product-options-wrapper"]//span[text()="%s"]]//select';
/**
* Bundle field CSS locator
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
new file mode 100644
index 00000000000..7e749999428
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Util\Protocol\CurlTransport;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
+
+/**
+ * Class AssertAddedProductAttributeOnProductForm
+ * Check attribute on product form
+ */
+class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Add this attribute to Default attribute Template. Create product and Assert that created attribute
+ * is displayed on product form (Products > Inventory > Catalog)
+ *
+ * @param FixtureFactory $fixtureFactory
+ * @param CatalogProductSetIndex $productSet
+ * @param CatalogProductSetEdit $productSetEdit
+ * @param CatalogAttributeSet $productTemplate
+ * @param CatalogProductIndex $productGrid
+ * @param CatalogProductAttribute $productAttributeOriginal
+ * @param CatalogProductEdit $productEdit
+ * @param CatalogProductAttribute|null $productAttribute
+ * @return void
+ */
+ public function processAssert
+ (
+ FixtureFactory $fixtureFactory,
+ CatalogProductSetIndex $productSet,
+ CatalogProductSetEdit $productSetEdit,
+ CatalogAttributeSet $productTemplate,
+ CatalogProductIndex $productGrid,
+ CatalogProductEdit $productEdit,
+ CatalogProductAttribute $productAttribute,
+ CatalogProductAttribute $productAttributeOriginal = null
+ ) {
+ $filterAttribute = [
+ 'set_name' => $productTemplate->getAttributeSetName(),
+ ];
+ $productSet->open();
+ $productSet->getGrid()->searchAndOpen($filterAttribute);
+
+ $attributeData = ($productAttributeOriginal !== null)
+ ? array_merge($productAttribute->getData(), $productAttributeOriginal->getData())
+ : $productAttribute->getData();
+
+ $productSetEdit->getAttributeSetEditBlock()->moveAttribute($attributeData, 'Product Details');
+ $productSetEdit->getPageActions()->save();
+
+ $product = $fixtureFactory->createByCode(
+ 'catalogProductSimple',
+ [
+ 'dataSet' => 'product_with_category',
+ 'data' => [
+ 'attribute_set_id' => ['attribute_set' => $productTemplate],
+ ],
+ ]
+ );
+ $product->persist();
+
+ $filterProduct = [
+ 'sku' => $product->getSku(),
+ ];
+ $productGrid->open();
+ $productGrid->getProductGrid()->searchAndOpen($filterProduct);
+
+ $catalogProductAttribute = ($productAttributeOriginal !== null)
+ ? array_merge($productAttributeOriginal->getData(), $productAttribute->getData())
+ : $productAttribute->getData();
+
+ \PHPUnit_Framework_Assert::assertTrue(
+ $productEdit->getForm()->checkAttributeLabel($catalogProductAttribute),
+ "Product Attribute is absent on Product form."
+ );
+ }
+
+ /**
+ * Text of Product Attribute is present on the Product form.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product Attribute is present on Product form.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
new file mode 100644
index 00000000000..09506267476
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertCategoryAbsenceOnBackend
+ * Assert that not displayed category in backend catalog category tree
+ */
+class AssertCategoryAbsenceOnBackend extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Assert that not displayed category in backend catalog category tree
+ *
+ * @param CatalogCategoryIndex $catalogCategoryIndex
+ * @param CatalogCategory $category
+ * @return void
+ */
+ public function processAssert(CatalogCategoryIndex $catalogCategoryIndex, CatalogCategory $category)
+ {
+ $catalogCategoryIndex->open();
+ \PHPUnit_Framework_Assert::assertFalse(
+ $catalogCategoryIndex->getTreeCategories()->isCategoryVisible($category),
+ 'Category is displayed in backend catalog category tree.'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Category not displayed in backend catalog category tree.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
new file mode 100644
index 00000000000..5018bf8a7da
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Mtf\Client\Browser;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertCategoryAbsenceOnFrontend
+ * Assert that not displayed category in frontend main menu
+ */
+class AssertCategoryAbsenceOnFrontend extends AbstractConstraint
+{
+ /**
+ * Message on the product page 404
+ */
+ const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Assert that not displayed category in frontend main menu
+ *
+ * @param Browser $browser
+ * @param CatalogCategoryView $categoryView
+ * @param CatalogCategory $category
+ * @return void
+ */
+ public function processAssert(Browser $browser, CatalogCategoryView $categoryView, CatalogCategory $category)
+ {
+ $browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::NOT_FOUND_MESSAGE,
+ $categoryView->getTitleBlock()->getTitle(),
+ 'Wrong page is displayed.'
+ );
+ }
+
+ /**
+ * Not found page is display
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Not found page is display.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index 24c41b9867f..a7e5badc39e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -63,7 +63,7 @@ class AssertCategoryPage extends AbstractConstraint
$product = $fixtureFactory->createByCode(
'catalogProductSimple',
[
- 'dataSet' => 'product_without_category',
+ 'dataSet' => 'default',
'data' => [
'category_ids' => [
'category' => $initialCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
new file mode 100644
index 00000000000..c8634622ed2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertCategorySuccessDeleteMessage
+ * Assert that after delete a category "You deleted the category." successful message appears
+ */
+class AssertCategorySuccessDeleteMessage extends AbstractConstraint
+{
+ /**
+ * Message that displayed after delete url rewrite
+ */
+ const SUCCESS_DELETE_MESSAGE = 'You deleted the category.';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Assert that after delete a category "You deleted the category." successful message appears
+ *
+ * @param CatalogCategoryEdit $categoryEdit
+ * @return void
+ */
+ public function processAssert(CatalogCategoryEdit $categoryEdit)
+ {
+ $actualMessage = $categoryEdit->getMessagesBlock()->getSuccessMessages();
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::SUCCESS_DELETE_MESSAGE,
+ $actualMessage,
+ 'Wrong success delete message is displayed.'
+ . "\nExpected: " . self::SUCCESS_DELETE_MESSAGE
+ . "\nActual: " . $actualMessage
+ );
+ }
+
+ /**
+ * Category delete message is displayed
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Category delete message is displayed.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
new file mode 100644
index 00000000000..1e098b53b76
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+
+/**
+ * Class AssertAbsenceProductAttributeInGrid
+ * Checks that product attribute cannot be found by attribute code
+ */
+class AssertProductAttributeAbsenceInGrid extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that after deleted product attribute cannot be found by attribute code.
+ *
+ * @param CatalogProductAttributeIndex $attributeIndex
+ * @param CatalogProductAttribute $attribute
+ * @return void
+ */
+ public function processAssert(
+ CatalogProductAttributeIndex $attributeIndex,
+ CatalogProductAttribute $attribute
+ ) {
+ $filter = [
+ 'attribute_code' => $attribute->getAttributeCode(),
+ ];
+
+ $attributeIndex->open();
+ \PHPUnit_Framework_Assert::assertFalse(
+ $attributeIndex->getGrid()->isRowVisible($filter),
+ 'Attribute \'' . $attribute->getFrontendLabel() . '\' is present in Attribute grid.'
+ );
+ }
+
+ /**
+ * Text absent Product Attribute in Attribute Grid
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product Attribute is absent in Attribute grid.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
new file mode 100644
index 00000000000..f78a28f4298
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
+use Magento\ConfigurableProduct\Test\Fixture\CatalogProductConfigurable;
+
+/**
+ * Class AssertAbsenceInAddAttributeSearch
+ * Checks that product attribute cannot be added to product template on Product Page via Add Attribute control
+ */
+class AssertProductAttributeAbsenceInSearchOnProductForm extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that deleted attribute can't be added to product template on Product Page via Add Attribute control
+ *
+ * @param CatalogProductAttribute $productAttribute
+ * @param CatalogProductIndex $productGrid
+ * @param CatalogProductNew $newProductPage
+ * @return void
+ */
+ public function processAssert
+ (
+ CatalogProductAttribute $productAttribute,
+ CatalogProductIndex $productGrid,
+ CatalogProductNew $newProductPage
+ ) {
+ $productGrid->open();
+ $productGrid->getProductBlock()->addProduct('simple');
+ \PHPUnit_Framework_Assert::assertFalse(
+ $newProductPage->getForm()->checkAttributeInSearchAttributeForm($productAttribute),
+ "Product attribute found in Attribute Search form."
+ );
+ }
+
+ /**
+ * Text absent Product Attribute in Attribute Search form
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return "Product Attribute is absent in Attribute Search form.";
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
index ed9f6e0f34f..5a1cba9d194 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
@@ -51,10 +51,10 @@ class AssertProductAttributeSaveMessage extends AbstractConstraint
{
\PHPUnit_Framework_Assert::assertEquals(
self::SUCCESS_MESSAGE,
- $attributeIndex->getMessageBlock()->getSuccessMessages(),
+ $attributeIndex->getMessagesBlock()->getSuccessMessages(),
'Wrong success message is displayed.'
. "\nExpected: " . self::SUCCESS_MESSAGE
- . "\nActual: " . $attributeIndex->getMessageBlock()->getSuccessMessages()
+ . "\nActual: " . $attributeIndex->getMessagesBlock()->getSuccessMessages()
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
new file mode 100644
index 00000000000..e085c0eaa82
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
+
+/**
+ * Class AssertSuccessDeletedAttribute
+ * Check success message on Attribute page
+ */
+class AssertProductAttributeSuccessDeleteMessage extends AbstractConstraint
+{
+ const SUCCESS_MESSAGE = 'The product attribute has been deleted.';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that message "The product attribute has been deleted." is present on Attribute page
+ *
+ * @param CatalogProductAttributeIndex $attributeIndex
+ * @return void
+ */
+ public function processAssert(CatalogProductAttributeIndex $attributeIndex)
+ {
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::SUCCESS_MESSAGE,
+ $attributeIndex->getMessagesBlock()->getSuccessMessages(),
+ 'Wrong success message is displayed.'
+ . "\nExpected: " . self::SUCCESS_MESSAGE
+ . "\nActual: " . $attributeIndex->getMessagesBlock()->getSuccessMessages()
+ );
+ }
+
+ /**
+ * Text success present delete message
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Attribute success delete message is present.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
index cf84ebe3663..267cfb97e52 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
@@ -116,6 +116,10 @@ class AssertProductForm extends AbstractConstraint
$this->formattingOptions
);
+ if (isset($compareData['special_price'])) {
+ $compareData['special_price'] = ['special_price' => $compareData['special_price']];
+ }
+
return $compareData;
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
new file mode 100644
index 00000000000..5a8a6b80c4d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertProductTemplateForm
+ * Checking data from Product Template form with data fixture
+ */
+class AssertProductTemplateForm extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that after save a product template on edit product set page displays:
+ * 1. Correct product template name in Attribute set name field passed from fixture
+ * 2. Created Product Attribute (if was added)
+ *
+ * @param CatalogProductSetIndex $productSet
+ * @param CatalogProductSetEdit $productSetEdit
+ * @param CatalogAttributeSet $attributeSet
+ * @param CatalogProductAttribute $productAttribute
+ * @return void
+ */
+ public function processAssert
+ (
+ CatalogProductSetIndex $productSet,
+ CatalogProductSetEdit $productSetEdit,
+ CatalogAttributeSet $attributeSet,
+ CatalogProductAttribute $productAttribute = null
+ ) {
+ $filterAttribute = [
+ 'set_name' => $attributeSet->getAttributeSetName(),
+ ];
+ $productSet->open();
+ $productSet->getGrid()->searchAndOpen($filterAttribute);
+ \PHPUnit_Framework_Assert::assertEquals(
+ $filterAttribute['set_name'],
+ $productSetEdit->getAttributeSetEditBlock()->getAttributeSetName(),
+ 'Attribute Set not found'
+ . "\nExpected: " . $filterAttribute['set_name']
+ . "\nActual: " . $productSetEdit->getAttributeSetEditBlock()->getAttributeSetName()
+ );
+ if ($productAttribute !== null) {
+ $attributeLabel = $productAttribute->getFrontendLabel();
+ \PHPUnit_Framework_Assert::assertTrue(
+ $productSetEdit->getAttributeSetEditBlock()->checkProductAttribute($attributeLabel),
+ "Product Attribute is absent on Product Template Groups"
+ );
+ }
+ }
+
+ /**
+ * Text matches the data from a form with data from fixture
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Data from the Product Template form matched with fixture';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
new file mode 100644
index 00000000000..157e96979b1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertProductTemplateInGrid
+ * Checks present product template in Product Templates grid
+ */
+class AssertProductTemplateInGrid extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that new product template displays in Product Templates grid
+ *
+ * @param CatalogProductSetIndex $productSetPage
+ * @param CatalogAttributeSet $attributeSet
+ * @return void
+ */
+ public function processAssert(CatalogProductSetIndex $productSetPage, CatalogAttributeSet $attributeSet)
+ {
+ $filterAttributeSet = [
+ 'set_name' => $attributeSet->getAttributeSetName(),
+ ];
+
+ $productSetPage->open();
+ \PHPUnit_Framework_Assert::assertTrue(
+ $productSetPage->getGrid()->isRowVisible($filterAttributeSet),
+ 'Attribute Set \'' . $filterAttributeSet['set_name'] . '\' is absent in Product Template grid.'
+ );
+ }
+
+ /**
+ * Text present new product template in grid
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product template is present in Product Templates grid';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
new file mode 100644
index 00000000000..3d7b29e55d6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+
+/**
+ * Class AssertProductTemplateOnProductForm
+ * Check Attribute Set and Product Attribute on Product form
+ */
+class AssertProductTemplateOnProductForm extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that created product template:
+ * 1. Displays in product template suggest container dropdown
+ * 2. Can be used for new created product.
+ *
+ * @param FixtureFactory $fixtureFactory
+ * @param CatalogProductEdit $productEdit
+ * @param CatalogProductIndex $productGrid
+ * @param CatalogAttributeSet $attributeSet
+ * @param CatalogProductNew $newProductPage
+ * @param CatalogProductAttribute $productAttribute
+ * @return void
+ */
+ public function processAssert
+ (
+ FixtureFactory $fixtureFactory,
+ CatalogProductEdit $productEdit,
+ CatalogProductIndex $productGrid,
+ CatalogAttributeSet $attributeSet,
+ CatalogProductNew $newProductPage,
+ CatalogProductAttribute $productAttribute
+ ) {
+
+ $productGrid->open();
+ $productGrid->getProductBlock()->addProduct('simple');
+ $productBlockForm = $newProductPage->getForm();
+
+ /**@var CatalogProductSimple $catalogProductSimple */
+ $productSimple = $fixtureFactory->createByCode(
+ 'catalogProductSimple',
+ [
+ 'dataSet' => 'default',
+ 'data' => [
+ 'attribute_set_id' => ['attribute_set' => $attributeSet],
+ ],
+ ]
+ );
+ $productBlockForm->fillProduct($productSimple);
+ $newProductPage->getFormAction()->save();
+
+ $formData = $productEdit->getForm()->getData($productSimple);
+ $formAttributeSet = $formData['attribute_set_id'];
+ \PHPUnit_Framework_Assert::assertEquals(
+ $attributeSet->getAttributeSetName(),
+ $formAttributeSet,
+ 'Attribute Set not found on Product form.'
+ . "\nExpected: " . $attributeSet->getAttributeSetName()
+ . "\nActual: " . $formAttributeSet
+ );
+
+ $productEdit->getForm()->openTab('product-details');
+ \PHPUnit_Framework_Assert::assertTrue(
+ $productEdit->getForm()->checkAttributeLabel($productAttribute),
+ "Product Attribute is absent on Product form."
+ );
+ }
+
+ /**
+ * Text of Product Attribute and Attribute Set are present on the Product form.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product Attribute and Attribute Set are present on the Product form.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
new file mode 100644
index 00000000000..b36f6467a83
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertProductTemplateSuccessSaveMessage
+ * Check Product Templates success save message
+ */
+class AssertProductTemplateSuccessSaveMessage extends AbstractConstraint
+{
+ /**
+ * Text value to be checked
+ */
+ const SUCCESS_MESSAGE = 'You saved the attribute set.';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that after save a product template "You saved the attribute set." successful message appears
+ *
+ * @param CatalogProductSetIndex $productSetIndex
+ * @return void
+ */
+ public function processAssert(CatalogProductSetIndex $productSetIndex)
+ {
+ $actualMessage = $productSetIndex->getMessagesBlock()->getSuccessMessages();
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::SUCCESS_MESSAGE,
+ $actualMessage,
+ 'Wrong success message is displayed.'
+ . "\nExpected: " . self::SUCCESS_MESSAGE
+ . "\nActual: " . $actualMessage
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product Templates success save message is present.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
new file mode 100644
index 00000000000..61cf9b7a915
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+
+/**
+ * Class AssertProductView
+ *
+ * @package Magento\Catalog\Test\Constraint
+ */
+class AssertProductView extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * @param CatalogProductView $catalogProductView
+ * @param CatalogProductSimple $product
+ * @return void
+ */
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ CatalogProductSimple $product
+ ) {
+ //Open product view page
+ $catalogProductView->init($product);
+ $catalogProductView->open();
+
+ //Process assertions
+ $this->assertOnProductView($product, $catalogProductView);
+ }
+
+ /**
+ * Assert data on the product view page
+ *
+ * @param CatalogProductSimple $product
+ * @param CatalogProductView $catalogProductView
+ * @return void
+ */
+ protected function assertOnProductView(CatalogProductSimple $product, CatalogProductView $catalogProductView)
+ {
+ $viewBlock = $catalogProductView->getViewBlock();
+ $price = $viewBlock->getProductPriceBlock()->getPrice();
+ $name = $viewBlock->getProductName();
+ $sku = $viewBlock->getProductSku();
+
+ \PHPUnit_Framework_Assert::assertEquals(
+ $product->getName(),
+ $name,
+ 'Product name on product view page is not correct.'
+ );
+ \PHPUnit_Framework_Assert::assertEquals(
+ $product->getSku(),
+ $sku,
+ 'Product sku on product view page is not correct.'
+ );
+
+ if (isset($price['price_regular_price'])) {
+ \PHPUnit_Framework_Assert::assertEquals(
+ number_format($product->getPrice(), 2),
+ $price['price_regular_price'],
+ 'Product regular price on product view page is not correct.'
+ );
+ }
+
+ $priceComparing = false;
+ if ($specialPrice = $product->getSpecialPrice()) {
+ $priceComparing = $specialPrice;
+ }
+
+ if ($groupPrice = $product->getGroupPrice()) {
+ $groupPrice = reset($groupPrice);
+ $priceComparing = $groupPrice['price'];
+ }
+
+ if ($priceComparing && isset($price['price_special_price'])) {
+ \PHPUnit_Framework_Assert::assertEquals(
+ number_format($priceComparing, 2),
+ $price['price_special_price'],
+ 'Product special price on product view page is not correct.'
+ );
+ }
+ }
+
+ /**
+ * Text of Visible in category assert
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product data on product view page is not correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertTierPriceOnProductPage.php
index 221acb64db4..d2cf9dfba5c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertTierPriceOnProductPage.php
@@ -47,8 +47,10 @@ class AssertTierPriceOnProductPage extends AbstractConstraint
* @param FixtureInterface $product
* @return void
*/
- public function processAssert(CatalogProductView $catalogProductView, FixtureInterface $product)
- {
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product
+ ) {
// TODO fix initialization url for frontend page
//Open product view page
$catalogProductView->init($product);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
index e4ead58781d..fdc3c604ce6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
@@ -41,9 +41,9 @@ class AssignProducts extends Product
parent::__construct($configuration, $placeholders);
$this->_placeholders[$this->assignType . '_simple::getProductSku'] = array($this, 'productProvider');
- $this->_placeholders[$this->assignType . '_simple::getProductName'] = array($this, 'productProvider');
+ $this->_placeholders[$this->assignType . '_simple::getName'] = array($this, 'productProvider');
$this->_placeholders[$this->assignType . '_configurable::getProductSku'] = array($this, 'productProvider');
- $this->_placeholders[$this->assignType . '_configurable::getProductName'] = array($this, 'productProvider');
+ $this->_placeholders[$this->assignType . '_configurable::getName'] = array($this, 'productProvider');
}
/**
@@ -62,11 +62,11 @@ class AssignProducts extends Product
'value' => array(
'product_1' => array(
'sku' => '%' . $this->assignType . '_simple::getProductSku%',
- 'name' => '%' . $this->assignType . '_simple::getProductName%'
+ 'name' => '%' . $this->assignType . '_simple::getName%'
),
'product_2' => array(
'sku' => '%' . $this->assignType . '_configurable::getProductSku%',
- 'name' => '%' . $this->assignType . '_configurable::getProductName%'
+ 'name' => '%' . $this->assignType . '_configurable::getName%'
)
),
'group' => $type::GROUP
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
new file mode 100644
index 00000000000..85942bbc2a9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Fixture;
+
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Class CatalogProductTemplate
+ * Product Template fixture
+ */
+class CatalogAttributeSet extends InjectableFixture
+{
+ /**
+ * @var string
+ */
+ protected $repositoryClass = 'Magento\Catalog\Test\Repository\CatalogAttributeSet';
+
+ /**
+ * @var string
+ */
+ protected $handlerInterface = 'Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface';
+
+ protected $defaultDataSet = [
+ 'attribute_set_name' => 'Default_attribute_set_%isolation%',
+ 'skeleton_set' => ['dataSet' => 'default'],
+ ];
+
+ protected $attribute_set_id = [
+ 'attribute_code' => 'attribute_set_id',
+ 'backend_type' => 'smallint',
+ 'is_required' => '1',
+ 'default_value' => '',
+ 'input' => '',
+ ];
+
+ protected $entity_type_id = [
+ 'attribute_code' => 'entity_type_id',
+ 'backend_type' => 'smallint',
+ 'is_required' => '',
+ 'default_value' => '0',
+ 'input' => '',
+ ];
+
+ protected $attribute_set_name = [
+ 'attribute_code' => 'attribute_set_name',
+ 'backend_type' => 'varchar',
+ 'is_required' => '',
+ 'default_value' => '',
+ 'input' => '',
+ ];
+
+ protected $sort_order = [
+ 'attribute_code' => 'sort_order',
+ 'backend_type' => 'smallint',
+ 'is_required' => '',
+ 'default_value' => '0',
+ 'input' => '',
+ ];
+
+ protected $skeleton_set = [
+ 'attribute_code' => 'skeleton_set',
+ 'backend_type' => 'varchar',
+ 'is_required' => '',
+ 'default_value' => '',
+ 'input' => '',
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogAttributeSet\SkeletonSet',
+ ];
+
+ public function getAttributeSetId()
+ {
+ return $this->getData('attribute_set_id');
+ }
+
+ public function getEntityTypeId()
+ {
+ return $this->getData('entity_type_id');
+ }
+
+ public function getAttributeSetName()
+ {
+ return $this->getData('attribute_set_name');
+ }
+
+ public function getSortOrder()
+ {
+ return $this->getData('sort_order');
+ }
+
+ public function getSkeletonSet()
+ {
+ return $this->getData('skeleton_set');
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml
new file mode 100644
index 00000000000..9d89dbd3824
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<fixture class="Magento\Catalog\Test\Fixture\CatalogAttributeSet">
+ <module>Magento_Catalog</module>
+ <type>flat</type>
+ <entity_type>eav_attribute_set</entity_type>
+ <collection>Magento\Catalog\Model\Resource\Product\Link\Product\Collection</collection>
+ <fields>
+ <attribute_set_id>
+ <attribute_code>attribute_set_id</attribute_code>
+ <backend_type>smallint</backend_type>
+ <is_required>1</is_required>
+ <default_value></default_value>
+ <input></input>
+ </attribute_set_id>
+ <entity_type_id>
+ <attribute_code>entity_type_id</attribute_code>
+ <backend_type>smallint</backend_type>
+ <is_required></is_required>
+ <default_value>0</default_value>
+ <input></input>
+ </entity_type_id>
+ <attribute_set_name>
+ <attribute_code>attribute_set_name</attribute_code>
+ <backend_type>varchar</backend_type>
+ <is_required></is_required>
+ <default_value></default_value>
+ <input></input>
+ </attribute_set_name>
+ <sort_order>
+ <attribute_code>sort_order</attribute_code>
+ <backend_type>smallint</backend_type>
+ <is_required></is_required>
+ <default_value>0</default_value>
+ <input></input>
+ </sort_order>
+ <skeleton_set>
+ <attribute_code>skeleton_set</attribute_code>
+ <backend_type>virtual</backend_type>
+ </skeleton_set>
+ </fields>
+ <repository_class>Magento\Catalog\Test\Repository\CatalogAttributeSet</repository_class>
+ <handler_interface>Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface</handler_interface>
+</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
new file mode 100644
index 00000000000..12e3f539114
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Fixture\FixtureFactory;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+
+/**
+ * Class SkeletonSet
+ *
+ * Data keys:
+ * - dataSet
+ */
+class SkeletonSet implements FixtureInterface
+{
+ /**
+ * Attribute Set name
+ *
+ * @var string
+ */
+ protected $data;
+
+ /**
+ * New Attribute Set
+ *
+ * @var array
+ */
+ protected $attributeSet;
+
+ /**
+ * @param FixtureFactory $fixtureFactory
+ * @param array $params
+ * @param array $data
+ */
+ public function __construct(FixtureFactory $fixtureFactory, array $params, array $data = [])
+ {
+ $this->params = $params;
+ if (isset($data['dataSet']) && $data['dataSet'] !== '-') {
+ $parentSet = $fixtureFactory->createByCode('catalogAttributeSet', ['dataSet' => $data['dataSet']]);
+ if (!$parentSet->hasData('attribute_set_id')) {
+ $parentSet->persist();
+ }
+ /** @var CatalogAttributeSet $parentSet */
+ $this->data = $parentSet->getAttributeSetName();
+ $this->attributeSet = $parentSet;
+ }
+ }
+
+ /**
+ * Persist attribute options
+ *
+ * @return void
+ */
+ public function persist()
+ {
+ //
+ }
+
+ /**
+ * Return prepared data set
+ *
+ * @param string|null $key
+ * @return mixed
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getData($key = null)
+ {
+ return $this->data;
+ }
+
+ /**
+ * Get Attribute Set
+ *
+ * @return array
+ */
+ public function getAttributeSet()
+ {
+ return $this->attributeSet;
+ }
+
+ /**
+ * Return data set configuration settings
+ *
+ * @return array
+ */
+ public function getDataConfig()
+ {
+ return $this->params;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.php
index c4b0f4ebd13..0f187b98e85 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.php
@@ -91,6 +91,7 @@ class CatalogCategory extends InjectableFixture
'is_required' => '',
'default_value' => '0',
'input' => '',
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogCategory\ParentId',
];
protected $created_at = [
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml
index f491f2349f7..2f68c4b8c43 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml
@@ -62,6 +62,7 @@
<backend_type>int</backend_type>
<is_required></is_required>
<default_value>0</default_value>
+ <source>Magento\Catalog\Test\Fixture\CatalogCategory\ParentId</source>
<input></input>
</parent_id>
<created_at>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory/ParentId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory/ParentId.php
new file mode 100644
index 00000000000..c353f8f2b10
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory/ParentId.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Fixture\CatalogCategory;
+
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Fixture\FixtureFactory;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+
+/**
+ * Class ParentId
+ * Prepare parent category
+ */
+class ParentId implements FixtureInterface
+{
+ /**
+ * Return category
+ *
+ * @var CatalogCategory
+ */
+ protected $parentCategory = null;
+
+ /**
+ * Fixture params
+ *
+ * @var array
+ */
+ protected $params;
+
+ /**
+ * @constructor
+ * @param FixtureFactory $fixtureFactory
+ * @param array $params
+ * @param array|int $data
+ */
+ public function __construct(FixtureFactory $fixtureFactory, array $params, $data = [])
+ {
+ $this->params = $params;
+ if ($data['dataSet']) {
+ $this->parentCategory = $fixtureFactory->createByCode('catalogCategory', ['dataSet' => $data['dataSet']]);
+ if (!$this->parentCategory->hasData('id')) {
+ $this->parentCategory->persist();
+ }
+ $this->data = $this->parentCategory->getId();
+ } else {
+ $this->data = $data;
+ }
+ }
+
+ /**
+ * Persist attribute options
+ *
+ * @return void
+ */
+ public function persist()
+ {
+ //
+ }
+
+ /**
+ * Return prepared data set
+ *
+ * @param string|null $key
+ * @return mixed
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getData($key = null)
+ {
+ return $this->data;
+ }
+
+ /**
+ * Return data set configuration settings
+ *
+ * @return array
+ */
+ public function getDataConfig()
+ {
+ return $this->params;
+ }
+
+ /**
+ * Return entity
+ *
+ * @return CatalogCategory
+ */
+ public function getParentCategory()
+ {
+ return $this->parentCategory;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
index 442b6ce020e..bb614003f83 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
@@ -36,12 +36,14 @@ class CatalogProductAttribute extends InjectableFixture
/**
* @var string
*/
- protected $repositoryClass = 'Magento\Catalog\Test\Repository\CatalogAttributeEntity';
+ protected $repositoryClass = 'Magento\Catalog\Test\Repository\CatalogProductAttribute';
+ // @codingStandardsIgnoreStart
/**
* @var string
*/
- protected $handlerInterface = 'Magento\Catalog\Test\Handler\CatalogAttributeEntity\CatalogAttributeEntityInterface';
+ protected $handlerInterface = 'Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface';
+ // @codingStandardsIgnoreEnd
protected $defaultDataSet = [
'frontend_label' => 'attribute_label%isolation%',
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
index 680588a7960..b9be6d7cf2f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
@@ -42,6 +42,8 @@ class Options implements FixtureInterface
$this->params = $params;
if (isset($data['preset'])) {
$this->data = $this->getPreset($data['preset']);
+ } else {
+ $this->data = $data;
}
}
@@ -90,8 +92,8 @@ class Options implements FixtureInterface
'default' => [
[
'is_default' => 'Yes',
- 'admin' => 'Admin',
- 'view' => 'Electronics',
+ 'admin' => 'blue',
+ 'view' => '',
]
],
];
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
index 571664c4286..3bc3fb8d958 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
@@ -99,7 +99,7 @@ class CatalogProductSimple extends InjectableFixture
protected $defaultDataSet = [
'name' => 'Test simple product %isolation%',
'sku' => 'test_simple_sku_%isolation%',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'price' => ['value' => 100.00],
'weight' => 12.0000,
'qty' => 10,
@@ -557,6 +557,8 @@ class CatalogProductSimple extends InjectableFixture
protected $attribute_set_id = [
'attribute_code' => 'attribute_set_id',
'backend_type' => 'virtual',
+ 'group' => 'product-details',
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId',
];
protected $qty = [
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
index 703252c0d22..2292b5ade49 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
@@ -427,6 +427,7 @@
<attribute_set_id>
<attribute_code>attribute_set_id</attribute_code>
<backend_type>virtual</backend_type>
+ <group>product-details</group>
</attribute_set_id>
<qty>
<attribute_code>qty</attribute_code>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
new file mode 100644
index 00000000000..f2da24e6a9c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Fixture\FixtureFactory;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+
+/**
+ * Class AttributeSetId
+ *
+ * Data keys:
+ * - dataSet
+ * - attribute_set
+ */
+class AttributeSetId implements FixtureInterface
+{
+ /**
+ * Attribute Set name
+ *
+ * @var string
+ */
+ protected $data;
+
+ /**
+ * Attribute Set fixture
+ *
+ * @var CatalogAttributeSet
+ */
+ protected $attributeSet;
+
+ /**
+ * @param FixtureFactory $fixtureFactory
+ * @param array $params
+ * @param array $data
+ */
+ public function __construct(FixtureFactory $fixtureFactory, array $params, array $data = [])
+ {
+ $this->params = $params;
+ if (isset($data['dataSet']) && $data['dataSet'] !== '-') {
+ $attributeSet = $fixtureFactory->createByCode('catalogAttributeSet', ['dataSet' => $data['dataSet']]);
+ }
+ if (isset($data['attribute_set']) && $data['attribute_set'] instanceof CatalogAttributeSet) {
+ $attributeSet = $data['attribute_set'];
+ }
+ /** @var CatalogAttributeSet $attributeSet */
+ $this->data = $attributeSet->getAttributeSetName();
+ $this->attributeSet = $attributeSet;
+ }
+
+ /**
+ * Persist attribute options
+ *
+ * @return void
+ */
+ public function persist()
+ {
+ //
+ }
+
+ /**
+ * Return prepared data set
+ *
+ * @param string|null $key
+ * @return mixed
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getData($key = null)
+ {
+ return $this->data;
+ }
+
+ /**
+ * Return Attribute Set fixture
+ *
+ * @return CatalogAttributeSet
+ */
+ public function getAttributeSet()
+ {
+ return $this->attributeSet;
+ }
+
+ /**
+ * Return data set configuration settings
+ *
+ * @return array
+ */
+ public function getDataConfig()
+ {
+ return $this->params;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
index 42cd67dd861..54a9275c6b6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
@@ -55,7 +55,7 @@ class CrosssellProducts extends AssignProducts
/** @var $product \Magento\Catalog\Test\Fixture\Product */
$productsArray['product_' . $key] = array(
'sku' => $product->getProductSku(),
- 'name' => $product->getProductName()
+ 'name' => $product->getName()
);
}
$this->_data['fields'][$this->assignType . '_products']['value'] = $productsArray;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/GroupedProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/GroupedProduct.php
index ddf0ab08d4d..01be0918c75 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/GroupedProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/GroupedProduct.php
@@ -53,9 +53,9 @@ class GroupedProduct extends Product
{
parent::__construct($configuration, $placeholders);
- $this->_placeholders['simple::getProductName'] = array($this, 'productProvider');
- $this->_placeholders['virtual::getProductName'] = array($this, 'productProvider');
- $this->_placeholders['downloadable::getProductName'] = array($this, 'productProvider');
+ $this->_placeholders['simple::getName'] = array($this, 'productProvider');
+ $this->_placeholders['virtual::getName'] = array($this, 'productProvider');
+ $this->_placeholders['downloadable::getName'] = array($this, 'productProvider');
$this->_placeholders['simple::getProductId'] = array($this, 'productProvider');
$this->_placeholders['virtual::getProductId'] = array($this, 'productProvider');
$this->_placeholders['downloadable::getProductId'] = array($this, 'productProvider');
@@ -101,7 +101,7 @@ class GroupedProduct extends Product
'value' => array(
'assigned_product_0' => array(
'search_data' => array(
- 'name' => '%simple::getProductName%',
+ 'name' => '%simple::getName%',
),
'data' => array(
'selection_qty' => array(
@@ -114,7 +114,7 @@ class GroupedProduct extends Product
),
'assigned_product_1' => array(
'search_data' => array(
- 'name' => '%virtual::getProductName%',
+ 'name' => '%virtual::getName%',
),
'data' => array(
'selection_qty' => array(
@@ -127,7 +127,7 @@ class GroupedProduct extends Product
),
'assigned_product_2' => array(
'search_data' => array(
- 'name' => '%downloadable::getProductName%',
+ 'name' => '%downloadable::getName%',
),
'data' => array(
'selection_qty' => array(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
index 9d6819752d6..a74300f52ce 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
@@ -235,7 +235,7 @@ class Product extends DataFixture
*
* @return string
*/
- public function getProductName()
+ public function getName()
{
return $this->getData('fields/name/value');
}
@@ -291,7 +291,7 @@ class Product extends DataFixture
if (isset($fields['url'])) {
return $fields['url'];
} else {
- return trim(strtolower(preg_replace('#[^0-9a-z]+#i', '-', $this->getProductName())), '-');
+ return trim(strtolower(preg_replace('#[^0-9a-z]+#i', '-', $this->getName())), '-');
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
index 0f1c78a8227..5731eaf803a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
@@ -88,6 +88,12 @@ class SimpleProduct extends Product
'group' => static::GROUP_PRODUCT_DETAILS,
'input_name' => 'product[quantity_and_stock_status][qty]'
),
+ 'quantity_and_stock_status' => array(
+ 'value' => 'In Stock',
+ 'input_value' => 1,
+ 'group' => static::GROUP_PRODUCT_DETAILS,
+ 'input_name' => 'product[quantity_and_stock_status][is_in_stock]'
+ ),
'weight' => array('value' => '1', 'group' => static::GROUP_PRODUCT_DETAILS),
'product_website_1' => array(
'value' => 'Yes',
diff --git a/app/code/Magento/Log/Helper/Data.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
similarity index 81%
rename from app/code/Magento/Log/Helper/Data.php
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
index cf6819b86d7..41a1bc168d7 100644
--- a/app/code/Magento/Log/Helper/Data.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
@@ -22,11 +22,14 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Catalog\Test\Handler\CatalogAttributeSet;
+
+use Mtf\Handler\HandlerInterface;
+
/**
- * Log data helper
+ * Interface CatalogCategoryEntityInterface
*/
-namespace Magento\Log\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+interface CatalogAttributeSetInterface extends HandlerInterface
{
+ //
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
new file mode 100644
index 00000000000..dc4c1f9b6c3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Handler\CatalogAttributeSet;
+
+use Mtf\System\Config;
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Util\Protocol\CurlInterface;
+use Mtf\Util\Protocol\CurlTransport;
+use Mtf\Handler\Curl as AbstractCurl;
+use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+
+/**
+ * Class Curl
+ * Create new Attribute Set via curl
+ */
+class Curl extends AbstractCurl implements CatalogAttributeSetInterface
+{
+ /**
+ * Post request for creating Attribute Set
+ *
+ * @param FixtureInterface $fixture
+ * @return array
+ * @throws \Exception
+ */
+ public function persist(FixtureInterface $fixture = null)
+ {
+ $data = $fixture->getData();
+ if (!isset($data['gotoEdit'])) {
+ $data['gotoEdit'] = 1;
+ }
+ $data['skeleton_set'] = $fixture
+ ->getDataFieldConfig('skeleton_set')['source']
+ ->getAttributeSet()
+ ->getAttributeSetId();
+
+ $url = $_ENV['app_backend_url'] . 'catalog/product_set/save/';
+ $curl = new BackendDecorator(new CurlTransport(), new Config);
+ $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
+ $response = $curl->read();
+ $curl->close();
+
+ preg_match(
+ '`http.*?id\/(\d*?)\/.*?data-ui-id=\"page-actions-toolbar-delete-button\".*`',
+ $response,
+ $matches
+ );
+ $id = isset($matches[1]) ? $matches[1] : null;
+
+ if (!strpos($response, 'data-ui-id="messages-message-success"')) {
+ throw new \Exception("Attribute Set creating by curl handler was not successful!");
+ }
+
+ return ['attribute_set_id' => $id];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
new file mode 100644
index 00000000000..bf85c2ee42d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Handler\CatalogProductAttribute;
+
+use Mtf\Handler\HandlerInterface;
+
+/**
+ * Interface CatalogCategoryEntityInterface
+ */
+interface CatalogProductAttributeInterface extends HandlerInterface
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
new file mode 100644
index 00000000000..88e86d5ea38
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Handler\CatalogProductAttribute;
+
+use Mtf\System\Config;
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Util\Protocol\CurlInterface;
+use Mtf\Util\Protocol\CurlTransport;
+use Mtf\Handler\Curl as AbstractCurl;
+use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Backend\Test\Handler\Extractor;
+
+/**
+ * Class Curl
+ * Create new Product Attribute via curl
+ */
+class Curl extends AbstractCurl implements CatalogProductAttributeInterface
+{
+ /**
+ * Mapping values for data.
+ *
+ * @var array
+ */
+ protected $mappingData = [
+ 'frontend_input' => [
+ 'Text Field' => 'text',
+ 'Text Area' => 'textarea',
+ 'Date' => 'date',
+ 'Yes/No' => 'boolean',
+ 'Multiple Select' => 'multiselect',
+ 'Dropdown' => 'select',
+ 'Price' => 'price',
+ 'Media Image' => 'media_image',
+ 'Fixed Product Tax' => 'weee',
+ ],
+ 'is_required' => [
+ 'Yes' => 1,
+ 'No' => 0,
+ ],
+
+ ];
+
+ /**
+ * Post request for creating Product Attribute
+ *
+ * @param FixtureInterface $fixture
+ * @return array
+ * @throws \Exception
+ */
+ public function persist(FixtureInterface $fixture = null)
+ {
+
+ $data = $this->replaceMappingData($fixture->getData());
+ $data['frontend_label'] = [0 => $data['frontend_label']];
+
+ if (isset($data['options'])) {
+ foreach ($data['options'] as $key => $values) {
+ if ($values['is_default'] == 'Yes') {
+ $data['default'][] = $values['view'];
+ }
+ $index = 'option_' . $key;
+ $data['option']['value'][$index] = [$values['admin'], $values['view']];
+ $data['option']['order'][$index] = $key;
+ }
+ unset($data['options']);
+ }
+
+ $url = $_ENV['app_backend_url'] . 'catalog/product_attribute/save/';
+ $curl = new BackendDecorator(new CurlTransport(), new Config);
+ $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
+ $response = $curl->read();
+ $curl->close();
+
+ if (!strpos($response, 'data-ui-id="messages-message-success"')) {
+ throw new \Exception("Product Attribute creating by curl handler was not successful!");
+ }
+
+ $url = 'catalog/product_attribute/index/filter/';
+ $url .= base64_encode('frontend_label=' . $data['frontend_label'][0]);
+ $regExpPattern = '`<tr.*?http.*?attribute_id\/(\d*?)\/`';
+ $extractor = new Extractor($url, $regExpPattern);
+
+ return ['attribute_id' => $extractor->getData()[1]];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
index 1d918e0302d..f1f298234fb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -39,11 +39,11 @@ use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
class Curl extends AbstractCurl implements CatalogProductSimpleInterface
{
/**
- * Placeholder for data sent Curl
+ * Mapping values for data.
*
* @var array
*/
- protected $placeholderData = [
+ protected $mappingData = [
'manage_stock' => [
'Yes' => 1,
'No' => 0
@@ -55,6 +55,10 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
'Yes' => 1,
'No' => 0
],
+ 'is_in_stock' => [
+ 'In Stock' => 1,
+ 'Out of Stock' => 0
+ ],
'quantity_and_stock_status' => [
'In Stock' => 1,
'Out of Stock' => 0
@@ -91,43 +95,9 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
{
$config = $fixture->getDataConfig();
$prefix = isset($config['input_prefix']) ? $config['input_prefix'] : null;
- // @todo remove "if" when fixtures refactored
- if ($fixture instanceof InjectableFixture) {
- $fields = $this->replacePlaceholder($fixture->getData(), $this->placeholderData);
- // Getting Tax class id
- if ($fixture->hasData('tax_class_id')) {
- $taxClassId = $fixture->getDataFieldConfig('tax_class_id')['source']->getTaxClass()->getId();
- $fields['tax_class_id'] = ($taxClassId === null)
- ? $this->getTaxClassId($fields['tax_class_id'])
- : $taxClassId;
- }
- $fields = $this->prepareStockData($fields);
- if (!empty($fields['category_ids'])) {
- $categoryIds = [];
- foreach ($fields['category_ids'] as $categoryData) {
- $categoryIds[] = $categoryData['id'];
- }
- $fields['category_ids'] = $categoryIds;
- }
-
- $data = $prefix ? [$prefix => $fields] : $fields;
- } else {
- $data = $this->_prepareData($fixture->getData('fields'), $prefix);
- }
-
- $url = $this->_getUrl($config);
- $curl = new BackendDecorator(new CurlTransport(), new Config);
- $curl->addOption(CURLOPT_HEADER, 1);
- $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
- $response = $curl->read();
- $curl->close();
+ $data = $this->prepareData($fixture, $prefix);
- if (!strpos($response, 'data-ui-id="messages-message-success"')) {
- throw new \Exception("Product creation by curl handler was not successful! Response: $response");
- }
- preg_match("~Location: [^\s]*\/id\/(\d+)~", $response, $matches);
- $id = isset($matches[1]) ? $matches[1] : null;
- return ['id' => $id];
+ return ['id' => $this->createProduct($data, $config)];
}
/**
@@ -155,41 +125,72 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
}
/**
- * Replace placeholder data in fixture data
+ * Remove items from a null
*
* @param array $data
- * @param array $placeholders
* @return array
*/
- private function replacePlaceholder(array $data, array $placeholders)
+ protected function filter(array $data)
{
foreach ($data as $key => $value) {
- if (!isset($placeholders[$key])) {
- continue;
- }
- if (is_array($value)) {
- $data[$key] = $this->replacePlaceholderValues($value, $placeholders[$key]);
- } else {
- $data[$key] = isset($placeholders[$key][$value]) ? $placeholders[$key][$value] : $value;
+ if ($value === null) {
+ unset($data[$key]);
+ } elseif (is_array($data[$key])) {
+ $data[$key] = $this->filter($data[$key]);
}
}
return $data;
}
/**
- * Replace placeholder data in fixture values
+ * Prepare POST data for creating product request
*
- * @param array $data
- * @param array $placeholders
+ * @param FixtureInterface $fixture
+ * @param string|null $prefix
* @return array
+ *
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
- private function replacePlaceholderValues(array $data, array $placeholders)
+ protected function prepareData(FixtureInterface $fixture, $prefix = null)
{
- foreach ($data as $key => $value) {
- if (isset($placeholders[$value])) {
- $data[$key] = $placeholders[$value];
+ $fields = $this->replaceMappingData($fixture->getData());
+ $fields = $this->prepareStockData($fields);
+ // Getting Tax class id
+ if ($fixture->hasData('tax_class_id')) {
+ $taxClassId = $fixture->getDataFieldConfig('tax_class_id')['source']->getTaxClass()->getId();
+ $fields['tax_class_id'] = ($taxClassId === null)
+ ? $this->getTaxClassId($fields['tax_class_id'])
+ : $taxClassId;
+ }
+
+ if (!empty($fields['category_ids'])) {
+ $categoryIds = [];
+ foreach ($fields['category_ids'] as $categoryData) {
+ $categoryIds[] = $categoryData['id'];
+ }
+ $fields['category_ids'] = $categoryIds;
+ }
+
+ if (!empty($fields['website_ids'])) {
+ foreach ($fields['website_ids'] as &$value) {
+ $value = isset($this->mappingData['website_ids'][$value])
+ ? $this->mappingData['website_ids'][$value]
+ : $value;
}
}
+
+ // Getting Attribute Set id
+ if ($fixture->hasData('attribute_set_id')) {
+ $attributeSetId = $fixture
+ ->getDataFieldConfig('attribute_set_id')['source']
+ ->getAttributeSet()
+ ->getAttributeSetId();
+ $fields['attribute_set_id'] = $attributeSetId;
+ }
+
+ $data = $prefix ? [$prefix => $fields] : $fields;
+
return $data;
}
@@ -203,12 +204,12 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
{
$fields['stock_data']['manage_stock'] = 0;
- if (empty($fields['stock_data']['is_in_stock'])) {
+ if (!isset($fields['stock_data']['is_in_stock'])) {
$fields['stock_data']['is_in_stock'] = isset($fields['quantity_and_stock_status'])
? $fields['quantity_and_stock_status']
: (isset($fields['inventory_manage_stock']) ? $fields['inventory_manage_stock'] : null);
}
- if (empty($fields['stock_data']['qty'])) {
+ if (!isset($fields['stock_data']['qty'])) {
$fields['stock_data']['qty'] = isset($fields['qty']) ? $fields['qty'] : null;
}
if (!empty($fields['stock_data']['qty'])) {
@@ -224,48 +225,27 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
}
/**
- * Remove items from a null
+ * Create product via curl
*
* @param array $data
- * @return array
+ * @param array $config
+ * @return int|null
+ * @throws \Exception
*/
- protected function filter(array $data)
+ protected function createProduct(array $data, array $config)
{
- foreach ($data as $key => $value) {
- if ($value === null) {
- unset($data[$key]);
- } elseif (is_array($data[$key])) {
- $data[$key] = $this->filter($data[$key]);
- }
- }
- return $data;
- }
+ $url = $this->getUrl($config);
+ $curl = new BackendDecorator(new CurlTransport(), new Config);
+ $curl->addOption(CURLOPT_HEADER, 1);
+ $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
+ $response = $curl->read();
+ $curl->close();
- /**
- * Prepare POST data for creating product request
- *
- * @param array $params
- * @param string|null $prefix
- * @return array
- */
- protected function _prepareData($params, $prefix = null)
- {
- $data = array();
- foreach ($params as $key => $values) {
- $value = $this->_getValue($values);
- //do not add this data if value does not exist
- if (null === $value) {
- continue;
- }
- if (isset($values['input_name'])) {
- $data[$values['input_name']] = $value;
- } elseif ($prefix) {
- $data[$prefix][$key] = $value;
- } else {
- $data[$key] = $value;
- }
+ if (!strpos($response, 'data-ui-id="messages-message-success"')) {
+ throw new \Exception("Product creation by curl handler was not successful! Response: $response");
}
- return $data;
+ preg_match("~Location: [^\s]*\/id\/(\d+)~", $response, $matches);
+ return isset($matches[1]) ? $matches[1] : null;
}
/**
@@ -274,7 +254,7 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
* @param array $values
* @return null|mixed
*/
- protected function _getValue($values)
+ protected function getValue($values)
{
if (!isset($values['value'])) {
return null;
@@ -288,7 +268,7 @@ class Curl extends AbstractCurl implements CatalogProductSimpleInterface
* @param array $config
* @return string
*/
- protected function _getUrl(array $config)
+ protected function getUrl(array $config)
{
$requestParams = isset($config['create_url_params']) ? $config['create_url_params'] : array();
$params = '';
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.php
index 43feaacbb2e..777d9af0578 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.php
@@ -28,6 +28,7 @@ use Mtf\Page\BackendPage;
/**
* Class CatalogProductAttributeIndex
+ * Product Attribute page
*/
class CatalogProductAttributeIndex extends BackendPage
{
@@ -35,7 +36,7 @@ class CatalogProductAttributeIndex extends BackendPage
protected $_blocks = [
'messagesBlock' => [
- 'name' => 'messageBlock',
+ 'name' => 'messagesBlock',
'class' => 'Magento\Core\Test\Block\Messages',
'locator' => '#messages',
'strategy' => 'css selector',
@@ -57,7 +58,7 @@ class CatalogProductAttributeIndex extends BackendPage
/**
* @return \Magento\Core\Test\Block\Messages
*/
- public function getMessageBlock()
+ public function getMessagesBlock()
{
return $this->getBlockInstance('messagesBlock');
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.php
index 5382c2babda..a70c9ab63f6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.php
@@ -28,6 +28,7 @@ use Mtf\Page\BackendPage;
/**
* Class CatalogProductAttributeNew
+ * Product Attribute New page
*/
class CatalogProductAttributeNew extends BackendPage
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.php
index 8513d19dc21..29af1a20c5f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.php
@@ -59,10 +59,10 @@ class CatalogProductIndex extends BackendPage
'locator' => '[id="page:main-container"]',
'strategy' => 'css selector',
],
- 'addNewSplitButtonBlock' => [
- 'name' => 'addNewSplitButtonBlock',
- 'class' => 'Magento\Catalog\Test\Block\Backend\AddNewSplitButton',
- 'locator' => '[id="add_new_product"]',
+ 'FormPageActions' => [
+ 'name' => 'GridPageActions',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\FormPageActions',
+ 'locator' => '#add_new_product',
'strategy' => 'css selector',
],
];
@@ -98,12 +98,4 @@ class CatalogProductIndex extends BackendPage
{
return $this->getBlockInstance('accessDeniedBlock');
}
-
- /**
- * @return \Magento\Catalog\Test\Block\Backend\AddNewSplitButton
- */
- public function getAddNewSpliteButtonBlock()
- {
- return $this->getBlockInstance('addNewSplitButtonBlock');
- }
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml
index b5c18b67a09..0f7cb2b405b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml
@@ -48,10 +48,4 @@
<locator>[id="page:main-container"]</locator>
<strategy>css selector</strategy>
</block>
- <block>
- <name>addNewSplitButtonBlock</name>
- <class>Magento\Catalog\Test\Block\Backend\AddNewSplitButton</class>
- <locator>[id="add_new_product"]</locator>
- <strategy>css selector</strategy>
- </block>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.php
new file mode 100644
index 00000000000..a849a5a384b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Page\Adminhtml;
+
+use Mtf\Page\BackendPage;
+
+/**
+ * Class CatalogProductSetAdd
+ * Product Set add page
+ */
+class CatalogProductSetAdd extends BackendPage
+{
+ const MCA = 'catalog/product_set/add';
+
+ protected $_blocks = [
+ 'pageActions' => [
+ 'name' => 'pageActions',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions',
+ 'locator' => '.page-main-actions',
+ 'strategy' => 'css selector',
+ ],
+ 'attributeSetForm' => [
+ 'name' => 'attributeSetForm',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main\AttributeSetForm',
+ 'locator' => '#set_name',
+ 'strategy' => 'css selector',
+ ],
+ ];
+
+ /**
+ * @return \Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions
+ */
+ public function getPageActions()
+ {
+ return $this->getBlockInstance('pageActions');
+ }
+
+ /**
+ * @return \Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main\AttributeSetForm
+ */
+ public function getAttributeSetForm()
+ {
+ return $this->getBlockInstance('attributeSetForm');
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml
new file mode 100644
index 00000000000..d0926b72094
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<page mca="catalog/product_set/add" >
+ <block>
+ <name>pageActions</name>
+ <class>Magento\Backend\Test\Block\FormPageActions</class>
+ <locator>.page-main-actions</locator>
+ <strategy>css selector</strategy>
+ </block>
+ <block>
+ <name>attributeSetForm</name>
+ <class>Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main\Form</class>
+ <locator>#set_name</locator>
+ <strategy>css selector</strategy>
+ </block>
+</page>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.php
new file mode 100644
index 00000000000..0b39dcd231e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Page\Adminhtml;
+
+use Mtf\Page\BackendPage;
+
+/**
+ * Class CatalogProductSetEdit
+ * Product Set edit page
+ */
+class CatalogProductSetEdit extends BackendPage
+{
+ const MCA = 'catalog/product_set/edit';
+
+ protected $_blocks = [
+ 'pageActions' => [
+ 'name' => 'pageActions',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions',
+ 'locator' => '.page-main-actions',
+ 'strategy' => 'css selector',
+ ],
+ 'attributeSetEditBlock' => [
+ 'name' => 'attributeSetEditBlock',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main',
+ 'locator' => '.attribute-set',
+ 'strategy' => 'css selector',
+ ],
+ ];
+
+ /**
+ * @return \Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions
+ */
+ public function getPageActions()
+ {
+ return $this->getBlockInstance('pageActions');
+ }
+
+ /**
+ * @return \Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main
+ */
+ public function getAttributeSetEditBlock()
+ {
+ return $this->getBlockInstance('attributeSetEditBlock');
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml
new file mode 100644
index 00000000000..bcdc08250cf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<page mca="catalog/product_set/edit" >
+ <block>
+ <name>pageActions</name>
+ <class>Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions</class>
+ <locator>.page-main-actions</locator>
+ <strategy>css selector</strategy>
+ </block>
+ <block>
+ <name>attributeSetEditBlock</name>
+ <class>Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main</class>
+ <locator>#tree-div2</locator>
+ <strategy>css selector</strategy>
+ </block>
+</page>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.php
new file mode 100644
index 00000000000..6915567785d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Page\Adminhtml;
+
+use Mtf\Page\BackendPage;
+
+/**
+ * Class CatalogProductSetIndex
+ * Product Set page
+ */
+class CatalogProductSetIndex extends BackendPage
+{
+ const MCA = 'catalog/product_set/index';
+
+ protected $_blocks = [
+ 'messagesBlock' => [
+ 'name' => 'messagesBlock',
+ 'class' => 'Magento\Core\Test\Block\Messages',
+ 'locator' => '#messages',
+ 'strategy' => 'css selector',
+ ],
+ 'pageActionsBlock' => [
+ 'name' => 'pageActionsBlock',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\GridPageActions',
+ 'locator' => '.page-main-actions',
+ 'strategy' => 'css selector',
+ ],
+ 'grid' => [
+ 'name' => 'grid',
+ 'class' => 'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Grid',
+ 'locator' => '#setGrid',
+ 'strategy' => 'css selector',
+ ],
+ ];
+
+ /**
+ * @return \Magento\Core\Test\Block\Messages
+ */
+ public function getMessagesBlock()
+ {
+ return $this->getBlockInstance('messagesBlock');
+ }
+
+ /**
+ * @return \Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\GridPageActions
+ */
+ public function getPageActionsBlock()
+ {
+ return $this->getBlockInstance('pageActionsBlock');
+ }
+
+ /**
+ * @return \Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Grid
+ */
+ public function getGrid()
+ {
+ return $this->getBlockInstance('grid');
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml
new file mode 100644
index 00000000000..fbc289b722c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<page mca="catalog/product_set/index" >
+ <block>
+ <name>messagesBlock</name>
+ <class>Magento\Core\Test\Block\Messages</class>
+ <locator>#messages</locator>
+ <strategy>css selector</strategy>
+ </block>
+ <block>
+ <name>pageActionsBlock</name>
+ <class>Magento\Backend\Test\Block\GridPageActions</class>
+ <locator>.page-main-actions</locator>
+ <strategy>css selector</strategy>
+ </block>
+ <block>
+ <name>grid</name>
+ <class>Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Grid</class>
+ <locator>#setGrid</locator>
+ <strategy>css selector</strategy>
+ </block>
+</page>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.php
index 05dae7f2921..72129db9242 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.php
@@ -66,11 +66,11 @@ class CatalogCategoryView extends FrontendPage
'strategy' => 'css selector',
],
'viewBlock' => [
- 'name' => 'descriptionBlock',
+ 'name' => 'viewBlock',
'class' => 'Magento\Catalog\Test\Block\Category\View',
'locator' => '.category.view',
'strategy' => 'css selector',
- ]
+ ],
];
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml
index 1ac146ad826..179054d44fc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml
@@ -44,7 +44,7 @@
</block>
<block>
<name>toolbar</name>
- <class>\Magento\Catalog\Test\Block\Product\ProductList\Toolbar</class>
+ <class>Magento\Catalog\Test\Block\Product\ProductList\Toolbar</class>
<locator>.pages .items</locator>
<strategy>css selector</strategy>
</block>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
new file mode 100644
index 00000000000..0eed509e416
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Repository;
+
+use Mtf\Repository\AbstractRepository;
+
+/**
+ * Class CatalogProductTemplate
+ * Data for creation Product Template
+ */
+class CatalogAttributeSet extends AbstractRepository
+{
+ /**
+ * Construct
+ *
+ * @param array $defaultConfig
+ * @param array $defaultData
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function __construct(array $defaultConfig = [], array $defaultData = [])
+ {
+ $this->_data['default'] = [
+ 'attribute_set_name' => 'Default',
+ 'attribute_set_id' => 4,
+ ];
+
+ $this->_data['custom_attribute_set'] = [
+ 'attribute_set_name' => 'Custom_attribute_set%isolation%',
+ 'skeleton_set' => ['dataSet' => 'default'],
+ ];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.php
index fb472f7134a..9445bc40785 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.php
@@ -40,12 +40,35 @@ class CatalogCategory extends AbstractRepository
*/
public function __construct(array $defaultConfig = [], array $defaultData = [])
{
+ $this->_data['default_category'] = [
+ 'name' => 'Default Category',
+ 'parent_id' => 1,
+ 'is_active' => 'Yes',
+ 'id' => 2,
+ ];
+
$this->_data['default_subcategory'] = [
- 'name' => 'Subcategory%isolation%',
- 'path' => 'Default Category',
- 'parent_id' => 2,
+ 'name' => 'DefaultSubcategory%isolation%',
+ 'url_key' => 'DefaultSubcategory%isolation%',
+ 'parent_id' => ['dataSet' => 'default_category'],
'is_active' => 'Yes',
'include_in_menu' => 'Yes',
];
+
+ $this->_data['root_category'] = [
+ 'name' => 'RootCategory%isolation%',
+ 'url_key' => 'RootCategory%isolation%',
+ 'parent_id' => 1,
+ 'is_active' => 'Yes',
+ 'include_in_menu' => 'Yes'
+ ];
+
+ $this->_data['root_subcategory'] = [
+ 'name' => 'RootSubCategory%isolation%',
+ 'url_key' => 'RootSubCategory%isolation%',
+ 'parent_id' => ['dataSet' => 'root_category'],
+ 'is_active' => 'Yes',
+ 'include_in_menu' => 'Yes'
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
new file mode 100644
index 00000000000..44698ac538f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\Repository;
+
+use Mtf\Repository\AbstractRepository;
+
+/**
+ * Class CatalogProductAttribute
+ * Data for creation Product Attributes
+ */
+class CatalogProductAttribute extends AbstractRepository
+{
+ /**
+ * Construct
+ *
+ * @param array $defaultConfig
+ * @param array $defaultData
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function __construct(array $defaultConfig = [], array $defaultData = [])
+ {
+ $this->_data['attribute_type_text_field'] = [
+ 'frontend_label' => 'attribute_text%isolation%',
+ 'attribute_code' => 'attribute_text%isolation%',
+ 'frontend_input' => 'Text Field',
+ 'is_required' => 'No'
+ ];
+
+ $this->_data['attribute_type_dropdown'] = [
+ 'frontend_label' => 'attribute_dropdown%isolation%',
+ 'attribute_code' => 'attribute_dropdown%isolation%',
+ 'frontend_input' => 'Dropdown',
+ 'is_required' => 'No',
+ 'options' => [
+ 1 => [
+ 'is_default' => 'Yes',
+ 'admin' => 'black',
+ 'view' => 'option_0',
+ ],
+ 2 => [
+ 'is_default' => 'No',
+ 'admin' => 'white',
+ 'view' => 'option_1',
+ ],
+ 3 => [
+ 'is_default' => 'No',
+ 'admin' => 'green',
+ 'view' => 'option_2',
+ ]
+ ]
+ ];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
index 97603f853fd..feddf6acf48 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
@@ -42,8 +42,7 @@ class CatalogProductSimple extends AbstractRepository
public function __construct(array $defaultConfig = [], array $defaultData = [])
{
$this->_data['default'] = [
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'name' => 'Simple Product %isolation%',
'sku' => 'sku_simple_product_%isolation%',
'weight' => 1,
@@ -56,8 +55,7 @@ class CatalogProductSimple extends AbstractRepository
$this->_data['100_dollar_product'] = [
'sku' => '100_dollar_product%isolation%',
'name' => '100_dollar_product%isolation%',
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'quantity_and_stock_status' => 'In Stock',
'price' => ['value' => 100, 'preset' => '-'],
'website_ids' => ['Main Website'],
@@ -66,8 +64,7 @@ class CatalogProductSimple extends AbstractRepository
$this->_data['40_dollar_product'] = [
'sku' => '40_dollar_product',
'name' => '40_dollar_product',
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'quantity_and_stock_status' => 'In Stock',
'price' => ['value' => 40, 'preset' => '-'],
'id' => '2',
@@ -78,8 +75,7 @@ class CatalogProductSimple extends AbstractRepository
$this->_data['MAGETWO-23036'] = [
'sku' => 'MAGETWO-23036',
'name' => 'simple_with_category',
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'quantity_and_stock_status' => 'In Stock',
'price' => ['value' => 100, 'preset' => 'MAGETWO-23036'],
'id' => '3',
@@ -91,8 +87,7 @@ class CatalogProductSimple extends AbstractRepository
$this->_data['product_with_category'] = [
'sku' => 'simple_product_with_category_%isolation%',
'name' => 'Simple product with category %isolation%',
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'price' => ['value' => 100, 'preset' => ''],
'category_ids' => ['presets' => 'default_subcategory'],
'website_ids' => ['Main Website'],
@@ -100,8 +95,7 @@ class CatalogProductSimple extends AbstractRepository
];
$this->_data['simple_for_salesrule_1'] = [
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'quantity_and_stock_status' => 'In Stock',
'name' => 'Simple Product %isolation%',
'sku' => 'sku_simple_product_%isolation%',
@@ -112,8 +106,7 @@ class CatalogProductSimple extends AbstractRepository
];
$this->_data['simple_for_salesrule_2'] = [
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'name' => 'Simple Product %isolation%',
'sku' => 'sku_simple_product_%isolation%',
'price' => ['value' => 50, 'preset' => ''],
@@ -125,8 +118,7 @@ class CatalogProductSimple extends AbstractRepository
$this->_data['product_with_special_price_and_category'] = [
'sku' => 'simple_product_with_special_price_and_category%isolation%',
'name' => 'Simple product with special price and category %isolation%',
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'price' => ['value' => 100, 'preset' => ''],
'special_price' => 90,
'category_ids' => ['presets' => 'default_subcategory'],
@@ -185,8 +177,7 @@ class CatalogProductSimple extends AbstractRepository
$this->_data['100_dollar_product_for_tax_rule'] = [
'sku' => '100_dollar_product%isolation%',
'name' => '100_dollar_product%isolation%',
- 'type_id' => 'simple',
- 'attribute_set_id' => 'Default',
+ 'attribute_set_id' => ['dataSet' => 'default'],
'quantity_and_stock_status' => 'In Stock',
'qty' => 25,
'price' => ['value' => 100, 'preset' => '-'],
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
index 3a884fda130..3bc92ee6892 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
@@ -101,20 +101,30 @@ class Product extends AbstractRepository
'fields' => array(
'inventory_manage_stock' => array(
'value' => 'Yes',
- 'input_value' => '1',
+ 'input_value' => 1,
),
'inventory_qty' => array(
'value' => 0,
'group' => Fixture\Product::GROUP_PRODUCT_INVENTORY
),
+ 'quantity_and_stock_status' => array(
+ 'value' => 'Out of Stock',
+ 'input_value' => 0,
+ 'group' => Fixture\Product::GROUP_PRODUCT_INVENTORY,
+ 'input_name' => 'product[quantity_and_stock_status][is_in_stock]'
+ ),
'inventory_stock_availability' => array(
'value' => 'Out of Stock', // Out of Stock
+ 'input_value' => 0,
+ 'group' => Fixture\Product::GROUP_PRODUCT_INVENTORY,
+ 'input' => 'select',
+ 'input_name' => 'product[stock_data][is_in_stock]'
)
)
)
);
$product = array_replace_recursive($this->_data['simple'], $inventory);
- unset($product['data']['fields']['qty']);
+
return $product;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AssignProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AssignProductTest.php
index 06d357e7ee3..7e1fdc7b308 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AssignProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AssignProductTest.php
@@ -25,12 +25,11 @@ namespace Magento\Catalog\Test\TestCase\Category;
use Mtf\Factory\Factory;
use Mtf\TestCase\Functional;
-use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\Product;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
/**
* Class AssignProducts
- *
*/
class AssignProductTest extends Functional
{
@@ -51,8 +50,7 @@ class AssignProductTest extends Functional
$bundle = Factory::getFixtureFactory()->getMagentoBundleBundleFixed();
$bundle->switchData('bundle_fixed_required');
$bundle->persist();
- $category = Factory::getFixtureFactory()->getMagentoCatalogCategory();
- $category->switchData('default');
+ $category = Factory::getFixtureFactory()->getMagentoCatalogCatalogCategory();
$category->persist();
//Pages & Blocks
$catalogCategoryPage = Factory::getPageFactory()->getCatalogCategory();
@@ -64,7 +62,7 @@ class AssignProductTest extends Functional
//Steps
Factory::getApp()->magentoBackendLoginUser();
$catalogCategoryPage->open();
- $treeBlock->selectCategory($category->getCategoryPath() . '/' . $category->getCategoryName());
+ $treeBlock->selectCategory($category);
$formBlock->openTab('category_products');
$categoryProductsGrid = $formBlock->getCategoryProductsGrid();
$products = [$simple, $configurable, $bundle];
@@ -91,23 +89,23 @@ class AssignProductTest extends Functional
/**
* Verifying that category present in Frontend with products
*
- * @param Category $category
+ * @param CatalogCategory $category
* @param array $products
*/
- protected function assertProductsOnCategory(Category $category, array $products)
+ protected function assertProductsOnCategory(CatalogCategory $category, array $products)
{
//Open created category on frontend
$frontendHomePage = Factory::getPageFactory()->getCmsIndexIndex();
$categoryPage = Factory::getPageFactory()->getCatalogCategoryView();
$frontendHomePage->open();
$navigationMenu = $frontendHomePage->getTopmenu();
- $navigationMenu->selectCategoryByName($category->getCategoryName());
- $this->assertEquals($category->getCategoryName(), $frontendHomePage->getTitleBlock()->getTitle());
+ $navigationMenu->selectCategoryByName($category->getName());
+ $this->assertEquals($category->getName(), $frontendHomePage->getTitleBlock()->getTitle());
$productListBlock = $categoryPage->getListProductBlock();
/** @var Product $product */
foreach ($products as $product) {
$this->assertTrue(
- $productListBlock->isProductVisible($product->getProductName()),
+ $productListBlock->isProductVisible($product->getName()),
'Product is absent on category page.'
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateTest.php
index 0e1da3da5f9..9592b70c86b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateTest.php
@@ -31,7 +31,6 @@ use Magento\Catalog\Test\Fixture\Category;
/**
* Class CreateTest
* Create category test
- *
*/
class CreateTest extends Functional
{
@@ -56,7 +55,7 @@ class CreateTest extends Functional
//Steps
Factory::getApp()->magentoBackendLoginUser();
$catalogCategoryPage->open();
- $treeBlock->selectCategory($category->getCategoryPath());
+ $treeBlock->selectCategory($category);
$treeBlockEdit->addSubcategory();
$formBlock->fill($category);
$actionsBlock->save();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
new file mode 100644
index 00000000000..5af07fd2262
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\TestCase\Category;
+
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
+use Mtf\TestCase\Injectable;
+
+/**
+ * Test Creation for DeleteCategoryEntity
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Create category
+ *
+ * Steps:
+ * 1. Log in to backend as admin user.
+ * 2. Navigate PRODUCTS->Categories.
+ * 3. Open category.
+ * 4. Click "Delete" button.
+ * 5. Perform asserts.
+ *
+ * @group Category_Management_(MX)
+ * @ZephyrId MAGETWO-23303
+ */
+class DeleteCategoryEntityTest extends Injectable
+{
+ /**
+ * Catalog category index page
+ *
+ * @var CatalogCategoryIndex
+ */
+ protected $catalogCategoryIndex;
+
+ /**
+ * Catalog category edit page
+ *
+ * @var CatalogCategoryEdit
+ */
+ protected $catalogCategoryEdit;
+
+ /**
+ * Inject pages
+ *
+ * @param CatalogCategoryIndex $catalogCategoryIndex
+ * @param CatalogCategoryEdit $catalogCategoryEdit
+ * @return void
+ */
+ public function __inject(CatalogCategoryIndex $catalogCategoryIndex, CatalogCategoryEdit $catalogCategoryEdit)
+ {
+ $this->catalogCategoryIndex = $catalogCategoryIndex;
+ $this->catalogCategoryEdit = $catalogCategoryEdit;
+ }
+
+ /**
+ * Delete category
+ *
+ * @param CatalogCategory $category
+ * @return void
+ */
+ public function test(CatalogCategory $category)
+ {
+ $category->persist();
+ $this->catalogCategoryIndex->open();
+ $this->catalogCategoryIndex->getTreeCategories()->selectCategory($category);
+ $this->catalogCategoryEdit->getFormPageActions()->delete();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest/test.csv
new file mode 100644
index 00000000000..8f02c0a6472
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest/test.csv
@@ -0,0 +1,3 @@
+"category/dataSet";"constraint"
+"root_category";"assertCategorySuccessDeleteMessage, assertCategoryAbsenceOnBackend"
+"root_subcategory";"assertCategorySuccessDeleteMessage, assertCategoryAbsenceOnBackend, assertCategoryAbsenceOnFrontend"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
index 0743df162b4..978f7780876 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
@@ -90,12 +90,10 @@ class UpdateCategoryEntityTest extends Injectable
* @param CatalogCategory $initialCategory
* @return void
*/
- public function testUpdateCategory(CatalogCategory $category, CatalogCategory $initialCategory)
+ public function test(CatalogCategory $category, CatalogCategory $initialCategory)
{
$this->catalogCategoryIndex->open();
- $this->catalogCategoryIndex->getTreeCategories()->selectCategory(
- $initialCategory->getPath() . '/' . $initialCategory->getName()
- );
+ $this->catalogCategoryIndex->getTreeCategories()->selectCategory($initialCategory);
$this->catalogCategoryEdit->getEditForm()->fill($category);
$this->catalogCategoryEdit->getFormPageActions()->save();
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/testUpdateCategory.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv
similarity index 100%
rename from dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/testUpdateCategory.csv
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/Configurable/CreateWithAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/Configurable/CreateWithAttributeTest.php
index 2faf3d85e14..cb6a5950987 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/Configurable/CreateWithAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/Configurable/CreateWithAttributeTest.php
@@ -186,14 +186,14 @@ class CreateWithAttributeTest extends Functional
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
$this->assertTrue(
- $productListBlock->isProductVisible($product->getProductName()),
+ $productListBlock->isProductVisible($product->getName()),
'Product is absent on category page.'
);
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $productListBlock->openProductViewPage($product->getProductName());
+ $productListBlock->openProductViewPage($product->getName());
$this->assertEquals(
- $product->getProductName(),
+ $product->getName(),
$productViewBlock->getProductName(),
'Product name does not correspond to specified.'
);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateConfigurableTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateConfigurableTest.php
index f33fb2cdf62..6deb176332e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateConfigurableTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateConfigurableTest.php
@@ -123,14 +123,14 @@ class CreateConfigurableTest extends Functional
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
$this->assertTrue(
- $productListBlock->isProductVisible($product->getProductName()),
+ $productListBlock->isProductVisible($product->getName()),
'Product is absent on category page.'
);
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $productListBlock->openProductViewPage($product->getProductName());
+ $productListBlock->openProductViewPage($product->getName());
$this->assertEquals(
- $product->getProductName(),
+ $product->getName(),
$productViewBlock->getProductName(),
'Product name does not correspond to specified.'
);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateGroupedTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateGroupedTest.php
index 6b264249942..7ff383d0040 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateGroupedTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateGroupedTest.php
@@ -116,14 +116,14 @@ class CreateGroupedTest extends Functional
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
$this->assertTrue(
- $productListBlock->isProductVisible($product->getProductName()),
+ $productListBlock->isProductVisible($product->getName()),
'Product is absent on category page.'
);
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $productListBlock->openProductViewPage($product->getProductName());
+ $productListBlock->openProductViewPage($product->getName());
$this->assertEquals(
- $product->getProductName(),
+ $product->getName(),
$productViewBlock->getProductName(),
'Product name does not correspond to specified.'
);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
index d4c90ab9617..e2a9400500c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
@@ -104,11 +104,11 @@ class CreateProductTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $this->assertEquals($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertEquals($product->getName(), $productViewBlock->getProductName());
$price = $productViewBlock->getProductPrice();
$this->assertEquals(number_format($product->getProductPrice(), 2), $price['price_regular_price']);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
index c4b06bd2cc2..4a4e413458c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
@@ -115,14 +115,14 @@ class CreateSimpleWithCategoryTest extends Functional
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
$this->assertTrue(
- $productListBlock->isProductVisible($product->getProductName()),
+ $productListBlock->isProductVisible($product->getName()),
'Product is absent on category page.'
);
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $productListBlock->openProductViewPage($product->getProductName());
- $this->assertEquals($product->getProductName(), $productViewBlock->getProductName());
+ $productListBlock->openProductViewPage($product->getName());
+ $this->assertEquals($product->getName(), $productViewBlock->getProductName());
$price = $productViewBlock->getProductPrice();
$this->assertEquals(number_format($product->getProductPrice(), 2), $price['price_regular_price']);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
index b649e5c9ff7..3226fb642cc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
@@ -105,11 +105,11 @@ class CreateSimpleWithCustomOptionsAndCategoryTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $this->assertEquals($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertEquals($product->getName(), $productViewBlock->getProductName());
$price = $productViewBlock->getProductPrice();
$this->assertEquals(number_format($product->getProductPrice(), 2), $price['price_regular_price']);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
index b9b0eae2e3f..e7a891ed17e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
@@ -106,11 +106,11 @@ class CreateTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productViewBlock = $productPage->getViewBlock();
- $this->assertEquals($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertEquals($product->getName(), $productViewBlock->getProductName());
$price = $productViewBlock->getProductPrice();
$this->assertEquals(number_format($product->getProductPrice(), 2), $price['price_regular_price']);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
index c2d9d56316f..ecb1e37542a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
@@ -105,12 +105,12 @@ class CreateVirtualTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
//Verification on product detail page
$productPage = Factory::getPageFactory()->getCatalogProductView();
$productViewBlock = $productPage->getViewBlock();
- $this->assertEquals($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertEquals($product->getName(), $productViewBlock->getProductName());
$price = $productViewBlock->getProductPrice();
$this->assertEquals(number_format($product->getProductPrice(), 2), $price['price_regular_price']);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
index 33f0b3d5859..3c5220cacc8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
@@ -115,7 +115,7 @@ class EditSimpleProductTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($categoryName);
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
}
/**
@@ -132,7 +132,7 @@ class EditSimpleProductTest extends Functional
$productPage->open();
$productViewBlock = $productPage->getViewBlock();
- $this->assertEquals($productEdited->getProductName(), $productViewBlock->getProductName());
+ $this->assertEquals($productEdited->getName(), $productViewBlock->getProductName());
$price = $productViewBlock->getProductPrice();
$this->assertEquals(number_format($productEdited->getProductPrice(), 2), $price['price_regular_price']);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
index 9d75889bb72..4b9ec1c815f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
@@ -89,6 +89,6 @@ class UnassignCategoryTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
//Verification on category product list
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertFalse($productListBlock->isProductVisible($product->getProductName()));
+ $this->assertFalse($productListBlock->isProductVisible($product->getName()));
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
new file mode 100644
index 00000000000..3c37d921b09
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\TestCase\ProductAttribute;
+
+use Mtf\TestCase\Injectable;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetAdd;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
+
+/**
+ * Test Creation for CreateAttributeSetEntity
+ *
+ * Test Flow:
+ * 1. Log in to Backend.
+ * 2. Navigate to Stores > Attributes > Product Template.
+ * 3. Start to create new Product Template.
+ * 4. Fill out fields data according to data set.
+ * 5. Add created Product Attribute to Product Template.
+ * 6. Save new Product Template.
+ * 7. Verify created Product Template.
+ *
+ * @group Product_Attributes_(CS)
+ * @ZephyrId MAGETWO-25104
+ */
+class CreateAttributeSetEntityTest extends Injectable
+{
+ /**
+ * Catalog Product Set page
+ *
+ * @var CatalogProductSetIndex
+ */
+ protected $productSetIndex;
+
+ /**
+ * Catalog Product Set add page
+ *
+ * @var CatalogProductSetAdd
+ */
+ protected $productSetAdd;
+
+ /**
+ * Catalog Product Set edit page
+ *
+ * @var CatalogProductSetEdit
+ */
+ protected $productSetEdit;
+
+ /**
+ * @param CatalogProductSetIndex $productSetIndex
+ * @param CatalogProductSetAdd $productSetAdd
+ * @param CatalogProductSetEdit $productSetEdit
+ * @return void
+ */
+ public function __inject(
+ CatalogProductSetIndex $productSetIndex,
+ CatalogProductSetAdd $productSetAdd,
+ CatalogProductSetEdit $productSetEdit
+ ) {
+ $this->productSetIndex = $productSetIndex;
+ $this->productSetAdd = $productSetAdd;
+ $this->productSetEdit = $productSetEdit;
+ }
+
+ /**
+ * Run CreateAttributeSetEntity test
+ *
+ * @param CatalogAttributeSet $attributeSet
+ * @param CatalogProductAttribute $productAttribute
+ * @return void
+ */
+ public function testCreateAttributeSet(
+ CatalogAttributeSet $attributeSet,
+ CatalogProductAttribute $productAttribute
+ ) {
+ $productAttribute->persist();
+
+ //Steps
+ $this->productSetIndex->open();
+ $this->productSetIndex->getPageActionsBlock()->addNew();
+
+ $this->productSetAdd->getAttributeSetForm()->fill($attributeSet);
+ $this->productSetAdd->getPageActions()->save();
+ $this->productSetEdit->getAttributeSetEditBlock()
+ ->moveAttribute($productAttribute->getData(), 'Product Details');
+ $this->productSetEdit->getPageActions()->save();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest/testCreateAttributeSet.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest/testCreateAttributeSet.csv
new file mode 100644
index 00000000000..bf76668ece4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest/testCreateAttributeSet.csv
@@ -0,0 +1,2 @@
+"attributeSet/data/attribute_set_name";"attributeSet/data/skeleton_set/dataSet";"constraint"
+"ProductTemplate%isolation%";"default";"assertProductTemplateSuccessSaveMessage, assertProductTemplateForm, assertProductTemplateInGrid, assertProductTemplateOnProductForm"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
index e26c7edcec4..9d26a069dc1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
@@ -25,6 +25,7 @@
namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Mtf\TestCase\Injectable;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
@@ -51,13 +52,18 @@ class CreateProductAttributeEntityTest extends Injectable
* @param CatalogProductAttribute $productAttribute
* @param CatalogProductAttributeIndex $attributeIndex
* @param CatalogProductAttributeNew $attributeNew
+ * @param CatalogAttributeSet $productTemplate
* @return void
*/
public function testCreateProductAttribute(
CatalogProductAttribute $productAttribute,
CatalogProductAttributeIndex $attributeIndex,
- CatalogProductAttributeNew $attributeNew
+ CatalogProductAttributeNew $attributeNew,
+ CatalogAttributeSet $productTemplate
) {
+ //Precondition
+ $productTemplate->persist();
+
//Steps
$attributeIndex->open();
$attributeIndex->getPageActionsBlock()->addNew();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
index 4dd1b7bc9e9..6fea0abf52f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
@@ -1,9 +1,9 @@
-"productAttribute/data/frontend_label";"productAttribute/data/frontend_input";"productAttribute/data/options/preset";"productAttribute/data/is_required";"productAttribute/data/attribute_code";"productAttribute/data/is_global";"productAttribute/data/default_value_text";"productAttribute/data/is_unique";"productAttribute/data/is_configurable";"productAttribute/data/manage_frontend_label";"productAttribute/data/is_searchable";"productAttribute/data/is_visible_in_advanced_search";"productAttribute/data/is_comparable";"productAttribute/data/is_filterable";"productAttribute/data/is_filterable_in_search";"productAttribute/data/is_used_for_promo_rules";"productAttribute/data/is_html_allowed_on_front";"productAttribute/data/is_visible_on_front";"productAttribute/data/used_in_product_listing";"productAttribute/data/used_for_sort_by";"constraint"
-"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_textfield_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm"
-"Text_Field_Admin_%isolation%";"Text Area";"-";"Yes";"attr_textarea_%isolation%";"Store View";"default_value_text%isolation%";"No";"-";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm, assertProductAttributeIsRequired, assertAttributeSearchableByLabel, assertProductAttributeIsUnique, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable"
-"Date_Admin_%isolation%";"Date";"-";"No";"attr_date_%isolation%";"-";"%currentDate%";"No";"-";"Date_Store_View";"No";"No";"No";"-";"-";"Yes";"-";"Yes";"Yes";"Yes";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm, assertProductAttributeUsedSortOnFrontend, assertProductAttributeIsUsedPromoRules "
-"Yes/No_Admin_%isolation%";"Yes/No";"-";"Yes";"attr_yesno_%isolation%";"Global";"No";"-";"-";"Yes/No_Global";"-";"-";"-";"-";"-";"-";"No";"No";"No";"No";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm"
-"Multiple_Select_Admin_%isolation%";"Multiple Select";"default";"Yes";"attr_multiselect_%isolation%";"Website";"-";"Yes";"-";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsUnique, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertAttributeSearchableByLabel, assertAttributeOptionsOnProductForm"
-"Dropdown_Admin_%isolation%";"Dropdown";"default";"Yes";"attr_dropdown_%isolation%";"Global";"-";"No";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeUsedSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm"
-"Price_Admin_%isolation%";"Price";"-";"No";"attr_price_%isolation%";"-";"-";"No";"-";"Price_StoreView";"Yes";"Yes";"No";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch"
-"Fixed_Product_Tax_Admin_%isolation%";"Fixed Product Tax";"-";"No";"attr_fpt_code_%isolation%";"-";"-";"-";"-";"Fixed_Product_Tax_Storeview";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertProductAttributeOnProductForm"
+"productTemplate/dataSet";"productAttribute/data/frontend_label";"productAttribute/data/frontend_input";"productAttribute/data/options/preset";"productAttribute/data/is_required";"productAttribute/data/attribute_code";"productAttribute/data/is_global";"productAttribute/data/default_value_text";"productAttribute/data/is_unique";"productAttribute/data/is_configurable";"productAttribute/data/manage_frontend_label";"productAttribute/data/is_searchable";"productAttribute/data/is_visible_in_advanced_search";"productAttribute/data/is_comparable";"productAttribute/data/is_filterable";"productAttribute/data/is_filterable_in_search";"productAttribute/data/is_used_for_promo_rules";"productAttribute/data/is_html_allowed_on_front";"productAttribute/data/is_visible_on_front";"productAttribute/data/used_in_product_listing";"productAttribute/data/used_for_sort_by";"constraint"
+"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_textfield_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm"
+"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Area";"-";"Yes";"attr_textarea_%isolation%";"Store View";"default_value_text%isolation%";"No";"-";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertAttributeSearchableByLabel, assertProductAttributeIsUnique, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable"
+"custom_attribute_set";"Date_Admin_%isolation%";"Date";"-";"No";"attr_date_%isolation%";"-";"%currentDate%";"No";"-";"Date_Store_View";"No";"No";"No";"-";"-";"Yes";"-";"Yes";"Yes";"Yes";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeUsedSortOnFrontend, assertProductAttributeIsUsedPromoRules "
+"custom_attribute_set";"Yes/No_Admin_%isolation%";"Yes/No";"-";"Yes";"attr_yesno_%isolation%";"Global";"No";"-";"-";"Yes/No_Global";"-";"-";"-";"-";"-";"-";"No";"No";"No";"No";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm"
+"custom_attribute_set";"Multiple_Select_Admin_%isolation%";"Multiple Select";"default";"Yes";"attr_multiselect_%isolation%";"Website";"-";"Yes";"-";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsUnique, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertAttributeSearchableByLabel, assertAttributeOptionsOnProductForm"
+"custom_attribute_set";"Dropdown_Admin_%isolation%";"Dropdown";"default";"Yes";"attr_dropdown_%isolation%";"Global";"-";"No";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeUsedSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm"
+"custom_attribute_set";"Price_Admin_%isolation%";"Price";"-";"No";"attr_price_%isolation%";"-";"-";"No";"-";"Price_StoreView";"Yes";"Yes";"No";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch"
+"custom_attribute_set";"Fixed_Product_Tax_Admin_%isolation%";"Fixed Product Tax";"-";"No";"attr_fpt_code_%isolation%";"-";"-";"-";"-";"Fixed_Product_Tax_Storeview";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeSaveMessage, assertProductAttributeInGrid, assertAttributeOnAttributeForm, assertAddedProductAttributeOnProductForm"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
new file mode 100644
index 00000000000..093ed910fc5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\TestCase\ProductAttribute;
+
+use Mtf\TestCase\Injectable;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
+
+/**
+ * Test Creation for UpdateProductAttributeEntity
+ *
+ * Preconditions:
+ * 1. Attribute is created
+ * Test Flow:
+ * 1. Log in as default admin user.
+ * 2. Go to Stores > Attributes > Product
+ * 3. Search product attribute in grid by given data
+ * 4. Click on the required product attribute
+ * 5. Click on the "Delete Attribute" button
+ * 6. Perform all assertions
+ *
+ * @group Product_Attributes_(MX)
+ * @ZephyrId MAGETWO-24998
+ */
+class DeleteProductAttributeEntityTest extends Injectable
+{
+ /**
+ * Run DeleteProductAttributeEntity test
+ *
+ * @param CatalogProductAttribute $attribute
+ * @param CatalogProductAttributeIndex $attributeIndex
+ * @param CatalogProductAttributeNew $attributeNew
+ * @return void
+ */
+ public function testDeleteProductAttribute(
+ CatalogProductAttribute $attribute,
+ CatalogProductAttributeIndex $attributeIndex,
+ CatalogProductAttributeNew $attributeNew
+ ) {
+ //Precondition
+ $attribute->persist();
+
+ $filter = [
+ 'frontend_label' => $attribute->getFrontendLabel(),
+ ];
+ //Steps
+ $attributeIndex->open();
+ $attributeIndex->getGrid()->searchAndOpen($filter);
+ $attributeNew->getPageActions()->delete();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest/testDeleteProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest/testDeleteProductAttribute.csv
new file mode 100644
index 00000000000..e77976a657b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest/testDeleteProductAttribute.csv
@@ -0,0 +1,3 @@
+"attribute/dataSet";"isRequired";"constraint"
+"attribute_type_text_field";"Yes";"assertProductAttributeSuccessDeleteMessage, assertProductAttributeAbsenceInGrid, assertProductAttributeAbsenceInSearchOnProductForm, assertProductAttributeAbsenceForExport"
+"attribute_type_dropdown";"No";"assertProductAttributeSuccessDeleteMessage, assertProductAttributeAbsenceInGrid, assertProductAttributeAbsenceInSearchOnProductForm, assertProductAttributeAbsenceForExport"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
new file mode 100644
index 00000000000..5b449eaf42e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Test\TestCase\ProductAttribute;
+
+use Mtf\TestCase\Injectable;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
+
+/**
+ * Test Creation for UpdateProductAttributeEntity
+ *
+ * Preconditions:
+ * Preset : AttributeOptions
+ * 1. Attribute is created (Attribute)
+ * 2. Attribute set is created (Product Template)
+ *
+ * Test Flow:
+ * 1. Log in to Backend.
+ * 2. Navigate to Stores > Attributes > Product.
+ * 3. Select created attribute from preconditions
+ * 4. Fill data from dataset
+ * 5. Click 'Save Attribute' button
+ * 6. Perform all assertions
+ *
+ * @group Product_Attributes_(MX)
+ * @ZephyrId MAGETWO-23459
+ */
+class UpdateProductAttributeEntityTest extends Injectable
+{
+ /**
+ * Run UpdateProductAttributeEntity test
+ *
+ * @param CatalogProductAttribute $productAttributeOriginal
+ * @param CatalogProductAttribute $productAttribute
+ * @param CatalogAttributeSet $productTemplate
+ * @param CatalogProductAttributeIndex $attributeIndex
+ * @param CatalogProductAttributeNew $attributeNew
+ * @return void
+ */
+ public function testUpdateProductAttribute(
+ CatalogProductAttribute $productAttributeOriginal,
+ CatalogProductAttribute $productAttribute,
+ CatalogAttributeSet $productTemplate,
+ CatalogProductAttributeIndex $attributeIndex,
+ CatalogProductAttributeNew $attributeNew
+ ) {
+ //Precondition
+ $productTemplate->persist();
+ $productAttributeOriginal->persist();
+
+ $filter = [
+ 'attribute_code' => $productAttributeOriginal->getAttributeCode(),
+ ];
+
+ //Steps
+ $attributeIndex->open();
+ $attributeIndex->getGrid()->searchAndOpen($filter);
+ $attributeNew->getAttributeForm()->fill($productAttribute);
+ $attributeNew->getPageActions()->save();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv
new file mode 100644
index 00000000000..b156600a3a1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv
@@ -0,0 +1,3 @@
+"productTemplate/dataSet";"productAttributeOriginal/dataSet";"productAttribute/data/frontend_label";"productAttribute/data/frontend_input";"productAttribute/data/options/preset";"productAttribute/data/is_required";"productAttribute/data/attribute_code";"productAttribute/data/is_global";"productAttribute/data/default_value_text";"productAttribute/data/is_unique";"productAttribute/data/is_configurable";"productAttribute/data/manage_frontend_label";"productAttribute/data/is_searchable";"productAttribute/data/is_visible_in_advanced_search";"productAttribute/data/is_comparable";"productAttribute/data/is_filterable";"productAttribute/data/is_filterable_in_search";"productAttribute/data/is_used_for_promo_rules";"productAttribute/data/is_html_allowed_on_front";"productAttribute/data/is_visible_on_front";"productAttribute/data/used_in_product_listing";"productAttribute/data/used_for_sort_by";"isRequired";"constraint"
+"custom_attribute_set";"attribute_type_text_field";"Text_Field_%isolation%";"-";"-";"Yes";"-";"Global";"attribute_edited%isolation%";"Yes";"-";"-";"Yes";"Yes";"Yes";"-";"-";"Yes";"Yes";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeSaveMessage, assertAddedProductAttributeOnProductForm"
+"custom_attribute_set";"attribute_type_dropdown";"Dropdown_%isolation%";"-";"default";"Yes";"-";"Global";"-";"Yes";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"No";"Yes";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeSaveMessage, assertAddedProductAttributeOnProductForm"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/curl/di.xml
index e916678bd8c..91e0087de29 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/curl/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/curl/di.xml
@@ -25,5 +25,7 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface" type="\Magento\Catalog\Test\Handler\CatalogProductSimple\Curl" />
+ <preference for="Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface" type="\Magento\Catalog\Test\Handler\CatalogProductAttribute\Curl" />
+ <preference for="Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface" type="\Magento\Catalog\Test\Handler\CatalogAttributeSet\Curl" />
<preference for="Magento\Catalog\Test\Handler\CatalogCategory\CatalogCategoryInterface" type="\Magento\Catalog\Test\Handler\CatalogCategory\Curl" />
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/constraint.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/constraint.xml
index fc50ecd0876..5293569e798 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/constraint.xml
@@ -170,9 +170,19 @@
<assertAttributeOnAttributeForm module="Magento_Catalog">
<severeness>low</severeness>
</assertAttributeOnAttributeForm>
- <assertProductAttributeOnProductForm module="Magento_Catalog">
+ <assertAddedProductAttributeOnProductForm module="Magento_Catalog">
<severeness>low</severeness>
- </assertProductAttributeOnProductForm>
+ <require>
+ <productTemplate class="Magento\Catalog\Test\Fixture\CatalogProductTemplate" />
+ <attribute class="Magento\Catalog\Test\Fixture\CatalogProductAttribute" />
+ <productAttribute class="Magento\Catalog\Test\Fixture\CatalogProductAttribute" />
+ <productEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
+ <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
+ <productSetEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit" />
+ <productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
+ <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
+ </require>
+ </assertAddedProductAttributeOnProductForm>
<assertProductAttributeIsRequired module="Magento_Catalog">
<severeness>low</severeness>
</assertProductAttributeIsRequired>
@@ -223,6 +233,9 @@
<checkoutCart class="Magento\Checkout\Test\Page\CheckoutCart" />
</require>
</assertCrossSellsProductsSection>
+ <assertProductAttributeSuccessDeleteMessage module="Magento_Catalog">
+ <severeness>high</severeness>
+ </assertProductAttributeSuccessDeleteMessage>
<assertNoCrossSellsProductsSection module="Magento_Catalog">
<severeness>middle</severeness>
</assertNoCrossSellsProductsSection>
@@ -236,6 +249,9 @@
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
</require>
</assertRelatedProductsSection>
+ <assertProductAttributeAbsenceInGrid module="Magento_Catalog">
+ <severeness>high</severeness>
+ </assertProductAttributeAbsenceInGrid>
<assertNoRelatedProductsSection module="Magento_Catalog">
<severeness>middle</severeness>
</assertNoRelatedProductsSection>
@@ -249,6 +265,9 @@
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
</require>
</assertUpSellsProductsSection>
+ <assertProductAttributeAbsenceInSearchOnProductForm module="Magento_Catalog">
+ <severeness>high</severeness>
+ </assertProductAttributeAbsenceInSearchOnProductForm>
<assertNoUpSellsProductsSection module="Magento_Catalog">
<severeness>middle</severeness>
</assertNoUpSellsProductsSection>
@@ -261,6 +280,52 @@
<assertCategoryPage module="Magento_Catalog">
<severeness>low</severeness>
</assertCategoryPage>
+ <assertCategorySuccessDeleteMessage module="Magento_Catalog">
+ <severeness>low</severeness>
+ <require>
+ <categoryEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit" />
+ </require>
+ </assertCategorySuccessDeleteMessage>
+ <assertCategoryAbsenceOnFrontend module="Magento_Catalog">
+ <severeness>low</severeness>
+ <require>
+ <browser class="Mtf\Client\Browser" />
+ <categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
+ <category class="Magento\Catalog\Test\Fixture\CatalogCategory" />
+ </require>
+ </assertCategoryAbsenceOnFrontend>
+ <assertCategoryAbsenceOnBackend module="Magento_Catalog">
+ <severeness>low</severeness>
+ <require>
+ <category class="Magento\Catalog\Test\Fixture\CatalogCategory" />
+ <catalogCategoryIndex class="Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex" />
+ </require>
+ </assertCategoryAbsenceOnBackend>
+ <assertProductTemplateSuccessSaveMessage module="Magento_Catalog">
+ <severeness>high</severeness>
+ <productSetIndex class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
+ </assertProductTemplateSuccessSaveMessage>
+ <assertProductTemplateForm module="Magento_Catalog">
+ <severeness>high</severeness>
+ <productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
+ <productSetEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit" />
+ <attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
+ <productAttribute class="Magento\Catalog\Test\Fixture\CatalogProductAttribute" />
+ </assertProductTemplateForm>
+ <assertProductTemplateInGrid module="Magento_Catalog">
+ <severeness>high</severeness>
+ <productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
+ <attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
+ </assertProductTemplateInGrid>
+ <assertProductTemplateOnProductForm module="Magento_Catalog">
+ <severeness>high</severeness>
+ <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
+ <attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
+ <productEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
+ <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
+ <newProductPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew" />
+ <productAttribute class="Magento\Catalog\Test\Fixture\CatalogProductAttribute" />
+ </assertProductTemplateOnProductForm>
<assertAbsenceDeleteAttributeButton module="Magento_Catalog">
<severeness>high</severeness>
<require>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/fixture.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/fixture.xml
index 38ac0903913..b6320f265be 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/fixture.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/fixture.xml
@@ -220,4 +220,9 @@
</entities>
<collection>Magento\Catalog\Model\Resource\Attribute</collection>
</catalogProductAttribute>
+ <catalogAttributeSet module="Magento_Catalog">
+ <type>flat</type>
+ <entity_type>eav_attribute_set</entity_type>
+ <collection>Magento\Catalog\Model\Resource\Product\Link\Product\Collection</collection>
+ </catalogAttributeSet>
</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/page.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/page.xml
index a1436244cff..5fd15786ae5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/page.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/global/page.xml
@@ -64,4 +64,24 @@
<area>adminhtml</area>
<class>Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit</class>
</catalogCategoryEdit>
+ <catalogProductSetIndex>
+ <mca>catalog/product_set/index</mca>
+ <area>adminhtml</area>
+ <class>Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex</class>
+ </catalogProductSetIndex>
+ <catalogProductSetEdit>
+ <mca>catalog/product_set/edit</mca>
+ <area>adminhtml</area>
+ <class>Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit</class>
+ </catalogProductSetEdit>
+ <catalogCategoryEdit>
+ <mca>catalog/category/edit</mca>
+ <area>adminhtml</area>
+ <class>Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit</class>
+ </catalogCategoryEdit>
+ <catalogProductSetAdd>
+ <mca>catalog/product_set/add</mca>
+ <area>adminhtml</area>
+ <class>Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetAdd</class>
+ </catalogProductSetAdd>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchTest.php
index f89c161590b..2c3b8930dec 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchTest.php
@@ -60,7 +60,7 @@ class AdvancedSearchTest extends Functional
$searchForm->submit();
//Verifying
- $productName = $productFixture->getProductName();
+ $productName = $productFixture->getName();
$this->assertTrue(
$advancedSearchResultPage->getListProductBlock()->isProductVisible($productName),
sprintf('Product "%s" is not displayed on the "Catalog Advanced Search" results page."', $productName)
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index 79e02713099..6518de4138b 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -31,6 +31,7 @@ use Magento\Catalog\Test\Fixture\Product;
use Magento\Catalog\Test\Fixture\SimpleProduct;
use Magento\Catalog\Test\Fixture\ConfigurableProduct;
use Magento\Checkout\Test\Block\Onepage\Link;
+use Mtf\Fixture\FixtureInterface;
/**
* Class Cart
@@ -122,7 +123,7 @@ class Cart extends Block
/**
* Get unit price for the specified item in the cart
*
- * @param Product $product
+ * @param FixtureInterface $product
* @param string $currency
* @return float
*/
@@ -258,12 +259,12 @@ class Cart extends Block
/**
* Return the name of the specified product.
*
- * @param Product $product
+ * @param FixtureInterface $product
* @return string
*/
private function getProductName($product)
{
- $productName = $product->getProductName();
+ $productName = $product->getName();
if ($product instanceof ConfigurableProduct) {
$productOptions = $product->getProductOptions();
if (!empty($productOptions)) {
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.php
index 9af22c8b0e7..4629a1b8ef5 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.php
@@ -40,7 +40,7 @@ class CheckoutCart extends FrontendPage
'cartBlock' => [
'name' => 'cartBlock',
'class' => 'Magento\Checkout\Test\Block\Cart',
- 'locator' => '//div[contains(@class, "cart container")]',
+ 'locator' => '//div[contains(@class, "cart-container")]',
'strategy' => 'xpath',
],
'messagesBlock' => [
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml
index 82bbcbc16df..db32d6943be 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml
@@ -27,7 +27,7 @@
<block>
<name>cartBlock</name>
<class>Magento\Checkout\Test\Block\Cart</class>
- <locator>//div[contains(@class, "cart container")]</locator>
+ <locator>//div[contains(@class, "cart-container")]</locator>
<strategy>xpath</strategy>
</block>
<block>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
index a9cd22332ce..6589d7c3443 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
@@ -25,7 +25,7 @@
namespace Magento\Cms\Test\Handler\CmsPage;
use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
+use Magento\Backend\Test\Handler\Conditions;
use Mtf\Util\Protocol\CurlInterface;
use Mtf\Util\Protocol\CurlTransport;
use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
@@ -33,29 +33,37 @@ use Mtf\System\Config;
/**
* Class Curl
- * Curl handler for creating cms page
+ * Curl handler for creating Cms page
*/
-class Curl extends AbstractCurl implements CmsPageInterface
+class Curl extends Conditions implements CmsPageInterface
{
/**
- * Data mapping
+ * Mapping values for data.
*
* @var array
*/
protected $mappingData = [
- 'status' => ['Published' => 1, 'Disabled' => 0],
- 'store_id' => ['All Store Views' => 0],
+ 'is_active' => [
+ 'Published' => 1,
+ 'Disabled' => 0
+ ],
+ 'store_id' => [
+ 'All Store Views' => 0,
+ ],
+ 'root_template' => [
+ '1 column' => 'one_column',
+ '2 columns with left bar' => 'two_columns_left',
+ '2 columns with right bar' => 'two_columns_right',
+ '3 columns' => 'three_columns'
+ ],
+ 'under_version_control' => [
+ 'Yes' => 1,
+ 'No' => 0
+ ]
];
/**
- * Url for save rewrite
- *
- * @var string
- */
- protected $url = 'admin/cms_page/save/back/edit/active_tab/content_section/';
-
- /**
- * Post request for creating cms page
+ * Post request for creating a cms page
*
* @param FixtureInterface $fixture
* @return array
@@ -63,14 +71,18 @@ class Curl extends AbstractCurl implements CmsPageInterface
*/
public function persist(FixtureInterface $fixture = null)
{
- $url = $_ENV['app_backend_url'] . $this->url;
+ $url = $_ENV['app_backend_url'] . 'admin/cms_page/save/';
$data = $this->replaceMappingData($fixture->getData());
- $curl = new BackendDecorator(new CurlTransport(), new Config());
+ $data['stores'] = [$data['store_id']];
+ unset($data['store_id']);
+ $curl = new BackendDecorator(new CurlTransport(), new Config);
+ $curl->addOption(CURLOPT_HEADER, 1);
$curl->write(CurlInterface::POST, $url, '1.0', [], $data);
$response = $curl->read();
+ $curl->close();
if (!strpos($response, 'data-ui-id="messages-message-success"')) {
- throw new \Exception("Page creation by curl handler was not successful! Response: $response");
+ throw new \Exception("Cms page entity creating by curl handler was not successful! Response: $response");
}
preg_match("~page_id\/(\d*?)\/~", $response, $matches);
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.php
index 2e110104a54..0fd1481fc81 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.php
@@ -49,13 +49,13 @@ class CmsIndex extends FrontendPage
'titleBlock' => [
'name' => 'titleBlock',
'class' => 'Magento\Theme\Test\Block\Html\Title',
- 'locator' => '.page.title',
+ 'locator' => '[data-ui-id="page-title"]',
'strategy' => 'css selector',
],
'footerBlock' => [
'name' => 'footerBlock',
'class' => 'Magento\Theme\Test\Block\Html\Footer',
- 'locator' => 'footer.footer',
+ 'locator' => 'footer.page-footer',
'strategy' => 'css selector',
],
'linksBlock' => [
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
index 0f03a95f956..f2c089e48bf 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
@@ -39,13 +39,13 @@
<block>
<name>titleBlock</name>
<class>Magento\Theme\Test\Block\Html\Title</class>
- <locator>.page.title</locator>
+ <locator>.page-title</locator>
<strategy>css selector</strategy>
</block>
<block>
<name>footerBlock</name>
<class>Magento\Theme\Test\Block\Html\Footer</class>
- <locator>footer.footer</locator>
+ <locator>footer.page-footer</locator>
<strategy>css selector</strategy>
</block>
<block>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
index 6f110172b7a..53e690f919e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
@@ -54,18 +54,22 @@ class AssertProductAttributeIsConfigurable extends AbstractConstraint
* Assert check whether the attribute is used to create a configurable products
*
* @param CatalogProductAttribute $productAttribute
+ * @param CatalogProductAttribute $attribute
* @param CatalogProductIndex $productGrid
* @param FixtureFactory $fixtureFactory
* @param CatalogProductNew $newProductPage
*/
public function processAssert
(
- CatalogProductAttribute $productAttribute,
+ CatalogProductAttribute $attribute,
CatalogProductIndex $productGrid,
FixtureFactory $fixtureFactory,
- CatalogProductNew $newProductPage
+ CatalogProductNew $newProductPage,
+ CatalogProductAttribute $productAttribute = null
) {
- $this->attributeFrontendLabel = $productAttribute->getFrontendLabel();
+ $this->attributeFrontendLabel = ($productAttribute)
+ ? $productAttribute->getFrontendLabel()
+ : $attribute->getFrontendLabel();
$productGrid->open();
$productGrid->getProductBlock()->addProduct('configurable');
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/CatalogProductConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/CatalogProductConfigurable.php
index d455dc52296..7206777cb85 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/CatalogProductConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/CatalogProductConfigurable.php
@@ -27,7 +27,7 @@ namespace Magento\ConfigurableProduct\Test\Repository;
use Mtf\Repository\AbstractRepository;
/**
- * Class CatalogProductSimple
+ * Class CatalogProductConfigurable
* Data for creation Catalog Product Configurable
*/
class CatalogProductConfigurable extends AbstractRepository
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/curl/di.xml
new file mode 100644
index 00000000000..c60ac77fe79
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/curl/di.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <preference for="Magento\ConfigurableProduct\Test\Handler\CatalogProductConfigurable\CatalogProductConfigurableInterface" type="\Magento\ConfigurableProduct\Test\Handler\CatalogProductConfigurable\Curl" />
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
index 21c7cbae76a..c72bb53b30f 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
@@ -74,12 +74,19 @@ class Messages extends Block
/**
* Get all success messages which are present on the page
*
- * @return string
+ * @return string|array
*/
public function getSuccessMessages()
{
$this->waitForElementVisible($this->successMessage);
- return $this->_rootElement->find($this->successMessage)->getText();
+ $elements = $this->_rootElement->find($this->successMessage)->getElements();
+
+ $messages = [];
+ foreach ($elements as $key => $element) {
+ $messages[$key] = $element->getText();
+ }
+
+ return count($messages) > 1 ? $messages : $messages[0];
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
index c34b09d69dc..1ab9ac3bee4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
@@ -29,8 +29,6 @@ use Magento\Backend\Test\Block\Widget\Grid;
/**
* Class CustomerGroupGrid
* Adminhtml customer group grid
- *
- * @package Magento\Customer\Test\Block\Adminhtml\Group
*/
class CustomerGroupGrid extends Grid
{
@@ -44,4 +42,11 @@ class CustomerGroupGrid extends Grid
'selector' => '#customerGroupGrid_filter_type'
]
];
+
+ /**
+ * Locator value for grid to click
+ *
+ * @var string
+ */
+ protected $editLink = 'td[data-column="time"]';
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
index 469dda30552..5972dc3629d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
@@ -29,12 +29,10 @@ use Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupAlreadyExists
- *
- * @package Magento\Customer\Test\Constraint
*/
class AssertCustomerGroupAlreadyExists extends AbstractConstraint
{
- const SUCCESS_MESSAGE = 'Customer Group already exists.';
+ const ERROR_MESSAGE = 'Customer Group already exists.';
/**
* Constraint severeness
@@ -53,7 +51,7 @@ class AssertCustomerGroupAlreadyExists extends AbstractConstraint
{
$actualMessage = $customerGroupNew->getMessagesBlock()->getErrorMessages();
\PHPUnit_Framework_Assert::assertEquals(
- self::SUCCESS_MESSAGE,
+ self::ERROR_MESSAGE,
$actualMessage,
'Wrong error message is displayed.'
);
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
new file mode 100644
index 00000000000..30d18a4fda6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Customer\Test\Constraint;
+
+use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertCustomerGroupForm
+ */
+class AssertCustomerGroupForm extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Skipped fields while verifying
+ *
+ * @var array
+ */
+ protected $skippedFields = [
+ 'customer_group_id',
+ ];
+
+ /**
+ * Assert that customer group form equals to fixture data
+ *
+ * @param CustomerGroupIndex $customerGroupIndex
+ * @param CustomerGroupNew $customerGroupNew
+ * @param CustomerGroupInjectable $customerGroup
+ * @param CustomerGroupInjectable $customerGroupOriginal
+ * @return void
+ */
+ public function processAssert(
+ CustomerGroupIndex $customerGroupIndex,
+ CustomerGroupNew $customerGroupNew,
+ CustomerGroupInjectable $customerGroup,
+ CustomerGroupInjectable $customerGroupOriginal = null
+ ) {
+ $data = ($customerGroupOriginal !== null)
+ ? array_merge($customerGroupOriginal->getData(), $customerGroup->getData())
+ : $customerGroup->getData();
+ $filter = [
+ 'code' => $data['customer_group_code'],
+ ];
+
+ $customerGroupIndex->open();
+ $customerGroupIndex->getCustomerGroupGrid()->searchAndOpen($filter);
+ $formData = $customerGroupNew->getPageMainForm()->getData();
+ $dataDiff = $this->verifyForm($formData, $data);
+ \PHPUnit_Framework_Assert::assertTrue(
+ empty($dataDiff),
+ 'Customer Group form was filled incorrectly.'
+ . "\nLog:\n" . implode(";\n", $dataDiff)
+ );
+ }
+
+ /**
+ * Verifying that form is filled correctly
+ *
+ * @param array $formData
+ * @param array $fixtureData
+ * @return array $errorMessages
+ */
+ protected function verifyForm(array $formData, array $fixtureData)
+ {
+ $errorMessages = [];
+
+ foreach ($fixtureData as $key => $value) {
+ if (in_array($key, $this->skippedFields)) {
+ continue;
+ }
+ if ($value !== $formData[$key]) {
+ $errorMessages[] = "Data in " . $key . " field is not equal."
+ . "\nExpected: " . $value
+ . "\nActual: " . $formData[$key];
+ }
+ }
+
+ return $errorMessages;
+ }
+
+ /**
+ * Returns a string representation of successful assertion
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Customer Group form was filled correctly.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
new file mode 100644
index 00000000000..77ac3d0b3af
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Customer\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
+
+/**
+ * Class AssertCustomerGroupSuccessDeleteMessage
+ */
+class AssertCustomerGroupSuccessDeleteMessage extends AbstractConstraint
+{
+ const SUCCESS_DELETE_MESSAGE= "The customer group has been deleted.";
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that message "The customer group has been deleted." is displayed on Customer Group page.
+ *
+ * @param CustomerGroupIndex $customerGroupIndex
+ * @return void
+ */
+ public function processAssert(CustomerGroupIndex $customerGroupIndex)
+ {
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::SUCCESS_DELETE_MESSAGE,
+ $customerGroupIndex->getMessagesBlock()->getSuccessMessages(),
+ 'Wrong message is displayed.'
+ . "\nExpected: " . self::SUCCESS_DELETE_MESSAGE
+ . "\nActual: " . $customerGroupIndex->getMessagesBlock()->getSuccessMessages()
+ );
+ }
+
+ /**
+ * Text success delete message is displayed
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Assert that success delete message is displayed.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
similarity index 92%
rename from dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessCreateMessage.php
rename to dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
index dfe1501cb58..1b43e85d560 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
@@ -28,11 +28,9 @@ use Mtf\Constraint\AbstractConstraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
/**
- * Class AssertCustomerGroupSuccessCreateMessage
- *
- * @package Magento\Customer\Test\Constraint
+ * Class AssertCustomerGroupSuccessSaveMessage
*/
-class AssertCustomerGroupSuccessCreateMessage extends AbstractConstraint
+class AssertCustomerGroupSuccessSaveMessage extends AbstractConstraint
{
const SUCCESS_MESSAGE = 'The customer group has been saved.';
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
index 2919f8f2149..ad989b3dfab 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
@@ -26,16 +26,30 @@ namespace Magento\Customer\Test\Fixture\CustomerGroup;
use Mtf\Fixture\FixtureFactory;
use Mtf\Fixture\FixtureInterface;
+use Magento\Tax\Test\Fixture\TaxClass;
/**
- * Class TaxClass
- * @package Magento\Customer\Test\Fixture
+ * Class TaxClassIds
+ *
+ * Data keys:
+ * - dataSet
*/
class TaxClassIds implements FixtureInterface
{
- /** @var string Data */
+ /**
+ * Tax class name
+ *
+ * @var string
+ */
protected $data;
+ /**
+ * TaxClass fixture
+ *
+ * @var TaxClass
+ */
+ protected $taxClass;
+
/**
* @param FixtureFactory $fixtureFactory
* @param array $params
@@ -55,6 +69,7 @@ class TaxClassIds implements FixtureInterface
$taxClass->persist();
}
$this->data = $taxClass->getClassName();
+ $this->taxClass = $taxClass;
}
}
@@ -81,6 +96,16 @@ class TaxClassIds implements FixtureInterface
return $this->data;
}
+ /**
+ * Return TaxClass fixture
+ *
+ * @return TaxClass
+ */
+ public function getTaxClass()
+ {
+ return $this->taxClass;
+ }
+
/**
* Return data set configuration settings
*
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
index 07ba892a115..9ce23bf3c5f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
@@ -31,9 +31,16 @@ use Mtf\Fixture\InjectableFixture;
*/
class CustomerGroupInjectable extends InjectableFixture
{
+ /**
+ * @var string
+ */
+ // @codingStandardsIgnoreStart
+ protected $handlerInterface = 'Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface';
+ // @codingStandardsIgnoreEnd
+
protected $defaultDataSet = [
'customer_group_code' => 'customer_code_%isolation%',
- 'tax_class_id' => 'Retail Customer',
+ 'tax_class_id' => ['dataSet' => 'customer_tax_class'],
];
protected $customer_group_code = [
@@ -53,6 +60,11 @@ class CustomerGroupInjectable extends InjectableFixture
'source' => 'Magento\Customer\Test\Fixture\CustomerGroup\TaxClassIds',
];
+ protected $customer_group_id = [
+ 'attribute_code' => 'customer_group_id',
+ 'backend_type' => 'virtual',
+ ];
+
public function getCustomerGroupCode()
{
return $this->getData('customer_group_code');
@@ -62,4 +74,9 @@ class CustomerGroupInjectable extends InjectableFixture
{
return $this->getData('tax_class_id');
}
+
+ public function getCustomerGroupId()
+ {
+ return $this->getData('customer_group_id');
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml
index 7a57153862b..cbfd09e31bb 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml
@@ -43,5 +43,9 @@
<default_value>Retail Customer</default_value>
<input>select</input>
</tax_class_id>
+ <customer_group_id>
+ <attribute_code>customer_group_id</attribute_code>
+ <backend_type>virtual</backend_type>
+ </customer_group_id>
</fields>
</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
new file mode 100644
index 00000000000..e3f3ff35fea
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Customer\Test\Handler\CustomerGroupInjectable;
+
+use Mtf\System\Config;
+use Mtf\Handler\Curl as AbstractCurl;
+use Mtf\Util\Protocol\CurlInterface;
+use Mtf\Util\Protocol\CurlTransport;
+use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Mtf\Fixture\FixtureInterface;
+use Magento\Backend\Test\Handler\Extractor;
+
+/**
+ * Class Curl
+ * Curl handler for creating customer group
+ */
+class Curl extends AbstractCurl implements CustomerGroupInjectableInterface
+{
+ /**
+ * Url for saving data
+ *
+ * @var string
+ */
+ protected $saveUrl = 'customer/group/save/';
+
+ /**
+ * POST request for creating Customer Group
+ *
+ * @param FixtureInterface $fixture
+ * @return array|mixed
+ * @throws \Exception
+ */
+ public function persist(FixtureInterface $fixture = null)
+ {
+ $data['code'] = $fixture->getCustomerGroupCode();
+ $data['tax_class'] = $fixture->getDataFieldConfig('tax_class_id')['source']->getTaxClass()->getId();
+ $url = $_ENV['app_backend_url'] . $this->saveUrl;
+ $curl = new BackendDecorator(new CurlTransport(), new Config);
+ $curl->addOption(CURLOPT_HEADER, 1);
+ $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
+ $response = $curl->read();
+ $curl->close();
+
+ if (!strpos($response, 'data-ui-id="messages-message-success"')) {
+ throw new \Exception(
+ "Customer Group entity creating by curl handler was not successful! Response: $response"
+ );
+ }
+
+ return ['customer_group_id' => $this->getCustomerGroupId($data, $response)];
+ }
+
+ /**
+ * Get id after creating Customer Group
+ *
+ * @param array $data
+ * @return int|null
+ */
+ public function getCustomerGroupId(array $data)
+ {
+ $url = 'customer/group/index/sort/time/dir/desc';
+ $regExp = '/.*id\/(\d+)\/.*'. $data['code'] .'/siu';
+ $extractor = new Extractor($url, $regExp);
+ $match = $extractor->getData();
+
+ return empty($match[1]) ? null : $match[1];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
new file mode 100644
index 00000000000..b6426161423
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Customer\Test\Handler\CustomerGroupInjectable;
+
+use Mtf\Handler\HandlerInterface;
+
+/**
+ * Interface CustomerGroupInjectableInterface
+ */
+interface CustomerGroupInjectableInterface extends HandlerInterface
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.php
index ca68f19c111..ab1e5b42812 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.php
@@ -51,7 +51,7 @@ class CustomerAccountIndex extends FrontendPage
'titleBlock' => [
'name' => 'titleBlock',
'class' => 'Magento\Theme\Test\Block\Html\Title',
- 'locator' => '.page.title',
+ 'locator' => '.page-title',
'strategy' => 'css selector',
],
'accountMenuBlock' => [
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml
index 08a8c094a0f..a550144c4b2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml
@@ -39,7 +39,7 @@
<block>
<name>titleBlock</name>
<class>Magento\Theme\Test\Block\Html\Title</class>
- <locator>.page.title</locator>
+ <locator>.page-title</locator>
<strategy>css selector</strategy>
</block>
<block>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv
index 1bc43c1efba..4fba0855cf1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv
@@ -1,4 +1,4 @@
"customerGroup/data/tax_class_id/dataSet";"customerGroup/data/customer_group_code";"constraint"
-"Retail Customer";"GroupName%isolation%";"assertCustomerGroupSuccessCreateMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm"
+"Retail Customer";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm"
"Retail Customer";"General ";"assertCustomerGroupAlreadyExists, assertCustomerGroupNotInGrid"
-"customer_tax_class";"GroupName%isolation%";"assertCustomerGroupSuccessCreateMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm"
+"customer_tax_class";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
new file mode 100644
index 00000000000..adacc741eb2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Customer\Test\TestCase;
+
+use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
+use Mtf\TestCase\Injectable;
+
+/**
+ * Test Creation for DeleteCustomerGroupEntity
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Customer Group is created
+ * Steps:
+ * 1. Log in to backend as admin user
+ * 2. Navigate to Stores > Other Settings > Customer Groups
+ * 3. Click on Customer Group from grid
+ * 4. Click on Delete "Customer Group"
+ * 5. Confirm in pop-up
+ * 6. Perform all assertions
+ *
+ * @group Customer_Groups_(CS)
+ * @ZephyrId MAGETWO-25243
+ */
+class DeleteCustomerGroupEntityTest extends Injectable
+{
+ /**
+ * Page CustomerGroupIndex
+ *
+ * @var CustomerGroupIndex
+ */
+ protected $customerGroupIndex;
+
+ /**
+ * Page CustomerGroupNew
+ *
+ * @var CustomerGroupNew
+ */
+ protected $customerGroupNew;
+
+ /**
+ * Injection data
+ *
+ * @param CustomerGroupIndex $customerGroupIndex
+ * @param CustomerGroupNew $customerGroupNew
+ * @return void
+ */
+ public function __inject(
+ CustomerGroupIndex $customerGroupIndex,
+ CustomerGroupNew $customerGroupNew
+ ) {
+ $this->customerGroupIndex = $customerGroupIndex;
+ $this->customerGroupNew = $customerGroupNew;
+ }
+
+ /**
+ * Delete Customer Group
+ *
+ * @param CustomerGroupInjectable $customerGroup
+ * @return void
+ */
+ public function test(CustomerGroupInjectable $customerGroup)
+ {
+ // Precondition
+ $customerGroup->persist();
+
+ // Steps
+ $filter = ['code' => $customerGroup->getCustomerGroupCode()];
+ $this->customerGroupIndex->open();
+ $this->customerGroupIndex->getCustomerGroupGrid()->searchAndOpen($filter);
+ $this->customerGroupNew->getPageMainActions()->delete();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest/test.csv
new file mode 100644
index 00000000000..029581ec254
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest/test.csv
@@ -0,0 +1,2 @@
+"constraint"
+"assertCustomerGroupSuccessDeleteMessage, assertCustomerGroupNotInGrid"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
new file mode 100644
index 00000000000..8396a00113b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Customer\Test\TestCase;
+
+use Mtf\TestCase\Injectable;
+use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
+use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
+
+/**
+ * Test Creation for Update Customer Group Entity
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Customer Group is created
+ * Steps:
+ * 1. Log in to backend as admin user
+ * 2. Navigate to Stores > Other Settings > Customer Groups
+ * 3. Click on Customer Group from grid
+ * 4. Update data according to data set
+ * 5. Click "Save Customer Group" button
+ * 6. Perform all assertions
+ *
+ * @group Customer_Groups_(CS)
+ * @ZephyrId MAGETWO-25536
+ */
+class UpdateCustomerGroupEntityTest extends Injectable
+{
+ /**
+ * Page CustomerGroupIndex
+ *
+ * @var CustomerGroupIndex
+ */
+ protected $customerGroupIndex;
+
+ /**
+ * Page CustomerGroupNew
+ *
+ * @var CustomerGroupNew
+ */
+ protected $customerGroupNew;
+
+ /**
+ * Injection data
+ *
+ * @param CustomerGroupIndex $customerGroupIndex
+ * @param CustomerGroupNew $customerGroupNew
+ * @return void
+ */
+ public function __inject(
+ CustomerGroupIndex $customerGroupIndex,
+ CustomerGroupNew $customerGroupNew
+ ) {
+ $this->customerGroupIndex = $customerGroupIndex;
+ $this->customerGroupNew = $customerGroupNew;
+ }
+
+ /**
+ * Update Customer Group
+ *
+ * @param CustomerGroupInjectable $customerGroupOriginal
+ * @param CustomerGroupInjectable $customerGroup
+ * @return void
+ */
+ public function test(
+ CustomerGroupInjectable $customerGroupOriginal,
+ CustomerGroupInjectable $customerGroup
+ ) {
+ // Precondition
+ $customerGroupOriginal->persist();
+ $filter = ['code' => $customerGroupOriginal->getCustomerGroupCode()];
+
+ // Steps
+ $this->customerGroupIndex->open();
+ $this->customerGroupIndex->getCustomerGroupGrid()->searchAndOpen($filter);
+ $this->customerGroupNew->getPageMainForm()->fill($customerGroup);
+ $this->customerGroupNew->getPageMainActions()->save();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv
new file mode 100644
index 00000000000..111f6ac2661
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv
@@ -0,0 +1,5 @@
+"customerGroup/data/tax_class_id/dataSet";"customerGroup/data/customer_group_code";"constraint"
+"Retail Customer";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm"
+"-";"General ";"assertCustomerGroupAlreadyExists"
+"customer_tax_class";"Group Name %isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm"
+"customer_tax_class";"Group#Name%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml
index 4ea2277356e..df4af3d074f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml
@@ -25,4 +25,5 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface" type="\Magento\Customer\Test\Handler\CustomerInjectable\Curl"/>
+ <preference for="Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface" type="\Magento\Customer\Test\Handler\CustomerGroupInjectable\Curl"/>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/constraint.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/constraint.xml
index aa20c921c46..87100e00439 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/constraint.xml
@@ -72,9 +72,9 @@
<pageCustomerIndexNew class="Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew" />
</require>
</assertCustomerInvalidEmail>
- <assertCustomerGroupSuccessCreateMessage module="Magento_Customer">
+ <assertCustomerGroupSuccessSaveMessage module="Magento_Customer">
<severeness>low</severeness>
- </assertCustomerGroupSuccessCreateMessage>
+ </assertCustomerGroupSuccessSaveMessage>
<assertCustomerGroupInGrid module="Magento_Customer">
<severeness>low</severeness>
</assertCustomerGroupInGrid>
@@ -93,4 +93,13 @@
<registerPage class="Magento\Customer\Test\Page\CustomerAccountCreate" />
</require>
</assertCustomerFailRegisterMessage>
+ <assertCustomerGroupSuccessDeleteMessage module="Magento_Customer">
+ <severeness>high</severeness>
+ <require>
+ <customerGroupIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex" />
+ </require>
+ </assertCustomerGroupSuccessDeleteMessage>
+ <assertCustomerGroupForm module="Magento_Customer">
+ <severeness>low</severeness>
+ </assertCustomerGroupForm>
</constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/fixture.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/fixture.xml
index 4038bc21439..258aef0e6b3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/fixture.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/global/fixture.xml
@@ -49,9 +49,9 @@
<entity_type>customer_address</entity_type>
<collection>Magento\Customer\Model\Resource\Address\Collection</collection>
</addressInjectable>
- <customerGroup module="Magento_Customer">
+ <customerGroupInjectable module="Magento_Customer">
<type>flat</type>
<entity_type>customer_group</entity_type>
<collection>Magento\Customer\Model\Resource\Group\Collection</collection>
- </customerGroup>
+ </customerGroupInjectable>
</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index cf65d7ffc3b..a3397f13c57 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -96,7 +96,9 @@ class Links extends Form
);
$this->_fill($mapping);
foreach ($fields['downloadable']['link'] as $index => $link) {
- $element->find($this->addNewLinkRow, Locator::SELECTOR_XPATH)->click();
+ if (!$element->find(sprintf($this->rowBlock, $index + 1), Locator::SELECTOR_XPATH)->isVisible()) {
+ $element->find($this->addNewLinkRow, Locator::SELECTOR_XPATH)->click();
+ }
$this->getRowBlock($index, $element)->fillLinkRow($link);
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinks.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
similarity index 97%
rename from dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinks.php
rename to dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
index 4f77fa13534..0930ca949eb 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinks.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
@@ -29,11 +29,11 @@ use Magento\Downloadable\Test\Page\Product\CatalogProductView;
use Magento\Downloadable\Test\Fixture\CatalogProductDownloadable;
/**
- * Class AssertDownloadableLinks
+ * Class AssertDownloadableLinksData
*
* Assert that Link block for downloadable product on front-end
*/
-class AssertDownloadableLinks extends AbstractConstraint
+class AssertDownloadableLinksData extends AbstractConstraint
{
/**
* Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductForm.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductForm.php
index 905b881fd5f..f66ca5e1287 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductForm.php
@@ -31,6 +31,7 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
/**
* Class AssertDownloadableProductForm
+ * Assert that downloadable product data on edit page equals to passed from fixture
*/
class AssertDownloadableProductForm extends AssertProductForm
{
@@ -42,7 +43,7 @@ class AssertDownloadableProductForm extends AssertProductForm
protected $severeness = 'low';
/**
- * Assert that downloadable product data on edit page equals to passed from fixture
+ * Assert form data equals fixture data
*
* @param FixtureInterface $product
* @param CatalogProductIndex $productGrid
@@ -57,8 +58,7 @@ class AssertDownloadableProductForm extends AssertProductForm
$filter = ['sku' => $product->getData('sku')];
$productGrid->open()->getProductGrid()->searchAndOpen($filter);
- $fields = $this->prepareFixtureData($product);
- $fields = $this->convertDownloadableArray($fields);
+ $fields = $this->convertDownloadableArray($this->prepareFixtureData($product));
$fieldsForm = $productPage->getForm()->getData($product);
\PHPUnit_Framework_Assert::assertEquals($fields, $fieldsForm, 'Form data not equals fixture data.');
@@ -74,8 +74,11 @@ class AssertDownloadableProductForm extends AssertProductForm
{
usort(
$fields,
- function ($a, $b) {
- return $a['sort_order'] - $b['sort_order'];
+ function ($row1, $row2) {
+ if ($row1['sort_order'] == $row2['sort_order']) {
+ return 0;
+ }
+ return ($row1['sort_order'] < $row2['sort_order']) ? -1 : 1;
}
);
}
@@ -99,15 +102,6 @@ class AssertDownloadableProductForm extends AssertProductForm
);
}
- foreach ($fields as $key => $value) {
- if (is_array($value)) {
- $fields[$key] = $this->convertDownloadableArray($value);
- } else {
- if ($key == "special_price") {
- $fields[$key] = [$key => $fields[$key]];
- }
- }
- }
return $fields;
}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/CatalogProductDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/CatalogProductDownloadable.php
index 3f79f35d3c1..4af3002dd3d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/CatalogProductDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/CatalogProductDownloadable.php
@@ -43,12 +43,14 @@ class CatalogProductDownloadable extends InjectableFixture
/**
* @var string
*/
- protected $repositoryClass = 'Magento\Downloadable\Test\Repository\DownloadableProduct';
+ protected $repositoryClass = 'Magento\Downloadable\Test\Repository\CatalogProductDownloadable';
+ // @codingStandardsIgnoreStart
/**
* @var string
*/
- protected $handlerInterface = 'Magento\Downloadable\Test\Handler\Curl\CreateDownloadable';
+ protected $handlerInterface = 'Magento\Downloadable\Test\Handler\CatalogProductDownloadable\CatalogProductDownloadableInterface';
+ // @codingStandardsIgnoreEnd
/**
* Constructor
@@ -95,7 +97,7 @@ class CatalogProductDownloadable extends InjectableFixture
'type' => 'downloadable',
'set' => '4',
],
- 'input_prefix' => 'product',
+ 'input_prefix' => 'product'
];
protected $defaultDataSet = [
@@ -117,7 +119,7 @@ class CatalogProductDownloadable extends InjectableFixture
'is_required' => '0',
'default_value' => '',
'input' => 'text',
- 'fixture' => 'Magento\Catalog\Test\Fixture\CategoryIds'
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds'
];
protected $cost = [
@@ -200,7 +202,7 @@ class CatalogProductDownloadable extends InjectableFixture
'default_value' => '',
'input' => 'text',
'group' => 'advanced-pricing',
- 'fixture' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions'
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions'
];
protected $has_options = [
@@ -387,7 +389,13 @@ class CatalogProductDownloadable extends InjectableFixture
'group' => 'advanced-inventory',
];
- protected $stock_data_min_qty= [
+ protected $stock_data = [
+ 'attribute_code' => 'stock_data',
+ 'input' => 'text',
+ 'group' => 'advanced-inventory',
+ ];
+
+ protected $stock_data_min_qty = [
'attribute_code' => 'stock_data_min_qty',
'input' => 'text',
'group' => 'advanced-inventory',
@@ -464,6 +472,13 @@ class CatalogProductDownloadable extends InjectableFixture
'group' => 'autosettings'
];
+ protected $downloadable = [
+ 'attribute_code' => 'downloadable',
+ 'backend_type' => 'virtual',
+ 'is_required' => '0',
+ 'group' => 'downloadable_information',
+ ];
+
protected $downloadable_links = [
'attribute_code' => 'downloadable_items',
'backend_type' => 'text',
@@ -471,8 +486,7 @@ class CatalogProductDownloadable extends InjectableFixture
'default_value' => 'dafault',
'input' => 'text',
'group' => 'downloadable_information',
- 'fixture' => 'Magento\Downloadable\Test\Fixture\CatalogProductDownloadable\Links'
-
+ 'source' => 'Magento\Downloadable\Test\Fixture\CatalogProductDownloadable\Links'
];
protected $downloadable_sample = [
@@ -482,8 +496,7 @@ class CatalogProductDownloadable extends InjectableFixture
'default_value' => 'dafault',
'input' => 'text',
'group' => 'downloadable_information',
- 'fixture' => 'Magento\Downloadable\Test\Fixture\CatalogProductDownloadable\Samples'
-
+ 'source' => 'Magento\Downloadable\Test\Fixture\CatalogProductDownloadable\Samples'
];
protected $sku = [
@@ -541,6 +554,7 @@ class CatalogProductDownloadable extends InjectableFixture
'is_required' => '0',
'default_value' => '1',
'input' => 'select',
+ 'group' => 'product-details'
];
protected $tax_class_id = [
@@ -576,7 +590,7 @@ class CatalogProductDownloadable extends InjectableFixture
'default_value' => 'default',
'input' => 'text',
'group' => 'advanced-pricing',
- 'fixture' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions'
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions'
];
protected $updated_at = [
@@ -626,6 +640,7 @@ class CatalogProductDownloadable extends InjectableFixture
'is_required' => '0',
'default_value' => '4',
'input' => 'select',
+ 'group' => 'autosettings'
];
protected $weight = [
@@ -634,6 +649,7 @@ class CatalogProductDownloadable extends InjectableFixture
'is_required' => '0',
'default_value' => '',
'input' => 'weight',
+ 'group' => 'product-details',
];
protected $custom_options = [
@@ -642,7 +658,7 @@ class CatalogProductDownloadable extends InjectableFixture
'is_required' => '0',
'default_value' => 'default',
'group' => 'customer-options',
- 'fixture' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions',
+ 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions',
];
protected $id = [
@@ -650,6 +666,17 @@ class CatalogProductDownloadable extends InjectableFixture
'backend_type' => 'virtual',
];
+ protected $is_virtual = [
+ 'attribute_code' => 'is_virtual',
+ 'backend_type' => 'virtual',
+ 'group' => 'product-details',
+ ];
+
+ protected $website_ids = [
+ 'attribute_code' => 'website_ids',
+ 'backend_type' => 'virtual'
+ ];
+
public function getCategoryIds()
{
return $this->getData('category_ids');
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/CatalogProductDownloadableInterface.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/CatalogProductDownloadableInterface.php
new file mode 100644
index 00000000000..847a2a03e84
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/CatalogProductDownloadableInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Downloadable\Test\Handler\CatalogProductDownloadable;
+
+use Mtf\Handler\HandlerInterface;
+
+/**
+ * Interface CatalogProductDownloadableInterface
+ */
+interface CatalogProductDownloadableInterface extends HandlerInterface
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/Curl.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/Curl.php
new file mode 100644
index 00000000000..443a6e01303
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/CatalogProductDownloadable/Curl.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Downloadable\Test\Handler\CatalogProductDownloadable;
+
+use Mtf\Fixture\FixtureInterface;
+use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as AbstractCurl;
+
+/**
+ * Class Curl
+ * Create new downloadable product via curl
+ */
+class Curl extends AbstractCurl implements CatalogProductDownloadableInterface
+{
+ /**
+ * Post request for creating downloadable product
+ *
+ * @param FixtureInterface $fixture [optional]
+ * @return array
+ */
+ public function persist(FixtureInterface $fixture = null)
+ {
+ $this->extendPlaceholder();
+ $config = $fixture->getDataConfig();
+ $prefix = isset($config['input_prefix']) ? $config['input_prefix'] : null;
+ $data = $this->prepareData($fixture, $prefix);
+
+ if ($prefix) {
+ $data['downloadable'] = $data[$prefix]['downloadable'];
+ unset($data[$prefix]['downloadable']);
+ }
+
+ return ['id' => $this->createProduct($data, $config)];
+ }
+
+ /**
+ * Expand basic placeholder
+ *
+ * @return void
+ */
+ protected function extendPlaceholder()
+ {
+ $this->mappingData += [
+ 'links_purchased_separately' => [
+ 'Yes' => 1,
+ 'No' => 0
+ ],
+ 'is_shareable' => [
+ 'Yes' => 1,
+ 'No' => 0,
+ 'Use config' => 2
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.php
index 729bf7c8c47..450ccd4918c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.php
@@ -45,7 +45,7 @@ class CatalogProductView extends ParentCatalogProductView
$this->_blocks['downloadableViewBlock'] = [
'name' => 'downloadableViewBlock',
'class' => 'Magento\Downloadable\Test\Block\Catalog\Product\View',
- 'locator' => '.product.info.main',
+ 'locator' => '.product-info-main',
'strategy' => 'css selector',
];
parent::_init();
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml
index 2f62dab457f..b196777e838 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml
@@ -27,7 +27,7 @@
<block>
<name>downloadableViewBlock</name>
<class>Magento\Downloadable\Test\Block\Catalog\Product\View</class>
- <locator>.product.info.main</locator>
+ <locator>.product-info-main</locator>
<strategy>css selector</strategy>
</block>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/CatalogProductDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/CatalogProductDownloadable.php
new file mode 100644
index 00000000000..5d82c6fce02
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/CatalogProductDownloadable.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Downloadable\Test\Repository;
+
+use Mtf\Repository\AbstractRepository;
+
+/**
+ * Class CatalogProductDownloadable
+ * Data for creation Catalog Product Downloadable
+ */
+class CatalogProductDownloadable extends AbstractRepository
+{
+ /**
+ * @constructor
+ * @param array $defaultConfig
+ * @param array $defaultData
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function __construct(array $defaultConfig = [], array $defaultData = [])
+ {
+ $this->_data['default'] = [
+ 'name' => 'Test downloadable product %isolation%',
+ 'sku' => 'sku_test_downloadable_product_%isolation%',
+ 'price' => 280.00,
+ 'type_id' => 'downloadable',
+ 'tax_class' => ['Taxable Goods'],
+ 'quantity_and_stock_status' => [
+ 'qty' => 90.0000,
+ 'is_in_stock' => 'In Stock',
+ ],
+ 'status' => 'Product online',
+ 'category_ids' => ['presets' => 'default_subcategory'],
+ 'visibility' => 'Catalog, Search',
+ 'url_key' => 'test-downloadable-product-%isolation%',
+ 'is_virtual' => 'Yes',
+ 'links_title' => 'Links',
+ 'links_purchased_separately' => 'Yes',
+ 'downloadable' => [
+ 'link' => [
+ [
+ 'title' => 'Link title',
+ 'price' => '1',
+ 'number_of_downloads' => '1',
+ 'is_shareable' => 'Use config',
+ 'sample' => [
+ 'type' => 'url',
+ 'url' => 'http://example.com/',
+ ],
+ 'type' => 'url',
+ 'link_url' => 'http://example.com/',
+ ]
+ ]
+ ],
+ 'website_ids' => ['Main Website'],
+ ];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
index a26211d4dd7..b05377f2d3e 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
@@ -106,11 +106,11 @@ class LinksPurchasedSeparatelyTest extends Functional
$frontendHomePage->getTopmenu()->selectCategoryByName($product->getCategoryName());
$productListBlock = $categoryPage->getListProductBlock();
- $this->assertTrue($productListBlock->isProductVisible($product->getProductName()));
- $productListBlock->openProductViewPage($product->getProductName());
+ $this->assertTrue($productListBlock->isProductVisible($product->getName()));
+ $productListBlock->openProductViewPage($product->getName());
$productViewBlock = $productPage->getDownloadableViewBlock();
- $this->assertEquals($product->getProductName(), $productViewBlock->getProductName());
+ $this->assertEquals($product->getName(), $productViewBlock->getProductName());
$this->assertEquals(
sprintf('%1.2f', $product->getProductPrice()),
$productViewBlock->getProductPrice()['price_regular_price']
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv
index 347e99671fc..219b5b0a909 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv
@@ -1,14 +1,14 @@
product/data/name;product/data/sku;product/data/price;product/data/tax_class_id/dataSet;product/data/qty;product/data/quantity_and_stock_status;product/data/is_virtual;product/data/category;product/data/description;product/data/short_description;product/data/inventory_manage_stock;product/data/inventory_qty;product/data/stock_data_use_config_min_qty;product/data/stock_data_min_qty;product/data/downloadable_sample/preset;product/data/downloadable_links/preset;product/data/custom_options/preset;product/data/special_price;product/data/group_price/preset;product/data/tier_price/preset;constraint
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;100;Taxable Goods;1;In Stock;Yes;Default Category;-;-;-;-;-;-;-;default;-;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock
-DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;1;Taxable Goods;10;In Stock;Yes;category %isolation%;-;-;-;-;-;-;default;default;-;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinks
-DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;33;Taxable Goods;10;In Stock;Yes;category %isolation%;-;-;-;-;-;-;-;default;default;-;-;-;assertProductSaveMessage, assertDownloadableProductForm, assertCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinks
-DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;55;Taxable Goods;10;In Stock;Yes;-;-;-;-;-;-;-;with_three_samples;with_three_links;two_options;-;-;-;assertProductSaveMessage, assertCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinks, assertProductInStock, assertProductSearchableBySku
+DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;1;Taxable Goods;10;In Stock;Yes;category %isolation%;-;-;-;-;-;-;default;default;-;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData
+DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;33;Taxable Goods;10;In Stock;Yes;category %isolation%;-;-;-;-;-;-;-;default;default;-;-;-;assertProductSaveMessage, assertDownloadableProductForm, assertCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData
+DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;55;Taxable Goods;10;In Stock;Yes;-;-;-;-;-;-;-;with_three_samples;with_three_links;two_options;-;-;-;assertProductSaveMessage, assertCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;100;Taxable Goods;50;Out of Stock;Yes;Default Category;-;-;-;-;-;-;-;default;-;-;-;-;assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;9999;Taxable Goods;-;-;Yes;Default Category;-;-;Yes;123;No;123;-;default;-;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;98;None;5;In Stock;Yes;Default Category;This is description for downloadable product;-;-;-;-;-;-;default;-;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage
-DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;57;Taxable Goods;10;In Stock;Yes;category %isolation%;-;This is short description for downloadable product;-;-;-;-;default;with_three_links;default;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinks
-DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;65;Taxable Goods;11;In Stock;Yes;category %isolation%;This is description for downloadable product;This is short description for downloadable product;-;-;-;-;default;with_three_links;default;-;-;-;assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinks
-DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;65;Taxable Goods;11;In Stock;Yes;category %isolation%;-;-;-;-;-;-;default;with_three_links;default;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinks, assertCustomOptionsOnProductPage
+DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;57;Taxable Goods;10;In Stock;Yes;category %isolation%;-;This is short description for downloadable product;-;-;-;-;default;with_three_links;default;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData
+DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;65;Taxable Goods;11;In Stock;Yes;category %isolation%;This is description for downloadable product;This is short description for downloadable product;-;-;-;-;default;with_three_links;default;-;-;-;assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData
+DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;65;Taxable Goods;11;In Stock;Yes;category %isolation%;-;-;-;-;-;-;default;with_three_links;default;-;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertCustomOptionsOnProductPage
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;100;Taxable Goods;-;-;Yes;Default Category;-;-;-;-;-;-;-;default;-;-;-;-;assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;10;Taxable Goods;10;In Stock;Yes;category %isolation%;-;-;-;-;-;-;-;-;-;5;-;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertSpecialPriceOnProductPage
DownloadableProduct_%isolation%;DownloadableProduct_%isolation%;365;Taxable Goods;23;In Stock;Yes;category %isolation%;-;-;-;-;-;-;-;-;-;-;default;-;assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertGroupedPriceOnProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
new file mode 100644
index 00000000000..3a601fb7e55
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Downloadable\Test\TestCase;
+
+use Mtf\TestCase\Injectable;
+use Mtf\Fixture\FixtureFactory;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Downloadable\Test\Fixture\CatalogProductDownloadable;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+
+/**
+ * Test Creation for Update DownloadableProductEntity
+ *
+ * Test Flow:
+ *
+ * Precondition:
+ * 1. Category is created.
+ * 2. Product is created(before each variation).
+ *
+ * Steps:
+ * 1. Login to backend.
+ * 2. Navigate to PRODUCTS > Catalog.
+ * 3. Search and open product in the grid.
+ * 4. Edit test value(s) according to dataset.
+ * 5. Click "Save".
+ * 6. Perform asserts.
+ *
+ * @group Downloadable_Product_(MX)
+ * @ZephyrId MAGETWO-24775
+ */
+class UpdateDownloadableProductEntityTest extends Injectable
+{
+ /**
+ * Downloadable product fixture
+ *
+ * @var CatalogProductDownloadable
+ */
+ protected $product;
+
+ /**
+ * Product page with a grid
+ *
+ * @var CatalogProductIndex
+ */
+ protected $catalogProductIndex;
+
+ /**
+ * Edit product page on backend
+ *
+ * @var CatalogProductEdit
+ */
+ protected $catalogProductEdit;
+
+ /**
+ * Persist category
+ *
+ * @param CatalogCategory $category
+ * @return array
+ */
+ public function __prepare(CatalogCategory $category)
+ {
+ $category->persist();
+ return [
+ 'category' => $category
+ ];
+ }
+
+ /**
+ * Filling objects of the class
+ *
+ * @param CatalogProductIndex $catalogProductIndexNewPage
+ * @param CatalogProductEdit $catalogProductEditPage
+ * @param FixtureFactory $fixtureFactory
+ * @return void
+ */
+ public function __inject(
+ CatalogProductIndex $catalogProductIndexNewPage,
+ CatalogProductEdit $catalogProductEditPage,
+ FixtureFactory $fixtureFactory
+ ) {
+ $this->product = $fixtureFactory->createByCode(
+ 'catalogProductDownloadable',
+ ['dataSet' => 'default']
+ );
+ $this->product->persist();
+ $this->catalogProductIndex = $catalogProductIndexNewPage;
+ $this->catalogProductEdit = $catalogProductEditPage;
+ }
+
+ /**
+ * Test update downloadable product
+ *
+ * @param CatalogProductDownloadable $product
+ * @param CatalogCategory $category
+ * @return void
+ */
+ public function testUpdateDownloadableProduct(CatalogProductDownloadable $product, CatalogCategory $category)
+ {
+ $filter = ['sku' => $this->product->getSku()];
+ $this->catalogProductIndex->open()->getProductGrid()->searchAndOpen($filter);
+ $productBlockForm = $this->catalogProductEdit->getForm();
+ $productBlockForm->fillProduct($product, $category);
+ $this->catalogProductEdit->getFormAction()->save();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv
new file mode 100644
index 00000000000..c93d36d0c73
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv
@@ -0,0 +1,8 @@
+"product/data/name";"product/data/sku";"product/data/price";"product/data/tax_class_id/dataSet";"product/data/qty";"product/data/quantity_and_stock_status";"product/data/is_virtual";"product/data/weight";"product/data/category";"product/data/description";"product/data/short_description";"product/data/inventory_manage_stock";"product/data/inventory_qty";"product/data/stock_data_use_config_min_qty";"product/data/stock_data_min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/special_price";"isRequired";"constraint"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"Taxable Goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"No";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertCustomOptionsOnProductPage, assertProductSearchableBySku"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"50";"Out of Stock";"Yes";"-";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"No";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"Taxable Goods";"123";"-";"Yes";"-";"Default Category";"-";"-";"Yes";"-";"No";"123";"-";"-";"-";"-";"No";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"48";"None";"5";"In Stock";"Yes";"-";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"No";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"54";"Taxable Goods";"10";"In Stock";"Yes";"-";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"Yes";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData, assertProductInCategory"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"Taxable Goods";"10";"In Stock";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"No";"assertProductSaveMessage, assertProductInGrid"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"43";"Taxable Goods";"10";"In Stock";"No";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"40";"No";"assertProductSaveMessage, assertProductInGrid, assertSpecialPriceOnProductPage, assertProductPage"
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/curl/di.xml
new file mode 100644
index 00000000000..55ab8c43489
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/curl/di.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <preference for="Magento\Downloadable\Test\Handler\CatalogProductDownloadable\CatalogProductDownloadableInterface" type="\Magento\Downloadable\Test\Handler\CatalogProductDownloadable\Curl" />
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/global/constraint.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/global/constraint.xml
index 113ed007c23..e2332785b79 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/global/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/global/constraint.xml
@@ -27,9 +27,9 @@
<assertDownloadableSamplesData module="Magento_Downloadable">
<severeness>low</severeness>
</assertDownloadableSamplesData>
- <assertDownloadableLinks module="Magento_Downloadable">
+ <assertDownloadableLinksData module="Magento_Downloadable">
<severeness>low</severeness>
- </assertDownloadableLinks>
+ </assertDownloadableLinksData>
<assertDownloadableProductForm module="Magento_Downloadable">
<severeness>low</severeness>
</assertDownloadableProductForm>
diff --git a/app/code/Magento/Install/Helper/Data.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
similarity index 84%
rename from app/code/Magento/Install/Helper/Data.php
rename to dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
index 039b554a45b..d13ea7c4fdb 100644
--- a/app/code/Magento/Install/Helper/Data.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
@@ -22,11 +22,15 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\ImportExport\Test\Block\Adminhtml\Export\Edit;
+
+use Mtf\Block\Form as AbstractForm;
+
/**
- * Install data helper
+ * Class Form
+ * Export form
*/
-namespace Magento\Install\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+class Form extends AbstractForm
{
+ //
}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.xml
new file mode 100644
index 00000000000..a29cec2a960
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<mapping strict="0">
+ <fields>
+ <entity>
+ <input>select</input>
+ </entity>
+ <file_format>
+ <input>select</input>
+ </file_format>
+ </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Filter.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Filter.php
new file mode 100644
index 00000000000..6b50a375024
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Filter.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\ImportExport\Test\Block\Adminhtml\Export;
+
+use Magento\Backend\Test\Block\Widget\Grid;
+use Mtf\Client\Element\Locator;
+use Mtf\Client\Element;
+
+/**
+ * Class Filter
+ * Filter for export grid
+ */
+class Filter extends Grid
+{
+ /**
+ * Filters array mapping
+ *
+ * @var array
+ */
+ protected $filters = [
+ 'frontend_label' => [
+ 'selector' => 'input[name="frontend_label"]'
+ ],
+ 'attribute_code' => [
+ 'selector' => 'input[name="attribute_code"]'
+ ],
+ ];
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
new file mode 100644
index 00000000000..2aa5ed5a7c0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\ImportExport\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\ImportExport\Test\Fixture\ImportExport;
+use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertAbsenceProductAttributeForExport
+ * Checks that product attribute cannot be used for Products' Export
+ */
+class AssertProductAttributeAbsenceForExport extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that deleted attribute can't be used for Products' Export
+ *
+ * @param AdminExportIndex $exportIndex
+ * @param CatalogProductAttribute $attribute
+ * @param ImportExport $export
+ * @return void
+ */
+ public function processAssert
+ (
+ AdminExportIndex $exportIndex,
+ CatalogProductAttribute $attribute,
+ ImportExport $export
+ ) {
+ $exportIndex->open();
+ $exportIndex->getExportForm()->fill($export);
+
+ $filter = [
+ 'attribute_code' => $attribute->getAttributeCode(),
+ ];
+
+ \PHPUnit_Framework_Assert::assertFalse(
+ $exportIndex->getFilterExport()->isRowVisible($filter),
+ 'Attribute \'' . $attribute->getFrontendLabel() . '\' is present in Filter export grid'
+ );
+ }
+
+ /**
+ * Text absent Product Attribute in Filter export grid
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product Attribute is absent in Filter export grid';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
new file mode 100644
index 00000000000..091a0037b1c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\ImportExport\Test\Fixture;
+
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Class ImportExport
+ * Export fixture
+ */
+class ImportExport extends InjectableFixture
+{
+ protected $defaultDataSet = [
+ 'entity' => 'Products',
+ 'behavior' => 'CSV',
+ ];
+
+ protected $id = [
+ 'attribute_code' => 'id',
+ 'backend_type' => 'int',
+ 'is_required' => '1',
+ 'default_value' => '',
+ 'input' => '',
+ ];
+
+ protected $entity = [
+ 'attribute_code' => 'entity',
+ 'backend_type' => 'varchar',
+ 'is_required' => '',
+ 'default_value' => '',
+ 'input' => '',
+ ];
+
+ protected $behavior = [
+ 'attribute_code' => 'behavior',
+ 'backend_type' => 'varchar',
+ 'is_required' => '',
+ 'default_value' => 'append',
+ 'input' => '',
+ ];
+
+ protected $data_export = [
+ 'attribute_code' => 'data',
+ 'backend_type' => 'longtext',
+ 'is_required' => '',
+ 'default_value' => '',
+ 'input' => '',
+ ];
+
+ public function getId()
+ {
+ return $this->getData('id');
+ }
+
+ public function getEntity()
+ {
+ return $this->getData('entity');
+ }
+
+ public function getBehavior()
+ {
+ return $this->getData('behavior');
+ }
+
+ public function getDataExport()
+ {
+ return $this->getData('data_export');
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml
new file mode 100644
index 00000000000..8e1eb4d81d0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<fixture class="Magento\ImportExport\Test\Fixture\ImportExport">
+ <module>Magento_ImportExport</module>
+ <type>flat</type>
+ <entity_type>importexport_importdata</entity_type>
+ <fields>
+ <id>
+ <attribute_code>id</attribute_code>
+ <backend_type>int</backend_type>
+ <is_required>1</is_required>
+ <default_value></default_value>
+ <input></input>
+ </id>
+ <entity>
+ <attribute_code>entity</attribute_code>
+ <backend_type>varchar</backend_type>
+ <is_required></is_required>
+ <default_value></default_value>
+ <input></input>
+ </entity>
+ <behavior>
+ <attribute_code>behavior</attribute_code>
+ <backend_type>varchar</backend_type>
+ <is_required></is_required>
+ <default_value>append</default_value>
+ <input></input>
+ </behavior>
+ <data>
+ <attribute_code>data</attribute_code>
+ <backend_type>longtext</backend_type>
+ <is_required></is_required>
+ <default_value></default_value>
+ <input></input>
+ </data>
+ </fields>
+</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.php
new file mode 100644
index 00000000000..05311fb95d0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\ImportExport\Test\Page\Adminhtml;
+
+use Mtf\Page\BackendPage;
+
+/**
+ * Class AdminExportIndex
+ * Export page
+ */
+class AdminExportIndex extends BackendPage
+{
+ const MCA = 'admin/export/index';
+
+ protected $_blocks = [
+ 'filterExport' => [
+ 'name' => 'filterExport',
+ 'class' => 'Magento\ImportExport\Test\Block\Adminhtml\Export\Filter',
+ 'locator' => '#export_filter_container',
+ 'strategy' => 'css selector',
+ ],
+ 'exportForm' => [
+ 'name' => 'exportForm',
+ 'class' => 'Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form',
+ 'locator' => '#base_fieldset',
+ 'strategy' => 'css selector',
+ ],
+ ];
+
+ /**
+ * @return \Magento\ImportExport\Test\Block\Adminhtml\Export\Filter
+ */
+ public function getFilterExport()
+ {
+ return $this->getBlockInstance('filterExport');
+ }
+
+ /**
+ * @return \Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form
+ */
+ public function getExportForm()
+ {
+ return $this->getBlockInstance('exportForm');
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml
new file mode 100644
index 00000000000..3e461ee5e5c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<page mca="admin/export/index" >
+ <block>
+ <name>filterExport</name>
+ <class>Magento\ImportExport\Test\Block\Adminhtml\Export\Filter</class>
+ <locator>#export_filter_container</locator>
+ <strategy>css selector</strategy>
+ </block>
+ <block>
+ <name>exportForm</name>
+ <class>Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form</class>
+ <locator>#base_fieldset</locator>
+ <strategy>css selector</strategy>
+ </block>
+</page>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/constraint.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/constraint.xml
new file mode 100644
index 00000000000..51554e0afff
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/constraint.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<constraint>
+ <assertProductAttributeAbsenceForExport module="Magento_ImportExport">
+ <severeness>high</severeness>
+ </assertProductAttributeAbsenceForExport>
+</constraint>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/fixture.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/fixture.xml
new file mode 100644
index 00000000000..90331e842b8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/fixture.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+
+<fixture>
+ <importExport module="Magento_ImportExport">
+ <type>flat</type>
+ <entity_type>importexport_importdata</entity_type>
+ </importExport>
+</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/page.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/page.xml
new file mode 100644
index 00000000000..a46aece3271
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/global/page.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<page>
+ <adminExportIndex>
+ <mca>admin/export/index</mca>
+ <area>adminhtml</area>
+ <class>Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex</class>
+ </adminExportIndex>
+</page>
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ReviewTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ReviewTest.php
index fc05c321c3d..1e6d249e032 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ReviewTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ReviewTest.php
@@ -112,7 +112,7 @@ class ReviewTest extends Functional
$reviewsBlock = $productPage->getCustomerReviewBlock();
$reviewsSummaryBlock->getViewReviewLink()->click();
$this->assertContains(
- sprintf('You\'re reviewing:%s', $productFixture->getProductName()),
+ sprintf('You\'re reviewing:%s', $productFixture->getName()),
$reviewForm->getLegend()->getText()
);
$this->verifyReview($reviewsBlock, $reviewFixture);
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
index d7140a1473a..bfaf63d1cf2 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
@@ -25,11 +25,11 @@
namespace Magento\Sitemap\Test\Block\Adminhtml;
use Magento\Backend\Test\Block\Widget\Grid;
+use Mtf\Client\Element\Locator;
/**
* Class SitemapGrid
* Backend sitemap grid
- *
*/
class SitemapGrid extends Grid
{
@@ -55,5 +55,39 @@ class SitemapGrid extends Grid
*
* @var string
*/
- protected $editLink = 'td[class*=col-sitemap_id]';
+ protected $editLink = 'td[data-column="sitemap_id"]';
+
+ /**
+ * Locator link for Google in grid
+ *
+ * @var string
+ */
+ protected $linkForGoogle = 'td[data-column="link"] a';
+
+ /**
+ * Locator generate link
+ *
+ * @var string
+ */
+ protected $generate = 'td[data-column="action"] a';
+
+ /**
+ * Get link for Google
+ *
+ * @return string
+ */
+ public function getLinkForGoogle()
+ {
+ return $this->_rootElement->find($this->linkForGoogle, Locator::SELECTOR_CSS)->getText();
+ }
+
+ /**
+ * Generate sitemap
+ *
+ * @return void
+ */
+ public function generate()
+ {
+ $this->_rootElement->find($this->generate, Locator::SELECTOR_CSS)->click();
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Backend/UserEditPageActions.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapPageActions.php
similarity index 71%
rename from dev/tests/functional/tests/app/Magento/User/Test/Block/Backend/UserEditPageActions.php
rename to dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapPageActions.php
index 5372bdaec57..3d094f15ab8 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Backend/UserEditPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapPageActions.php
@@ -1,7 +1,5 @@
<?php
/**
- * Config actions block
- *
* Magento
*
* NOTICE OF LICENSE
@@ -24,29 +22,30 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\User\Test\Block\Backend;
+namespace Magento\Sitemap\Test\Block\Adminhtml;
use Magento\Backend\Test\Block\FormPageActions;
/**
- * Class UserEditPageActions
- * Form page actions block
- *
+ * Class SitemapPageActions
+ * Backend sitemap form page actions
*/
-class UserEditPageActions extends FormPageActions
+class SitemapPageActions extends FormPageActions
{
/**
- * "Delete" button
+ * "Save & Generate" button
*
* @var string
*/
- protected $deleteButton = '#delete';
+ protected $saveAndGenerateButton = '#generate';
/**
- * Click on "Delete" button
+ * Click on "Save & Generate" button
+ *
+ * @return void
*/
- public function delete()
+ public function saveAndGenerate()
{
- $this->_rootElement->find($this->deleteButton)->click();
+ $this->_rootElement->find($this->saveAndGenerateButton)->click();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
new file mode 100644
index 00000000000..ba6723f73df
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Sitemap\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Cms\Test\Fixture\CmsPage;
+use Magento\Sitemap\Test\Fixture\Sitemap;
+use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
+
+/**
+ * Class AssertSitemapContent
+ * Assert that sitemap.xml file contains correct content
+ */
+class AssertSitemapContent extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Assert that sitemap.xml file contains correct content according to dataset:
+ * - product url
+ * - category url
+ * - CMS page url
+ *
+ * @param CatalogProductSimple $product
+ * @param CatalogCategory $catalog
+ * @param CmsPage $cmsPage
+ * @param Sitemap $sitemap
+ * @param SitemapIndex $sitemapIndex
+ * @return void
+ */
+ public function processAssert(
+ CatalogProductSimple $product,
+ CatalogCategory $catalog,
+ CmsPage $cmsPage,
+ Sitemap $sitemap,
+ SitemapIndex $sitemapIndex
+ ) {
+ $sitemapIndex->open()->getSitemapGrid()->sortGridByField('sitemap_id');
+ $filter = [
+ 'sitemap_filename' => $sitemap->getSitemapFilename(),
+ 'sitemap_path' => $sitemap->getSitemapPath(),
+ ];
+ $sitemapIndex->getSitemapGrid()->search($filter);
+ $content = file_get_contents($sitemapIndex->getSitemapGrid()->getLinkForGoogle());
+ $urls = [
+ $_ENV['app_frontend_url'] . $product->getUrlKey() . '.html',
+ $_ENV['app_frontend_url'] . $catalog->getUrlKey() . '.html',
+ $_ENV['app_frontend_url'] . $cmsPage->getIdentifier()
+ ];
+
+ \PHPUnit_Framework_Assert::assertTrue(
+ $this->checkContent($content, $urls),
+ 'Content of file sitemap.xml does not include one or more of next urls:'
+ . implode("\n", $urls)
+ );
+ }
+
+ /**
+ * Check content for the presence urls
+ *
+ * @param string $content
+ * @param array $urls
+ * @return bool
+ */
+ protected function checkContent($content, $urls)
+ {
+ foreach ($urls as $url) {
+ if (strpos($content, $url) === false) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'File sitemap.xml contains correct content according to dataset.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
index 4a521f480f2..c75eed4f796 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
@@ -30,7 +30,6 @@ use Magento\Sitemap\Test\Fixture\Sitemap;
/**
* Class AssertSitemapFailFolderSaveMessage
- *
*/
class AssertSitemapFailFolderSaveMessage extends AbstractConstraint
{
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
index 1822e2aa098..90ef81c53a6 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
@@ -30,7 +30,6 @@ use Magento\Sitemap\Test\Fixture\Sitemap;
/**
* Class AssertSitemapFailPathSaveMessage
- *
*/
class AssertSitemapFailPathSaveMessage extends AbstractConstraint
{
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
index eb3c9691d7b..b8f4a772ad7 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
@@ -30,7 +30,6 @@ use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
/**
* Class AssertSitemapInGrid
- *
*/
class AssertSitemapInGrid extends AbstractConstraint
{
@@ -45,20 +44,20 @@ class AssertSitemapInGrid extends AbstractConstraint
* Assert that sitemap availability in sitemap grid
*
* @param Sitemap $sitemap
- * @param SitemapIndex $sitemapPageGrid
+ * @param SitemapIndex $sitemapIndex
* @return void
*/
- public function processAssert(Sitemap $sitemap, SitemapIndex $sitemapPageGrid)
+ public function processAssert(Sitemap $sitemap, SitemapIndex $sitemapIndex)
{
- $sitemapPageGrid->open();
+ $sitemapIndex->open()->getSitemapGrid()->sortGridByField('sitemap_id');
$filter = [
'sitemap_filename' => $sitemap->getSitemapFilename(),
- 'sitemap_path' => $sitemap->getSitemapPath()
+ 'sitemap_path' => $sitemap->getSitemapPath(),
];
\PHPUnit_Framework_Assert::assertTrue(
- $sitemapPageGrid->getSitemapGrid()->isRowVisible($filter),
+ $sitemapIndex->getSitemapGrid()->isRowVisible($filter),
'Sitemap with filename \'' . $sitemap->getSitemapFilename() . '\' and path \''
- . $sitemap->getSitemapPath() . '\'is absent in Sitemap grid.'
+ . $sitemap->getSitemapPath() . '\' is absent in Sitemap grid. \''
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
index 2a385683ff2..22ecdfb6105 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
@@ -30,7 +30,6 @@ use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
/**
* Class AssertSitemapNotInGrid
- *
*/
class AssertSitemapNotInGrid extends AbstractConstraint
{
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
index ef8e1118662..28f3dd0ba1b 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
@@ -29,7 +29,6 @@ use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
/**
* Class AssertSitemapSuccessDeleteMessage
- *
*/
class AssertSitemapSuccessDeleteMessage extends AbstractConstraint
{
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
new file mode 100644
index 00000000000..3875fb8d7d4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Sitemap\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
+use Magento\Sitemap\Test\Fixture\Sitemap;
+
+/**
+ * Class AssertSitemapSuccessGenerateMessage
+ */
+class AssertSitemapSuccessGenerateMessage extends AbstractConstraint
+{
+ const SUCCESS_GENERATE_MESSAGE = 'The sitemap "%s" has been generated.';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Assert that success message is displayed after sitemap generate
+ *
+ * @param SitemapIndex $sitemapPage
+ * @param Sitemap $sitemap
+ * @return void
+ */
+ public function processAssert(
+ SitemapIndex $sitemapPage,
+ Sitemap $sitemap
+ ) {
+ $actualMessage = $sitemapPage->getMessagesBlock()->getSuccessMessages();
+ \PHPUnit_Framework_Assert::assertEquals(
+ sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename()),
+ $actualMessage,
+ 'Wrong success message is displayed.'
+ . "\nExpected: " . sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename())
+ . "\nActual: " . $actualMessage
+ );
+ }
+
+ /**
+ * Text of success create sitemap assert.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Sitemap success generate message is present.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
new file mode 100644
index 00000000000..8f36d2f79cf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Sitemap\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
+use Magento\Sitemap\Test\Fixture\Sitemap;
+
+/**
+ * Class AssertSitemapSuccessSaveAndGenerateMessages
+ */
+class AssertSitemapSuccessSaveAndGenerateMessages extends AbstractConstraint
+{
+ const SUCCESS_GENERATE_MESSAGE = 'The sitemap "%s" has been generated.';
+
+ const SUCCESS_SAVE_MESSAGE = 'The sitemap has been saved.';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Assert that success messages is displayed after sitemap generate
+ *
+ * @param SitemapIndex $sitemapIndex
+ * @param Sitemap $sitemap
+ * @return void
+ */
+ public function processAssert(SitemapIndex $sitemapIndex, Sitemap $sitemap)
+ {
+ $actualMessages = $sitemapIndex->getMessagesBlock()->getSuccessMessages();
+ \PHPUnit_Framework_Assert::assertTrue(
+ in_array(self::SUCCESS_SAVE_MESSAGE, $actualMessages) &&
+ in_array(sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename()), $actualMessages),
+ 'Wrong success messages is displayed.'
+ . "\nExpected: " . sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename())
+ . "\nExpected: " . self::SUCCESS_SAVE_MESSAGE
+ . "\nActual messages: " . implode("\n", $actualMessages)
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Sitemap success generate and save messages are present.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
index f9eb07e1a76..ca9963fb48d 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
@@ -29,7 +29,6 @@ use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
/**
* Class AssertSitemapSuccessSaveMessage
- *
*/
class AssertSitemapSuccessSaveMessage extends AbstractConstraint
{
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
index ab762253e89..9a1cac46add 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
@@ -31,10 +31,11 @@ use Mtf\Util\Protocol\CurlInterface;
use Mtf\Util\Protocol\CurlTransport;
use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
use Mtf\System\Config;
+use Magento\Backend\Test\Handler\Extractor;
/**
* Class Curl
- *
+ * Curl handler for creating sitemap
*/
class Curl extends AbstractCurl implements SitemapInterface
{
@@ -46,7 +47,7 @@ class Curl extends AbstractCurl implements SitemapInterface
protected $defaultAttributeValues = ['store_id' => 1];
/**
- * Prepare data for deleting sitemap
+ * Post request for creating sitemap
*
* @param FixtureInterface $fixture
* @return array
@@ -54,7 +55,7 @@ class Curl extends AbstractCurl implements SitemapInterface
*/
public function persist(FixtureInterface $fixture = null)
{
- $url = $_ENV['app_backend_url'] . 'admin/sitemap/save/';
+ $url = $_ENV['app_backend_url'] . 'admin/sitemap/save/generate/';
$data = array_merge($this->defaultAttributeValues, $fixture->getData());
$curl = new BackendDecorator(new CurlTransport(), new Config);
$curl->addOption(CURLOPT_HEADER, 1);
@@ -73,24 +74,17 @@ class Curl extends AbstractCurl implements SitemapInterface
* Get id after created sitemap
*
* @param array $data
- * @return mixed
- * @throws \Exception
+ * @return string|null
*/
protected function getSitemapId(array $data)
{
//Sort data in grid to define sitemap id if more than 20 items in grid
- $url = $_ENV['app_backend_url'] . 'admin/sitemap/index/sort/sitemap_id/dir/desc';
- $curl = new BackendDecorator(new CurlTransport(), new Config);
- $curl->write(CurlInterface::POST, $url, '1.0');
- $response = $curl->read();
- $curl->close();
-
+ $url = 'admin/sitemap/index/sort/sitemap_id/dir/desc';
$pattern = '/class=\" col\-id col\-sitemap_id\W*>\W+(\d+)\W+<\/td>\W+<td[\w\s\"=\-]*?>\W+?'
. $data['sitemap_filename'] . '/siu';
- preg_match($pattern, $response, $matches);
- if (empty($matches)) {
- throw new \Exception('Cannot find sitemap id');
- }
- return $matches[1];
+ $extractor = new Extractor($url, $pattern);
+ $match = $extractor->getData();
+
+ return empty($match[1]) ? null : $match[1];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.php
index 756f6807cc7..4ff6f74a334 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.php
@@ -28,7 +28,6 @@ use Mtf\Page\BackendPage;
/**
* Class SitemapIndex
- *
*/
class SitemapIndex extends BackendPage
{
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.php
index 46988e92c62..5a37bbc7f86 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.php
@@ -28,7 +28,6 @@ use Mtf\Page\BackendPage;
/**
* Class SitemapNew
- *
*/
class SitemapNew extends BackendPage
{
@@ -41,9 +40,9 @@ class SitemapNew extends BackendPage
'locator' => '#add_sitemap_form',
'strategy' => 'css selector',
],
- 'formPageActions' => [
- 'name' => 'formPageActions',
- 'class' => 'Magento\Backend\Test\Block\FormPageActions',
+ 'sitemapPageActions' => [
+ 'name' => 'sitemapPageActions',
+ 'class' => 'Magento\Sitemap\Test\Block\Adminhtml\SitemapPageActions',
'locator' => '.page-main-actions',
'strategy' => 'css selector',
],
@@ -58,10 +57,10 @@ class SitemapNew extends BackendPage
}
/**
- * @return \Magento\Backend\Test\Block\FormPageActions
+ * @return \Magento\Sitemap\Test\Block\Adminhtml\SitemapPageActions
*/
- public function getFormPageActions()
+ public function getSitemapPageActions()
{
- return $this->getBlockInstance('formPageActions');
+ return $this->getBlockInstance('sitemapPageActions');
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml
index f8e680939bf..0617287d25d 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml
@@ -31,8 +31,8 @@
<strategy>css selector</strategy>
</block>
<block>
- <name>formPageActions</name>
- <class>Magento\Backend\Test\Block\FormPageActions</class>
+ <name>sitemapPageActions</name>
+ <class>Magento\Sitemap\Test\Block\Adminhtml\SitemapPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</block>
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
index 9b495b40cf6..776e6ec4e1f 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
@@ -76,6 +76,6 @@ class CreateSitemapEntityTest extends Injectable
$this->sitemapIndex->open();
$this->sitemapIndex->getGridPageActions()->addNew();
$this->sitemapNew->getSitemapForm()->fill($sitemap);
- $this->sitemapNew->getFormPageActions()->save();
+ $this->sitemapNew->getSitemapPageActions()->save();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest.php
new file mode 100644
index 00000000000..0cfc9b88b15
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Sitemap\Test\TestCase;
+
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Cms\Test\Fixture\CmsPage;
+use Magento\Sitemap\Test\Fixture\Sitemap;
+use Mtf\TestCase\Injectable;
+use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
+use Magento\Sitemap\Test\Page\Adminhtml\SitemapNew;
+
+/**
+ * Cover generating Sitemap Entity
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Create category
+ * 2. Create simple product
+ * 3. Create CMS page
+ * Steps:
+ * 1. Log in as admin user from data set.
+ * 2. Navigate to Marketing > SEO and Search > Site Map.
+ * 3. Click "Add Sitemap" button.
+ * 4. Fill out all data according to data set.
+ * 5. Click "Save" button.
+ * 6. Perform all assertions.
+ *
+ * @group XML_Sitemap_(MX)
+ * @ZephyrId MAGETWO-25124
+ */
+class GenerateSitemapEntityTest extends Injectable
+{
+ /**
+ * Sitemap grid page
+ *
+ * @var SitemapIndex
+ */
+ protected $sitemapIndex;
+
+ /**
+ * Sitemap new page
+ *
+ * @var SitemapNew
+ */
+ protected $sitemapNew;
+
+ /**
+ * Inject data
+ *
+ * @param SitemapIndex $sitemapIndex
+ * @param SitemapNew $sitemapNew
+ * @return void
+ */
+ public function __inject(
+ SitemapIndex $sitemapIndex,
+ SitemapNew $sitemapNew
+ ) {
+ $this->sitemapIndex = $sitemapIndex;
+ $this->sitemapNew = $sitemapNew;
+ }
+
+ /**
+ * Generate Sitemap Entity
+ *
+ * @param Sitemap $sitemap
+ * @param CatalogProductSimple $product
+ * @param CatalogCategory $catalog
+ * @param CmsPage $cmsPage
+ * @return void
+ */
+ public function testGenerateSitemap(
+ Sitemap $sitemap,
+ CatalogProductSimple $product,
+ CatalogCategory $catalog,
+ CmsPage $cmsPage
+ ) {
+ // Preconditions
+ $product->persist();
+ $catalog->persist();
+ $cmsPage->persist();
+
+ // Steps
+ $this->sitemapIndex->open();
+ $this->sitemapIndex->getGridPageActions()->addNew();
+ $this->sitemapNew->getSitemapForm()->fill($sitemap);
+ $this->sitemapNew->getSitemapPageActions()->saveAndGenerate();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest/testGenerateSitemap.csv b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest/testGenerateSitemap.csv
new file mode 100644
index 00000000000..083f1b38cb9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/GenerateSitemapEntityTest/testGenerateSitemap.csv
@@ -0,0 +1,2 @@
+"catalog/dataSet";"product/dataSet";"cmsPage/dataSet";"sitemap/data/sitemap_filename";"sitemap/data/sitemap_path";"constraint"
+"default_category";"default";"default";"sitemap.xml";"/";"assertSitemapSuccessSaveAndGenerateMessages, assertSitemapContent, assertSitemapInGrid"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest.php
new file mode 100644
index 00000000000..fa9e26502ce
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Sitemap\Test\TestCase;
+
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Cms\Test\Fixture\CmsPage;
+use Magento\Sitemap\Test\Fixture\Sitemap;
+use Mtf\TestCase\Injectable;
+use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
+
+/**
+ * Cover updating Sitemap Entity
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Generate sitemap
+ * 2. Create category
+ * 3. Create simple product
+ * 4. Create CMS page
+ * Steps:
+ * 1. Login as Admin User
+ * 2. Go to Marketing > SEO & Search: Site Map
+ * 3. Click 'Generate' In the grid for sitemap from preconditions
+ * 4. Perform all assertions
+ *
+ * @group XML_Sitemap_(PS)
+ * @ZephyrId MAGETWO-25362
+ */
+class UpdateSitemapEntityTest extends Injectable
+{
+ /**
+ * Sitemap grid page
+ *
+ * @var SitemapIndex
+ */
+ protected $sitemapIndex;
+
+ /**
+ * Inject data
+ *
+ * @param SitemapIndex $sitemapIndex
+ * @return void
+ */
+ public function __inject(SitemapIndex $sitemapIndex)
+ {
+ $this->sitemapIndex = $sitemapIndex;
+ }
+
+ /**
+ * Update Sitemap Entity
+ *
+ * @param Sitemap $sitemap
+ * @param CatalogProductSimple $product
+ * @param CatalogCategory $catalog
+ * @param CmsPage $cmsPage
+ * @return void
+ */
+ public function testUpdateSitemap(
+ Sitemap $sitemap,
+ CatalogProductSimple $product,
+ CatalogCategory $catalog,
+ CmsPage $cmsPage
+ ) {
+ // Preconditions
+ $sitemap->persist();
+ $product->persist();
+ $catalog->persist();
+ $cmsPage->persist();
+ $filter = [
+ 'sitemap_filename' => $sitemap->getSitemapFilename(),
+ 'sitemap_path' => $sitemap->getSitemapPath(),
+ 'sitemap_id' => $sitemap->getSitemapId()
+ ];
+
+ // Steps
+ $this->sitemapIndex->open()->getSitemapGrid()->search($filter);
+ $this->sitemapIndex->getSitemapGrid()->generate();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest/testUpdateSitemap.csv b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest/testUpdateSitemap.csv
new file mode 100644
index 00000000000..2033e2a90f3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/UpdateSitemapEntityTest/testUpdateSitemap.csv
@@ -0,0 +1,2 @@
+"catalog/dataSet";"product/dataSet";"cmsPage/dataSet";"sitemap/dataSet";"constraint"
+"default_category";"default";"default";"default";"assertSitemapSuccessGenerateMessage, assertSitemapContent"
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/curl/di.xml
index 006c7b3bb77..d2f58220016 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/curl/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/curl/di.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/Magento/ObjectManager/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface" type="\Magento\Sitemap\Test\Handler\Sitemap\Curl" />
-</config>
+</config>
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/global/constraint.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/global/constraint.xml
index 49995d956e6..b6a5d07a9d2 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/global/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/global/constraint.xml
@@ -42,4 +42,13 @@
<assertSitemapNotInGrid module="Magento_Sitemap">
<severeness>low</severeness>
</assertSitemapNotInGrid>
+ <assertSitemapSuccessSaveAndGenerateMessages module="Magento_Sitemap">
+ <severeness>low</severeness>
+ </assertSitemapSuccessSaveAndGenerateMessages>
+ <assertSitemapContent module="Magento_Sitemap">
+ <severeness>low</severeness>
+ </assertSitemapContent>
+ <assertSitemapSuccessGenerateMessage module="Magento_Sitemap">
+ <severeness>low</severeness>
+ </assertSitemapSuccessGenerateMessage>
</constraint>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/IdPath.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/IdPath.php
index ac2d8b7d434..fee524bd331 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/IdPath.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/IdPath.php
@@ -63,7 +63,7 @@ class IdPath implements FixtureInterface
$explodeValue = explode('::', $dataSet[1]);
if (!empty($explodeValue) && count($explodeValue) > 1) {
/** @var FixtureInterface $fixture */
- $this->entity = $fixtureFactory->createByCode($explodeValue[0], ['entity' => $explodeValue[1]]);
+ $this->entity = $fixtureFactory->createByCode($explodeValue[0], ['dataSet' => $explodeValue[1]]);
$this->entity->persist();
$this->data = preg_replace('`(%.*?%)`', $this->entity->getId(), $data['entity']);
} else {
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/RoleForm.xml b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/RoleForm.xml
index 5a9858f60d5..acbd9cd481f 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/RoleForm.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/RoleForm.xml
@@ -35,7 +35,7 @@
</role_name>
</fields>
</role-info>
- <role-resources-tab>
+ <role-resources>
<class>\Magento\Backend\Test\Block\Widget\Tab</class>
<selector>#role_info_tabs_account</selector>
<strategy>css selector</strategy>
@@ -51,5 +51,5 @@
<strategy>css selector</strategy>
</roles_resources>
</fields>
- </role-resources-tab>
+ </role-resources>
</tabs>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/RoleGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/RoleGrid.php
index 42199dc858d..6b19f5f2825 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/RoleGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/RoleGrid.php
@@ -43,15 +43,15 @@ class RoleGrid extends Grid
'id' => [
'selector' => '#roleGrid_filter_role_id'
],
- 'role_name' => [
+ 'rolename' => [
'selector' => '#roleGrid_filter_role_name'
]
];
/**
- * Locator value for link in action column
+ * Locator value for td with role name
*
* @var string
*/
- protected $editLink = '[data-column="role_name"]';
+ protected $editLink = 'tbody [data-column="role_name"]';
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
new file mode 100644
index 00000000000..0840ad4dcd3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Block\Adminhtml\User\Tab;
+
+use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element;
+use Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid;
+
+/**
+ * Class Role
+ * User role tab on UserEdit page.
+ */
+class Role extends Tab
+{
+ /**
+ * Fill user options
+ *
+ * @param array $fields
+ * @param Element|null $element
+ * @return void
+ */
+ public function fillFormTab(array $fields, Element $element = null)
+ {
+ $this->getRoleGrid()->searchAndOpen(['rolename' => $fields['rolename']]);
+ }
+
+ /**
+ * Returns role grid
+ *
+ * @return \Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid
+ */
+ public function getRoleGrid()
+ {
+ return $this->blockFactory->create(
+ 'Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid',
+ ['element' => $this->_rootElement->find('#permissionsUserRolesGrid')]
+ );
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role/Grid.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role/Grid.php
new file mode 100644
index 00000000000..425921593c6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role/Grid.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Block\Adminhtml\User\Tab\Role;
+
+use Mtf\Client\Element;
+use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
+
+/**
+ * Class Grid
+ * Role Grid on UserEdit page.
+ */
+class Grid extends GridInterface
+{
+ /**
+ * Grid filters' selectors
+ *
+ * @var array
+ */
+ protected $filters = [
+ 'rolename' => [
+ 'selector' => '#permissionsUserRolesGrid_filter_role_name'
+ ]
+ ];
+
+ /**
+ * Locator value for role name column
+ *
+ * @var string
+ */
+ protected $editLink = '.col-role_name';
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.php
new file mode 100644
index 00000000000..2634be773d6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Block\Adminhtml\User;
+
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Magento\User\Test\Fixture\AdminUserInjectable;
+use Magento\User\Test\Fixture\AdminUserRole;
+use Mtf\Client\Element;
+
+/**
+ * Class Edit
+ * User edit form page
+ */
+class UserForm extends FormTabs
+{
+ /**
+ * Method for filling different fixtures' data on different tabs
+ *
+ * @param AdminUserInjectable $user
+ * @param null|AdminUserRole $role
+ */
+ public function fillUser(AdminUserInjectable $user, AdminUserRole $role = null)
+ {
+ if ($user->hasData()) {
+ parent::fill($user);
+ }
+ if ($role != null) {
+ $this->openTab('user-role');
+ $tabElement = $this->getTabElement('user-role');
+ $tabElement->fillFormTab(['rolename' => $role->getRoleName()]);
+ }
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.xml b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.xml
new file mode 100644
index 00000000000..0541a6bf871
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/UserForm.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<tabs>
+ <user-info>
+ <class>\Magento\Backend\Test\Block\Widget\Tab</class>
+ <selector>#page_tabs_main_section</selector>
+ <strategy>css selector</strategy>
+ <fields>
+ <username />
+ <firstname />
+ <lastname />
+ <email />
+ <password />
+ <password_confirmation />
+ <is_active>
+ <input>select</input>
+ </is_active>
+ </fields>
+ </user-info>
+ <user-role>
+ <class>\Magento\User\Test\Block\Adminhtml\User\Tab\Role</class>
+ <selector>#page_tabs_roles_section</selector>
+ <strategy>css selector</strategy>
+ </user-role>
+</tabs>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
index 57a571c9e28..409cd44af97 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
@@ -51,7 +51,7 @@ class AssertRoleInGrid extends AbstractConstraint
UserRoleIndex $rolePage,
AdminUserRole $role
) {
- $filter = ['role_name' => $role->getRoleName()];
+ $filter = ['rolename' => $role->getRoleName()];
$rolePage->open();
\PHPUnit_Framework_Assert::assertTrue(
$rolePage->getRoleGrid()->isRowVisible($filter),
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
index dd026340820..bc8be484587 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
@@ -51,7 +51,7 @@ class AssertRoleNotInGrid extends AbstractConstraint
UserRoleIndex $rolePage,
AdminUserRole $role
) {
- $filter = ['role_name' => $role->getRoleName()];
+ $filter = ['rolename' => $role->getRoleName()];
$rolePage->open();
\PHPUnit_Framework_Assert::assertFalse(
$rolePage->getRoleGrid()->isRowVisible($filter),
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
index 47fe88ce8db..4deb7eeb42a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
@@ -32,7 +32,7 @@ use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
*/
class AssertRoleSuccessDeleteMessage extends AbstractConstraint
{
- const SUCCESS_MESSAGE = 'You deleted the role.';
+ const SUCCESS_DELETE_MESSAGE = 'You deleted the role.';
/**
* Constraint severeness
@@ -51,10 +51,10 @@ class AssertRoleSuccessDeleteMessage extends AbstractConstraint
{
$successMessage = $rolePage->getMessagesBlock()->getSuccessMessages();
\PHPUnit_Framework_Assert::assertEquals(
- self::SUCCESS_MESSAGE,
+ self::SUCCESS_DELETE_MESSAGE,
$successMessage,
'Wrong success message is displayed.'
- . "\nExpected: " . self::SUCCESS_MESSAGE
+ . "\nExpected: " . self::SUCCESS_DELETE_MESSAGE
. "\nActual: " . $successMessage
);
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
index 1b2c17f7fa5..eddf99452a3 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
@@ -44,13 +44,16 @@ class AssertUserInGrid extends AbstractConstraint
* Asserts that user is present in User Grid.
*
* @param UserIndex $userIndex
- * @param AdminUserInjectable $adminUser
+ * @param AdminUserInjectable $user
+ * @param AdminUserInjectable $customAdmin
* @return void
*/
public function processAssert(
UserIndex $userIndex,
- AdminUserInjectable $adminUser
+ AdminUserInjectable $user,
+ AdminUserInjectable $customAdmin = null
) {
+ $adminUser = ($user->hasData('password') || $user->hasData('username')) ? $user : $customAdmin;
$filter = ['username' => $adminUser->getUsername()];
$userIndex->open();
\PHPUnit_Framework_Assert::assertTrue(
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
new file mode 100644
index 00000000000..27318ba2ee0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\Backend\Test\Page\Dashboard;
+use Magento\User\Test\Page\Adminhtml\UserIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertUserRoleSalesRestrictedAccess
+ */
+class AssertUserRoleSalesRestrictedAccess extends AbstractConstraint
+{
+ const ROLE_RESOURCE = 'sales';
+ const DENIED_ACCESS = 'Access denied';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Asserts that user has only Sales-related permissions
+ *
+ * @param Dashboard $dashboard
+ * @param UserIndex $userIndex
+ * @return void
+ */
+ public function processAssert(
+ Dashboard $dashboard,
+ UserIndex $userIndex
+ ) {
+ $menuItems = $dashboard->getMenuBlock()->getTopMenuItems();
+ $userIndex->open();
+ $deniedMessage = $userIndex->getAccessDeniedBlock()->getTextFromAccessDeniedBlock();
+ $hasSales = (in_array(self::ROLE_RESOURCE, $menuItems) && count($menuItems) == 1) ? true : false;
+ \PHPUnit_Framework_Assert::assertTrue(
+ $hasSales && self::DENIED_ACCESS == $deniedMessage,
+ 'Sales item is absent in Menu block.'
+ );
+ }
+
+ /**
+ * Returns success message if assert true.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Sales item is present in Menu block.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
new file mode 100644
index 00000000000..456792d088b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\Backend\Test\Page\Dashboard;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\AdminAuthLogin;
+
+/**
+ * Class AssertUserSuccessLogOut
+ */
+class AssertUserSuccessLogOut extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Asserts that 'You have logged out.' message is present on page
+ *
+ * @param AdminAuthLogin $adminAuth
+ * @param Dashboard $dashboard
+ * @return void
+ */
+ public function processAssert(
+ AdminAuthLogin $adminAuth,
+ Dashboard $dashboard
+ ) {
+ $dashboard->getAdminPanelHeader()->logOut();
+ $isLoginBlockVisible = $adminAuth->getLoginBlock()->isVisible();
+ \PHPUnit_Framework_Assert::assertTrue(
+ $isLoginBlockVisible,
+ 'Admin user was not logged out.'
+ );
+ }
+
+ /**
+ * Return message if user successful logout
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'User had successfully logout.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
new file mode 100644
index 00000000000..c4da03406ff
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\User\Test\Fixture\AdminUserInjectable;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\Dashboard;
+use Magento\Backend\Test\Page\AdminAuthLogin;
+
+/**
+ * Class AssertUserSuccessLogin
+ */
+class AssertUserSuccessLogin extends AbstractConstraint
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Verify whether customer has logged in to the Backend
+ *
+ * @param Dashboard $dashboard
+ * @param AdminUserInjectable $user
+ * @param AdminAuthLogin $adminAuth
+ * @param AdminUserInjectable $customAdmin
+ * @return void
+ */
+ public function processAssert(
+ Dashboard $dashboard,
+ AdminUserInjectable $user,
+ AdminAuthLogin $adminAuth,
+ AdminUserInjectable $customAdmin = null
+ ) {
+ $adminUser = ($user->hasData('password') || $user->hasData('username')) ? $user : $customAdmin;
+ if ($dashboard->getAdminPanelHeader()->isVisible()) {
+ $dashboard->getAdminPanelHeader()->logOut();
+ }
+ $adminAuth->getLoginBlock()->fill($adminUser);
+ $adminAuth->getLoginBlock()->submit();
+
+ \PHPUnit_Framework_Assert::assertTrue(
+ $dashboard->getAdminPanelHeader()->isLoggedIn(),
+ 'Admin user was not logged in.'
+ );
+ }
+
+ /**
+ * Returns success message if equals to expected message
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Admin user is logged in.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
new file mode 100644
index 00000000000..a644486ab8c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\User\Test\Page\Adminhtml\UserIndex;
+
+/**
+ * Class AssertUserSuccessSaveMessage
+ */
+class AssertUserSuccessSaveMessage extends AbstractConstraint
+{
+ const SUCCESS_MESSAGE = 'You saved the user.';
+
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'low';
+
+ /**
+ * Asserts that success message equals to expected message.
+ *
+ * @param UserIndex $userIndex
+ * @return void
+ */
+ public function processAssert(UserIndex $userIndex)
+ {
+ $successMessage = $userIndex->getMessagesBlock()->getSuccessMessages();
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::SUCCESS_MESSAGE,
+ $successMessage,
+ 'Wrong success message is displayed.'
+ . "\nExpected: " . self::SUCCESS_MESSAGE
+ . "\nActual: " . $successMessage
+ );
+ }
+
+ /**
+ * Returns success message if equals to expected message.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Success message on User Index page is correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/InvalidCredentials.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
similarity index 67%
rename from dev/tests/functional/tests/app/Magento/User/Test/Constraint/InvalidCredentials.php
rename to dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
index 4edd7c34e3f..e1a7702e5bb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/InvalidCredentials.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
@@ -24,13 +24,14 @@
namespace Magento\User\Test\Constraint;
+use Magento\User\Test\Fixture\AdminUserInjectable;
use Mtf\Constraint\AbstractConstraint;
use Magento\Backend\Test\Page\AdminAuthLogin;
/**
- * Class InvalidCredentials
+ * Class AssertUserWrongCredentialsMessage
*/
-class InvalidCredentials extends AbstractConstraint
+class AssertUserWrongCredentialsMessage extends AbstractConstraint
{
const INVALID_CREDENTIALS_MESSAGE = 'Please correct the user name or password.';
@@ -44,19 +45,29 @@ class InvalidCredentials extends AbstractConstraint
/**
* Verify incorrect credentials message while login to admin
*
- * @param AdminAuthLogin $loginPage
+ * @param AdminAuthLogin $adminAuth
+ * @param AdminUserInjectable $customAdmin
+ * @return void
*/
- public function processAssert(AdminAuthLogin $loginPage)
- {
+ public function processAssert(
+ AdminAuthLogin $adminAuth,
+ AdminUserInjectable $customAdmin
+ ) {
+ $adminAuth->open();
+ $adminAuth->getLoginBlock()->fill($customAdmin);
+ $adminAuth->getLoginBlock()->submit();
+
\PHPUnit_Framework_Assert::assertEquals(
self::INVALID_CREDENTIALS_MESSAGE,
- $loginPage->getMessagesBlock()->getErrorMessages(),
- 'Message \'' . self::INVALID_CREDENTIALS_MESSAGE . '\' is not visible.'
+ $adminAuth->getMessagesBlock()->getErrorMessages(),
+ 'Message "' . self::INVALID_CREDENTIALS_MESSAGE . '" is not visible.'
);
}
/**
- * @inheritdoc
+ * Returns error message equals expected message
+ *
+ * @return string
*/
public function toString()
{
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/LoginSuccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/LoginSuccess.php
index 50f10eead4d..9572885621e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/LoginSuccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/LoginSuccess.php
@@ -26,7 +26,6 @@ namespace Magento\User\Test\Constraint;
use Mtf\Constraint\AbstractConstraint;
use Magento\Backend\Test\Page\Dashboard;
-use Magento\User\Test\Fixture\AdminUserInjectable;
/**
* Class LoginSuccess
@@ -43,12 +42,9 @@ class LoginSuccess extends AbstractConstraint
/**
* Verify whether customer has logged in to the Backend
*
- * @param AdminUserInjectable $fixture
* @param Dashboard $dashboard
- *
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function processAssert(AdminUserInjectable $fixture, Dashboard $dashboard)
+ public function processAssert(Dashboard $dashboard)
{
\PHPUnit_Framework_Assert::assertTrue(
$dashboard->getAdminPanelHeader()->isLoggedIn(),
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.php
index d767dbd0d8e..f6e96d1cdf0 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.php
@@ -66,6 +66,7 @@ class AdminUserInjectable extends InjectableFixture
'is_required' => '',
'default_value' => '',
'input' => '',
+ 'group' => 'user-info'
];
protected $lastname = [
@@ -74,6 +75,7 @@ class AdminUserInjectable extends InjectableFixture
'is_required' => '',
'default_value' => '',
'input' => '',
+ 'group' => 'user-info'
];
protected $email = [
@@ -82,6 +84,7 @@ class AdminUserInjectable extends InjectableFixture
'is_required' => '',
'default_value' => '',
'input' => '',
+ 'group' => 'user-info'
];
protected $username = [
@@ -90,6 +93,7 @@ class AdminUserInjectable extends InjectableFixture
'is_required' => '',
'default_value' => '',
'input' => '',
+ 'group' => 'user-info'
];
protected $password = [
@@ -98,6 +102,7 @@ class AdminUserInjectable extends InjectableFixture
'is_required' => '',
'default_value' => '',
'input' => '',
+ 'group' => 'user-info'
];
protected $created = [
@@ -185,6 +190,18 @@ class AdminUserInjectable extends InjectableFixture
'backend_type' => 'virtual',
];
+ protected $role = [
+ 'attribute_code' => 'role',
+ 'backend_type' => 'virtual',
+ 'source' => 'Magento\User\Test\Fixture\User\Role'
+ ];
+
+ protected $password_confirmation = [
+ 'attribute_code' => 'password_confirmation',
+ 'backend_type' => 'virtual',
+ 'group' => 'user-info'
+ ];
+
public function getUserId()
{
return $this->getData('user_id');
@@ -269,4 +286,14 @@ class AdminUserInjectable extends InjectableFixture
{
return $this->getData('role_id');
}
+
+ public function getRole()
+ {
+ return $this->getData('role');
+ }
+
+ public function getPasswordConfirmation()
+ {
+ return $this->getData('password_confirmation');
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.xml
index 3f24c9313fd..fc51e9fefc3 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserInjectable.xml
@@ -145,6 +145,10 @@
<attribute_code>role_id</attribute_code>
<backend_type>virtual</backend_type>
</role_id>
+ <password_confirmation>
+ <attribute_code>password_confirmation</attribute_code>
+ <backend_type>virtual</backend_type>
+ </password_confirmation>
</fields>
<repository_class>Magento\User\Test\Repository\AdminUserInjectable</repository_class>
<handler_interface>Magento\User\Test\Handler\AdminUser\AdminUserInterface</handler_interface>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
index b011fa3eeb6..44ca844e6ad 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
@@ -94,8 +94,8 @@ class AdminUserRole extends InjectableFixture
'input' => '',
];
- protected $role_name = [
- 'attribute_code' => 'role_name',
+ protected $rolename = [
+ 'attribute_code' => 'rolename',
'backend_type' => 'varchar',
'is_required' => '',
'default_value' => '',
@@ -152,7 +152,7 @@ class AdminUserRole extends InjectableFixture
public function getRoleName()
{
- return $this->getData('role_name');
+ return $this->getData('rolename');
}
public function getUserType()
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml
index 9d091e47fae..0dddfdbd20e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml
@@ -71,13 +71,13 @@
<default_value>0</default_value>
<input></input>
</user_id>
- <role_name>
- <attribute_code>role_name</attribute_code>
+ <rolename>
+ <attribute_code>rolename</attribute_code>
<backend_type>varchar</backend_type>
<is_required></is_required>
<default_value></default_value>
<input></input>
- </role_name>
+ </rolename>
<user_type>
<attribute_code>user_type</attribute_code>
<backend_type>varchar</backend_type>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/Role.php
new file mode 100644
index 00000000000..08a765caf26
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/Role.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\Fixture\User;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Util\Protocol\CurlTransport;
+use Magento\User\Test\Fixture\AdminUserRole;
+
+/**
+ * Class Role
+ *
+ * Data keys:
+ * - dataSet
+ */
+class Role implements FixtureInterface
+{
+ /**
+ * Admin User Role
+ *
+ * @var AdminUserRole
+ */
+ protected $role;
+
+ /**
+ * User role name
+ *
+ * @var string
+ */
+ protected $data;
+
+ /**
+ * @construct
+ * @param FixtureFactory $fixtureFactory
+ * @param array $params
+ * @param array $data
+ */
+ public function __construct(FixtureFactory $fixtureFactory, array $params, array $data = [])
+ {
+ $this->params = $params;
+ if (isset($data['dataSet']) && $data['dataSet'] !== '-') {
+ $this->role = $fixtureFactory->createByCode('adminUserRole', ['dataSet' => $data['dataSet']]);
+ if (!$this->role->hasData('role_id')) {
+ $this->role->persist();
+ }
+ $this->data = $this->role->getRoleName();
+ }
+ if (isset($data['role_fixture'])
+ && $data['role_fixture'] instanceof \Magento\User\Test\Fixture\AdminUserRole
+ ) {
+ $this->role = $data['role_fixture'];
+ $this->data = $data['role_fixture']->getRoleName();
+ }
+ }
+
+ /**
+ * Persist user role
+ *
+ * @return void
+ */
+ public function persist()
+ {
+ //
+ }
+
+ /**
+ * Return prepared data set
+ *
+ * @param string $key [optional]
+ * @return string|null
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getData($key = null)
+ {
+ return $this->data;
+ }
+
+ /**
+ * Return data set configuration settings
+ *
+ * @return string
+ */
+ public function getDataConfig()
+ {
+ return $this->params;
+ }
+
+ /**
+ * Return role fixture
+ *
+ * @return AdminUserRole
+ */
+ public function getRole()
+ {
+ return $this->role;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUser/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUser/Curl.php
index 13653bc9d2f..d91467f1d15 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUser/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUser/Curl.php
@@ -47,14 +47,15 @@ class Curl extends AbstractCurl implements AdminUserInterface
*/
public function persist(FixtureInterface $fixture = null)
{
+ /** @var \Magento\User\Test\Fixture\AdminUserInjectable $fixture */
$data = $fixture->getData();
- $data['roles[]'] = $fixture->getRoleId();
- unset($data['role_id']);
+ $role = $fixture->getDataFieldConfig('role')['source']->getRole();
+ $data['roles[]'] = $role->getRoleId();
$url = $_ENV['app_backend_url'] . 'admin/user/save/active_tab/main_section/';
$curl = new BackendDecorator(new CurlTransport(), new Config);
$curl->addOption(CURLOPT_HEADER, 1);
- $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
+ $curl->write(CurlInterface::POST, $url, '1.0', [], $data);
$response = $curl->read();
$curl->close();
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
index 918d42c2c4b..a35a2feb403 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
@@ -48,15 +48,18 @@ class Curl extends AbstractCurl implements AdminUserRoleInterface
public function persist(FixtureInterface $fixture = null)
{
$data = $fixture->getData();
- $data['rolename'] = $data['role_name'];
- unset($data['role_name']);
- $data['all'] = ($data['resource_access'] == 'All') ? '1' : '0';
- unset($data['resource_access']);
+ $data['all'] = ($data['resource_access'] == 'All') ? 1 : 0;
+ if (isset($data['roles_resources'])) {
+ foreach ($data['roles_resources'] as $resource) {
+ $data['resource'][] = $resource;
+ }
+ }
+ unset($data['roles_resources']);
$data['gws_is_all'] = (isset($data['gws_is_all'])) ? $data['gws_is_all'] : '1';
$url = $_ENV['app_backend_url'] . 'admin/user_role/saverole/active_tab/info/';
$curl = new BackendDecorator(new CurlTransport(), new Config);
$curl->addOption(CURLOPT_HEADER, 1);
- $curl->write(CurlInterface::POST, $url, '1.0', array(), $data);
+ $curl->write(CurlInterface::POST, $url, '1.0', [], $data);
$response = $curl->read();
$curl->close();
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.php b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.php
index d12315a867c..0da9021aa98 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.php
@@ -48,10 +48,16 @@ class UserEdit extends BackendPage
],
'userForm' => [
'name' => 'userForm',
- 'class' => 'Magento\User\Test\Block\Adminhtml\User\Edit\Form',
+ 'class' => 'Magento\User\Test\Block\Adminhtml\User\UserForm',
'locator' => '[id="page:main-container"]',
'strategy' => 'css selector',
],
+ 'rolesGrid' => [
+ 'name' => 'rolesGrid',
+ 'class' => 'Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid',
+ 'locator' => '[id="permissionsUserRolesGrid"]',
+ 'strategy' => 'css selector',
+ ],
];
/**
@@ -71,10 +77,18 @@ class UserEdit extends BackendPage
}
/**
- * @return \Magento\User\Test\Block\Adminhtml\User\Edit\Form
+ * @return \Magento\User\Test\Block\Adminhtml\User\UserForm
*/
public function getUserForm()
{
return $this->getBlockInstance('userForm');
}
+
+ /**
+ * @return \Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid
+ */
+ public function getRolesGrid()
+ {
+ return $this->getBlockInstance('rolesGrid');
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml
index c5235586183..e094d8ea20d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml
@@ -38,8 +38,14 @@
</block>
<block>
<name>userForm</name>
- <class>Magento\User\Test\Block\Adminhtml\User\Edit\Form</class>
+ <class>Magento\User\Test\Block\Adminhtml\User\UserForm</class>
<locator>[id="page:main-container"]</locator>
<strategy>css selector</strategy>
</block>
+ <block>
+ <name>rolesGrid</name>
+ <class>Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid</class>
+ <locator>[id="permissionsUserRolesGrid"]</locator>
+ <strategy>css selector</strategy>
+ </block>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.php b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.php
index ba6103d7096..9f523d848dc 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.php
@@ -52,6 +52,12 @@ class UserIndex extends BackendPage
'locator' => '#messages',
'strategy' => 'css selector',
],
+ 'accessDeniedBlock' => [
+ 'name' => 'accessDeniedBlock',
+ 'class' => 'Magento\Backend\Test\Block\Denied',
+ 'locator' => '#anchor-content',
+ 'strategy' => 'css selector',
+ ],
];
/**
@@ -77,4 +83,12 @@ class UserIndex extends BackendPage
{
return $this->getBlockInstance('messagesBlock');
}
+
+ /**
+ * @return \Magento\Backend\Test\Block\Denied
+ */
+ public function getAccessDeniedBlock()
+ {
+ return $this->getBlockInstance('accessDeniedBlock');
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml
index 1783a653f41..aafc1e3009b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml
@@ -42,4 +42,10 @@
<locator>#messages</locator>
<strategy>css selector</strategy>
</block>
+ <block>
+ <name>accessDeniedBlock</name>
+ <class>Magento\Backend\Test\Block\Denied</class>
+ <locator>#anchor-content</locator>
+ <strategy>css selector</strategy>
+ </block>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserInjectable.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserInjectable.php
index d1d6d809c4c..f1f19188669 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserInjectable.php
@@ -27,7 +27,8 @@ namespace Magento\User\Test\Repository;
use Mtf\Repository\AbstractRepository;
/**
- * Class Admin User Repository
+ * Class AdminUserInjectable
+ * Admin User Repository
*/
class AdminUserInjectable extends AbstractRepository
{
@@ -51,12 +52,22 @@ class AdminUserInjectable extends AbstractRepository
];
$this->_data['custom_admin'] = [
+ 'username' => 'AdminUser%isolation%',
+ 'firstname' => 'FirstName%isolation%',
+ 'lastname' => 'LastName%isolation%',
+ 'email' => 'email%isolation%@example.com',
+ 'password' => '123123q',
+ 'password_confirmation' => '123123q'
+ ];
+
+ $this->_data['custom_admin_with_default_role'] = [
'username' => 'AdminUser%isolation%',
'firstname' => 'FirstName%isolation%',
'lastname' => 'LastName%isolation%',
'email' => 'email%isolation%@example.com',
'password' => '123123q',
'password_confirmation' => '123123q',
+ 'role' => ['dataSet' => 'default']
];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
index c1da04d4f5f..d90b6e5b64a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
@@ -28,6 +28,7 @@ use Mtf\Repository\AbstractRepository;
/**
* Class AdminUserRole
+ * Predefined dataSets provider for AdminUserRoles entity
*/
class AdminUserRole extends AbstractRepository
{
@@ -41,8 +42,34 @@ class AdminUserRole extends AbstractRepository
public function __construct(array $defaultConfig = [], array $defaultData = [])
{
$this->_data['default'] = [
- 'role_name' => 'RoleName%isolation%',
+ 'rolename' => 'RoleName%isolation%',
'resource_access' => 'All'
];
+
+ $this->_data['role_sales'] = [
+ 'rolename' => 'RoleName%isolation%',
+ 'resource_access' => 'Custom',
+ 'roles_resources' => [
+ 'Sales' => 'Magento_Sales::sales',
+ 'Operation' => 'Magento_Sales::sales_operation',
+ 'Actions' => 'Magento_Sales::actions',
+ 'Orders' => 'Magento_Sales::sales_order',
+ 'Create' => 'Magento_Sales::create',
+ 'View' => 'Magento_Sales::actions_view',
+ 'Send Order Email' => 'Magento_Sales::email',
+ 'Reorder' => 'Magento_Sales::reorder',
+ 'Edit' => 'Magento_Sales::actions_edit',
+ 'Cancel' => 'Magento_Sales::cancel',
+ 'Accept or Deny Payment' => 'Magento_Sales::review_payment',
+ 'Capture' => 'Magento_Sales::capture',
+ 'Invoice' => 'Magento_Sales::invoice',
+ 'Credit Memos' => 'Magento_Sales::creditmemo',
+ 'Hold' => 'Magento_Sales::hold',
+ 'Unhold' => 'Magento_Sales::unhold',
+ 'Ship' => 'Magento_Sales::ship',
+ 'Comment' => 'Magento_Sales::comment',
+ 'Send Sales Emails' => 'Magento_Sales::emails',
+ ]
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest/testCreateUserRole.csv b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest/testCreateUserRole.csv
index b8c7ec03d17..9b756758670 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest/testCreateUserRole.csv
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest/testCreateUserRole.csv
@@ -1,3 +1,3 @@
-"role/data/role_name";"role/data/resource_access";"role/data/roles_resources";"constraint"
+"role/data/rolename";"role/data/resource_access";"role/data/roles_resources";"constraint"
AdminRole%isolation%;Custom;Sales;"assertRoleSuccessSaveMessage, assertRoleInGrid"
AdminRole%isolation%;All;-;"assertRoleSuccessSaveMessage, assertRoleInGrid"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
index f7d092739fb..1d6c66d84ea 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
@@ -78,20 +78,14 @@ class DeleteAdminUserEntityTest extends Injectable
*/
public function __prepare(FixtureFactory $fixtureFactory)
{
- $role = $fixtureFactory->createByCode('adminUserRole', ['dataSet' => 'default']);
- $role->persist();
- $roleId = $role->getData('role_id');
- $adminUser = $fixtureFactory->createByCode(
+ $user = $fixtureFactory->createByCode(
'adminUserInjectable',
- [
- 'dataSet' => 'custom_admin',
- 'data' => ['role_id' => $roleId]
- ]
+ ['dataSet' => 'custom_admin_with_default_role']
);
- $adminUser->persist();
+ $user->persist();
return [
- 'adminUser' => $adminUser
+ 'user' => $user
];
}
@@ -119,21 +113,21 @@ class DeleteAdminUserEntityTest extends Injectable
/**
* Runs Delete User Entity test
*
- * @param AdminUserInjectable $adminUser
+ * @param AdminUserInjectable $user
* @param string $isDefaultUser
* @return void
*/
public function testDeleteAdminUserEntity(
- AdminUserInjectable $adminUser,
+ AdminUserInjectable $user,
$isDefaultUser
) {
$filter = [
- 'username' => $adminUser->getUsername()
+ 'username' => $user->getUsername()
];
//Steps
if ($isDefaultUser == 0) {
$this->adminAuthLogin->open();
- $this->adminAuthLogin->getLoginBlock()->fill($adminUser);
+ $this->adminAuthLogin->getLoginBlock()->fill($user);
$this->adminAuthLogin->getLoginBlock()->submit();
}
$this->userIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
index cfbbe6a88de..84af8af5af4 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
@@ -73,19 +73,20 @@ class DeleteUserRoleEntityTest extends Injectable
/**
* Preconditions for test
+ *
* @param FixtureFactory $fixtureFactory
* @return array
*/
public function __prepare(FixtureFactory $fixtureFactory)
{
+ /** @var \Magento\User\Test\Fixture\AdminUserRole $role */
$role = $fixtureFactory->createByCode('adminUserRole', ['dataSet' => 'default']);
$role->persist();
- $roleId = $role->getData('role_id');
$adminUser = $fixtureFactory->createByCode(
'adminUserInjectable',
[
- 'dataSet' => 'custom_admin',
- 'data' => ['role_id' => $roleId]
+ 'dataSet' => 'custom_admin_with_default_role',
+ 'data' => ['role' => ['role_fixture' => $role]],
]
);
$adminUser->persist();
@@ -101,6 +102,7 @@ class DeleteUserRoleEntityTest extends Injectable
* @param UserRoleEditRole $userRoleEditRole
* @param AdminAuthLogin $adminAuthLogin
* @param Dashboard $dashboard
+ * @return void
*/
public function __inject(
UserRoleIndex $userRoleIndex,
@@ -128,7 +130,7 @@ class DeleteUserRoleEntityTest extends Injectable
$isDefaultUser
) {
$filter = [
- 'role_name' => $role->getRoleName()
+ 'rolename' => $role->getRoleName()
];
//Steps
if ($isDefaultUser == 0) {
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest.php
index c920040dac0..4ae2844d471 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest.php
@@ -67,13 +67,13 @@ class LoginUserTest extends Injectable
/**
* Test admin login to backend
*
- * @param AdminUserInjectable $adminUser
+ * @param AdminUserInjectable $user
*/
- public function test(AdminUserInjectable $adminUser)
+ public function test(AdminUserInjectable $user)
{
// Steps
$this->loginPage->open();
- $this->loginPage->getLoginBlock()->fill($adminUser);
+ $this->loginPage->getLoginBlock()->fill($user);
$this->loginPage->getLoginBlock()->submit();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest/test.csv b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest/test.csv
index b32491c9190..937e828197a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LoginUserTest/test.csv
@@ -1,2 +1,2 @@
-"adminUser/data/username"; "adminUser/data/password"; "constraint"
-"admin"; "123123q"; "loginSuccess"
\ No newline at end of file
+"user/data/username"; "user/data/password"; "constraint"
+"admin"; "123123q"; "assertUserSuccessLogin"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
new file mode 100644
index 00000000000..0e128b69f1c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\User\Test\TestCase;
+
+use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\User\Test\Fixture\AdminUserInjectable;
+use Magento\User\Test\Fixture\AdminUserRole;
+use Mtf\Fixture\FixtureFactory;
+use Mtf\TestCase\Injectable;
+use Magento\Backend\Test\Page\Dashboard;
+use Magento\User\Test\Page\Adminhtml\UserEdit;
+use Magento\User\Test\Page\Adminhtml\UserIndex;
+
+/**
+ * Test Creation for UpdateAdminUserEntity
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Admin user with assigned full access role is created.
+ * 2. Custom role with restricted permission: Sales is created
+ *
+ * Steps:
+ * 1. Log in as admin user from data set
+ * 2. Navigate to System>Permissions>All Users
+ * 3. Open user from precondition.
+ * 4. Fill in all data according to data set
+ * 5. Save user
+ * 6. Perform all assertions
+ *
+ * @group ACL_(MX)
+ * @ZephyrId MAGETWO-24345
+ */
+class UpdateAdminUserEntityTest extends Injectable
+{
+ /**
+ * @var UserIndex
+ */
+ protected $userIndex;
+
+ /**
+ * @var UserEdit
+ */
+ protected $userEdit;
+
+ /**
+ * @var Dashboard
+ */
+ protected $dashboard;
+
+ /**
+ * @var AdminAuthLogin
+ */
+ protected $adminAuth;
+
+ /**
+ * Run preconditions for test.
+ *
+ * @param FixtureFactory $fixtureFactory
+ * @return array
+ */
+ public function __prepare(FixtureFactory $fixtureFactory)
+ {
+ $roleSales = $fixtureFactory->createByCode('adminUserRole', ['dataSet' => 'role_sales']);
+ $roleSales->persist();
+ return ['roleSales' => $roleSales];
+ }
+
+ /**
+ * Setup necessary data for test
+ *
+ * @param UserIndex $userIndex
+ * @param UserEdit $userEdit
+ * @param Dashboard $dashboard
+ * @param AdminAuthLogin $adminAuth
+ * @param FixtureFactory $fixtureFactory
+ * @return array
+ */
+ public function __inject(
+ UserIndex $userIndex,
+ UserEdit $userEdit,
+ Dashboard $dashboard,
+ AdminAuthLogin $adminAuth,
+ FixtureFactory $fixtureFactory
+ ) {
+ $this->userIndex = $userIndex;
+ $this->userEdit = $userEdit;
+ $this->dashboard = $dashboard;
+ $this->adminAuth = $adminAuth;
+
+ $customAdmin = $fixtureFactory->createByCode(
+ 'adminUserInjectable',
+ ['dataSet' => 'custom_admin_with_default_role']
+ );
+ $customAdmin->persist();
+
+ return [
+ 'customAdmin' => $customAdmin
+ ];
+ }
+
+ /**
+ * Runs Update Admin User test
+ *
+ * @param AdminUserInjectable $user
+ * @param AdminUserInjectable $customAdmin
+ * @param AdminUserRole $roleSales
+ * @param string $useSalesRoleFromDataSet
+ * @param string $loginAsDefaultAdmin
+ * @return void
+ */
+ public function testUpdateAdminUser(
+ AdminUserInjectable $user,
+ AdminUserInjectable $customAdmin,
+ AdminUserRole $roleSales,
+ $useSalesRoleFromDataSet,
+ $loginAsDefaultAdmin
+ ) {
+ // Prepare data
+ $filter = ['username' => $customAdmin->getUsername()];
+ $userRole = $useSalesRoleFromDataSet != '-' ? $roleSales : null;
+
+ // Steps
+ if ($loginAsDefaultAdmin == '0') {
+ $this->adminAuth->open();
+ $this->adminAuth->getLoginBlock()->fill($customAdmin);
+ $this->adminAuth->getLoginBlock()->submit();
+ }
+ $this->userIndex->open();
+ $this->userIndex->getUserGrid()->searchAndOpen($filter);
+ $this->userEdit->getUserForm()->fillUser($user, $userRole);
+ $this->userEdit->getPageActions()->save();
+ }
+
+ /**
+ * Logout Admin User from account
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ if ($this->dashboard->getAdminPanelHeader()->isVisible()) {
+ $this->dashboard->getAdminPanelHeader()->logOut();
+ }
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest/testUpdateAdminUser.csv b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest/testUpdateAdminUser.csv
new file mode 100644
index 00000000000..0ce0c1ca5f7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest/testUpdateAdminUser.csv
@@ -0,0 +1,4 @@
+"user/data/username";"user/data/firstname";"user/data/lastname";"user/data/email";"user/data/password";"user/data/password_confirmation";"user/data/is_active";"useSalesRoleFromDataSet";"loginAsDefaultAdmin";"constraint"
+"NewAdminUser%isolation%";"NewFirstName%isolation%";"NewLastName%isolation%";"NewEmail%isolation%@example.com";"123123qa";"123123qa";"-";"-";"0";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin"
+"-";"-";"-";"-";"-";"-";"-";"1";"0";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin, assertUserRoleSalesRestrictedAccess"
+"-";"-";"-";"-";"-";"-";"Inactive";"-";"1";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/global/constraint.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/global/constraint.xml
index 1107ec8a937..447fa763412 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/etc/global/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/global/constraint.xml
@@ -24,71 +24,92 @@
*/
-->
<constraint>
- <loginSuccess module="Magento_User">
+ <assertUserSuccessLogin module="Magento_User">
<severeness>low</severeness>
<require>
<dashboard class="Magento\Backend\Test\Page\Dashboard" />
+ <adminAuth class="Magento\Backend\Test\Page\AdminAuthLogin" />
+ <user class="Magento\User\Test\Fixture\AdminUserInjectable" />
+ <customAdmin class="Magento\User\Test\Fixture\AdminUserInjectable" />
</require>
- </loginSuccess>
- <invalidCredentials module="Magento_User">
+ </assertUserSuccessLogin>
+ <assertUserSuccessLogOut module="Magento_User">
<severeness>low</severeness>
<require>
- <loginPage class="Magento\Backend\Test\Page\AdminAuthLogin" />
+ <adminAuth class="Magento\Backend\Test\Page\AdminAuthLogin" />
+ <dashboard class="Magento\Backend\Test\Page\Dashboard" />
</require>
- </invalidCredentials>
- <assertRoleSuccessSaveMessage module="Magento_User">
+ </assertUserSuccessLogOut>
+ <assertUserWrongCredentialsMessage module="Magento_User">
<severeness>low</severeness>
<require>
- <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
+ <adminAuth class="Magento\Backend\Test\Page\AdminAuthLogin" />
+ <customAdmin class="Magento\User\Test\Fixture\AdminUserInjectable" />
</require>
- </assertRoleSuccessSaveMessage>
- <assertRoleSuccessDeleteMessage module="Magento_User">
+ </assertUserWrongCredentialsMessage>
+ <assertUserRoleSalesRestrictedAccess module="Magento_User">
+ <severeness>low</severeness>
+ </assertUserRoleSalesRestrictedAccess>
+ <assertRoleSuccessSaveMessage module="Magento_User">
<severeness>low</severeness>
<require>
<rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
</require>
- </assertRoleSuccessDeleteMessage>
+ </assertRoleSuccessSaveMessage>
<assertRoleInGrid module="Magento_User">
<severeness>low</severeness>
<require>
<rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
</require>
</assertRoleInGrid>
- <assertRoleNotInGrid module="Magento_User">
+ <assertUserInGrid module="Magento_User">
<severeness>low</severeness>
<require>
- <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
- <role class="Magento\User\Test\Fixture\AdminUserRole" />
+ <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
+ <user class="Magento\User\Test\Fixture\AdminUserInjectable" />
+ <customAdmin class="Magento\User\Test\Fixture\AdminUserInjectable" />
</require>
- </assertRoleNotInGrid>
- <assertImpossibleDeleteYourOwnAccount module="Magento_User">
+ </assertUserInGrid>
+ <assertUserSuccessSaveMessage module="Magento_User">
<severeness>low</severeness>
<require>
- <userEdit class="Magento\User\Test\Page\Adminhtml\UserEdit" />
+ <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
</require>
- </assertImpossibleDeleteYourOwnAccount>
+ </assertUserSuccessSaveMessage>
<assertImpossibleDeleteYourOwnRole module="Magento_User">
<severeness>low</severeness>
<require>
<rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleEditRole" />
</require>
</assertImpossibleDeleteYourOwnRole>
- <assertUserInGrid module="Magento_User">
+ <assertRoleSuccessDeleteMessage module="Magento_User">
<severeness>low</severeness>
<require>
- <rolePage class="Magento\User\Test\Page\Adminhtml\UserIndex" />
+ <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
</require>
- </assertUserInGrid>
- <assertUserNotInGrid module="Magento_User">
+ </assertRoleSuccessDeleteMessage>
+ <assertRoleNotInGrid module="Magento_User">
<severeness>low</severeness>
<require>
- <rolePage class="Magento\User\Test\Page\Adminhtml\UserIndex" />
+ <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
</require>
- </assertUserNotInGrid>
+ </assertRoleNotInGrid>
+ <assertImpossibleDeleteYourOwnAccount module="Magento_User">
+ <severeness>low</severeness>
+ <require>
+ <userEdit class="Magento\User\Test\Page\Adminhtml\UserEdit" />
+ </require>
+ </assertImpossibleDeleteYourOwnAccount>
<assertUserSuccessDeleteMessage module="Magento_User">
<severeness>low</severeness>
<require>
- <rolePage class="Magento\User\Test\Page\Adminhtml\UserIndex" />
+ <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
</require>
</assertUserSuccessDeleteMessage>
+ <assertUserNotInGrid module="Magento_User">
+ <severeness>low</severeness>
+ <require>
+ <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
+ </require>
+ </assertUserNotInGrid>
</constraint>
diff --git a/dev/tests/functional/utils/generate/factory.php b/dev/tests/functional/utils/generate/factory.php
index 2b20ae56547..69fa2cc30fd 100644
--- a/dev/tests/functional/utils/generate/factory.php
+++ b/dev/tests/functional/utils/generate/factory.php
@@ -38,6 +38,7 @@ $path .= PATH_SEPARATOR . MTF_BP;
$path .= PATH_SEPARATOR . MTF_BP . '/lib';
$path .= PATH_SEPARATOR . MTF_BP . '/tests/app';
$path .= PATH_SEPARATOR . MTF_BP . '/vendor/magento/mtf';
+$path .= PATH_SEPARATOR . MTF_BP . '/vendor/phpunit/phpunit';
set_include_path($path);
$entryPoint = new \Magento\Framework\App\EntryPoint\EntryPoint(BP, $_SERVER);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
index 5e680d47e78..ec614b438fc 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
@@ -74,7 +74,7 @@ class Mysql extends \Magento\TestFramework\Db\AbstractDb
*/
protected function getSetupDbDumpFilename()
{
- return $this->_varPath . '/setup_dump.sql';
+ return $this->_varPath . '/setup_dump_' . $this->_schema . '.sql';
}
/**
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php b/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php
index 5d22514c634..0ef23f8262c 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php
@@ -33,6 +33,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
public static function tearDownAfterClass()
{
+ self::_getDbInstance()->cleanup();
self::_restoreDbState();
parent::tearDownAfterClass();
}
diff --git a/dev/tests/integration/testsuite/Magento/Authz/Service/AuthorizationV1Test.php b/dev/tests/integration/testsuite/Magento/Authz/Service/AuthorizationV1Test.php
index 6f3f5635bc9..5b8bad590ed 100644
--- a/dev/tests/integration/testsuite/Magento/Authz/Service/AuthorizationV1Test.php
+++ b/dev/tests/integration/testsuite/Magento/Authz/Service/AuthorizationV1Test.php
@@ -170,7 +170,7 @@ class AuthorizationV1Test extends \PHPUnit_Framework_TestCase
}
/**
- * @expectedException \Magento\Webapi\ServiceException
+ * @expectedException \Magento\Framework\Exception\AuthorizationException
* @expectedMessage The role associated with the specified user cannot be found.
*/
public function testGetAllowedResourcesRoleNotFound()
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlrewriteTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlrewriteTest.php
new file mode 100644
index 00000000000..f407159ae7b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlrewriteTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\Controller\Adminhtml;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class UrlrewriteTest extends \Magento\Backend\Utility\Controller
+{
+ /**
+ * Check save cms page rewrite
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Cms/_files/pages.php
+ */
+ public function testSaveActionCmsPage()
+ {
+ $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Cms\Model\Page');
+ $page->load('page_design_blank', 'identifier');
+
+ $this->getRequest()->setPost(
+ [
+ 'description' => 'Some URL rewrite description',
+ 'options' => 'R',
+ 'request_path' => 'some_new_path',
+ 'store_id' => 1,
+ 'cms_page' => $page->getId()
+ ]
+ );
+ $this->dispatch('backend/admin/urlrewrite/save');
+
+ $this->assertSessionMessages(
+ $this->contains('The URL Rewrite has been saved.'),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+ $this->assertRedirect($this->stringContains('backend/admin/urlrewrite/index'));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Backend/Helper/DataTest.php
index 4df31d672fc..a2f0bbb717b 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Helper/DataTest.php
@@ -144,7 +144,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
/**
* @covers \Magento\Backend\Helper\Data::prepareFilterString
- * @covers \Magento\Backend\Helper\Data::decodeFilter
*/
public function testPrepareFilterString()
{
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
index 89928e1d47c..d9a44f2146f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -56,6 +56,7 @@ class RowsTest extends \Magento\TestFramework\Indexer\TestCase
*/
public function testProductsUpdate()
{
+ $this->markTestSkipped('Should be fixed in MAGETWO-25641');
$this->_product->load(1);
$this->_processor->reindexList(array($this->_product->getId()));
diff --git a/app/code/Magento/Cms/Helper/Data.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/_files/select_attribute_rollback.php
similarity index 74%
rename from app/code/Magento/Cms/Helper/Data.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/_files/select_attribute_rollback.php
index 38fb127971e..ba95b63f8d8 100644
--- a/app/code/Magento/Cms/Helper/Data.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/_files/select_attribute_rollback.php
@@ -1,7 +1,5 @@
<?php
/**
- * CMS Data helper
- *
* Magento
*
* NOTICE OF LICENSE
@@ -23,8 +21,12 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Cms\Helper;
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
-{
-}
+/** @var $attribute \Magento\Catalog\Model\Resource\Eav\Attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Catalog\Model\Resource\Eav\Attribute'
+);
+$attribute->load('select_attribute', 'attribute_code');
+if ($attribute->getId()) {
+ $attribute->delete();
+}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Catalog/WidgetTest.php
index 50bcc808782..77039c37f64 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/WidgetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/WidgetTest.php
@@ -48,9 +48,9 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
$containers[] = $block['container_name'];
}
- $this->assertContains('left', $containers);
+ $this->assertContains('sidebar.main', $containers);
$this->assertContains('content', $containers);
- $this->assertContains('right', $containers);
+ $this->assertContains('sidebar.additional', $containers);
// Verify that the correct id (code) is found for this widget instance type.
$code = $model->setType($type)->getWidgetReference('type', $type, 'code');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category.php
new file mode 100644
index 00000000000..f49973b78db
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->setId(
+ 333
+)->setCreatedAt(
+ '2014-06-23 09:50:07'
+)->setName(
+ 'Category 1'
+)->setParentId(
+ 2
+)->setPath(
+ '1/2/3'
+)->setLevel(
+ 2
+)->setAvailableSortBy(
+ ['position', 'name']
+)->setDefaultSortBy(
+ 'name'
+)->setIsActive(
+ true
+)->setPosition(
+ 1
+)->save();
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php
new file mode 100644
index 00000000000..eeeb3f4afd5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->setId(
+ 333
+)->setCreatedAt(
+ '2014-06-23 09:50:07'
+)->setName(
+ 'Category 1'
+)->setParentId(
+ 2
+)->setPath(
+ '1/2/3'
+)->setLevel(
+ 2
+)->setAvailableSortBy(
+ 'name'
+)->setDefaultSortBy(
+ 'name'
+)->setIsActive(
+ true
+)->setPosition(
+ 1
+)->setAvailableSortBy(
+ ['position']
+)->save();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(
+ \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+ 333
+)->setAttributeSetId(
+ 4
+)->setStoreId(
+ 1
+)->setWebsiteIds(
+ array(1)
+)->setName(
+ 'Simple Product Three'
+)->setSku(
+ 'simple333'
+)->setPrice(
+ 10
+)->setWeight(
+ 18
+)->setStockData(
+ array('use_config_manage_stock' => 0)
+)->setCategoryIds(
+ array(333)
+)->setVisibility(
+ \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+ \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php
new file mode 100644
index 00000000000..226252653e9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->load(333);
+if ($product->getId()) {
+ $product->delete();
+}
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->load(333);
+if ($category->getId()) {
+ $category->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_rollback.php
new file mode 100644
index 00000000000..a367e5951d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->load(333);
+if ($category->getId()) {
+ $category->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree.php
new file mode 100644
index 00000000000..58bd0f4c4ec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * After installation system has two categories: root one with ID:1 and Default category with ID:2
+ */
+/** @var $category \Magento\Catalog\Model\Category */
+$categories = array(
+ [
+ 'id' => 400,
+ 'name' => 'Category 1',
+ 'parent_id' => 2,
+ 'path' => '1/2/400',
+ 'level' => 2,
+ 'available_sort_by' => 'name',
+ 'default_sort_by' => 'name',
+ 'is_active' => true,
+ 'position' => 1
+ ],
+ [
+ 'id' => 401,
+ 'name' => 'Category 1.1',
+ 'parent_id' => 400,
+ 'path' => '1/2/400/401',
+ 'level' => 3,
+ 'available_sort_by' => 'name',
+ 'default_sort_by' => 'name',
+ 'is_active' => true,
+ 'position' => 1
+ ],
+ [
+ 'id' => 402,
+ 'name' => 'Category 1.1.1',
+ 'parent_id' => 401,
+ 'path' => '1/2/400/401/402',
+ 'level' => 4,
+ 'available_sort_by' => 'name',
+ 'default_sort_by' => 'name',
+ 'is_active' => true,
+ 'position' => 1
+ ]
+);
+foreach ($categories as $data) {
+ $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+ $model->setId($data['id'])
+ ->setName($data['name'])
+ ->setParentId($data['parent_id'])
+ ->setPath($data['path'])
+ ->setLevel($data['level'])
+ ->setAvailableSortBy($data['available_sort_by'])
+ ->setDefaultSortBy($data['default_sort_by'])
+ ->setIsActive($data['is_active'])
+ ->setPosition($data['position'])
+ ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree_rollback.php
new file mode 100644
index 00000000000..b1564c26ce4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_tree_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->load(400);
+if ($category->getId()) {
+ $category->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
new file mode 100644
index 00000000000..0eacd9db586
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/* Create attribute */
+/** @var $installer \Magento\Catalog\Model\Resource\Setup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Catalog\Model\Resource\Setup',
+ array('resourceName' => 'catalog_setup')
+);
+/** @var $attribute \Magento\Catalog\Model\Resource\Eav\Attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Catalog\Model\Resource\Eav\Attribute'
+);
+$attribute->setData(
+ array(
+ 'attribute_code' => 'multiselect_attribute',
+ 'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+ 'is_global' => 1,
+ 'is_user_defined' => 1,
+ 'frontend_input' => 'multiselect',
+ 'is_unique' => 0,
+ 'is_required' => 0,
+ 'is_configurable' => 0,
+ 'is_searchable' => 0,
+ 'is_visible_in_advanced_search' => 0,
+ 'is_comparable' => 0,
+ 'is_filterable' => 0,
+ 'is_filterable_in_search' => 0,
+ 'is_used_for_promo_rules' => 0,
+ 'is_html_allowed_on_front' => 1,
+ 'is_visible_on_front' => 0,
+ 'used_in_product_listing' => 0,
+ 'used_for_sort_by' => 0,
+ 'frontend_label' => array('Multiselect Attribute'),
+ 'backend_type' => 'int',
+ 'option' => array(
+ 'value' => array(
+ 'option_1' => array('Option 1'),
+ 'option_2' => array('Option 2'),
+ 'option_3' => array('Option 3')
+ ),
+ 'order' => array(
+ 'option_1' => 1,
+ 'option_2' => 2,
+ 'option_3' => 3
+ )
+ )
+ )
+);
+$attribute->save();
+
+/* Assign attribute to attribute set */
+$installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php
new file mode 100644
index 00000000000..d3ce98601d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(
+ \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+ 333
+)->setAttributeSetId(
+ 4
+)->setName(
+ 'Simple Related Product'
+)->setSku(
+ 'simple'
+)->setPrice(
+ 10
+)->setVisibility(
+ \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+ \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->setWebsiteIds(
+ array(1)
+)->setStockData(
+ array('qty' => 100, 'is_in_stock' => 1)
+)->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(
+ \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+ 334
+)->setAttributeSetId(
+ 4
+)->setName(
+ 'Simple Product With Related Product'
+)->setSku(
+ 'simple_with_cross'
+)->setPrice(
+ 10
+)->setVisibility(
+ \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+ \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->setWebsiteIds(
+ array(1)
+)->setStockData(
+ array('qty' => 100, 'is_in_stock' => 1)
+)->save();
+
+/** @var \Magento\Catalog\Model\Category $category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->setId(
+ 333
+)->setCreatedAt(
+ '2014-06-23 09:50:07'
+)->setName(
+ 'Category 1'
+)->setParentId(
+ 2
+)->setPath(
+ '1/2/3'
+)->setLevel(
+ 2
+)->setAvailableSortBy(
+ 'name'
+)->setDefaultSortBy(
+ 'name'
+)->setIsActive(
+ true
+)->setPosition(
+ 1
+)->setAvailableSortBy(
+ ['position']
+)->setPostedProducts(
+ [333 => 10]
+)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category_rollback.php
new file mode 100644
index 00000000000..49147e1b348
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category_rollback.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category');
+$category->load(333);
+if ($category->getId()) {
+ $category->delete();
+}
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->load(333);
+if ($product->getId()) {
+ $product->delete();
+}
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->load(334);
+if ($product->getId()) {
+ $product->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
new file mode 100644
index 00000000000..8234dc3197d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+require __DIR__ . '/multiselect_attribute.php';
+
+/** @var $installer \Magento\Catalog\Model\Resource\Setup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Catalog\Model\Resource\Setup',
+ array('resourceName' => 'catalog_setup')
+);
+
+/** @var $options \Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection */
+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection'
+);
+$options->setAttributeFilter($attribute->getId());
+$optionIds = $options->getAllIds();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(
+ \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+ $optionIds[0] * 10
+)->setAttributeSetId(
+ $installer->getAttributeSetId('catalog_product', 'Default')
+)->setWebsiteIds(
+ array(1)
+)->setName(
+ 'With Multiselect 1'
+)->setSku(
+ 'simple_ms_1'
+)->setPrice(
+ 10
+)->setVisibility(
+ \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setMultiselectAttribute(
+ [$optionIds[0]]
+)->setStatus(
+ \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->setStockData(
+ array('use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1)
+)->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(
+ \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+ $optionIds[1] * 10
+)->setAttributeSetId(
+ $installer->getAttributeSetId('catalog_product', 'Default')
+)->setWebsiteIds(
+ array(1)
+)->setName(
+ 'With Multiselect 2'
+)->setSku(
+ 'simple_ms_2'
+)->setPrice(
+ 10
+)->setVisibility(
+ \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setMultiselectAttribute(
+ [$optionIds[1], $optionIds[2]]
+)->setStatus(
+ \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->setStockData(
+ array('use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1)
+)->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 246101344bb..5908f6749bf 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -590,7 +590,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
);
$mediaDirectory->create('import');
$dirPath = $mediaDirectory->getAbsolutePath('import');
- copy(__DIR__ . '/../../../../../Magento/Catalog/_files/magento_image.jpg', "{$dirPath}/magento_image.jpg");
+ copy(__DIR__ . '/../../../../Magento/Catalog/_files/magento_image.jpg', "{$dirPath}/magento_image.jpg");
}
/**
@@ -680,6 +680,37 @@ class ProductTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+ */
+ public function testValidateInvalidMultiselectValues()
+ {
+ // import data from CSV file
+ $pathToFile = __DIR__ . '/_files/products_with_invalid_multiselect_values.csv';
+ $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Framework\App\Filesystem'
+ );
+ $directory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem::ROOT_DIR);
+ $source = new \Magento\ImportExport\Model\Import\Source\Csv($pathToFile, $directory);
+ $validationResult = $this->_model->setSource(
+ $source
+ )->setParameters(
+ array('behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND)
+ )->isDataValid();
+
+ $this->assertFalse($validationResult);
+
+ $errors = $this->_model->getErrorMessages();
+ $expectedErrors = array(
+ "Please correct the value for 'multiselect_attribute'." => [2],
+ "Orphan rows that will be skipped due default row errors" => [3,4]
+ );
+ foreach ($expectedErrors as $message => $invalidRows) {
+ $this->assertArrayHasKey($message, $errors);
+ $this->assertEquals($invalidRows, $errors[$message]);
+ }
+ }
+
/**
* @magentoDataFixture Magento/Catalog/_files/categories.php
* @magentoDataFixture Magento/Core/_files/store.php
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_invalid_multiselect_values.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_invalid_multiselect_values.csv
new file mode 100644
index 00000000000..6aee29b2c1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_invalid_multiselect_values.csv
@@ -0,0 +1,5 @@
+sku,_store,_type,name,price,multiselect_attribute
+simple_ms_1,,simple,"With Multiselect 1",10,Option 1
+simple_ms_2,,simple,"With Multiselect 2",10,Option 5
+,,,,Option 2
+,,,,Option 3
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index 4e06dfb6e04..55114899996 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -31,7 +31,7 @@ class PageTest extends \Magento\TestFramework\TestCase\AbstractController
{
public function testViewAction()
{
- $this->dispatch('/about-magento-demo-store');
- $this->assertContains('About Magento Store', $this->getResponse()->getBody());
+ $this->dispatch('/enable-cookies/');
+ $this->assertContains('What are Cookies?', $this->getResponse()->getBody());
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php
index 9db705736f6..d64cb623d98 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages.php
@@ -24,33 +24,20 @@
/** @var $page \Magento\Cms\Model\Page */
$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Cms\Model\Page');
-$page->setTitle( //->setId(100) // doesn't work: it triggers update
- 'Cms Page 100'
-)->setIdentifier(
- 'page100'
-)->setStores(
- array(0)
-)->setIsActive(
- 1
-)->setContent(
- '<h1>Cms Page 100 Title</h1>'
-)->setRootTemplate(
- 'one_column'
-)->save();
+$page->setTitle('Cms Page 100')
+ ->setIdentifier('page100')
+ ->setStores(array(0))
+ ->setIsActive(1)
+ ->setContent('<h1>Cms Page 100 Title</h1>')
+ ->setRootTemplate('one_column')
+ ->save();
$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Cms\Model\Page');
-$page->setTitle(
- 'Cms Page Design Blank'
-)->setIdentifier(
- 'page_design_blank'
-)->setStores(
- array(0)
-)->setIsActive(
- 1
-)->setContent(
- '<h1>Cms Page Design Blank Title</h1>'
-)->setRootTemplate(
- 'one_column'
-)->setCustomTheme(
- 'Magento/blank'
-)->save();
+$page->setTitle('Cms Page Design Blank')
+ ->setIdentifier('page_design_blank')
+ ->setStores(array(0))
+ ->setIsActive(1)
+ ->setContent('<h1>Cms Page Design Blank Title</h1>')
+ ->setRootTemplate('one_column')
+ ->setCustomTheme('Magento/blank')
+ ->save();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
index e81e68cab01..9ee5b14862d 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
@@ -86,6 +86,7 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('template', $config);
$this->assertArrayHasKey('basePrice', $config);
$this->assertArrayHasKey('productId', $config);
+ $this->assertArrayHasKey('baseImage', $config);
$this->assertEquals(1, $config['productId']);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/Edit/FormTest.php
index 2c6cf5b1d62..73e60223e16 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/Edit/FormTest.php
@@ -88,6 +88,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
$form = $block->getForm();
$this->assertEquals('edit_form', $form->getId());
+ $this->assertEquals('post', $form->getMethod());
$baseFieldSet = $form->getElement('base_fieldset');
$this->assertNotNull($baseFieldSet);
$groupCodeElement = $form->getElement('customer_group_code');
@@ -120,6 +121,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
$form = $block->getForm();
$this->assertEquals('edit_form', $form->getId());
+ $this->assertEquals('post', $form->getMethod());
$baseFieldSet = $form->getElement('base_fieldset');
$this->assertNotNull($baseFieldSet);
$groupCodeElement = $form->getElement('customer_group_code');
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php
deleted file mode 100644
index 41528830040..00000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-namespace Magento\Framework\App\Helper;
-
-class AbstractHelperTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Framework\App\Helper\AbstractHelper|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $_helper = null;
-
- protected function setUp()
- {
- $context = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Framework\App\Helper\Context');
- $this->_helper = $this->getMock(
- 'Magento\Framework\App\Helper\AbstractHelper',
- array('_getModuleName'),
- array($context)
- );
- $this->_helper->expects($this->any())->method('_getModuleName')->will($this->returnValue('Magento_Core'));
- }
-
- /**
- * @covers \Magento\Framework\App\Helper\AbstractHelper::isModuleEnabled
- * @covers \Magento\Framework\App\Helper\AbstractHelper::isModuleOutputEnabled
- */
- public function testIsModuleEnabled()
- {
- $this->assertTrue($this->_helper->isModuleEnabled());
- $this->assertTrue($this->_helper->isModuleOutputEnabled());
- }
-
- public function testUrlEncodeDecode()
- {
- $data = uniqid();
- $result = $this->_helper->urlEncode($data);
- $this->assertNotContains('&', $result);
- $this->assertNotContains('%', $result);
- $this->assertNotContains('+', $result);
- $this->assertNotContains('=', $result);
- $this->assertEquals($data, $this->_helper->urlDecode($result));
- }
-
- public function testTranslateArray()
- {
- $data = array(uniqid(), array(uniqid(), array(uniqid())));
- $this->assertEquals($data, $this->_helper->translateArray($data));
- }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/problems.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/problems.php
index 326025748cb..20523500c81 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/problems.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/problems.php
@@ -25,7 +25,7 @@
require __DIR__ . '/queue.php';
$problem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Newsletter\Model\problem');
+ ->create('Magento\Newsletter\Model\Problem');
// $firstSubscriberId comes from subscribers.php
$problem->setSubscriberId($firstSubscriberId)
->setQueueId($queue->getQueueId())
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Payment/Model/ConfigTest.php
index b3fe4384116..78bede8699e 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Model/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Model/ConfigTest.php
@@ -67,4 +67,12 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$groups = $this->_model->getGroups();
$this->assertEquals($expected, $groups);
}
+
+ protected function tearDown()
+ {
+ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ /** @var $cache \Magento\Framework\App\Cache */
+ $cache = $objectManager->create('Magento\Framework\App\Cache');
+ $cache->clean();
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
index 312fc032445..b8d2b149334 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
@@ -75,4 +75,44 @@ class GridTest extends \PHPUnit_Framework_TestCase
$this->assertNotEquals($normalCollection, $filteredCollection);
}
+
+
+ /**
+ * Check that grid does not contain unnecessary totals row
+ *
+ * @param $from string
+ * @param $to string
+ * @param $expectedResult bool
+ *
+ * @dataProvider getCountTotalsDataProvider
+ * @magentoDataFixture Magento/Reports/_files/orders.php
+ */
+ public function testGetCountTotals($from, $to, $expectedResult)
+ {
+ $block = $this->_createBlock();
+ $filterData = new \Magento\Framework\Object();
+
+ $filterData->setReportType('updated_at_order');
+ $filterData->setPeriodType('day');
+ $filterData->setData('from', $from);
+ $filterData->setData('to', $to);
+ $block->setFilterData($filterData);
+
+ $block->toHtml();
+ $this->assertEquals($block->getCountTotals(), $expectedResult);
+ }
+
+ /**
+ * Data provider for testGetCountTotals
+ *
+ * @return array
+ */
+ public function getCountTotalsDataProvider()
+ {
+ return [
+ [date("Y-m-d", time() + 24 * 60 * 60), date("Y-m-d", time() + 48 * 60 * 60), false],
+ [date("Y-m-d", time() - 24 * 60 * 60), date("Y-m-d", time() + 24 * 60 * 60), true],
+ [null, null, false],
+ ];
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/WidgetTest.php
index e1659f1a6be..89fac5d09bf 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Block/WidgetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/WidgetTest.php
@@ -53,9 +53,9 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
$containers[] = $block['container_name'];
}
- $this->assertContains('left', $containers);
+ $this->assertContains('sidebar.main', $containers);
$this->assertContains('content', $containers);
- $this->assertContains('right', $containers);
+ $this->assertContains('sidebar.additional', $containers);
}
public function testComparedProductsWidget()
@@ -85,8 +85,8 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
$containers[] = $block['container_name'];
}
- $this->assertContains('left', $containers);
+ $this->assertContains('sidebar.main', $containers);
$this->assertContains('content', $containers);
- $this->assertContains('right', $containers);
+ $this->assertContains('sidebar.additional', $containers);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/orders.php b/dev/tests/integration/testsuite/Magento/Reports/_files/orders.php
new file mode 100644
index 00000000000..2e5f4a38edc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/orders.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+require __DIR__ . '/../../../Magento/Sales/_files/order.php';
+
+// refresh report statistics
+/** @var \Magento\Sales\Model\Resource\Report\Order $reportResource */
+$reportResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Sales\Model\Resource\Report\Order'
+);
+$reportResource->aggregate();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
new file mode 100644
index 00000000000..2de8e33bce4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Sales\Model\Resource\Order;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class StatusTest
+ */
+class StatusTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Sales\Model\Resource\Order\Status
+ */
+ protected $resourceModel;
+
+ /**
+ * Test setUp
+ */
+ public function setUp()
+ {
+ $this->resourceModel = Bootstrap::getObjectManager()
+ ->create(
+ 'Magento\Sales\Model\Resource\Order\Status',
+ [
+ 'data' => ['status' => 'fake_status']
+ ]
+ );
+ }
+
+ /**
+ * @magentoDataFixture Magento/Sales/_files/assign_status_to_state.php
+ */
+ public function testUnassignState()
+ {
+ $this->resourceModel->unassignState('fake_status_do_not_use_it', 'fake_state_do_not_use_it');
+ $this->assertTrue(true);
+ $this->assertFalse((bool)
+ $this->resourceModel->getReadConnection()->fetchOne($this->resourceModel->getReadConnection()->select()
+ ->from($this->resourceModel->getTable('sales_order_status_state'), [new \Zend_Db_Expr(1)])
+ ->where('status = ?', 'fake_status_do_not_use_it')
+ ->where('state = ?', 'fake_state_do_not_use_it')));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/assign_status_to_state.php b/dev/tests/integration/testsuite/Magento/Sales/_files/assign_status_to_state.php
new file mode 100644
index 00000000000..a83494a5abe
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/assign_status_to_state.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var \Magento\Sales\Model\Order\Status $status */
+$status = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Sales\Model\Order\Status');
+$status->setData(
+ [
+ 'status' => 'fake_status_do_not_use_it',
+ 'label' => 'Fake status do not use it'
+ ]
+);
+$status->save();
+$status->assignState('fake_state_do_not_use_it', true, true);
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php
index dd58d4e0e36..29f92bb2bee 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php
@@ -49,7 +49,7 @@ class ClassTest extends \PHPUnit_Framework_TestCase
)->getFirstItem();
$this->setExpectedException('Magento\Framework\Model\Exception');
- $model->checkClassCanBeDeleted();
+ $model->delete();
}
/**
@@ -91,7 +91,7 @@ class ClassTest extends \PHPUnit_Framework_TestCase
)->save();
$this->setExpectedException('Magento\Framework\Model\Exception');
- $model->checkClassCanBeDeleted();
+ $model->delete();
}
/**
@@ -105,7 +105,7 @@ class ClassTest extends \PHPUnit_Framework_TestCase
$model->setClassName('TaxClass' . uniqid())->setClassType($classType)->isObjectNew(true);
$model->save();
- $this->assertTrue($model->checkClassCanBeDeleted());
+ $model->delete();
}
public function classesDataProvider()
@@ -135,7 +135,7 @@ class ClassTest extends \PHPUnit_Framework_TestCase
'You cannot delete this tax class because it is used in' .
' Tax Rules. You have to delete the rules it is used in first.'
);
- $model->checkClassCanBeDeleted();
+ $model->delete();
}
/**
@@ -157,6 +157,6 @@ class ClassTest extends \PHPUnit_Framework_TestCase
'You cannot delete this tax class because it is used in' .
' Tax Rules. You have to delete the rules it is used in first.'
);
- $model->checkClassCanBeDeleted();
+ $model->delete();
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php
new file mode 100644
index 00000000000..a16b5a05bd9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Tax\Model\ClassModel as TaxClassModel;
+use Magento\Tax\Service\V1\Data\TaxClass as TaxClassDataObject;
+use Magento\Tax\Service\V1\Data\TaxClassBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class TaxClassServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var TaxClassService
+ */
+ private $taxClassService;
+
+ /**
+ * @var TaxClassBuilder
+ */
+ private $taxClassBuilder;
+
+ /**
+ * @var TaxClassModel
+ */
+ private $taxClassModel;
+
+ /**
+ * @var \Magento\Framework\ObjectManager
+ */
+ private $objectManager;
+
+ /**
+ * @var array
+ */
+ private $predefinedTaxClasses;
+
+ const SAMPLE_TAX_CLASS_NAME = 'Wholesale Customer';
+
+ protected function setUp()
+ {
+ $this->objectManager = Bootstrap::getObjectManager();
+ $this->taxClassService = $this->objectManager->create('Magento\Tax\Service\V1\TaxClassService');
+ $this->taxClassBuilder = $this->objectManager->create('Magento\Tax\Service\V1\Data\TaxClassBuilder');
+ $this->taxClassModel = $this->objectManager->create('Magento\Tax\Model\ClassModel');
+ $this->predefinedTaxClasses = [
+ TaxClassDataObject::TYPE_PRODUCT => 'Taxable Goods',
+ TaxClassDataObject::TYPE_CUSTOMER => 'Retail Customer'
+ ];
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage class_id is not expected for this request.
+ */
+ public function testCreateTaxClass()
+ {
+ $taxClassDataObject = $this->taxClassBuilder
+ ->setClassName(self::SAMPLE_TAX_CLASS_NAME)
+ ->setClassType(TaxClassDataObject::TYPE_CUSTOMER)
+ ->create();
+ $taxClassId = $this->taxClassService->createTaxClass($taxClassDataObject);
+ $this->assertEquals(self::SAMPLE_TAX_CLASS_NAME, $this->taxClassModel->load($taxClassId)->getClassName());
+
+ //Create another one with created id. Make sure its not updating the existing Tax class
+ $taxClassDataObject = $this->taxClassBuilder
+ ->setClassId($taxClassId)
+ ->setClassName(self::SAMPLE_TAX_CLASS_NAME . uniqid())
+ ->setClassType(TaxClassDataObject::TYPE_CUSTOMER)
+ ->create();
+ //Should not be allowed to set the classId. Will throw InputException
+ $this->taxClassService->createTaxClass($taxClassDataObject);
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage A class with the same name already exists for ClassType PRODUCT.
+ */
+ public function testCreateTaxClassUnique()
+ {
+ //ClassType and name combination has to be unique.
+ //Testing against existing Tax classes which are already setup when the instance is installed
+ $taxClassDataObject = $this->taxClassBuilder
+ ->setClassName($this->predefinedTaxClasses[TaxClassModel::TAX_CLASS_TYPE_PRODUCT])
+ ->setClassType(TaxClassDataObject::TYPE_PRODUCT)
+ ->create();
+ $this->taxClassService->createTaxClass($taxClassDataObject);
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ */
+ public function testCreateTaxClassInvalidData()
+ {
+ $taxClassDataObject = $this->taxClassBuilder->setClassName(null)
+ ->setClassType('')
+ ->create();
+ try {
+ $this->taxClassService->createTaxClass($taxClassDataObject);
+ } catch (InputException $e) {
+ $errors = $e->getErrors();
+ $this->assertEquals('class_name is a required field.', $errors[0]->getMessage());
+ $this->assertEquals('class_type is a required field.', $errors[1]->getMessage());
+ }
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ */
+ public function testGetTaxClass()
+ {
+ $taxClassName = 'Get Me';
+ $taxClassDataObject = $this->taxClassBuilder
+ ->setClassName($taxClassName)
+ ->setClassType(TaxClassDataObject::TYPE_CUSTOMER)
+ ->create();
+ $taxClassId = $this->taxClassService->createTaxClass($taxClassDataObject);
+ $data = $this->taxClassService->getTaxClass($taxClassId);
+ $this->assertEquals($taxClassId, $data->getClassId());
+ $this->assertEquals($taxClassName, $data->getClassName());
+ $this->assertEquals(TaxClassDataObject::TYPE_CUSTOMER, $data->getClassType());
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ * @expectedExceptionMessage No such entity with class_id = -9999
+ */
+ public function testGetTaxClassWithNoSuchEntityException()
+ {
+ $this->taxClassService->getTaxClass(-9999);
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ */
+ public function testDeleteTaxClass()
+ {
+ $taxClassName = 'Delete Me';
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($taxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_CUSTOMER)
+ ->create();
+ $taxClassId = $this->taxClassService->createTaxClass($taxClassDataObject);
+
+ $this->assertTrue($this->taxClassService->deleteTaxClass($taxClassId));
+
+ // Verify if the tax class is deleted
+ $this->setExpectedException(
+ 'Magento\Framework\Exception\NoSuchEntityException',
+ "No such entity with taxClassId = $taxClassId"
+ );
+ $this->taxClassService->deleteTaxClass($taxClassId);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ * @expectedExceptionMessage No such entity with taxClassId = 99999
+ */
+ public function testDeleteTaxClassInvalidData()
+ {
+ $nonexistentTaxClassId = 99999;
+ $this->taxClassService->deleteTaxClass($nonexistentTaxClassId);
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ */
+ public function testUpdateTaxClassSuccess()
+ {
+ $taxClassName = 'New Class Name';
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($taxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_CUSTOMER)
+ ->create();
+ $taxClassId = $this->taxClassService->createTaxClass($taxClassDataObject);
+ $this->assertEquals($taxClassName, $this->taxClassModel->load($taxClassId)->getClassName());
+
+ $updatedTaxClassName = 'Updated Class Name';
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($updatedTaxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_CUSTOMER)
+ ->create();
+
+ $this->assertTrue($this->taxClassService->updateTaxClass($taxClassId, $taxClassDataObject));
+
+ $this->assertEquals($updatedTaxClassName, $this->taxClassModel->load($taxClassId)->getClassName());
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage Invalid value of "" provided for the taxClassId field.
+ */
+ public function testUpdateTaxClassWithoutClassId()
+ {
+ $taxClassName = 'New Class Name';
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($taxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_CUSTOMER)
+ ->create();
+ $this->taxClassService->updateTaxClass("", $taxClassDataObject);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ * @expectedExceptionMessage No such entity with taxClassId = 99999
+ */
+ public function testUpdateTaxClassWithInvalidClassId()
+ {
+ $taxClassName = 'New Class Name';
+ $nonexistentTaxClassId = 99999;
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($taxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_CUSTOMER)
+ ->create();
+ $this->taxClassService->updateTaxClass($nonexistentTaxClassId, $taxClassDataObject);
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage Updating classType is not allowed.
+ */
+ public function testUpdateTaxClassWithChangingClassType()
+ {
+ $taxClassName = 'New Class Name';
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($taxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_CUSTOMER)
+ ->create();
+ $taxClassId = $this->taxClassService->createTaxClass($taxClassDataObject);
+ $this->assertEquals($taxClassName, $this->taxClassModel->load($taxClassId)->getClassName());
+
+ $updatedTaxClassName = 'Updated Class Name';
+ $taxClassDataObject = $this->taxClassBuilder->setClassName($updatedTaxClassName)
+ ->setClassType(TaxClassModel::TAX_CLASS_TYPE_PRODUCT)
+ ->create();
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassDataObject);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRateServiceTest.php b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRateServiceTest.php
index 501206c328b..daae33c4cbb 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRateServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRateServiceTest.php
@@ -91,7 +91,7 @@ class TaxRateServiceTest extends \PHPUnit_Framework_TestCase
}
/**
- * @expectedException \Magento\Framework\Model\Exception
+ * @expectedException \Magento\Framework\Exception\InputException
* @expectedExceptionMessage Code already exists.
* @magentoDbIsolation enabled
*/
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleFixtureFactory.php b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleFixtureFactory.php
index c1cea6aba29..38dd7faea41 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleFixtureFactory.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleFixtureFactory.php
@@ -155,7 +155,7 @@ class TaxRuleFixtureFactory
/** @var \Magento\Tax\Model\ClassModel $class */
$class = $this->objectManager->create('Magento\Tax\Model\ClassModel');
foreach ($classIds as $classId) {
- $class->setId($classId);
+ $class->load($classId);
$class->delete();
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleServiceTest.php b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleServiceTest.php
index 859726da03a..462b8a7fd56 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Service/V1/TaxRuleServiceTest.php
@@ -149,7 +149,7 @@ class TaxRuleServiceTest extends \PHPUnit_Framework_TestCase
$ruleId = $taxRuleModel->getId();
$taxRateId = $registry->registry('_fixture/Magento_Tax_Model_Calculation_Rate')->getId();
- $customerTaxClassIds = array_unique($taxRuleModel->getCustomerTaxClasses());
+ $customerTaxClassIds = array_values(array_unique($taxRuleModel->getCustomerTaxClasses()));
// Call getTaxRule and verify
$taxRule = $this->taxRuleService->getTaxRule($ruleId);
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php
index 6aabca2d2db..93e55450e03 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php
@@ -30,83 +30,57 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
/**
* @var string
*/
- protected $_testDir;
+ protected $testDir;
/**
* @var string
*/
- protected $_expectedDir;
+ protected $expectedDir;
/**
* @var string
*/
- protected $_source;
+ protected $source;
/**
* @var string
*/
- protected $_outputFileName;
+ protected $outputFileName;
/**
* @var \Magento\Tools\I18n\Code\Dictionary\Generator
*/
- protected $_generator;
+ protected $generator;
+
- /**
- * @var array
- */
- protected $_filesOptions;
protected function setUp()
{
- $this->_testDir = realpath(__DIR__ . '/_files');
- $this->_expectedDir = $this->_testDir . '/expected';
- $this->_source = $this->_testDir . '/source';
- $this->_filesOptions = array(
- array(
- 'type' => 'php',
- 'paths' => array($this->_source . '/app/code/', $this->_source . '/app/design/'),
- 'fileMask' => '/\.(php|phtml)$/'
- ),
- array(
- 'type' => 'js',
- 'paths' => array(
- $this->_source . '/app/code/',
- $this->_source . '/app/design/',
- $this->_source . '/lib/web/mage/',
- $this->_source . '/lib/web/varien/'
- ),
- 'fileMask' => '/\.(js|phtml)$/'
- ),
- array(
- 'type' => 'xml',
- 'paths' => array($this->_source . '/app/code/', $this->_source . '/app/design/'),
- 'fileMask' => '/\.xml$/'
- )
- );
- $this->_outputFileName = $this->_testDir . '/translate.csv';
-
- $this->_generator = ServiceLocator::getDictionaryGenerator();
+ $this->testDir = realpath(__DIR__ . '/_files');
+ $this->expectedDir = $this->testDir . '/expected';
+ $this->source = $this->testDir . '/source';
+ $this->outputFileName = $this->testDir . '/translate.csv';
+ $this->generator = ServiceLocator::getDictionaryGenerator();
}
protected function tearDown()
{
- if (file_exists($this->_outputFileName)) {
- unlink($this->_outputFileName);
+ if (file_exists($this->outputFileName)) {
+ unlink($this->outputFileName);
}
}
public function testGenerationWithoutContext()
{
- $this->_generator->generate($this->_filesOptions, $this->_outputFileName);
+ $this->generator->generate($this->source, $this->outputFileName);
- $this->assertFileEquals($this->_expectedDir . '/without_context.csv', $this->_outputFileName);
+ $this->assertFileEquals($this->expectedDir . '/without_context.csv', $this->outputFileName);
}
public function testGenerationWithContext()
{
- $this->_generator->generate($this->_filesOptions, $this->_outputFileName, true);
+ $this->generator->generate($this->source, $this->outputFileName, true);
- $this->assertFileEquals($this->_expectedDir . '/with_context.csv', $this->_outputFileName);
+ $this->assertFileEquals($this->expectedDir . '/with_context.csv', $this->outputFileName);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/with_context.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/with_context.csv
index c8effa0f054..0895edb09f3 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/with_context.csv
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/with_context.csv
@@ -1,10 +1,10 @@
Helper,Helper,module,Magento_FirstModule
Model,Model,module,"Magento_FirstModule,Magento_SecondModule"
"Module template","Module template",module,Magento_FirstModule
-"Theme template","Theme template",theme,adminhtml/default
+"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"
"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
-"Theme layout title","Theme layout title",theme,adminhtml/default
+"Theme layout label","Theme layout label",theme,adminhtml/default/backend
+"Theme layout title","Theme layout title",theme,adminhtml/default/backend
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/without_context.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/without_context.csv
index cd76063d8c1..1db75c9cf6d 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/without_context.csv
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/expected/without_context.csv
@@ -2,8 +2,11 @@ Helper,Helper
Model,Model
"Module template","Module template"
"Theme template","Theme template"
+"Model unused","Model unused"
+"Theme template unused","Theme template unused"
"Module js","Module js"
"Lib js","Lib js"
+"Lib js unused","Lib js unused"
"Module layout label","Module layout label"
"Module layout title","Module layout title"
"Theme layout label","Theme layout label"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/Model.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/Model.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/Model.php
rename to dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/Model.php
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/file.js b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/file.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/file.js
rename to dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/file.js
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/template.phtml b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/template.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/template.phtml
rename to dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/template.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
index 72022d264da..447326e29d4 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
@@ -58,14 +58,11 @@ class PathProcessorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($storeCode, $this->storeManager->getStore()->getCode());
}
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage No such entity with storeCode = InvalidStorecode
- */
- public function testProcessWithInValidStoreCode()
+ public function testProcessWithoutStoreCode()
{
- $storeCode = 'InvalidStorecode';
- $path = '/rest/' . $storeCode . '/V1/customerAccounts/createCustomer';
- $this->pathProcessor->process($path);
+ $path = 'rest/V1/customerAccounts/createCustomer';
+ $result = $this->pathProcessor->process($path);
+ $this->assertEquals('/V1/customerAccounts/createCustomer', $result);
+ $this->assertEquals('default', $this->storeManager->getStore()->getCode());
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
index 44b27c75b81..24533c3e943 100644
--- a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
@@ -40,8 +40,8 @@ class TaxTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $helper = $this->getMock('Magento\Weee\Helper\Data', [], [], '', false);
- $helper->expects($this->any())->method('isEnabled')->will($this->returnValue(true));
+ $weeeConfig = $this->getMock('Magento\Weee\Model\Config', [], [], '', false);
+ $weeeConfig->expects($this->any())->method('isEnabled')->will($this->returnValue(true));
$attribute = $this->getMock('Magento\Eav\Model\Entity\Attribute', [], [], '', false);
$attribute->expects($this->any())->method('getAttributeCodesByFrontendType')->will(
$this->returnValue(['price'])
@@ -49,7 +49,8 @@ class TaxTest extends \PHPUnit_Framework_TestCase
$attributeFactory = $this->getMock('Magento\Eav\Model\Entity\AttributeFactory', [], [], '', false);
$attributeFactory->expects($this->any())->method('create')->will($this->returnValue($attribute));
$this->_model = Bootstrap::getObjectManager()->create(
- 'Magento\Weee\Model\Tax', ['weeeData' => $helper, 'attributeFactory' => $attributeFactory]
+ 'Magento\Weee\Model\Tax',
+ ['weeeConfig' => $weeeConfig, 'attributeFactory' => $attributeFactory]
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
index 093a31ffad9..d62a0e28dc5 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
@@ -94,9 +94,9 @@ class InstanceTest extends \PHPUnit_Framework_TestCase
$this->_model->setType('Magento\Catalog\Block\Product\Widget\NewWidget');
$containers = $this->_model->getWidgetSupportedContainers();
$this->assertInternalType('array', $containers);
- $this->assertContains('left', $containers);
+ $this->assertContains('sidebar.main', $containers);
$this->assertContains('content', $containers);
- $this->assertContains('right', $containers);
+ $this->assertContains('sidebar.additional', $containers);
return $this->_model;
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/Package.php b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/Package.php
new file mode 100644
index 00000000000..02ab1c72adf
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/Package.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Test\Integrity\App\Language;
+
+class Package extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Read all lamguage.xml files and figure out the vendor and language code according from the file structure
+ *
+ * @param string $rootDir
+ * @return array
+ */
+ public static function readDeclarationFiles($rootDir)
+ {
+ $result = [];
+ foreach (glob("{$rootDir}/app/i18n/*/*/language.xml") as $file) {
+ preg_match('/.+\/(.*)\/(.*)\/language.xml$/', $file, $matches);
+ $matches[0] = $file;
+ $result[] = $matches;
+ }
+ return $result;
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/PackageTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/PackageTest.php
index 86d812bcebf..4ff37b870bb 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/PackageTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/PackageTest.php
@@ -29,48 +29,6 @@ namespace Magento\Test\Integrity\App\Language;
*/
class PackageTest extends \PHPUnit_Framework_TestCase
{
- public function testExistingFilesDeclared()
- {
- $root = \Magento\TestFramework\Utility\Files::init()->getPathToSource();
- $notDeclared = array_diff($this->getLangsFromCsvFiles($root), $this->getDeclaredLangs($root));
- $print = print_r($notDeclared, true);
- $this->assertEmpty(
- $notDeclared,
- "There are .csv files in the system that are not declared by any of the language package: {$print}"
- );
- }
-
- /**
- * Scan code base for .csv files in the expected location of translations and determine distinct list of languages
- *
- * @param string $rootDir
- * @return array
- */
- private function getLangsFromCsvFiles($rootDir)
- {
- $result = [];
- foreach (glob("{$rootDir}/app/{code/*/*,design/*/*/*}/i18n/*.csv", GLOB_BRACE) as $file) {
- $lang = preg_replace('/\.csv$/i', '', basename($file));
- $result[$lang] = $lang;
- }
- return $result;
- }
-
- /**
- * Scan code base for language.xml files and figure out distinct list of languages from their file structure
- *
- * @param string $rootDir
- * @return array
- */
- private function getDeclaredLangs($rootDir)
- {
- $result = [];
- foreach (self::readDeclarationFiles($rootDir) as $row) {
- $result[$row[2]] = $row[2];
- }
- return $result;
- }
-
/**
* @param string $file
* @param string $expectedVendor
@@ -93,26 +51,9 @@ class PackageTest extends \PHPUnit_Framework_TestCase
{
$result = [];
$root = \Magento\TestFramework\Utility\Files::init()->getPathToSource();
- foreach (self::readDeclarationFiles($root) as $row) {
+ foreach (Package::readDeclarationFiles($root) as $row) {
$result[] = $row;
}
return $result;
}
-
- /**
- * Read all lamguage.xml files and figure out the vendor and language code according from the file structure
- *
- * @param string $rootDir
- * @return array
- */
- private static function readDeclarationFiles($rootDir)
- {
- $result = [];
- foreach (glob("{$rootDir}/app/i18n/*/*/language.xml") as $file) {
- preg_match('/.+\/(.*)\/(.*)\/language.xml$/', $file, $matches);
- $matches[0] = $file;
- $result[] = $matches;
- }
- return $result;
- }
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFiles.php b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFiles.php
new file mode 100644
index 00000000000..c58642f9063
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFiles.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Test\Integrity\App\Language;
+
+
+class TranslationFiles extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\File\Csv
+ */
+ protected $csvParser;
+
+ protected function setUp()
+ {
+ $this->csvParser = new \Magento\Framework\File\Csv();
+ $this->csvParser->setDelimiter(',');
+ }
+
+ /**
+ * @return array
+ */
+ public function getLocalePlacePath()
+ {
+ $pathToSource = \Magento\TestFramework\Utility\Files::init()->getPathToSource();
+ $places = array();
+ foreach (glob("{$pathToSource}/app/code/*/*", GLOB_ONLYDIR) as $modulePath) {
+ $places[basename($modulePath)] = ['placePath' => $modulePath];
+ }
+ foreach (glob("{$pathToSource}/app/design/*/*/*", GLOB_ONLYDIR) as $themePath) {
+ $placeName = basename(dirname(dirname($themePath))) . '_' . basename($themePath);
+ $places[$placeName] = ['placePath' => $themePath];
+ }
+ $places['lib_web'] = ['placePath' => "{$pathToSource}/lib/web"];
+ return $places;
+ }
+
+ /**
+ * @param string $modulePath
+ * @return string[] Array csv files array[$locale]$pathToCsvFile]
+ */
+ protected function getCsvFiles($modulePath)
+ {
+ $files = [];
+ foreach (glob("{$modulePath}/i18n/*.csv") as $file) {
+ $locale = str_replace('.csv', '', basename($file));
+ $files[$locale] = $file;
+ }
+ return $files;
+ }
+
+ /**
+ * @param array $baseLocaleData
+ * @param array $localeData
+ * @return array
+ */
+ protected function comparePhrase($baseLocaleData, $localeData)
+ {
+ $missing = array_diff_key($baseLocaleData, $localeData);
+ $extra = array_diff_key($localeData, $baseLocaleData);
+
+ $failures = array();
+ if (!empty($missing)) {
+ $failures['missing'] = array_keys($missing);
+ }
+ if (!empty($extra)) {
+ $failures['extra'] = array_keys($extra);
+ }
+ return $failures;
+ }
+
+ /**
+ * @param string[][][] $failures Array errors in format $failures[$locale][$errorType][$message]
+ * @param string $message
+ * @return string
+ */
+ protected function printMessage($failures, $message = '')
+ {
+ $message .= "\n";
+ foreach ($failures as $locale => $localeErrors) {
+ $message .= $locale . "\n";
+ foreach ($localeErrors as $typeError => $error) {
+ $message .= "\t" . $typeError . "\n";
+ foreach ($error as $phrase) {
+ $message .= "\t\t" . $phrase . "\n";
+ }
+ }
+ }
+ return $message;
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFilesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFilesTest.php
new file mode 100644
index 00000000000..959455cc170
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFilesTest.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Test\Integrity\App\Language;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class TranslationFilesTest extends TranslationFiles
+{
+ /**
+ * Context
+ *
+ * @var \Magento\Tools\I18n\Code\Context
+ */
+ protected $context;
+
+ /**
+ * Test default locale
+ *
+ * Check that all translation phrases in code are present in the locale files
+ *
+ * @param string $file
+ * @param array $phrases
+ *
+ * @dataProvider defaultLocaleDataProvider
+ */
+ public function testDefaultLocale($file, $phrases)
+ {
+ $this->markTestSkipped('MAGETWO-26083');
+ $failures = $this->comparePhrase($phrases, $this->csvParser->getDataPairs($file));
+ $this->assertEmpty(
+ $failures,
+ $this->printMessage([$file => $failures])
+ );
+ }
+
+ /**
+ * @return array
+ * @throws \RuntimeException
+ */
+ public function defaultLocaleDataProvider()
+ {
+ $parser = $this->prepareParser();
+
+ $optionResolverFactory = new \Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory();
+ $optionResolver = $optionResolverFactory->create(
+ \Magento\TestFramework\Utility\Files::init()->getPathToSource(),
+ true
+ );
+
+ $parser->parse($optionResolver->getOptions());
+
+ $defaultLocale = array();
+ foreach ($parser->getPhrases() as $key => $phrase) {
+ if (!$phrase->getContextType() || !$phrase->getContextValue()) {
+ throw new \RuntimeException(sprintf('Missed context in row #%d.', $key + 1));
+ }
+ foreach ($phrase->getContextValue() as $context) {
+ $phraseText = $this->eliminateSpecialChars($phrase->getPhrase());
+ $phraseTranslation = $this->eliminateSpecialChars($phrase->getTranslation());
+ $file = $this->buildFilePath($phrase, $context);
+ $defaultLocale[$file]['file'] = $file;
+ $defaultLocale[$file]['phrases'][$phraseText] = $phraseTranslation;
+ }
+ }
+ return $defaultLocale;
+ }
+
+ /**
+ * @param \Magento\Tools\I18n\Code\Dictionary\Phrase $phrase
+ * @param array $context
+ * @return string
+ */
+ protected function buildFilePath($phrase, $context)
+ {
+ $path = $this->getContext()->buildPathToLocaleDirectoryByContext($phrase->getContextType(), $context);
+ return \Magento\TestFramework\Utility\Files::init()->getPathToSource() . '/'
+ . $path . \Magento\Tools\I18n\Code\Locale::DEFAULT_SYSTEM_LOCALE
+ . '.' . \Magento\Tools\I18n\Code\Pack\Writer\File\Csv::FILE_EXTENSION;
+ }
+
+ /**
+ * @return \Magento\Tools\I18n\Code\Context
+ */
+ protected function getContext()
+ {
+ if ($this->context === null) {
+ $this->context = new \Magento\Tools\I18n\Code\Context();
+ }
+ return $this->context;
+ }
+
+ /**
+ * @return \Magento\Tools\I18n\Code\Parser\Contextual
+ */
+ protected function prepareParser()
+ {
+ $filesCollector = new \Magento\Tools\I18n\Code\FilesCollector();
+
+ $phraseCollector = new \Magento\Tools\I18n\Code\Parser\Adapter\Php\Tokenizer\PhraseCollector(
+ new \Magento\Tools\I18n\Code\Parser\Adapter\Php\Tokenizer()
+ );
+ $adapters = array(
+ 'php' => new \Magento\Tools\I18n\Code\Parser\Adapter\Php($phraseCollector),
+ 'js' => new \Magento\Tools\I18n\Code\Parser\Adapter\Js(),
+ 'xml' => new \Magento\Tools\I18n\Code\Parser\Adapter\Xml()
+ );
+
+ $parserContextual = new \Magento\Tools\I18n\Code\Parser\Contextual(
+ $filesCollector,
+ new \Magento\Tools\I18n\Code\Factory(),
+ new \Magento\Tools\I18n\Code\Context()
+ );
+ foreach ($adapters as $type => $adapter) {
+ $parserContextual->addAdapter($type, $adapter);
+ }
+
+ return $parserContextual;
+ }
+
+ /**
+ * @param string $text
+ * @return mixed
+ */
+ protected function eliminateSpecialChars($text)
+ {
+ return preg_replace(['/\\\\\'/', '/\\\\\\\\/'], ['\'', '\\'], $text);
+ }
+
+ /**
+ * Test placeholders in translations.
+ * Compares count numeric placeholders in keys and translates.
+ *
+ * @param string $placePath
+ * @dataProvider getLocalePlacePath
+ */
+ public function testPhrasePlaceHolders($placePath)
+ {
+ $this->markTestSkipped('MAGETWO-26083');
+ $files = $this->getCsvFiles($placePath);
+
+ $failures = array();
+ foreach ($files as $locale => $file) {
+ $fileData = $this->csvParser->getDataPairs($file);
+ foreach ($fileData as $key => $translate) {
+ preg_match_all('/%(\d+)/', $key, $keyMatches);
+ preg_match_all('/%(\d+)/', $translate, $translateMatches);
+ if (count(array_unique($keyMatches[1])) != count(array_unique($translateMatches[1]))) {
+ $failures[$locale][$key][] = $translate;
+ }
+ }
+ }
+ $this->assertEmpty(
+ $failures,
+ $this->printMessage(
+ $failures,
+ 'Found discrepancy between keys and translations in count of numeric placeholders'
+ )
+ );
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/namespace.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/namespace.txt
index a5472f82ecf..01d38633d5c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/namespace.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/namespace.txt
@@ -17,7 +17,7 @@ dev/tools/Magento/Tools/I18n/Zend/Console/Getopt/Exception.php
dev/tools/Magento/Tools/I18n/Zend/Console/Getopt.php
dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/app/code/Magento/FirstModule/Model/Model.php
dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/app/code/Magento/SecondModule/Model/Model.php
-dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/unused/Model.php
+dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/not_magento_dir/Model.php
dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/_files/source/app/code/Magento/FirstModule/Helper/Helper.php
dev/tests/static/framework/PHP/CodeSniffer/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php
dev/tests/static/framework/PHP/CodeSniffer/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 79cc3706905..e96b7a1646e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2701,6 +2701,18 @@ return array(
'Magento\Bundle\Pricing\Price\BasePrice',
'Magento\Catalog\Pricing\Price\BasePrice'
],
- ['\Magento\Bundle\Pricing\Price\BasePriceInterface'],
- ['\Magento\Paypal\Block\PayflowExpress\Shortcut']
+ ['Magento\Bundle\Pricing\Price\BasePriceInterface'],
+ ['Magento\Banner\Helper\Data'],
+ ['Magento\Cms\Helper\Data'],
+ ['Magento\Cron\Helper\Data'],
+ ['Magento\Email\Helper\Data'],
+ ['Magento\GiftMessage\Helper\Data'],
+ ['Magento\Index\Helper\Data'],
+ ['Magento\Install\Helper\Data'],
+ ['Magento\Log\Helper\Data'],
+ ['Magento\Ogone\Helper\Data'],
+ ['Magento\Rule\Helper\Data'],
+ ['Magento\Theme\Helper\Data'],
+ ['Magento\Widget\Helper\Data'],
+ ['Magento\SalesArchive\Block\Adminhtml\Sales\Order\Grid\Massaction'],
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index b58bd0afe7c..b4118569446 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1786,4 +1786,5 @@ return array(
['reset', 'Magento\CatalogInventory\Model\Stock\Item'],
['prepareValueForDuplicate', 'Magento\Catalog\Model\Product\Option\Value'],
['prepareOptionForDuplicate', '\Magento\Catalog\Model\Product\Option'],
+ ['translateArray', 'Magento\Framework\App\Helper\AbstractHelper'],
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index c6f65868bbf..40be27df109 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -41,8 +41,6 @@ Magento/Sales/Model/Service/Quote
Magento/Catalog/Block/Product
Magento/Catalog/Model/Resource/Product
Magento/Catalog/Model/Layer
-Magento/Catalog/Model/Layer/Search.php
-Magento/Catalog/Model/Layer/Category.php
Magento/Catalog/Service/V1/Data
Magento/CatalogImportExport/Model/Export
Magento/CatalogImportExport/Model/Import
@@ -120,9 +118,11 @@ var/generation
Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer
Magento/Newsletter/Model/Template/Filter
Magento/Newsletter/Model/Resource/Subscriber
+Magento/Tax/Service/V1/Data
Magento/CatalogInventory/Model/Resource/Stock/Item
lib/internal/Magento/Framework/Filesystem/Driver
Magento/OfflineShipping/Model/Carrier
Magento/Usps/Model/Carrier
Magento/Dhl/Model
Magento/Shipping/Model
+Magento/Catalog/Service/V1/Category
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
index b547815cc68..d24d1697e0f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
@@ -26,8 +26,6 @@ app/code/Zend
dev/tools/Magento/Tools/I18n/Zend
# Not magento code
dev/tools/layout
-# Not magento code
-dev/tools/xml
# PSR-1 not applied to
dev/tests/js
# Example files that are expected to fail code sniffer
diff --git a/dev/tests/unit/testsuite/Magento/Authz/Service/AuthorizationV1Test.php b/dev/tests/unit/testsuite/Magento/Authz/Service/AuthorizationV1Test.php
index 988ed854ab6..6a6ed9da8dc 100644
--- a/dev/tests/unit/testsuite/Magento/Authz/Service/AuthorizationV1Test.php
+++ b/dev/tests/unit/testsuite/Magento/Authz/Service/AuthorizationV1Test.php
@@ -60,7 +60,8 @@ class AuthorizationV1Test extends \PHPUnit_Framework_TestCase
}
/**
- * @expectedException \Magento\Webapi\ServiceException
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ * @expectedExceptionMessage No such entity with userType = Admin
*/
public function testRemovePermissionsException()
{
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
new file mode 100644
index 00000000000..69fab2654ee
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Model;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @covers Magento\Catalog\Model\Config::loadAttributeSets
+ * @return object
+ */
+ public function testLoadAttributeSets()
+ {
+ $setCollectionFactory = $this->getMock(
+ '\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory',
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $model = $objectManager->getObject(
+ '\Magento\Catalog\Model\Config',
+ ['setCollectionFactory' => $setCollectionFactory]
+ );
+ $setItem = $this->getMock(
+ '\Magento\Eav\Model\Entity\Attribute\Set',
+ ['getEntityTypeId', 'getAttributeSetName', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $setItem->expects($this->once())->method('getEntityTypeId')->will($this->returnValue(1));
+ $setItem->expects($this->once())->method('getAttributeSetName')->will($this->returnValue('name'));
+ $setCollection = $this->getMock(
+ '\Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection',
+ ['load'],
+ [],
+ '',
+ false
+ );
+ $setCollection->expects($this->once())->method('load')->will($this->returnValue([1 => $setItem]));
+ $setCollectionFactory->expects($this->any())->method('create')->will($this->returnValue($setCollection));
+ $model->loadAttributeSets();
+ return $model;
+ }
+
+ /**
+ * @depends testLoadAttributeSets
+ * @covers Magento\Catalog\Model\Config::getAttributeSetName
+ */
+ public function testGetAttributeSetName($model)
+ {
+ $this->assertEquals('name', $model->getAttributeSetName(1, 1));
+ $this->assertFalse($model->getAttributeSetName(2, 1));
+ }
+ /**
+ * @depends testLoadAttributeSets
+ * @covers Magento\Catalog\Model\Config::getAttributeSetId
+ */
+ public function testGetAttributeSetId($model)
+ {
+ $this->assertEquals(1, $model->getAttributeSetId(1, 'name'));
+ $this->assertFalse($model->getAttributeSetId(1, 'noname'));
+ }
+
+ /**
+ * @covers Magento\Catalog\Model\Config::loadAttributeGroups
+ * @return object
+ */
+ public function testLoadAttributeGroups()
+ {
+ $groupCollectionFactory = $this->getMock(
+ '\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory',
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $model = $objectManager->getObject(
+ '\Magento\Catalog\Model\Config',
+ ['groupCollectionFactory' => $groupCollectionFactory]
+ );
+ $setItem = $this->getMock(
+ '\Magento\Eav\Model\Entity\Attribute\Group',
+ ['getAttributeSetId', 'getAttributeGroupName', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $setItem->expects($this->once())->method('getAttributeSetId')->will($this->returnValue(1));
+ $setItem->expects($this->once())->method('getAttributeGroupName')->will($this->returnValue('name'));
+ $groupCollection = $this->getMock(
+ '\Magento\Eav\Model\Resource\Entity\Attribute\Group\Collection',
+ ['load'],
+ [],
+ '',
+ false
+ );
+ $groupCollection->expects($this->once())->method('load')->will($this->returnValue([1 => $setItem]));
+ $groupCollectionFactory
+ ->expects($this->any())
+ ->method('create')
+ ->will($this->returnValue($groupCollection));
+ $model->loadAttributeGroups();
+ return $model;
+ }
+
+ /**
+ * @depends testLoadAttributeGroups
+ * @covers Magento\Catalog\Model\Config::getAttributeGroupName
+ */
+ public function testGetAttributeGroupName($model)
+ {
+ $this->assertEquals('name', $model->getAttributeGroupName(1, 1));
+ $this->assertFalse($model->getAttributeGroupName(2, 1));
+ }
+ /**
+ * @depends testLoadAttributeGroups
+ * @covers Magento\Catalog\Model\Config::getAttributeGroupId
+ */
+ public function testGetAttributeGroupId($model)
+ {
+ $this->assertEquals(1, $model->getAttributeGroupId(1, 'name'));
+ $this->assertFalse($model->getAttributeGroupId(1, 'noname'));
+ }
+
+ /**
+ * @covers Magento\Catalog\Model\Config::loadProductTypes
+ * @return object
+ */
+ public function testLoadProductTypes()
+ {
+ $productTypeFactory = $this->getMock('\Magento\Catalog\Model\Product\TypeFactory', ['create'], [], '', false);
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $model = $objectManager->getObject(
+ '\Magento\Catalog\Model\Config',
+ ['productTypeFactory' => $productTypeFactory]
+ );
+ $typeCollection = $this->getMock('\Magento\Catalog\Model\Product\Type', ['getOptionArray'], [], '', false);
+ $typeCollection->expects($this->once())->method('getOptionArray')->will($this->returnValue([1 => 'name']));
+ $productTypeFactory
+ ->expects($this->any())
+ ->method('create')
+ ->will($this->returnValue($typeCollection));
+ $model->loadProductTypes();
+ return $model;
+ }
+
+ /**
+ * @depends testLoadProductTypes
+ * @covers Magento\Catalog\Model\Config::getProductTypeId
+ */
+ public function testGetProductTypeId($model)
+ {
+ $this->assertEquals(1, $model->getProductTypeId('name'));
+ $this->assertFalse($model->getProductTypeId('noname'));
+ }
+
+ /**
+ * @depends testLoadProductTypes
+ * @covers Magento\Catalog\Model\Config::getProductTypeName
+ */
+ public function testGetProductTypeName($model)
+ {
+ $this->assertEquals('name', $model->getProductTypeName(1));
+ $this->assertFalse($model->getProductTypeName(2));
+ }
+
+ /**
+ * @param $expected
+ * @param $data
+ * @param $search
+ *
+ * @covers Magento\Catalog\Model\Config::getSourceOptionId
+ * @dataProvider getSourceOptionIdDataProvider
+ */
+ public function testGetSourceOptionId($expected, $data, $search)
+ {
+ $object = $this->getMock('\Magento\Framework\Object', ['getAllOptions'], [], '', false);
+ $object->expects($this->once())->method('getAllOptions')->will($this->returnValue($data));
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $model = $objectManager->getObject('\Magento\Catalog\Model\Config');
+ $this->assertEquals($expected, $model->getSourceOptionId($object, $search));
+ }
+
+ /**
+ * @return array
+ */
+ public function getSourceOptionIdDataProvider()
+ {
+ return [
+ [1, [['label' => 'name', 'value' => 1]], 1],
+ [1, [['label' => 'name', 'value' => 1]], 'name'],
+ [null, [['label' => 'name', 'value' => 1]], 2],
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ protected function prepareConfigModelForAttributes()
+ {
+ $storeId = 1;
+ $attributeData = ['attribute_code' => 1];
+ $attributesData = [$attributeData];
+ $entityType = 'catalog_product';
+ $storeLabel = 'label';
+ $attributeCode = 'code';
+
+ $attribute = $this->getMock(
+ '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute',
+ ['getStoreLabel', 'getAttributeCode', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $attribute->expects($this->any())->method('getStoreLabel')->will($this->returnValue($storeLabel));
+ $attribute->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attributeCode));
+
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
+ $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
+ $store->expects($this->any())->method('getId')->will($this->returnValue($storeId));
+
+ $config = $this->getMock(
+ '\Magento\Catalog\Model\Resource\Config',
+ ['setStoreId', 'getAttributesUsedInListing', 'getAttributesUsedForSortBy', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $config->expects($this->any())->method('setStoreId')->with($storeId)->will($this->returnSelf());
+ $config->expects($this->any())->method('getAttributesUsedInListing')->will($this->returnValue($attributesData));
+ $config->expects($this->any())->method('getAttributesUsedForSortBy')->will($this->returnValue($attributesData));
+
+ $configFactory = $this->getMock('\Magento\Catalog\Model\Resource\ConfigFactory', ['create'], [], '', false);
+ $configFactory->expects($this->atLeastOnce())->method('create')->will($this->returnValue($config));
+
+ $eavConfig = $this->getMock(
+ '\Magento\Eav\Model\Config',
+ ['getAttribute', 'importAttributesData'],
+ [],
+ '',
+ false
+ );
+ $eavConfig->expects($this->once())->method('importAttributesData')->with($entityType, $attributesData)
+ ->will($this->returnSelf());
+ $eavConfig->expects($this->once())->method('getAttribute')->with($entityType, $attributeData['attribute_code'])
+ ->will($this->returnValue($attribute));
+
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $model = $objectManager->getObject(
+ '\Magento\Catalog\Model\Config',
+ ['configFactory' => $configFactory, 'storeManager' => $storeManager, 'eavConfig' => $eavConfig]
+ );
+
+ return [$model, $attribute];
+ }
+
+ /**
+ * @covers Magento\Catalog\Model\Config::getAttributesUsedInProductListing
+ * return object
+ */
+ public function testGetAttributesUsedInProductListing()
+ {
+ list($model, $attribute) = $this->prepareConfigModelForAttributes();
+ $this->assertEquals([1 => $attribute], $model->getAttributesUsedInProductListing());
+ return $model;
+ }
+
+ /**
+ * @depends testGetAttributesUsedInProductListing
+ * @covers Magento\Catalog\Model\Config::getProductAttributes
+ */
+ public function testGetProductAttributes($model)
+ {
+ $this->assertEquals([1], $model->getProductAttributes());
+ }
+
+ /**
+ * @covers Magento\Catalog\Model\Config::getAttributesUsedForSortBy
+ */
+ public function testGetAttributesUsedForSortBy()
+ {
+ list($model, $attribute) = $this->prepareConfigModelForAttributes();
+ $this->assertEquals([1 => $attribute], $model->getAttributesUsedForSortBy());
+ }
+
+ /**
+ * @covers Magento\Catalog\Model\Config::getAttributeUsedForSortByArray
+ */
+ public function testGetAttributeUsedForSortByArray()
+ {
+ list($model) = $this->prepareConfigModelForAttributes();
+ $this->assertEquals(['position' => 'Position', 'code' => 'label'], $model->getAttributeUsedForSortByArray());
+ }
+
+ /**
+ * @covers Magento\Catalog\Model\Config::getProductListDefaultSortBy
+ */
+ public function testGetProductListDefaultSortBy()
+ {
+ $scopeConfig = $this->getMock(
+ '\Magento\Framework\App\Config\ScopeConfigInterface',
+ ['getValue', 'isSetFlag'],
+ [],
+ '',
+ false
+ );
+ $scopeConfig->expects($this->once())->method('getValue')
+ ->with('catalog/frontend/default_sort_by', 'store', null)->will($this->returnValue(1));
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $model = $objectManager->getObject('\Magento\Catalog\Model\Config', ['scopeConfig' => $scopeConfig]);
+ $this->assertEquals(1, $model->getProductListDefaultSortBy());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/CategoryLoaderTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/CategoryLoaderTest.php
new file mode 100644
index 00000000000..e2d79704649
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/CategoryLoaderTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class CategoryLoaderTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Catalog\Service\V1\Category\CategoryLoader
+ */
+ private $model;
+
+ /**
+ * @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $category;
+
+ public function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->setMethods(['load', 'getId', '__wakeup'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ /** @var \Magento\Catalog\Model\CategoryFactory|\PHPUnit_Framework_MockObject_MockObject $categoryFactory */
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $categoryFactory->expects($this->any())->method('create')->will($this->returnValue($this->category));
+
+ $this->model = $objectManager->getObject(
+ 'Magento\Catalog\Service\V1\Category\CategoryLoader',
+ [
+ 'categoryFactory' => $categoryFactory,
+ ]
+ );
+ }
+
+ public function testLoad()
+ {
+ $categoryId = 333;
+ $this->category->expects($this->once())->method('load')->with($this->equalTo($categoryId));
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue($categoryId));
+
+ $this->assertInstanceOf('Magento\Catalog\Model\Category', $this->model->load($categoryId));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testLoadNoSuchEntityException()
+ {
+ $categoryId = 333;
+ $this->category->expects($this->once())->method('load')->with($this->equalTo($categoryId));
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue(false));
+
+ $this->model->load($categoryId);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceTest.php
new file mode 100644
index 00000000000..71140ba25c9
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/ReadServiceTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\ProductLinks;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductConverterFactory;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink;
+use Magento\Catalog\Service\V1\Data\Eav\Category\ProductLinkBuilder;
+use Magento\TestFramework\Helper\ObjectManager;
+
+class ReadServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Catalog\Service\V1\Category\ProductLinks\ReadService
+ */
+ private $model;
+
+ /**
+ * @var Category|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $category;
+
+ /**
+ * @var ProductLink|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $productLink;
+
+ /**
+ * @var ProductLinkBuilder|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $productLinkBuilder;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->setMethods(['getData', 'getId', 'load', '__wakeup', 'getProductsPosition', 'getProductCollection'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ /** @var \Magento\Catalog\Model\CategoryFactory|\PHPUnit_Framework_MockObject_MockObject $categoryFactory */
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $categoryFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($this->category));
+
+ $this->productLink = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->productLinkBuilder = $this->getMockBuilder(
+ 'Magento\Catalog\Service\V1\Data\Eav\Category\ProductLinkBuilder'
+ )
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->productLinkBuilder->expects($this->any())->method('create')
+ ->will($this->returnValue($this->productLink));
+
+ $this->model = $objectManager->getObject(
+ 'Magento\Catalog\Service\V1\Category\ProductLinks\ReadService',
+ [
+ 'categoryFactory' => $categoryFactory,
+ 'productLinkBuilder' => $this->productLinkBuilder
+ ]
+ );
+ }
+
+ public function testAssignedProducts()
+ {
+ $categoryId = 3;
+ $productPosition = 1;
+ $productId = $categoryId + 6;
+ $productSku = "sku{$productId}";
+
+ $productDto = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $productObject */
+ $productObject = $this->getMockBuilder('Magento\Catalog\Model\Product')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productObject->expects($this->once())->method('getSku')->will($this->returnValue($productSku));
+
+ /** @var \Magento\Framework\Data\Collection\Db|\PHPUnit_Framework_MockObject_MockObject $productCollection */
+ $productCollection = $this->getMockBuilder('Magento\Framework\Data\Collection\Db')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productCollection->expects($this->any())->method('getItems')
+ ->will($this->returnValue([$productId => $productObject]));
+
+ $this->category->expects($this->once())->method('load')->with($this->equalTo($categoryId));
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue(true));
+ $this->category->expects($this->once())->method('getProductsPosition')
+ ->will($this->returnValue([$productId => $productPosition]));
+ $this->category->expects($this->once())->method('getProductCollection')
+ ->will($this->returnValue($productCollection));
+
+ $this->productLinkBuilder->expects($this->any())->method('populateWithArray')->with(
+ $this->equalTo(
+ [
+ ProductLink::SKU => $productSku,
+ ProductLink::POSITION => $productPosition
+ ]
+ )
+ )->will($this->returnValue($this->productLinkBuilder));
+
+ $this->assertEquals([$productDto], $this->model->assignedProducts($categoryId));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceTest.php
new file mode 100644
index 00000000000..d04bae14a25
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ProductLinks/WriteServiceTest.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category\ProductLinks;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class WriteServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Catalog\Service\V1\Category\ProductLinks\WriteService
+ */
+ private $model;
+
+ /**
+ * @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $product;
+
+ /**
+ * @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $category;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Category\CategoryLoader|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $categoryLoader;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $productLink;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->productLink = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Category\ProductLink')
+ ->setMethods(['getSku', 'getPosition'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->setMethods(['getProductsPosition', 'setPostedProducts', 'save', '__wakeup'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->categoryLoader = $this->getMockBuilder('Magento\Catalog\Service\V1\Category\CategoryLoader')
+ ->setMethods(['load'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $categoryLoaderFactory = $this->getMockBuilder('Magento\Catalog\Service\V1\Category\CategoryLoaderFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $categoryLoaderFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($this->categoryLoader));
+
+ $this->product = $this->getMockBuilder('Magento\Catalog\Model\Product')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $productFactory = $this->getMockBuilder('Magento\Catalog\Model\ProductFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productFactory->expects($this->any())->method('create')->will($this->returnValue($this->product));
+
+ $this->model = $objectManager->getObject(
+ 'Magento\Catalog\Service\V1\Category\ProductLinks\WriteService',
+ [
+ 'categoryLoaderFactory' => $categoryLoaderFactory,
+ 'productFactory' => $productFactory
+ ]
+ );
+ }
+
+ public function testAssignProduct()
+ {
+ $categoryId = 33;
+
+ $this->prepareMocksForAssign($categoryId);
+ $this->category->expects($this->once())->method('save');
+
+ $this->assertTrue($this->model->assignProduct($categoryId, $this->productLink));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testAssignProductCouldNotSaveException()
+ {
+ $categoryId = 33;
+
+ $this->prepareMocksForAssign($categoryId);
+ $this->category->expects($this->once())->method('save')
+ ->will(
+ $this->returnCallback(
+ function () {
+ throw new \Exception();
+ }
+ )
+ );
+
+ $this->assertTrue($this->model->assignProduct($categoryId, $this->productLink));
+ }
+
+ public function testRemoveProduct()
+ {
+ $categoryId = 33;
+ $productId = 333;
+
+ $this->prepareMocksForRemove($categoryId, $productId);
+ $this->category->expects($this->once())->method('save');
+
+ $this->model->removeProduct($categoryId, 'sku333');
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testRemoveProductCouldNotSaveException()
+ {
+ $categoryId = 33;
+ $productId = 333;
+
+ $this->prepareMocksForRemove($categoryId, $productId);
+ $this->category->expects($this->once())->method('save')
+ ->will(
+ $this->returnCallback(
+ function () {
+ throw new \Exception();
+ }
+ )
+ );
+
+ $this->model->removeProduct($categoryId, 'sku333');
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\StateException
+ */
+ public function testRemoveProductStateException()
+ {
+ $categoryId = 33;
+ $productId = 33;
+
+ $this->prepareMocksForRemove($categoryId, $productId);
+
+ $this->model->removeProduct($categoryId, 'sku333');
+ }
+
+ private function prepareMocksForRemove($categoryId, $productId)
+ {
+ $productSku = 'sku333';
+ $productsPosition = [105 => 16, 333 => 1];
+
+ $this->categoryLoader->expects($this->once())->method('load')
+ ->with($this->equalTo($categoryId))
+ ->will($this->returnValue($this->category));
+
+ $this->category->expects($this->once())->method('getProductsPosition')
+ ->will($this->returnValue($productsPosition));
+ unset($productsPosition[$productId]);
+ $this->category->expects($this->any())->method('setPostedProducts')
+ ->with($this->equalTo($productsPosition));
+
+ $this->product->expects($this->once())->method('getIdBySku')->with($this->equalTo($productSku))
+ ->will($this->returnValue($productId));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\StateException
+ */
+ public function testAssignStateException()
+ {
+ $categoryId = 33;
+
+ $this->prepareMocksForAssign($categoryId, 334);
+
+ $this->assertTrue($this->model->assignProduct($categoryId, $this->productLink));
+ }
+
+ public function testUpdateProduct()
+ {
+ $categoryId = 33;
+
+ $this->prepareMocksForAssign($categoryId, 334);
+ $this->category->expects($this->once())->method('save');
+
+ $this->assertTrue($this->model->updateProduct($categoryId, $this->productLink));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testUpdateProductCouldNotSaveException()
+ {
+ $categoryId = 33;
+
+ $this->prepareMocksForAssign($categoryId, 334);
+ $this->category->expects($this->once())->method('save')
+ ->will(
+ $this->returnCallback(
+ function () {
+ throw new \Exception();
+ }
+ )
+ );
+
+ $this->assertTrue($this->model->updateProduct($categoryId, $this->productLink));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\StateException
+ */
+ public function testUpdateStateException()
+ {
+ $categoryId = 33;
+
+ $this->prepareMocksForAssign($categoryId);
+
+ $this->assertTrue($this->model->updateProduct($categoryId, $this->productLink));
+ }
+
+ private function prepareMocksForAssign($categoryId, $productId = 333)
+ {
+ $productSku = 'sku333';
+ $productsPosition = [105 => 16, 334 => 1];
+
+ $this->productLink->expects($this->once())->method('getSku')->will($this->returnValue($productSku));
+ $this->productLink->expects($this->any())->method('getPosition')->will($this->returnValue($categoryId));
+
+ $this->categoryLoader->expects($this->once())->method('load')
+ ->with($this->equalTo($categoryId))
+ ->will($this->returnValue($this->category));
+
+ $this->category->expects($this->once())->method('getProductsPosition')
+ ->will($this->returnValue($productsPosition));
+ $newProductPositions = [$productId => $categoryId] + $productsPosition;
+ $this->category->expects($this->any())->method('setPostedProducts')
+ ->with($this->equalTo($newProductPositions));
+
+ $this->product->expects($this->once())->method('getIdBySku')->with($this->equalTo($productSku))
+ ->will($this->returnValue($productId));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ReadServiceTest.php
new file mode 100644
index 00000000000..a0c598de86e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/ReadServiceTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Info\Converter;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Info\ConverterFactory;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Info\Metadata;
+use Magento\Catalog\Service\V1\Data\Eav\Category\Info\MetadataBuilder;
+use Magento\TestFramework\Helper\ObjectManager;
+
+class ReadServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Catalog\Service\V1\Category\ReadService
+ */
+ private $model;
+
+ /**
+ * @var MetadataBuilder|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $categoryBuilder;
+
+ /**
+ * @var Category|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $category;
+
+ /**
+ * @var Metadata|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $categoryInfoMetadata;
+
+ /**
+ * @var ConverterFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $converterFactory;
+
+ /**
+ * @var Converter|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $converter;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->categoryInfoMetadata = $this->getMockBuilder(
+ 'Magento\Catalog\Service\V1\Data\Eav\Category\Info\Metadata'
+ )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->categoryBuilder = $this->getMockBuilder(
+ 'Magento\Catalog\Service\V1\Data\Eav\Category\Info\MetadataBuilder'
+ )
+ ->setMethods(['create', 'populateWithArray'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->categoryBuilder->expects($this->any())->method('create')
+ ->will($this->returnValue($this->categoryInfoMetadata));
+
+ $this->category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->setMethods(['getData', 'getId', 'load', '__wakeup', 'getProductsPosition', 'getProductCollection'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ /** @var \Magento\Catalog\Model\CategoryFactory|\PHPUnit_Framework_MockObject_MockObject $categoryFactory */
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $categoryFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($this->category));
+
+ $this->converter = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Category\Info\Converter')
+ ->setMethods(['createDataFromModel'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->converterFactory = $this->getMockBuilder(
+ 'Magento\Catalog\Service\V1\Data\Eav\Category\Info\ConverterFactory'
+ )
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->converterFactory->expects($this->any())->method('create')->will($this->returnValue($this->converter));
+
+ $this->converter->expects($this->any())->method('createDataFromModel')
+ ->with($this->identicalTo($this->category))
+ ->will($this->returnValue($this->categoryInfoMetadata));
+
+ $this->model = $objectManager->getObject(
+ 'Magento\Catalog\Service\V1\Category\ReadService',
+ [
+ 'categoryFactory' => $categoryFactory,
+ 'builder' => $this->categoryBuilder,
+ 'converterFactory' => $this->converterFactory
+ ]
+ );
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testInfoNoSuchEntityException()
+ {
+ $id = 3;
+ $this->category->expects($this->once())->method('load')->with($this->equalTo($id));
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue(false));
+
+ $this->model->info($id);
+ }
+
+ public function testInfo()
+ {
+ $id = 3;
+ $this->category->expects($this->once())->method('load')->with($this->equalTo($id));
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue(true));
+
+ $this->assertInstanceOf(
+ 'Magento\Catalog\Service\V1\Data\Eav\Category\Info\Metadata',
+ $this->model->info($id)
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/Tree/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/Tree/ReadServiceTest.php
new file mode 100644
index 00000000000..6a62497412c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/Tree/ReadServiceTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Service\V1\Category\Tree;
+
+/**
+ * Test for \Magento\Catalog\Service\V1\Category\Tree\ReadService
+ */
+class ReadServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Service\V1\Data\Category\Tree
+ */
+ protected $categoryTreeMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Model\CategoryFactory
+ */
+ protected $categoryFactoryMock;
+
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Service\V1\Category\Tree\ReadService
+ */
+ protected $categoryService;
+
+ public function setUp()
+ {
+ $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->categoryTreeMock = $this->getMockBuilder(
+ 'Magento\Catalog\Service\V1\Data\Category\Tree'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $this->categoryFactoryMock = $this->getMockBuilder(
+ '\Magento\Catalog\Model\CategoryFactory'
+ )->disableOriginalConstructor()
+ ->setMethods(['create', 'load'])
+ ->getMock();
+
+ $this->categoryService = $this->objectManager
+ ->getObject(
+ '\Magento\Catalog\Service\V1\Category\Tree\ReadService',
+ [
+ 'categoryFactory' => $this->categoryFactoryMock,
+ 'categoryTree' => $this->categoryTreeMock,
+ ]
+ );
+
+ }
+
+ /**
+ * @dataProvider treeDataProvider
+ */
+ public function testTree($rootCategoryId, $depth)
+ {
+ $rootNode = $this->getMockBuilder(
+ 'Magento\Framework\Data\Tree\Node'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $category = null;
+ if (!is_null($rootCategoryId)) {
+ $category = $this->getMockBuilder(
+ '\Magento\Catalog\Model\Category'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $category->expects($this->once())->method('getId')->will($this->returnValue($rootCategoryId));
+
+ $this->categoryFactoryMock->expects($this->once())->method('create')->will($this->returnSelf());
+ $this->categoryFactoryMock->expects($this->once())->method('load')
+ ->with($this->equalTo($rootCategoryId))
+ ->will($this->returnValue($category));
+ }
+ $this->categoryTreeMock->expects($this->once())->method('getRootNode')
+ ->with($this->equalTo($category))
+ ->will($this->returnValue($rootNode));
+
+ $this->categoryTreeMock->expects($this->once())->method('getTree')
+ ->with($this->equalTo($rootNode), $this->equalTo($depth));
+ $this->categoryService->tree($rootCategoryId, $depth);
+ }
+
+ /**
+ * @return array
+ */
+ public function treeDataProvider()
+ {
+ return array(
+ [1, 0],
+ [null, 3]
+ );
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testTreeAbsentCategory()
+ {
+ $category = $this->getMockBuilder(
+ '\Magento\Catalog\Model\Category'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $category->expects($this->once())->method('getId')->will($this->returnValue(null));
+ $category->expects($this->never())->method('getPathIds');
+
+ $this->categoryFactoryMock->expects($this->once())->method('create')->will($this->returnSelf());
+ $this->categoryFactoryMock->expects($this->once())->method('load')
+ ->with($this->equalTo(1))
+ ->will($this->returnValue($category));
+
+ $this->categoryService->tree(1);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/WriteServiceTest.php
new file mode 100644
index 00000000000..d55e5e3af5c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Category/WriteServiceTest.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Category;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class WriteServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Catalog\Service\V1\Category\WriteService|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $model;
+
+ /**
+ * @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $category;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Data\Category\Mapper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $categoryMapper;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ /** @var \Magento\Catalog\Model\CategoryFactory|\PHPUnit_Framework_MockObject_MockObject $categoryFactory */
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $categoryFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($this->category));
+
+ $this->categoryMapper = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Category\Mapper')
+ ->setMethods(['toModel'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->model = $objectManager->getObject(
+ 'Magento\Catalog\Service\V1\Category\WriteService',
+ [
+ 'categoryFactory' => $categoryFactory,
+ 'categoryMapper' => $this->categoryMapper
+ ]
+ );
+ }
+
+ public function testCreate()
+ {
+ $categorySdo = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->categoryMapper->expects($this->any())
+ ->method('toModel')
+ ->with($categorySdo)
+ ->will($this->returnValue($this->category));
+
+ $this->category->expects($this->once())->method('validate')->will($this->returnValue([]));
+ $this->category->expects($this->once())->method('save');
+
+ $parentCategory = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $parentCategory->expects($this->any())->method('load')->will($this->returnSelf());
+ $parentCategory->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2'));
+
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $categoryFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($parentCategory));
+
+ $parentId = 1;
+ $storeManager = $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false);
+ $store = $this->getMock(
+ 'Magento\Store\Model\Store',
+ ['getRootCategoryId', '__sleep', '__wakeup'], [], '', false
+ );
+ $store->expects($this->any())->method('getRootCategoryId')->will($this->returnValue($parentId));
+ $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
+
+ $this->model = (new ObjectManager($this))->getObject(
+ 'Magento\Catalog\Service\V1\Category\WriteService',
+ [
+ 'categoryFactory' => $categoryFactory,
+ 'categoryMapper' => $this->categoryMapper,
+ 'storeManager' => $storeManager,
+ ]
+ );
+
+ $this->model->create($categorySdo);
+ }
+
+ public function testDelete()
+ {
+ $id = 3;
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $this->category->expects($this->once())->method('delete');
+
+ $this->assertTrue($this->model->delete($id));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testDeleteNoSuchEntityException()
+ {
+ $this->model->delete(3);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testDeleteCouldNotSaveException()
+ {
+ $id = 3;
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $this->category->expects($this->once())->method('delete')->will(
+ $this->returnCallback(
+ function () {
+ throw new \Exception();
+ }
+ )
+ );
+
+ $this->model->delete($id);
+ }
+
+ public function testUpdate()
+ {
+ $id = 3;
+ $categorySdo = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $this->category->expects($this->once())->method('validate')->will($this->returnValue(true));
+ $this->category->expects($this->once())->method('save');
+
+ $this->assertTrue($this->model->update($id, $categorySdo));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testUpdateNoSuchEntityException()
+ {
+ $categorySdo = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->model->update(3, $categorySdo);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testUpdateValidateException()
+ {
+ $id = 3;
+ $categorySdo = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $this->category->expects($this->once())->method('validate')->will($this->returnValue(['Validation error']));
+
+ $this->model->update($id, $categorySdo);
+ }
+
+ public function testMove()
+ {
+ $id = 5;
+ $parentId = 2;
+ $afterId = 3;
+
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->model = (new ObjectManager($this))->getObject(
+ 'Magento\Catalog\Service\V1\Category\WriteService',
+ ['categoryFactory' => $categoryFactory]
+ );
+
+ $category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $category->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2\3\4'));
+ $category->expects($this->once())->method('move')->with($parentId, $afterId);
+
+ $parentCategory = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $parentCategory->expects($this->once())->method('getId')->will($this->returnValue($parentId));
+ $parentCategory->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2'));
+
+ $categoryFactory->expects($this->at(0))->method('create')
+ ->will($this->returnValue($category));
+
+ $categoryFactory->expects($this->at(1))->method('create')
+ ->will($this->returnValue($parentCategory));
+
+ $this->assertTrue($this->model->move($id, $parentId, $afterId));
+ }
+
+ public function testMoveAfterId()
+ {
+ $id = 5;
+ $parentId = 2;
+ $afterId = 3;
+
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->model = (new ObjectManager($this))->getObject(
+ 'Magento\Catalog\Service\V1\Category\WriteService',
+ ['categoryFactory' => $categoryFactory]
+ );
+
+ $category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $category->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2\3\4'));
+ $category->expects($this->once())->method('move')->with($parentId, $afterId);
+
+ $parentCategory = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $parentCategory->expects($this->once())->method('getId')->will($this->returnValue($parentId));
+ $parentCategory->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2'));
+ $parentCategory->expects($this->once())->method('hasChildren')->will($this->returnValue(true));
+ $parentCategory->expects($this->once())->method('getChildren')->will($this->returnValue('6,7,' . $afterId));
+
+ $categoryFactory->expects($this->at(0))->method('create')
+ ->will($this->returnValue($category));
+
+ $categoryFactory->expects($this->at(1))->method('create')
+ ->will($this->returnValue($parentCategory));
+
+ $this->assertTrue($this->model->move($id, $parentId, null));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Model\Exception
+ */
+ public function testMoveParentToChild()
+ {
+ $id = 5;
+ $parentId = 2;
+ $afterId = 3;
+
+ $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->model = (new ObjectManager($this))->getObject(
+ 'Magento\Catalog\Service\V1\Category\WriteService',
+ ['categoryFactory' => $categoryFactory]
+ );
+
+ $category = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $category->expects($this->once())->method('getId')->will($this->returnValue($id));
+ $category->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2\3'));
+
+ $parentCategory = $this->getMockBuilder('Magento\Catalog\Model\Category')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $parentCategory->expects($this->once())->method('getId')->will($this->returnValue($parentId));
+ $parentCategory->expects($this->any())->method('__call')->with('getPath')->will($this->returnValue('1\2\3\4'));
+
+ $categoryFactory->expects($this->at(0))->method('create')
+ ->will($this->returnValue($category));
+
+ $categoryFactory->expects($this->at(1))->method('create')
+ ->will($this->returnValue($parentCategory));
+
+ $this->assertTrue($this->model->move($id, $parentId, $afterId));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/MapperTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/MapperTest.php
new file mode 100644
index 00000000000..9382a19bdf2
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/MapperTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Data\Category;
+
+use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+
+class MapperTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var ObjectManagerHelper */
+ protected $objectManagerHelper;
+
+ protected function setUp()
+ {
+ $this->objectManagerHelper = new ObjectManagerHelper($this);
+ }
+
+ public function testToModel()
+ {
+ $categoryFactory = $this->getMock('Magento\Catalog\Model\CategoryFactory', ['create'], [], '', false);
+ $categoryMapper = $this->objectManagerHelper->getObject('Magento\Catalog\Service\V1\Data\Category\Mapper',
+ [
+ 'categoryFactory' => $categoryFactory
+ ]
+ );
+
+ $categoryModel = $this->getMock(
+ 'Magento\Catalog\Model\Category',
+ ['setPath', 'getDefaultAttributeSetId', '__sleep', '__wakeup'], [], '', false
+ );
+
+ $categoryFactory->expects($this->at(0))->method('create')->will($this->returnValue($categoryModel));
+
+ $categoryObj = $this->getMock('Magento\Catalog\Service\V1\Data\Category', [], [], '', false);
+ $categoryObj->expects($this->any())->method('__toArray')
+ ->will($this->returnValue(
+ [
+ 'test_code' => 'test_value',
+ ]
+ ));
+
+ $this->assertEquals($categoryModel, $categoryMapper->toModel($categoryObj));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/TreeTest.php
new file mode 100644
index 00000000000..e4d32357803
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/Category/TreeTest.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Service\V1\Data\Category;
+
+/**
+ * Test for \Magento\Catalog\Service\V1\Category\ReadService
+ */
+class TreeTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Model\Resource\Category\Tree
+ */
+ protected $categoryTreeMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
+ */
+ protected $storeManagerMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Model\Resource\Category\Collection
+ */
+ protected $categoryCollection;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Service\V1\Data\Eav\Category\TreeBuilderFactory
+ */
+ protected $treeBuilderFactory;
+
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Data\Category\Tree
+ */
+ protected $tree;
+
+ public function setUp()
+ {
+ $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->categoryTreeMock = $this->getMockBuilder(
+ '\Magento\Catalog\Model\Resource\Category\Tree'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $this->categoryCollection = $this->getMockBuilder(
+ '\Magento\Catalog\Model\Resource\Category\Collection'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $this->storeManagerMock = $this->getMockBuilder(
+ '\Magento\Store\Model\StoreManagerInterface'
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $this->treeBuilderFactory = $this->getMockBuilder(
+ '\Magento\Catalog\Service\V1\Data\Eav\Category\TreeBuilderFactory'
+ )->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->tree = $this->objectManager
+ ->getObject(
+ 'Magento\Catalog\Service\V1\Data\Category\Tree',
+ [
+ 'categoryCollection' => $this->categoryCollection,
+ 'categoryTree' => $this->categoryTreeMock,
+ 'storeManager' => $this->storeManagerMock,
+ 'treeBuilderFactory' => $this->treeBuilderFactory
+ ]
+ );
+
+ }
+
+ public function testGetNode()
+ {
+ $category = $this->getMockBuilder(
+ '\Magento\Catalog\Model\Category'
+ )->disableOriginalConstructor()
+ ->getMock();
+ $category->expects($this->exactly(2))->method('getId')->will($this->returnValue(1));
+
+ $node = $this->getMockBuilder(
+ '\Magento\Framework\Data\Tree\Node'
+ )->disableOriginalConstructor()
+ ->getMock();
+ $node->expects($this->once())->method('loadChildren');
+ $this->categoryTreeMock->expects($this->once())->method('loadNode')
+ ->with($this->equalTo(1))
+ ->will($this->returnValue($node));
+
+ $store = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock();
+ $store->expects($this->once())->method('getId')->will($this->returnValue(1));
+ $this->storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($store));
+
+ $this->categoryCollection->expects($this->any())->method('addAttributeToSelect')->will($this->returnSelf());
+ $this->categoryCollection->expects($this->once())->method('setProductStoreId')->will($this->returnSelf());
+ $this->categoryCollection->expects($this->once())->method('setLoadProductCount')->will($this->returnSelf());
+ $this->categoryCollection->expects($this->once())->method('setStoreId')->will($this->returnSelf());
+
+ $this->categoryTreeMock->expects($this->once())->method('addCollectionData')
+ ->with($this->equalTo($this->categoryCollection));
+ $this->tree->getRootNode($category);
+ }
+
+ public function testGetRootNode()
+ {
+ $store = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock();
+ $store->expects($this->once())->method('getRootCategoryId')->will($this->returnValue(2));
+ $store->expects($this->once())->method('getId')->will($this->returnValue(1));
+ $this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
+
+ $this->categoryCollection->expects($this->any())->method('addAttributeToSelect')->will($this->returnSelf());
+ $this->categoryCollection->expects($this->once())->method('setProductStoreId')->will($this->returnSelf());
+ $this->categoryCollection->expects($this->once())->method('setLoadProductCount')->will($this->returnSelf());
+ $this->categoryCollection->expects($this->once())->method('setStoreId')->will($this->returnSelf());
+
+ $node = $this->getMockBuilder(
+ 'Magento\Catalog\Model\Resource\Category\Tree'
+ )->disableOriginalConstructor()
+ ->getMock();
+ $node->expects($this->once())->method('addCollectionData')
+ ->with($this->equalTo($this->categoryCollection));
+ $node->expects($this->once())->method('getNodeById')->with($this->equalTo(2));
+ $this->categoryTreeMock->expects($this->once())->method('load')
+ ->with($this->equalTo(null))
+ ->will($this->returnValue($node));
+ $this->tree->getRootNode();
+ }
+
+ public function testGetTree()
+ {
+ $depth = 2;
+ $currentLevel = 1;
+
+ $builder = $this->getMockBuilder('\Magento\Catalog\Service\V1\Data\Eav\Category\TreeBuilder')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $builder->expects($this->any())->method('setId')->with($this->equalTo($currentLevel))
+ ->will($this->returnSelf());
+ $builder->expects($this->any())->method('setParentId')->with($this->equalTo($currentLevel - 1))
+ ->will($this->returnSelf());
+ $builder->expects($this->any())->method('setName')->with($this->equalTo('Name' . $currentLevel))
+ ->will($this->returnSelf());
+ $builder->expects($this->any())->method('setPosition')->with($this->equalTo($currentLevel))
+ ->will($this->returnSelf());
+ $builder->expects($this->any())->method('setLevel')->with($this->equalTo($currentLevel))
+ ->will($this->returnSelf());
+ $builder->expects($this->any())->method('setActive')->with($this->equalTo(true))
+ ->will($this->returnSelf());
+ $builder->expects($this->any())->method('setChildren')->will($this->returnSelf());
+ $builder->expects($this->any())->method('create')->will($this->returnValue([]));
+
+ $this->treeBuilderFactory->expects($this->any())->method('create')->will($this->returnValue($builder));
+ $node = $this->getMockBuilder('Magento\Framework\Data\Tree\Node')->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'hasChildren',
+ 'getChildren',
+ 'getId',
+ 'getParentId',
+ 'getName',
+ 'getPosition',
+ 'getLevel',
+ 'getIsActive'
+ ]
+ )
+ ->getMock();
+ $node->expects($this->any())->method('hasChildren')->will($this->returnValue(true));
+ $node->expects($this->any())->method('getChildren')->will($this->returnValue([$node]));
+
+ $node->expects($this->any())->method('getId')->will($this->returnValue($currentLevel));
+ $node->expects($this->any())->method('getParentId')->will($this->returnValue($currentLevel - 1));
+ $node->expects($this->any())->method('getName')->will($this->returnValue('Name' . $currentLevel));
+ $node->expects($this->any())->method('getPosition')->will($this->returnValue($currentLevel));
+ $node->expects($this->any())->method('getLevel')->will($this->returnValue($currentLevel));
+ $node->expects($this->any())->method('getIsActive')->will($this->returnValue(true));
+ $this->tree->getTree($node, $depth, $currentLevel);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ConverterTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ConverterTest.php
index eb59a3744eb..bd29d60303e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ConverterTest.php
@@ -62,8 +62,7 @@ class ConverterTest extends \PHPUnit_Framework_TestCase
$attributes = [
ProductDataObject::SKU => ProductDataObject::SKU . 'value',
ProductDataObject::PRICE => ProductDataObject::PRICE . 'value',
- ProductDataObject::STATUS => ProductDataObject::STATUS . 'dataValue',
- ProductDataObject::ID => 'entity_id' . 'value'
+ ProductDataObject::STATUS => ProductDataObject::STATUS . 'dataValue'
];
$this->productBuilder->expects($this->once())
->method('populateWithArray')
@@ -104,7 +103,6 @@ class ConverterTest extends \PHPUnit_Framework_TestCase
$this->converter = new Converter($this->productBuilder);
$productData = $this->converter->createProductDataFromModel($productModelMock);
$this->assertEquals(ProductDataObject::SKU . 'value', $productData->getSku());
- $this->assertEquals('entity_id' . 'value', $productData->getId());
$this->assertEquals(ProductDataObject::PRICE . 'value', $productData->getPrice());
$this->assertEquals(ProductDataObject::STATUS . 'dataValue', $productData->getStatus());
$this->assertEquals(null, $productData->getUpdatedAt());
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ProductBuilderTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ProductBuilderTest.php
index 36569596be8..e5d29627e33 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ProductBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Data/ProductBuilderTest.php
@@ -31,7 +31,7 @@ class ProductBuilderTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\TestFramework\Helper\ObjectManager */
protected $_objectManager;
- /** @var \Magento\Catalog\Service\V1\ProductMetadataService */
+ /** @var \Magento\Catalog\Service\V1\MetadataService */
private $_productMetadataService;
/** @var \Magento\Framework\Service\Data\Eav\AttributeValueBuilder */
@@ -42,7 +42,7 @@ class ProductBuilderTest extends \PHPUnit_Framework_TestCase
$this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_productMetadataService = $this->getMockBuilder(
- 'Magento\Catalog\Service\V1\ProductMetadataService'
+ 'Magento\Catalog\Service\V1\Product\MetadataService'
)->setMethods(
array('getCustomAttributesMetadata')
)->disableOriginalConstructor()->getMock();
@@ -87,7 +87,6 @@ class ProductBuilderTest extends \PHPUnit_Framework_TestCase
public function setValueDataProvider()
{
return [
- ['setId', 100, 'getId'],
['setSku', 'product_sku', 'getSku'],
['setName', 'buhanka hleba', 'getName'],
['setStoreId', 0, 'getStoreId'],
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductMetadataServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/MetadataServiceTest.php
similarity index 93%
rename from dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductMetadataServiceTest.php
rename to dev/tests/unit/testsuite/Magento/Catalog/Service/V1/MetadataServiceTest.php
index 7d18a38bb2e..e36b4859be1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductMetadataServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/MetadataServiceTest.php
@@ -23,11 +23,7 @@
*/
namespace Magento\Catalog\Service\V1;
-use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadataBuilder;
-use Magento\Catalog\Service\V1\Data\Eav\OptionBuilder;
-use Magento\Catalog\Service\V1\Data\Eav\ValidationRuleBuilder;
-
-class ProductMetadataServiceTest extends \PHPUnit_Framework_TestCase
+class MetadataServiceTest extends \PHPUnit_Framework_TestCase
{
/**
* Test getAttributeMetadata
@@ -64,6 +60,7 @@ class ProductMetadataServiceTest extends \PHPUnit_Framework_TestCase
$optionBuilder = $helper->getObject('\Magento\Catalog\Service\V1\Data\Eav\OptionBuilder');
$frontendLabelBuilder = $helper
->getObject('\Magento\Catalog\Service\V1\Data\Eav\Product\Attribute\FrontendLabelBuilder');
+ /** @var \Magento\Catalog\Service\V1\Data\Eav\AttributeMetadataBuilder $attrMetadataBuilder */
$attrMetadataBuilder = $objectManager->getObject(
'Magento\Catalog\Service\V1\Data\Eav\AttributeMetadataBuilder',
[
@@ -74,7 +71,8 @@ class ProductMetadataServiceTest extends \PHPUnit_Framework_TestCase
);
// create service
- $service = $objectManager->getObject('Magento\Catalog\Service\V1\ProductMetadataService',
+ /** @var \Magento\Catalog\Service\V1\MetadataService $service */
+ $service = $objectManager->getObject('Magento\Catalog\Service\V1\MetadataService',
array(
'eavConfig' => $eavConfigMock,
'attributeMetadataBuilder'
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceTest.php
new file mode 100644
index 00000000000..c790536cf53
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/ReadServiceTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Product\Attribute\Option;
+
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
+use Magento\TestFramework\Helper\ObjectManager;
+
+class ReadServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Test for retrieving attribute options
+ */
+ public function testOptions()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $attributeCode = 'attr_code';
+ $metadataServiceMock = $this->getMock(
+ 'Magento\Catalog\Service\V1\MetadataService',
+ array('getAttributeMetadata'),
+ array(),
+ '',
+ false
+ );
+
+ $mock = $this->getMock(
+ 'Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata',
+ array('getOptions'),
+ array(),
+ '',
+ false
+ );
+
+ $options = array();
+ $mock->expects($this->once())
+ ->method('getOptions')
+ ->will($this->returnValue($options));
+
+ $metadataServiceMock->expects($this->once())
+ ->method('getAttributeMetadata')
+ ->with(
+ ProductMetadataServiceInterface::ENTITY_TYPE,
+ $attributeCode
+ )
+ ->will($this->returnValue($mock));
+
+ /** @var \Magento\Catalog\Service\V1\Product\Attribute\Option\ReadServiceInterface $service */
+ $service = $objectManager->getObject(
+ 'Magento\Catalog\Service\V1\Product\Attribute\Option\ReadService',
+ array(
+ 'metadataService' => $metadataServiceMock
+ )
+ );
+ $this->assertEquals($options, $service->options($attributeCode));
+ }
+}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceTest.php
new file mode 100644
index 00000000000..b9d1de72fed
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/Option/WriteServiceTest.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Catalog\Service\V1\Product\Attribute\Option;
+
+use Magento\Catalog\Service\V1\Data\Eav\Option\Label;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
+use Magento\TestFramework\Helper\ObjectManager;
+
+class WriteServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $eavConfig;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $attribute;
+
+ /**
+ * @var \Magento\Catalog\Service\V1\Product\Attribute\Option\WriteServiceInterface
+ */
+ protected $service;
+
+ public function setUp()
+ {
+ $this->eavConfig = $this->getMockBuilder('Magento\Eav\Model\Config')
+ ->disableOriginalConstructor()->getMock();
+ $this->attribute = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\AbstractAttribute')
+ ->disableOriginalConstructor()->getMock();
+
+ $this->service = (new ObjectManager($this))->getObject(
+ 'Magento\Catalog\Service\V1\Product\Attribute\Option\WriteService',
+ array(
+ 'eavConfig' => $this->eavConfig
+ )
+ );
+ }
+
+ /**
+ * Test for retrieving attribute options
+ */
+ public function testAddOption()
+ {
+ $attributeCode = 'attr_code';
+
+ $label = $this->buildLabel('st 42', 42);
+
+ $this->attribute->expects($this->once())->method('getId')->will($this->returnValue(1));
+ $this->attribute->expects($this->any())
+ ->method('usesSource')
+ ->will($this->returnValue(true));
+
+ $this->attribute->expects($this->at(2))
+ ->method('__call')
+ ->with('setDefault', [['new_option']]);
+
+ $this->attribute->expects($this->at(3))
+ ->method('__call')
+ ->with(
+ 'setOption',
+ [
+ [
+ 'value' => ['new_option' => ['label', 42 => 'st 42']],
+ 'order' => ['new_option' => 10],
+ ]
+ ]
+ );
+
+ $this->attribute->expects($this->any())
+ ->method('save');
+
+ $option = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Option')
+ ->disableOriginalConstructor()->getMock();
+
+ $option->expects($this->any())
+ ->method('getLabel')->will($this->returnValue('label'));
+
+ $option->expects($this->any())
+ ->method('getStoreLabels')
+ ->will(
+ $this->returnValue(
+ [
+ $label
+ ]
+ )
+ );
+
+ $option->expects($this->any())
+ ->method('getOrder')->will($this->returnValue(10));
+
+ $option->expects($this->any())
+ ->method('isDefault')->will($this->returnValue(true));
+
+ $this->eavConfig->expects($this->any())
+ ->method('getAttribute')
+ ->with(
+ ProductMetadataServiceInterface::ENTITY_TYPE,
+ $attributeCode
+ )->will($this->returnValue($this->attribute));
+
+ $this->assertTrue($this->service->addOption($attributeCode, $option));
+ }
+
+ /**
+ * Build label
+ *
+ * @param $labelText
+ * @param $storeId
+ * @return Label
+ */
+ private function buildLabel($labelText, $storeId)
+ {
+ $label = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Option\Label')
+ ->disableOriginalConstructor()->getMock();
+
+ $label->expects($this->any())
+ ->method('getLabel')->will($this->returnValue($labelText));
+
+ $label->expects($this->any())
+ ->method('getStoreID')->will($this->returnValue($storeId));
+
+ return $label;
+ }
+
+ /**
+ * Test for remove attribute option
+ */
+ public function testRemoveOption()
+ {
+ $this->attributeId = 'test_attr';
+ $optionId = 1;
+ $this->eavConfig
+ ->expects($this->once())
+ ->method('getAttribute')
+ ->with(ProductMetadataServiceInterface::ENTITY_TYPE, $this->attributeId)
+ ->will($this->returnValue($this->attribute));
+ $this->attribute->expects($this->once())->method('getId')->will($this->returnValue(1));
+ $this->attribute->expects($this->once())->method('usesSource')->will($this->returnValue(true));
+ $sourceMock = $this->getMock('Magento\Eav\Model\Entity\Attribute\Source\Table', [], [], '', false);
+ $sourceMock
+ ->expects($this->once())
+ ->method('getOptionText')
+ ->with($optionId)
+ ->will($this->returnValue('option text'));
+ $this->attribute->expects($this->any())->method('getSource')->will($this->returnValue($sourceMock));
+
+ $this->attribute->expects($this->once())->method('save');
+ $this->assertTrue($this->service->removeOption($this->attributeId, $optionId));
+ }
+
+ public function testRemoveOptionExceptionCase1()
+ {
+ $this->attributeId = 'test_attr';
+ $optionId = 1;
+ $this->eavConfig->expects($this->any())->method('getAttribute')->will($this->returnValue(false));
+ $this->setExpectedException(
+ 'Magento\Framework\Exception\NoSuchEntityException',
+ "No such entity with attribute_id = $this->attributeId"
+ );
+ $this->service->removeOption($this->attributeId, $optionId);
+
+ }
+
+ public function testRemoveOptionExceptionCase2()
+ {
+ $this->attributeId = 'test_attr';
+ $optionId = 1;
+ $this->eavConfig
+ ->expects($this->any())
+ ->method('getAttribute')
+ ->will($this->returnValue($this->attribute));
+ $this->attribute->expects($this->any())->method('getId')->will($this->returnValue(null));
+ $this->setExpectedException(
+ 'Magento\Framework\Exception\NoSuchEntityException',
+ "No such entity with attribute_id = $this->attributeId"
+ );
+ $this->service->removeOption($this->attributeId, $optionId);
+ }
+
+ public function testRemoveOptionExceptionCase3()
+ {
+ $this->attributeId = 'test_attr';
+ $optionId = 1;
+ $this->eavConfig
+ ->expects($this->once())
+ ->method('getAttribute')
+ ->will($this->returnValue($this->attribute));
+ $this->attribute->expects($this->once())->method('getId')->will($this->returnValue(1));
+ $this->attribute->expects($this->any())->method('usesSource')->will($this->returnValue(false));
+ $this->setExpectedException('Magento\Framework\Exception\StateException', 'Attribute doesn\'t have any option');
+ $this->service->removeOption($this->attributeId, $optionId);
+ }
+
+ public function testRemoveOptionExceptionCase4()
+ {
+ $this->attributeId = 'test_attr';
+ $optionId = 1;
+ $this->eavConfig
+ ->expects($this->once())
+ ->method('getAttribute')
+ ->will($this->returnValue($this->attribute));
+ $this->attribute->expects($this->once())->method('getId')->will($this->returnValue(1));
+ $this->attribute->expects($this->once())->method('usesSource')->will($this->returnValue(true));
+ $sourceMock = $this->getMock('Magento\Eav\Model\Entity\Attribute\Source\Table', [], [], '', false);
+ $sourceMock->expects($this->once())->method('getOptionText')->will($this->returnValue(false));
+ $this->attribute->expects($this->any())->method('getSource')->will($this->returnValue($sourceMock));
+ $this->setExpectedException(
+ 'Magento\Framework\Exception\NoSuchEntityException',
+ sprintf('Attribute %s does not contain option with Id %s', $this->attributeId, $optionId));
+ $this->service->removeOption($this->attributeId, $optionId);
+ }
+}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/ReadServiceTest.php
index c64aaa43d35..04ee6bf623c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/ReadServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/ReadServiceTest.php
@@ -23,8 +23,9 @@
*/
namespace Magento\Catalog\Service\V1\Product\Attribute;
-use Magento\Catalog\Service\V1\ProductMetadataServiceInterface;
+use Magento\Catalog\Service\V1\Product\MetadataService;
use Magento\Framework\Service\V1\Data\SearchCriteriaBuilder;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
class ReadServiceTest extends \PHPUnit_Framework_TestCase
{
@@ -51,7 +52,6 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase
$productAttributeReadService = $objectManager->getObject(
'\Magento\Catalog\Service\V1\Product\Attribute\ReadService',
[
- 'metadataService' => $objectManager->getObject('Magento\Catalog\Service\V1\ProductMetadataService'),
'inputTypeFactory' => $inputTypeFactoryMock,
'attributeTypeBuilder' => $attributeTypeBuilder
]
@@ -71,7 +71,7 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase
$attributeCode = 'attr_code';
$metadataServiceMock = $this->getMock(
- 'Magento\Catalog\Service\V1\ProductMetadataService', array('getAttributeMetadata'),
+ 'Magento\Catalog\Service\V1\MetadataService', array('getAttributeMetadata'),
array(),
'',
false
@@ -79,7 +79,7 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase
$metadataServiceMock->expects($this->once())
->method('getAttributeMetadata')
->with(
- ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT,
+ ProductMetadataServiceInterface::ENTITY_TYPE,
$attributeCode
);
@@ -93,163 +93,5 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase
$service->info($attributeCode);
}
- /**
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
- */
- public function testSearch()
- {
- $attrCollectionMock = $this->getMock('Magento\Eav\Model\Resource\Entity\Attribute\Collection',
- array(), array(), '', false);
- $attrCollectionMock->expects($this->any())->method('addOrder')->with(
- $this->equalTo('attribute_id'),
- $this->equalTo('DESC')
- );
- $attrCollectionMock->expects($this->once())->method('getTable')->with(
- $this->equalTo('catalog_eav_attribute')
- )->will(
- $this->returnValue('catalog_eav_attribute')
- );
- $attrCollectionMock->expects($this->once())->method('join')->with(
- $this->equalTo(array('additional_table' => 'catalog_eav_attribute')),
- $this->equalTo('main_table.attribute_id = additional_table.attribute_id'),
- $this->equalTo(
- [
- 'frontend_input_renderer',
- 'is_global',
- 'is_visible',
- 'is_searchable',
- 'is_filterable',
- 'is_comparable',
- 'is_visible_on_front',
- 'is_html_allowed_on_front',
- 'is_used_for_price_rules',
- 'is_filterable_in_search',
- 'used_in_product_listing',
- 'used_for_sort_by',
- 'apply_to',
- 'is_visible_in_advanced_search',
- 'position',
- 'is_wysiwyg_enabled',
- 'is_used_for_promo_rules',
- 'is_configurable',
- 'search_weight',
- ]
- )
- );
- $attrCollectionMock->expects($this->once())->method('getSize')->will($this->returnValue(1));
- $attrCollectionMock->expects($this->once())->method('addFieldToFilter')->with(
- $this->equalTo(array('frontend_input')),
- $this->equalTo(array(array('eq' => 'text')))
- );
-
- $attributeData = array(
- 'attribute_id' => 1,
- 'attribute_code' => 'status',
- 'frontend_label' => 'Status',
- 'default_value' => '1',
- 'is_required' => false,
- 'is_user_defined' => false,
- 'frontend_input' => 'text'
- );
- // Use magento object for simplicity
- $attributeElement = new \Magento\Framework\Object($attributeData);
- $this->_mockReturnValue(
- $attrCollectionMock,
- array(
- 'getSize' => 1,
- '_getItems' => array($attributeElement),
- 'getIterator' => new \ArrayIterator(array($attributeElement))
- )
- );
-
- $attributeBuilderMock = $this->getMock('\Magento\Catalog\Service\V1\Data\Eav\AttributeBuilder',
- array(), array(), '', false);
-
- $attributeBuilderMock->expects($this->once())
- ->method('setId')
- ->with($attributeData['attribute_id'])
- ->will($this->returnSelf());
- $attributeBuilderMock->expects($this->once())
- ->method('setCode')
- ->with($attributeData['attribute_code'])
- ->will($this->returnSelf());
- $attributeBuilderMock->expects($this->once())
- ->method('setFrontendLabel')
- ->with($attributeData['frontend_label'])
- ->will($this->returnSelf());
- $attributeBuilderMock->expects($this->once())
- ->method('setDefaultValue')
- ->with($attributeData['default_value'])
- ->will($this->returnSelf());
- $attributeBuilderMock->expects($this->once())
- ->method('setIsRequired')
- ->with($attributeData['is_required'])
- ->will($this->returnSelf());
- $attributeBuilderMock->expects($this->once())
- ->method('setIsUserDefined')
- ->with($attributeData['is_user_defined'])
- ->will($this->returnSelf());
- $attributeBuilderMock->expects($this->once())
- ->method('setFrontendInput')
- ->with($attributeData['frontend_input'])
- ->will($this->returnSelf());
-
- $dataObjectMock = $this->getMock(
- '\Magento\Catalog\Service\V1\Data\Eav\Attribute',
- array(),
- array(),
- '',
- false
- );
- $attributeBuilderMock->expects($this->once())
- ->method('create')
- ->will($this->returnValue($dataObjectMock));
-
- $searchResultsBuilderMock = $this->getMockBuilder(
- 'Magento\Catalog\Service\V1\Data\Product\Attribute\SearchResultsBuilder'
- )->disableOriginalConstructor()
- ->getMock();
-
- $searchResultsBuilderMock->expects($this->once())
- ->method('setItems')
- ->with($this->equalTo(array($dataObjectMock)));
- $searchResultsBuilderMock->expects($this->once())
- ->method('create');
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $filterBuilder = $helper->getObject('Magento\Framework\Service\V1\Data\FilterBuilder');
- $filter = $filterBuilder->setField('frontend_input')->setValue('text')->setConditionType('eq')->create();
-
- $filterGroupBuilder = $helper->getObject('Magento\Framework\Service\V1\Data\Search\FilterGroupBuilder');
- /** @var SearchCriteriaBuilder $searchBuilder */
- $searchBuilder = $helper->getObject(
- 'Magento\Framework\Service\V1\Data\SearchCriteriaBuilder',
- ['filterGroupBuilder' => $filterGroupBuilder]
- );
- $searchBuilder->addFilter([$filter]);
- $searchBuilder->addSortOrder('id', \Magento\Framework\Service\V1\Data\SearchCriteria::SORT_DESC);
- $searchBuilder->setCurrentPage(1);
- $searchBuilder->setPageSize(10);
-
- $prductAttrService = $helper->getObject(
- 'Magento\Catalog\Service\V1\Product\Attribute\ReadService',
- [
- 'searchResultsBuilder' => $searchResultsBuilderMock,
- 'attributeCollection' => $attrCollectionMock,
- 'attributeBuilder' => $attributeBuilderMock
- ]
- );
- $prductAttrService->search($searchBuilder->create());
- }
-
- /**
- * @param \PHPUnit_Framework_MockObject_MockObject $mock
- * @param array $valueMap
- */
- private function _mockReturnValue($mock, $valueMap)
- {
- foreach ($valueMap as $method => $value) {
- $mock->expects($this->any())->method($method)->will($this->returnValue($value));
- }
- }
}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/WriteServiceTest.php
index 9a2d0e66a0a..0c700dcab08 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/Attribute/WriteServiceTest.php
@@ -25,7 +25,8 @@ namespace Magento\Catalog\Service\V1\Product\Attribute;
use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata;
use Magento\Catalog\Service\V1\Data\Eav\AttributeMetadataBuilder;
-use Magento\Catalog\Service\V1\ProductMetadataServiceInterface;
+use Magento\Catalog\Service\V1\Product\MetadataService;
+use Magento\Catalog\Service\V1\Product\MetadataServiceInterface as ProductMetadataServiceInterface;
use Magento\Catalog\Service\V1\Data\Eav\Product\Attribute\FrontendLabel;
class WriteServiceTest extends \PHPUnit_Framework_TestCase
@@ -266,7 +267,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase
$this->eavConfig
->expects($this->once())
->method('getAttribute')
- ->with(ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT, $id)
+ ->with(ProductMetadataServiceInterface::ENTITY_TYPE, $id)
->will($this->returnValue($this->attributeMock));
$this->attributeMock->expects($this->at(0))->method('getId')->will($this->returnValue(1));
$this->attributeMock->expects($this->at(1))->method('delete');
@@ -282,7 +283,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase
$this->eavConfig
->expects($this->once())
->method('getAttribute')
- ->with(ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT, $id)
+ ->with(ProductMetadataServiceInterface::ENTITY_TYPE, $id)
->will($this->returnValue(false));
$this->setExpectedException(
'Magento\Framework\Exception\NoSuchEntityException',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceTest.php
index 62f48a97cc1..ecbc04f43c3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/Product/AttributeSet/WriteServiceTest.php
@@ -101,7 +101,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase
}
/**
- * @expectedException \Magento\Eav\Exception
+ * @expectedException \Magento\Framework\Exception\InputException
*/
public function testCreateWithEmptyName()
{
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductAttributeServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductAttributeServiceTest.php
deleted file mode 100644
index 330c1c2979c..00000000000
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductAttributeServiceTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-namespace Magento\Catalog\Service\V1;
-
-use Magento\Catalog\Service\V1\ProductMetadataServiceInterface;
-
-class ProductAttributeServiceTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * Test for retrieving attribute options
- */
- public function testOptions()
- {
- $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-
- $attributeCode = 'attr_code';
- $metadataServiceMock = $this->getMock(
- 'Magento\Catalog\Service\V1\ProductMetadataService',
- array('getAttributeMetadata'),
- array(),
- '',
- false
- );
-
- $mock = $this->getMock(
- 'Magento\Catalog\Service\V1\Data\Eav\AttributeMetadata',
- array('getOptions'),
- array(),
- '',
- false
- );
-
- $options = array();
- $mock->expects($this->once())
- ->method('getOptions')
- ->will($this->returnValue($options));
-
- $metadataServiceMock->expects($this->once())
- ->method('getAttributeMetadata')
- ->with(
- ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT,
- $attributeCode
- )
- ->will($this->returnValue($mock));
-
- /** @var \Magento\Catalog\Service\V1\ProductAttributeServiceInterface $service */
- $service = $objectManager->getObject(
- 'Magento\Catalog\Service\V1\ProductAttributeService',
- array(
- 'metadataService' => $metadataServiceMock
- )
- );
- $this->assertEquals($options, $service->options($attributeCode));
- }
-
- /**
- * Build label
- *
- * @param $labelText
- * @param $storeId
- * @return \Magento\Catalog\Service\V1\Data\Eav\Option\Label
- */
- private function buildLabel($labelText, $storeId)
- {
- $label = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Option\Label')
- ->disableOriginalConstructor()->getMock();
-
- $label->expects($this->any())
- ->method('getLabel')->will($this->returnValue($labelText));
-
- $label->expects($this->any())
- ->method('getStoreID')->will($this->returnValue($storeId));
-
- return $label;
- }
-
- /**
- * Test for retrieving attribute options
- */
- public function testAddOption()
- {
- $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-
- $attributeCode = 'attr_code';
-
- $label = $this->buildLabel('st 42', 42);
-
- $attribute = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\AbstractAttribute')
- ->disableOriginalConstructor()->getMock();
- $attribute->expects($this->any())
- ->method('usesSource')
- ->will($this->returnValue(true));
-
- $attribute->expects($this->at(1))
- ->method('__call')
- ->with('setDefault', [['new_option']]);
-
- $attribute->expects($this->at(2))
- ->method('__call')
- ->with(
- 'setOption',
- [
- [
- 'value' => ['new_option' => ['label', 42 => 'st 42']],
- 'order' => ['new_option' => 10],
- ]
- ]
- );
-
- $attribute->expects($this->any())
- ->method('save');
-
- $option = $this->getMockBuilder('Magento\Catalog\Service\V1\Data\Eav\Option')
- ->disableOriginalConstructor()->getMock();
-
- $option->expects($this->any())
- ->method('getLabel')->will($this->returnValue('label'));
-
- $option->expects($this->any())
- ->method('getStoreLabels')
- ->will(
- $this->returnValue(
- [
- $label
- ]
- )
- );
-
- $option->expects($this->any())
- ->method('getOrder')->will($this->returnValue(10));
-
- $option->expects($this->any())
- ->method('isDefault')->will($this->returnValue(true));
-
- $eavConfig = $this->getMockBuilder('Magento\Eav\Model\Config')
- ->disableOriginalConstructor()->getMock();
-
- $eavConfig->expects($this->any())
- ->method('getAttribute')
- ->with(
- \Magento\Catalog\Service\V1\ProductMetadataServiceInterface::ENTITY_TYPE_PRODUCT,
- $attributeCode
- )->will($this->returnValue($attribute));
-
- /** @var \Magento\Catalog\Service\V1\ProductAttributeServiceInterface $service */
- $service = $objectManager->getObject(
- 'Magento\Catalog\Service\V1\ProductAttributeService',
- array(
- 'eavConfig' => $eavConfig
- )
- );
-
- $this->assertTrue($service->addOption($attributeCode, $option));
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductServiceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductServiceTest.php
index 567c8bd6541..e11b3df3dd5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Service/V1/ProductServiceTest.php
@@ -58,7 +58,7 @@ class ProductServiceTest extends \PHPUnit_Framework_TestCase
protected $searchResultsBuilderMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Service\V1\ProductMetadataServiceInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Catalog\Service\V1\ProductMetadataService
*/
protected $metadataServiceMock;
@@ -106,7 +106,7 @@ class ProductServiceTest extends \PHPUnit_Framework_TestCase
->getMock();
$this->metadataServiceMock = $this->getMockBuilder(
- '\Magento\Catalog\Service\V1\ProductMetadataServiceInterface'
+ '\Magento\Catalog\Service\V1\Product\MetadataService'
)->disableOriginalConstructor()
->getMock();
@@ -210,7 +210,6 @@ class ProductServiceTest extends \PHPUnit_Framework_TestCase
$productDataBuilder = $this->getMockBuilder('\Magento\Catalog\Service\V1\Data\ProductBuilder')
->disableOriginalConstructor()
->getMock();
- $productDataBuilder->setId(1);
$productDataBuilder->setPrice('10.000');
$productDataBuilder->setSku('test');
$productDataBuilder->setStoreId(10);
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/Rule/Condition/ProductTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/Rule/Condition/ProductTest.php
new file mode 100644
index 00000000000..95ffddf34d3
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/Rule/Condition/ProductTest.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\CatalogRule\Model\Rule\Condition;
+
+use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+
+class ProductTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var \Magento\CatalogRule\Model\Rule\Condition\Product */
+ protected $product;
+
+ /** @var ObjectManagerHelper */
+ protected $objectManagerHelper;
+
+ /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+ protected $config;
+
+ /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
+ protected $productModel;
+
+ /** @var \Magento\Catalog\Model\Resource\Product|\PHPUnit_Framework_MockObject_MockObject */
+ protected $productResource;
+
+ /** @var \Magento\Catalog\Model\Resource\Eav\Attribute|\PHPUnit_Framework_MockObject_MockObject */
+ protected $eavAttributeResource;
+
+ protected function setUp()
+ {
+ $this->config = $this->getMock('Magento\Eav\Model\Config', array('getAttribute'), array(), '', false);
+ $this->productModel = $this->getMock(
+ 'Magento\Catalog\Model\Product',
+ array(
+ '__wakeup',
+ 'getAvailableInCategories',
+ 'hasData',
+ 'getData',
+ 'getId',
+ 'getStoreId',
+ 'getResource'
+ ),
+ array(),
+ '',
+ false
+ );
+ $this->productResource = $this->getMock(
+ 'Magento\Catalog\Model\Resource\Product',
+ ['loadAllAttributes',
+ 'getAttributesByCode',
+ 'getAttribute'
+ ],
+ array(),
+ '',
+ false
+ );
+ $this->eavAttributeResource = $this->getMock(
+ '\Magento\Catalog\Model\Resource\Eav\Attribute',
+ array(
+ '__wakeup',
+ 'isAllowedForRuleCondition',
+ 'getDataUsingMethod',
+ 'getAttributeCode',
+ 'getFrontendLabel',
+ 'isScopeGlobal',
+ 'getBackendType',
+ 'getFrontendInput'
+ ),
+ array(),
+ '',
+ false
+ );
+
+ $this->productResource->expects($this->any())->method('loadAllAttributes')
+ ->will($this->returnSelf());
+ $this->productResource->expects($this->any())->method('getAttributesByCode')
+ ->will($this->returnValue(array($this->eavAttributeResource)));
+ $this->eavAttributeResource->expects($this->any())->method('isAllowedForRuleCondition')
+ ->will($this->returnValue(false));
+ $this->eavAttributeResource->expects($this->any())->method('getAttributesByCode')
+ ->will($this->returnValue(false));
+ $this->eavAttributeResource->expects($this->any())->method('getAttributeCode')
+ ->will($this->returnValue('1'));
+ $this->eavAttributeResource->expects($this->any())->method('getFrontendLabel')
+ ->will($this->returnValue('attribute_label'));
+
+ $this->objectManagerHelper = new ObjectManagerHelper($this);
+ $this->product = $this->objectManagerHelper->getObject(
+ 'Magento\CatalogRule\Model\Rule\Condition\Product',
+ array(
+ 'config' => $this->config,
+ 'product' => $this->productModel,
+ 'productResource' => $this->productResource
+ )
+ );
+ }
+
+ public function testValidateMeetsCategory()
+ {
+ $this->product->setData('attribute', 'category_ids');
+ $this->product->setData('value_parsed', '1');
+ $this->product->setData('operator', '>=');
+
+ $this->productModel->expects($this->once())->method('getAvailableInCategories')
+ ->will($this->returnValue('2'));
+ $this->assertTrue($this->product->validate($this->productModel));
+ }
+
+ /**
+ * @dataProvider validateDataProvider
+ *
+ * @param string $attributeValue
+ * @param string|array $parsedValue
+ * @param string $newValue
+ * @param string $operator
+ * @param array $input
+ */
+ public function testValidateWithDatetimeValue($attributeValue, $parsedValue, $newValue, $operator, $input)
+ {
+ $this->product->setData('attribute', 'attribute_key');
+ $this->product->setData('value_parsed', $parsedValue);
+ $this->product->setData('operator', $operator);
+
+ $this->config->expects($this->any())->method('getAttribute')
+ ->will($this->returnValue($this->eavAttributeResource));
+
+ $this->eavAttributeResource->expects($this->any())->method('isScopeGlobal')
+ ->will($this->returnValue(false));
+ $this->eavAttributeResource->expects($this->any())->method($input['method'])
+ ->will($this->returnValue($input['type']));
+
+ $this->productModel->expects($this->any())->method('hasData')
+ ->will($this->returnValue(true));
+ $this->productModel->expects($this->at(0))->method('getData')
+ ->will($this->returnValue(array ('1' => array('1' => $attributeValue))));
+ $this->productModel->expects($this->any())->method('getData')
+ ->will($this->returnValue($newValue));
+ $this->productModel->expects($this->any())->method('getId')
+ ->will($this->returnValue('1'));
+ $this->productModel->expects($this->once())->method('getStoreId')
+ ->will($this->returnValue('1'));
+ $this->productModel->expects($this->any())->method('getResource')
+ ->will($this->returnValue($this->productResource));
+
+ $this->productResource->expects($this->any())->method('getAttribute')
+ ->will($this->returnValue($this->eavAttributeResource));
+
+ $this->product->collectValidatedAttributes($this->productModel);
+ $this->assertTrue($this->product->validate($this->productModel));
+ }
+
+ public function validateDataProvider()
+ {
+ return array(
+ array(
+ 'attribute_value' => '12:12',
+ 'parsed_value' => '12:12',
+ 'new_value' => '12:13',
+ 'operator' => '>=',
+ 'input' => array('method' => 'getBackendType', 'type' => 'input_type')
+ ),
+ array(
+ 'attribute_value' => '1',
+ 'parsed_value' => '1',
+ 'new_value' => '2',
+ 'operator' => '>=',
+ 'input' => array('method' => 'getBackendType', 'type' => 'input_type')
+ ),
+ array(
+ 'attribute_value' => '1',
+ 'parsed_value' => array('1' => '0'),
+ 'new_value' => array('1' => '1'),
+ 'operator' => '!()',
+ 'input' => array('method' => 'getFrontendInput', 'type' => 'multiselect')
+ )
+ );
+ }
+
+}
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
new file mode 100644
index 00000000000..7d251ad3cba
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\CatalogRule\Model;
+
+use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+
+class RuleTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var \Magento\CatalogRule\Model\Rule */
+ protected $rule;
+
+ /** @var ObjectManagerHelper */
+ protected $objectManagerHelper;
+
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ protected $storeManager;
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ protected $combineFactory;
+
+ /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
+ protected $storeModel;
+
+ /** @var \Magento\Store\Model\Website|\PHPUnit_Framework_MockObject_MockObject */
+ protected $websiteModel;
+
+ /** @var \Magento\Rule\Model\Condition\Combine|\PHPUnit_Framework_MockObject_MockObject */
+ protected $condition;
+
+ protected function setUp()
+ {
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeModel = $this->getMock('Magento\Store\Model\Store', array('__wakeup', 'getId'), array(), '', false);
+ $this->combineFactory = $this->getMock(
+ 'Magento\CatalogRule\Model\Rule\Condition\CombineFactory',
+ array(
+ 'create'
+ )
+ );
+ $this->productModel = $this->getMock(
+ 'Magento\Catalog\Model\Product',
+ array(
+ '__wakeup', 'getId'
+ ),
+ array(),
+ '',
+ false
+ );
+ $this->condition = $this->getMock(
+ 'Magento\Rule\Model\Condition\Combine',
+ array(
+ 'setRule',
+ 'validate'
+ ),
+ array(),
+ '',
+ false
+ );
+ $this->websiteModel = $this->getMock(
+ 'Magento\Store\Model\Website',
+ array(
+ '__wakeup',
+ 'getId',
+ 'getDefaultStore'
+ ),
+ array(),
+ '',
+ false
+ );
+
+ $this->objectManagerHelper = new ObjectManagerHelper($this);
+ $this->rule = $this->objectManagerHelper->getObject(
+ 'Magento\CatalogRule\Model\Rule',
+ array(
+ 'storeManager' => $this->storeManager,
+ 'combineFactory' => $this->combineFactory
+ )
+ );
+ }
+
+ /**
+ * @covers _getWebsitesMap
+ * @dataProvider dataProviderCallbackValidateProduct
+ * @param bool $validate
+ */
+ public function testCallbackValidateProduct($validate)
+ {
+ $args['product'] = $this->productModel;
+ $args['attributes'] = array();
+ $args['idx'] = 0;
+ $args['row'] = array(
+ 'entity_id' => '1',
+ 'entity_type_id' => '4',
+ 'attribute_set_id' => '4',
+ 'type_id' => 'simple',
+ 'sku' => 'Product',
+ 'has_options' => '0',
+ 'required_options' => '0',
+ 'created_at' => '2014-06-25 13:14:30',
+ 'updated_at' => '2014-06-25 14:37:15'
+ );
+ $this->storeManager->expects($this->any())->method('getWebsites')->with(true)
+ ->will($this->returnValue(array($this->websiteModel, $this->websiteModel)));
+ $this->websiteModel->expects($this->at(0))->method('getId')
+ ->will($this->returnValue('1'));
+ $this->websiteModel->expects($this->at(2))->method('getId')
+ ->will($this->returnValue('2'));
+ $this->websiteModel->expects($this->any())->method('getDefaultStore')
+ ->will($this->returnValue($this->storeModel));
+ $this->storeModel->expects($this->at(0))->method('getId')
+ ->will($this->returnValue('1'));
+ $this->storeModel->expects($this->at(1))->method('getId')
+ ->will($this->returnValue('2'));
+ $this->combineFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($this->condition));
+ $this->condition->expects($this->any())->method('validate')
+ ->will($this->returnValue($validate));
+ $this->condition->expects($this->any())->method('setRule')
+ ->will($this->returnSelf());
+ $this->productModel->expects($this->any())->method('getId')
+ ->will($this->returnValue(1));
+
+ $this->rule->callbackValidateProduct($args);
+
+ $matchingProducts = $this->rule->getMatchingProductIds();
+ foreach ($matchingProducts['1'] as $matchingRules) {
+ $this->assertEquals($validate, $matchingRules);
+ }
+ }
+
+ public function dataProviderCallbackValidateProduct()
+ {
+ return array(
+ array(false),
+ array(true),
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php
index aa6ee397b6d..c14d326274f 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php
@@ -97,12 +97,14 @@ class DataTest extends \PHPUnit_Framework_TestCase
);
$provider = array();
$provider[] = array(
- array(),
+ array('baseImage' => 'http://example.com/base_img_url'),
array(
'allowed_products' => array(),
- 'current_product_mock' => $currentProductMock
+ 'current_product_mock' => $currentProductMock,
+ 'baseImage' => 'http://example.com/base_img_url'
)
);
+
$attributesCount = 3;
$attributes = array();
for ($i = 1; $i < $attributesCount; $i++) {
@@ -175,11 +177,13 @@ class DataTest extends \PHPUnit_Framework_TestCase
),
'attribute_id_2' => array(
'attribute_code_value_2' => array('product_id_1', 'product_id_2')
- )
+ ),
+ 'baseImage' => 'http://example.com/base_img_url'
),
array(
'allowed_products' => $allowedProducts,
- 'current_product_mock' => $currentProductMock
+ 'current_product_mock' => $currentProductMock,
+ 'baseImage' => 'http://example.com/base_img_url'
)
);
return $provider;
diff --git a/dev/tests/unit/testsuite/Magento/Cron/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Cron/Model/ObserverTest.php
index 23b2b293295..b613b427f8d 100644
--- a/dev/tests/unit/testsuite/Magento/Cron/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cron/Model/ObserverTest.php
@@ -389,21 +389,12 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(true));
// cron start to execute some job
- $schedule->expects(
- $this->at(4)
- )->method(
- 'setStatus'
- )->with(
- $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_RUNNING)
- )->will(
- $this->returnSelf()
- );
$schedule->expects($this->any())->method('setExecutedAt')->will($this->returnSelf());
- $schedule->expects($this->at(6))->method('save');
+ $schedule->expects($this->at(5))->method('save');
// cron end execute some job
$schedule->expects(
- $this->at(7)
+ $this->at(6)
)->method(
'setStatus'
)->with(
@@ -412,7 +403,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->returnSelf()
);
- $schedule->expects($this->at(9))->method('save');
+ $schedule->expects($this->at(8))->method('save');
$this->_collection->addItem($schedule);
diff --git a/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php b/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
index b569a6fda5d..0d58540a353 100644
--- a/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
@@ -31,6 +31,24 @@ namespace Magento\Cron\Model;
*/
class ScheduleTest extends \PHPUnit_Framework_TestCase
{
+ protected $helper;
+
+ protected $resourceJobMock;
+
+ public function setUp()
+ {
+ $this->helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->resourceJobMock = $this->getMockBuilder('Magento\Cron\Model\Resource\Schedule')
+ ->disableOriginalConstructor()
+ ->setMethods(['trySetJobStatusAtomic', '__wakeup', 'getIdFieldName'])
+ ->getMockForAbstractClass();
+
+ $this->resourceJobMock->expects($this->any())
+ ->method('getIdFieldName')
+ ->will($this->returnValue('id'));
+ }
+
/**
* @param string $cronExpression
* @param array $expected
@@ -38,11 +56,9 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
*/
public function testSetCronExpr($cronExpression, $expected)
{
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
// 1. Create mocks
/** @var \Magento\Cron\Model\Schedule $model */
- $model = $helper->getObject('Magento\Cron\Model\Schedule');
+ $model = $this->helper->getObject('Magento\Cron\Model\Schedule');
// 2. Run tested method
$model->setCronExpr($cronExpression);
@@ -126,11 +142,9 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
*/
public function testSetCronExprException($cronExpression)
{
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
// 1. Create mocks
/** @var \Magento\Cron\Model\Schedule $model */
- $model = $helper->getObject('Magento\Cron\Model\Schedule');
+ $model = $this->helper->getObject('Magento\Cron\Model\Schedule');
// 2. Run tested method
$model->setCronExpr($cronExpression);
@@ -161,15 +175,13 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
*/
public function testTrySchedule($scheduledAt, $cronExprArr, $expected)
{
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
// 1. Create mocks
$date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
->disableOriginalConstructor()
->getMock();
/** @var \Magento\Cron\Model\Schedule $model */
- $model = $helper->getObject(
+ $model = $this->helper->getObject(
'Magento\Cron\Model\Schedule',
[
'date' => $date
@@ -219,11 +231,9 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
*/
public function testMatchCronExpression($cronExpressionPart, $dateTimePart, $expectedResult)
{
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
// 1. Create mocks
/** @var \Magento\Cron\Model\Schedule $model */
- $model = $helper->getObject('Magento\Cron\Model\Schedule');
+ $model = $this->helper->getObject('Magento\Cron\Model\Schedule');
// 2. Run tested method
$result = $model->matchCronExpression($cronExpressionPart, $dateTimePart);
@@ -280,11 +290,9 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
{
$dateTimePart = 10;
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
// 1 Create mocks
/** @var \Magento\Cron\Model\Schedule $model */
- $model = $helper->getObject('Magento\Cron\Model\Schedule');
+ $model = $this->helper->getObject('Magento\Cron\Model\Schedule');
// 2. Run tested method
$model->matchCronExpression($cronExpressionPart, $dateTimePart);
@@ -311,11 +319,9 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
*/
public function testGetNumeric($param, $expectedResult)
{
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
// 1. Create mocks
/** @var \Magento\Cron\Model\Schedule $model */
- $model = $helper->getObject('Magento\Cron\Model\Schedule');
+ $model = $this->helper->getObject('Magento\Cron\Model\Schedule');
// 2. Run tested method
$result = $model->getNumeric($param);
@@ -351,4 +357,52 @@ class ScheduleTest extends \PHPUnit_Framework_TestCase
['wedXXX', 3],
];
}
+
+ public function testTryLockJobSuccess()
+ {
+ $scheduleId = 1;
+
+ $this->resourceJobMock->expects($this->once())
+ ->method('trySetJobStatusAtomic')
+ ->with($scheduleId, Schedule::STATUS_RUNNING, Schedule::STATUS_PENDING)
+ ->will($this->returnValue(true));
+
+ /** @var \Magento\Cron\Model\Schedule $model */
+ $model = $this->helper->getObject(
+ 'Magento\Cron\Model\Schedule',
+ [
+ 'resource' => $this->resourceJobMock
+ ]
+ );
+ $model->setId($scheduleId);
+ $this->assertEquals(0, $model->getStatus());
+
+ $model->tryLockJob();
+
+ $this->assertEquals(Schedule::STATUS_RUNNING, $model->getStatus());
+ }
+
+ public function testTryLockJobFailure()
+ {
+ $scheduleId = 1;
+
+ $this->resourceJobMock->expects($this->once())
+ ->method('trySetJobStatusAtomic')
+ ->with($scheduleId, Schedule::STATUS_RUNNING, Schedule::STATUS_PENDING)
+ ->will($this->returnValue(false));
+
+ /** @var \Magento\Cron\Model\Schedule $model */
+ $model = $this->helper->getObject(
+ 'Magento\Cron\Model\Schedule',
+ [
+ 'resource' => $this->resourceJobMock
+ ]
+ );
+ $model->setId($scheduleId);
+ $this->assertEquals(0, $model->getStatus());
+
+ $model->tryLockJob();
+
+ $this->assertEquals(0, $model->getStatus());
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Account/RegisterLinkTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Account/RegisterLinkTest.php
index 481dad91f7c..0012c9586bc 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Account/RegisterLinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Account/RegisterLinkTest.php
@@ -38,27 +38,58 @@ class RegisterLinkTest extends \PHPUnit_Framework_TestCase
$this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
}
- public function testToHtml()
+ /**
+ * @param bool $isAuthenticated
+ * @param bool $isRegistrationAllowed
+ * @param bool $result
+ * @dataProvider dataProviderToHtml
+ * @return void
+ */
+ public function testToHtml($isAuthenticated, $isRegistrationAllowed, $result)
{
$context = $this->_objectManager->getObject('Magento\Framework\View\Element\Template\Context');
+
$httpContext = $this->getMockBuilder('Magento\Framework\App\Http\Context')
->disableOriginalConstructor()
->setMethods(array('getValue'))
->getMock();
- $httpContext->expects($this->once())
+ $httpContext->expects($this->any())
->method('getValue')
- ->will($this->returnValue(true));
+ ->with(\Magento\Customer\Helper\Data::CONTEXT_AUTH)
+ ->will($this->returnValue($isAuthenticated));
+
+ $helperMock = $this->getMockBuilder('Magento\Customer\Helper\Data')
+ ->disableOriginalConstructor()
+ ->setMethods(array('isRegistrationAllowed', 'getRegisterUrl'))
+ ->getMock();
+ $helperMock->expects($this->any())
+ ->method('isRegistrationAllowed')
+ ->will($this->returnValue($isRegistrationAllowed));
- /** @var \Magento\Sales\Block\Guest\Link $link */
+ /** @var \Magento\Customer\Block\Account\RegisterLink $link */
$link = $this->_objectManager->getObject(
'Magento\Customer\Block\Account\RegisterLink',
array(
'context' => $context,
'httpContext' => $httpContext,
+ 'customerHelper' => $helperMock,
)
);
- $this->assertEquals('', $link->toHtml());
+ $this->assertEquals($result, $link->toHtml() === '');
+ }
+
+ /**
+ * @return array
+ */
+ public function dataProviderToHtml()
+ {
+ return array(
+ array(true, true, true),
+ array(false, false, true),
+ array(true, false, true),
+ array(false, true, false),
+ );
}
public function testGetHref()
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/AccountTest.php
index 927b2867cf8..7e9d412e3c1 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -27,6 +27,9 @@
*/
namespace Magento\Customer\Controller;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AccountTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -59,6 +62,26 @@ class AccountTest extends \PHPUnit_Framework_TestCase
*/
protected $objectManager;
+ /**
+ * @var \Magento\Customer\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $customerHelperMock;
+
+ /**
+ * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $redirectMock;
+
+ /**
+ * @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $viewMock;
+
+ /**
+ * @var \Magento\Customer\Service\V1\CustomerAccountServiceInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $customerAccountServiceMock;
+
/**
* List of actions that are allowed for not authorized users
*
@@ -115,7 +138,6 @@ class AccountTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_formKeyValidator = $this->getMock(
'Magento\Core\App\Action\FormKeyValidator',
array(),
@@ -123,6 +145,26 @@ class AccountTest extends \PHPUnit_Framework_TestCase
'',
false
);
+ $this->customerHelperMock = $this->getMock(
+ 'Magento\Customer\Helper\Data',
+ array(),
+ array(),
+ '',
+ false
+ );
+ $this->formFactoryMock = $this->getMock(
+ 'Magento\Customer\Model\Metadata\FormFactory',
+ array(),
+ array(),
+ '',
+ false
+ );
+ $this->redirectMock = $this->getMockForAbstractClass('Magento\Framework\App\Response\RedirectInterface');
+ $this->viewMock = $this->getMockForAbstractClass('Magento\Framework\App\ViewInterface');
+ $this->customerAccountServiceMock =
+ $this->getMockForAbstractClass('Magento\Customer\Service\V1\CustomerAccountServiceInterface');
+
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->object = $objectManager->getObject(
'Magento\Customer\Controller\Account',
array(
@@ -132,6 +174,10 @@ class AccountTest extends \PHPUnit_Framework_TestCase
'url' => $this->url,
'objectManager' => $this->objectManager,
'formKeyValidator' => $this->_formKeyValidator,
+ 'customerHelperData' => $this->customerHelperMock,
+ 'redirect' => $this->redirectMock,
+ 'view' => $this->viewMock,
+ 'customerAccountService' => $this->customerAccountServiceMock,
''
)
);
@@ -189,4 +235,96 @@ class AccountTest extends \PHPUnit_Framework_TestCase
$this->object->loginPostAction();
}
+
+ /**
+ * @return void
+ */
+ public function testCreateActionRegistrationDisabled()
+ {
+ $this->customerSession->expects($this->once())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(false));
+
+ $this->customerHelperMock->expects($this->once())
+ ->method('isRegistrationAllowed')
+ ->will($this->returnValue(false));
+
+ $this->redirectMock->expects($this->once())
+ ->method('redirect')
+ ->with($this->response, '*/*', array())
+ ->will($this->returnValue(false));
+
+ $this->viewMock->expects($this->never())
+ ->method('loadLayout');
+ $this->viewMock->expects($this->never())
+ ->method('getLayout');
+ $this->viewMock->expects($this->never())
+ ->method('renderLayout');
+
+ $this->object->createAction();
+ }
+
+ /**
+ * @return void
+ */
+ public function testCreateActionRegistrationEnabled()
+ {
+ $this->customerSession->expects($this->once())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(false));
+
+ $this->customerHelperMock->expects($this->once())
+ ->method('isRegistrationAllowed')
+ ->will($this->returnValue(true));
+
+ $this->redirectMock->expects($this->never())
+ ->method('redirect');
+
+ $layoutMock = $this->getMock(
+ 'Magento\Framework\View\Layout',
+ array(),
+ array(),
+ '',
+ false
+ );
+ $layoutMock->expects($this->once())
+ ->method('initMessages')
+ ->will($this->returnSelf());
+
+ $this->viewMock->expects($this->once())
+ ->method('loadLayout')
+ ->will($this->returnSelf());
+ $this->viewMock->expects($this->once())
+ ->method('getLayout')
+ ->will($this->returnValue($layoutMock));
+ $this->viewMock->expects($this->once())
+ ->method('renderLayout')
+ ->will($this->returnSelf());
+
+ $this->object->createAction();
+ }
+
+ /**
+ * @return void
+ */
+ public function testCreatePostActionRegistrationDisabled()
+ {
+ $this->customerSession->expects($this->once())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(false));
+
+ $this->customerHelperMock->expects($this->once())
+ ->method('isRegistrationAllowed')
+ ->will($this->returnValue(false));
+
+ $this->redirectMock->expects($this->once())
+ ->method('redirect')
+ ->with($this->response, '*/*/', array())
+ ->will($this->returnValue(false));
+
+ $this->customerAccountServiceMock->expects($this->never())
+ ->method('createCustomer');
+
+ $this->object->createPostAction();
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
index e86aa48ba70..fe7fde4bd97 100755
--- a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
@@ -112,8 +112,11 @@ class AddressTest extends \PHPUnit_Framework_TestCase
array(2, 2),
array(3, 3),
array(4, 4),
- array(5, 4),
- array(10, 4)
+ array(5, 5),
+ array(10, 10),
+ array(15, 15),
+ array(20, 20),
+ array(21, 20),
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php
new file mode 100644
index 00000000000..3051905c3d7
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Helper/AbstractHelperTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Framework\App\Helper;
+
+/**
+ * Class AbstractHelperTest
+ */
+class AbstractHelperTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var \Magento\Framework\App\Helper\AbstractHelper */
+ protected $helper;
+
+ /** @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject */
+ protected $contextMock;
+
+ /** @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject */
+ protected $moduleManagerMock;
+
+ /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+ protected $urlBuilderMock;
+
+ protected function setUp()
+ {
+ $this->urlBuilderMock = $this->getMock('Magento\Framework\UrlInterface', [], [], '', false);
+ $this->moduleManagerMock = $this->getMock('Magento\Framework\Module\Manager', [], [], '', false);
+ $this->contextMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
+ $this->contextMock->expects($this->once())
+ ->method('getModuleManager')
+ ->will($this->returnValue($this->moduleManagerMock));
+ $this->contextMock->expects($this->once())
+ ->method('getUrlBuilder')
+ ->will($this->returnValue($this->urlBuilderMock));
+
+ $this->helper = $this->getMockForAbstractClass(
+ 'Magento\Framework\App\Helper\AbstractHelper',
+ ['context' => $this->contextMock]
+ );
+ }
+
+ /**
+ * @covers \Magento\Framework\App\Helper\AbstractHelper::isModuleEnabled
+ * @covers \Magento\Framework\App\Helper\AbstractHelper::isModuleOutputEnabled
+ * @param string|null $moduleName
+ * @param string $requestedName
+ * @param bool $result
+ * @dataProvider isModuleEnabledDataProvider
+ */
+ public function testIsModuleEnabled($moduleName, $requestedName, $result)
+ {
+ $this->moduleManagerMock->expects($this->once())
+ ->method('isEnabled')
+ ->with($this->equalTo($requestedName))
+ ->will($this->returnValue($result));
+
+ $this->moduleManagerMock->expects($this->once())
+ ->method('isOutputEnabled')
+ ->with($this->equalTo($requestedName))
+ ->will($this->returnValue($result));
+ $this->assertSame($result, $this->helper->isModuleEnabled($moduleName));
+ $this->assertSame($result, $this->helper->isModuleOutputEnabled($moduleName));
+ }
+
+ /**
+ * @return array
+ */
+ public function isModuleEnabledDataProvider()
+ {
+ return [
+ [null, '', true],
+ [null, '', false],
+ ['Module_Name', 'Module_Name', false],
+ ['Module\\Name', 'Module\\Name', true],
+ ];
+ }
+
+ /**
+ * @covers \Magento\Framework\App\Helper\AbstractHelper::urlEncode
+ * @covers \Magento\Framework\App\Helper\AbstractHelper::urlDecode
+ */
+ public function testUrlDecode()
+ {
+ $data = uniqid();
+ $result = $this->helper->urlEncode($data);
+ $this->urlBuilderMock->expects($this->once())
+ ->method('sessionUrlVar')
+ ->with($this->equalTo($data))
+ ->will($this->returnValue($result));
+ $this->assertNotContains('&', $result);
+ $this->assertNotContains('%', $result);
+ $this->assertNotContains('+', $result);
+ $this->assertNotContains('=', $result);
+ $this->assertEquals($result, $this->helper->urlDecode($result));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
new file mode 100644
index 00000000000..87b5860c8ee
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tests for \Magento\Framework\Data\Form\Element\Date
+ */
+namespace Magento\Framework\Data\Form\Element;
+
+class DateTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\Data\Form\Element\Date
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Framework\Data\Form\Element\Factory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $factoryMock;
+
+ /**
+ * @var \Magento\Framework\Data\Form\Element\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $collectionFactoryMock;
+
+ /**
+ * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $escaperMock;
+
+ protected function setUp()
+ {
+ $this->factoryMock = $this->getMock('Magento\Framework\Data\Form\Element\Factory', array(), array(), '', false);
+ $this->collectionFactoryMock = $this->getMock(
+ 'Magento\Framework\Data\Form\Element\CollectionFactory',
+ array(),
+ array(),
+ '',
+ false
+ );
+ $this->escaperMock = $this->getMock('Magento\Framework\Escaper', array(), array(), '', false);
+ $this->model = new Date(
+ $this->factoryMock,
+ $this->collectionFactoryMock,
+ $this->escaperMock
+ );
+ }
+
+ public function testGetElementHtmlException()
+ {
+ $this->setExpectedException(
+ 'Exception',
+ 'Output format is not specified. Please, specify "format" key in constructor, or set it using setFormat().'
+ );
+ $formMock = $this->getFormMock('never');
+ $this->model->setForm($formMock);
+ $this->model->getElementHtml();
+ }
+
+ /**
+ * @param $fieldName
+ * @dataProvider providerGetElementHtmlDateFormat
+ */
+ public function testGetElementHtmlDateFormat($fieldName)
+ {
+
+ $formMock = $this->getFormMock('once');
+ $this->model->setForm($formMock);
+
+ $this->model->setData(array(
+ $fieldName => 'yyyy-MM-dd',
+ 'name' => 'test_name',
+ 'html_id' => 'test_name',
+ ));
+ $this->model->getElementHtml();
+ }
+
+ public function providerGetElementHtmlDateFormat()
+ {
+ return array(
+ array('date_format'),
+ array('format'),
+ );
+ }
+
+ protected function getFormMock($exactly)
+ {
+ $functions = array('getFieldNameSuffix', 'getHtmlIdPrefix', 'getHtmlIdSuffix');
+ $formMock = $this->getMock(
+ 'stdClass',
+ $functions,
+ array(),
+ '',
+ false
+ );
+ foreach ($functions as $method) {
+ switch($exactly) {
+ case 'once':
+ $count = $this->once();
+ break;
+ case 'never':
+ default:
+ $count = $this->never();
+ }
+ $formMock->expects($count)->method($method);
+ }
+
+ return $formMock;
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Exception/AuthorizationExceptionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Exception/AuthorizationExceptionTest.php
index a3d79c7c6a0..d7fba24ac28 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Exception/AuthorizationExceptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Exception/AuthorizationExceptionTest.php
@@ -31,6 +31,6 @@ class AuthorizationExceptionTest extends \PHPUnit_Framework_TestCase
AuthorizationException::NOT_AUTHORIZED,
['consumer_id' => 1, 'resources' => 'record2']
);
- $this->assertSame('Consumer ID 1 is not authorized to access record2', $authorizationException->getMessage());
+ $this->assertSame('Consumer is not authorized to access record2', $authorizationException->getMessage());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
index 33bcd4f14ab..2f92bf8265b 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
@@ -864,10 +864,10 @@ HANDLE;
$integrationCollection = $this->getMockBuilder('\Magento\Integration\Model\Resource\Integration\Collection')
->disableOriginalConstructor()
- ->setMethods(['addUnsecureEndpointFilter', 'getSize'])
+ ->setMethods(['addUnsecureUrlsFilter', 'getSize'])
->getMock();
$integrationCollection->expects($this->any())
- ->method('addUnsecureEndpointFilter')
+ ->method('addUnsecureUrlsFilter')
->will($this->returnValue($integrationCollection));
$integrationCollection->expects($this->any())
->method('getSize')
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/StatusTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/StatusTest.php
index 4a5ba899285..5fbe4fab94d 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/StatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/StatusTest.php
@@ -30,6 +30,136 @@ namespace Magento\Sales\Model\Order;
*/
class StatusTest extends \PHPUnit_Framework_TestCase
{
+ /**
+ * @var \Magento\Sales\Model\Resource\Order\Status|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resourceMock;
+
+ /**
+ * @var \Magento\Framework\Event\Manager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $eventManagerMock;
+
+ /**
+ * @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $contextMock;
+
+ /**
+ * @var \Magento\Sales\Model\Order\Status
+ */
+ protected $model;
+
+ /**
+ * SetUp test
+ */
+ public function setUp()
+ {
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->resourceMock = $this->getMock(
+ 'Magento\Sales\Model\Resource\Order\Status',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->eventManagerMock = $this->getMock(
+ 'Magento\Framework\Event\Manager',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->contextMock = $this->getMock(
+ 'Magento\Framework\Model\Context',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->contextMock->expects($this->once())
+ ->method('getEventDispatcher')
+ ->will($this->returnValue($this->eventManagerMock));
+
+ $this->model = $objectManager->getObject(
+ 'Magento\Sales\Model\Order\Status',
+ [
+ 'context' => $this->contextMock,
+ 'resource' => $this->resourceMock,
+ 'data' => ['status' => 'test_status']
+ ]
+ );
+ }
+
+ /**
+ * Test for method unassignState
+ */
+ public function testUnassignStateSuccess()
+ {
+ $params = [
+ 'status' => $this->model->getStatus(),
+ 'state' => 'test_state'
+ ];
+ $this->resourceMock->expects($this->once())
+ ->method('checkIsStateLast')
+ ->with($this->equalTo($params['state']))
+ ->will($this->returnValue(false));
+ $this->resourceMock->expects($this->once())
+ ->method('checkIsStatusUsed')
+ ->with($this->equalTo($params['status']))
+ ->will($this->returnValue(false));
+ $this->eventManagerMock->expects($this->once())
+ ->method('dispatch')
+ ->with($this->equalTo('sales_order_status_unassign'), $this->equalTo($params));
+
+ $this->resourceMock->expects($this->once())
+ ->method('unassignState')
+ ->with($this->equalTo($params['status']), $this->equalTo($params['state']));
+ $this->assertEquals($this->model, $this->model->unassignState($params['state']));
+ }
+
+ /**
+ * Test for method unassignState state is last
+ *
+ * @expectedException \Magento\Framework\Model\Exception
+ * @expectedExceptionMessage The last status can't be unassigned from its current state.
+ */
+ public function testUnassignStateStateIsLast()
+ {
+ $params = [
+ 'status' => $this->model->getStatus(),
+ 'state' => 'test_state'
+ ];
+ $this->resourceMock->expects($this->once())
+ ->method('checkIsStateLast')
+ ->with($this->equalTo($params['state']))
+ ->will($this->returnValue(true));
+ $this->assertEquals($this->model, $this->model->unassignState($params['state']));
+ }
+
+ /**
+ * Test for method unassignState status in use
+ *
+ * @expectedException \Magento\Framework\Model\Exception
+ * @expectedExceptionMessage Status can't be unassigned, because it is used by existing order(s).
+ */
+ public function testUnassignStateStatusUsed()
+ {
+ $params = [
+ 'status' => $this->model->getStatus(),
+ 'state' => 'test_state'
+ ];
+ $this->resourceMock->expects($this->once())
+ ->method('checkIsStateLast')
+ ->with($this->equalTo($params['state']))
+ ->will($this->returnValue(false));
+ $this->resourceMock->expects($this->once())
+ ->method('checkIsStatusUsed')
+ ->with($this->equalTo($params['status']))
+ ->will($this->returnValue(true));
+ $this->assertEquals($this->model, $this->model->unassignState($params['state']));
+ }
+
/**
* Retrieve prepared for test \Magento\Sales\Model\Order\Status
*
@@ -53,39 +183,9 @@ class StatusTest extends \PHPUnit_Framework_TestCase
return $model;
}
- public function testUnassignState()
- {
- $state = 'test_state';
- $status = 'test_status';
-
- $resource = $this->getMock('Magento\Sales\Model\Resource\Order\Status', array(), array(), '', false);
- $resource->expects($this->once())->method('beginTransaction');
- $resource->expects(
- $this->once()
- )->method(
- 'unassignState'
- )->with(
- $this->equalTo($status),
- $this->equalTo($state)
- );
- $resource->expects($this->once())->method('commit');
-
- $params = array('status' => $status, 'state' => $state);
- $eventDispatcher = $this->getMock('Magento\Framework\Event\ManagerInterface', array(), array(), '', false);
- $eventDispatcher->expects(
- $this->once()
- )->method(
- 'dispatch'
- )->with(
- $this->equalTo('sales_order_status_unassign'),
- $this->equalTo($params)
- );
-
- $model = $this->_getPreparedModel($resource, $eventDispatcher);
- $model->setStatus($status);
- $this->assertInstanceOf('Magento\Sales\Model\Order\Status', $model->unassignState($state));
- }
-
+ /**
+ * Test for method assignState
+ */
public function testAssignState()
{
$state = 'test_state';
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
index 79f2a42c160..45ae3a53be1 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
@@ -89,11 +89,9 @@ class StatusTest extends \PHPUnit_Framework_TestCase
);
$this->configMock = $this->getMock('\Magento\Eav\Model\Config', ['getConnectionName'], [], '', false);
-
- $this->model = new \Magento\Sales\Model\Resource\Order\Status(
- $this->resourceMock,
- new \Magento\Framework\Stdlib\DateTime(),
- $this->configMock
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->model = $objectManager->getObject('Magento\Sales\Model\Resource\Order\Status',
+ ['resource' => $this->resourceMock]
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php b/dev/tests/unit/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php
new file mode 100644
index 00000000000..209e47f1dea
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tax/Service/V1/TaxClassServiceTest.php
@@ -0,0 +1,634 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Tax\Service\V1;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Tax\Service\V1\Data\TaxClass;
+use Magento\Tax\Service\V1\Data\TaxClassBuilder;
+
+/**
+ * Test for \Magento\Tax\Service\V1\TaxClassService
+ */
+class TaxClassServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Tax\Model\Resource\TaxClass\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $taxClassCollectionFactory;
+
+ /**
+ * @var \Magento\Tax\Service\V1\Data\SearchResultsBuilder|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $searchResultBuilder;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Tax\Model\ClassModelFactory
+ */
+ private $taxClassModelFactoryMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Model\ClassModel
+ */
+ private $taxClassModelMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Model\Converter
+ */
+ private $converterMock;
+
+ /**
+ * @var TaxClassBuilder
+ */
+ private $taxClassBuilder;
+
+ /**
+ * @var TaxClassService
+ */
+ private $taxClassService;
+
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ private $objectManager;
+
+ public function setUp()
+ {
+ $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->taxClassModelFactoryMock = $this->getMockBuilder('Magento\Tax\Model\ClassModelFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->taxClassModelMock = $this->getMockBuilder('Magento\Tax\Model\ClassModel')
+ ->disableOriginalConstructor()
+ ->setMethods(['load', 'getId', 'delete', 'save', 'getClassType', '__wakeup'])
+ ->getMock();
+
+ $this->taxClassModelFactoryMock->expects($this->any())
+ ->method('create')
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassBuilder = $this->objectManager->getObject('Magento\Tax\Service\V1\Data\TaxClassBuilder');
+
+ $this->taxClassService = $this->createService();
+ }
+
+ public function testCreateTaxClass()
+ {
+ $taxClassId = 1;;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('save');
+
+ $this->converterMock
+ ->expects($this->once())
+ ->method('createTaxClassModel')
+ ->with($taxClassSample)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->assertEquals($taxClassId, $this->taxClassService->createTaxClass($taxClassSample));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage A class with the same name already exists for ClassType PRODUCT.
+ */
+ public function testCreateTaxClassException()
+ {
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $exceptionMessage = \Magento\Tax\Model\Resource\TaxClass::UNIQUE_TAX_CLASS_MSG . ' already exists.';
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('save')
+ ->will($this->throwException(new \Magento\Framework\Model\Exception($exceptionMessage)));
+
+ $this->taxClassModelMock
+ ->expects($this->never())
+ ->method('getId');
+
+ $this->converterMock
+ ->expects($this->once())
+ ->method('createTaxClassModel')
+ ->with($taxClassSample)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassService->createTaxClass($taxClassSample);
+ }
+
+ public function testCreateTaxClassInvalidData()
+ {
+ $taxClassSample = $this->taxClassBuilder
+ ->create();
+
+ $this->taxClassModelMock
+ ->expects($this->never())
+ ->method('save');
+
+ $this->taxClassModelMock
+ ->expects($this->never())
+ ->method('getId');
+
+ //Make sure that the conversion is avoided in case of data validation
+ $this->converterMock
+ ->expects($this->never())
+ ->method('createTaxClassModel');
+
+ try {
+ $this->taxClassService->createTaxClass($taxClassSample);
+ } catch (InputException $e) {
+ $errors = $e->getErrors();
+ $this->assertEquals('class_name is a required field.', $errors[0]->getMessage());
+ $this->assertEquals('class_type is a required field.', $errors[1]->getMessage());
+ }
+ }
+
+ public function testGetTaxClass()
+ {
+ $taxClassId = 1;
+
+ $taxClassDataObjectMock = $this->getMockBuilder('Magento\Tax\Service\V1\Data\TaxClass')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->converterMock->expects($this->once())
+ ->method('createTaxClassData')
+ ->with($this->taxClassModelMock)
+ ->will($this->returnValue($taxClassDataObjectMock));
+
+ $this->assertEquals($taxClassDataObjectMock, $this->taxClassService->getTaxClass($taxClassId));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ * @expectedExceptionMessage No such entity with class_id = -9999
+ */
+ public function testGetTaxClassWithNoSuchEntityException()
+ {
+ $taxClassId = -9999;
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue(null));
+
+ $this->taxClassService->getTaxClass($taxClassId);
+ }
+
+ public function testUpdateTaxClassSuccess()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock
+ ->expects($this->exactly(2))
+ ->method('getClassType')
+ ->will($this->returnValue(TaxClass::TYPE_PRODUCT));
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('save');
+
+ $this->converterMock
+ ->expects($this->once())
+ ->method('createTaxClassModel')
+ ->with($taxClassSample)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->assertTrue($this->taxClassService->updateTaxClass($taxClassId, $taxClassSample));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage class_name is a required field.
+ */
+ public function testUpdateTaxClassInvalidDataNoClassName()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->create();
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage class_type is a required field.
+ */
+ public function testUpdateTaxClassInvalidDataNoClassType()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage Invalid value of "Invalid Class Type" provided for the class_type field.
+ */
+ public function testUpdateTaxClassInvalidDataInvalidClassType()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType('Invalid Class Type')
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage class_id is not expected for this request.
+ */
+ public function testUpdateTaxClassWithClassIdInDataObject()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassId($taxClassId)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage Invalid value of "" provided for the taxClassId field.
+ */
+ public function testUpdateTaxClassNoTaxClassId()
+ {
+ $taxClassId = null;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testUpdateTaxClassNotExistingEntity()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue(null));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage Updating classType is not allowed.
+ */
+ public function testUpdateTaxClassInvalidClassTypeSwitched()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('getClassType')
+ ->will($this->returnValue(TaxClass::TYPE_PRODUCT));
+
+ $convertedTaxClassModelMock = $this->getMockBuilder('Magento\Tax\Model\ClassModel')
+ ->disableOriginalConstructor()
+ ->setMethods(['getClassType', '__wakeup'])
+ ->getMock();
+
+ $convertedTaxClassModelMock
+ ->expects($this->once())
+ ->method('getClassType')
+ ->will($this->returnValue(TaxClass::TYPE_CUSTOMER));
+
+ $this->converterMock
+ ->expects($this->once())
+ ->method('createTaxClassModel')
+ ->with($taxClassSample)
+ ->will($this->returnValue($convertedTaxClassModelMock));
+
+ $this->taxClassService->updateTaxClass($taxClassId, $taxClassSample);
+ }
+
+ public function testUpdateTaxClassSaveFailure()
+ {
+ $taxClassId = 1;
+
+ $taxClassSample = $this->taxClassBuilder
+ ->setClassType(TaxClass::TYPE_PRODUCT)
+ ->setClassName('Wholesale product')
+ ->create();
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock
+ ->expects($this->exactly(2))
+ ->method('getClassType')
+ ->will($this->returnValue(TaxClass::TYPE_PRODUCT));
+
+ $this->converterMock
+ ->expects($this->once())
+ ->method('createTaxClassModel')
+ ->with($taxClassSample)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock
+ ->expects($this->once())
+ ->method('save')
+ ->will($this->throwException(new \Exception()));;
+
+ $this->assertFalse($this->taxClassService->updateTaxClass($taxClassId, $taxClassSample));
+ }
+
+ public function testDeleteModelDeleteThrowsException()
+ {
+ $taxClassId = 1;
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('delete')
+ ->will($this->throwException(new \Exception()));
+
+ $this->assertFalse($this->taxClassService->deleteTaxClass($taxClassId));
+ }
+
+ public function testDeleteModelDeleteSuccess()
+ {
+ $taxClassId = 1;
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue($taxClassId));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('delete');
+
+ $this->assertTrue($this->taxClassService->deleteTaxClass($taxClassId));
+ }
+
+ /**
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testDeleteNonExistentModel()
+ {
+ $taxClassId = 1;
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('load')
+ ->with($taxClassId)
+ ->will($this->returnValue($this->taxClassModelMock));
+
+ $this->taxClassModelMock->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue(null));
+
+ $this->taxClassService->deleteTaxClass($taxClassId);
+ }
+
+ public function testSearch()
+ {
+ $collectionSize = 3;
+ $currentPage = 1;
+ $pageSize = 10;
+ $searchCriteria = $this->createSearchCriteria();
+ $this->searchResultBuilder->expects($this->once())->method('setSearchCriteria')->with($searchCriteria);
+ /** @var \PHPUnit_Framework_MockObject_MockObject $collectionMock */
+ $collectionMock = $this->getMockBuilder('Magento\Tax\Model\Resource\TaxClass\Collection')
+ ->disableOriginalConstructor()
+ ->setMethods(['addFieldToFilter', 'getSize', 'setCurPage', 'setPageSize', 'getItems', 'addOrder'])
+ ->getMock();
+ $this->taxClassCollectionFactory
+ ->expects($this->once())
+ ->method('create')
+ ->will($this->returnValue($collectionMock));
+ $collectionMock->expects($this->exactly(2))->method('addFieldToFilter');
+ $collectionMock->expects($this->any())->method('getSize')->will($this->returnValue($collectionSize));
+ $collectionMock->expects($this->once())->method('setCurPage')->with($currentPage);
+ $collectionMock->expects($this->once())->method('setPageSize')->with($pageSize);
+ $collectionMock->expects($this->once())->method('addOrder')->with('class_name', 'ASC');
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject $taxClassModelMock */
+ $taxClassModelMock = $this->getMockBuilder('Magento\Tax\Model\ClassModel')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $collectionMock->expects($this->once())->method('getItems')->will($this->returnValue([$taxClassModelMock]));
+ /** @var \PHPUnit_Framework_MockObject_MockObject $taxMock */
+ $taxClassMock = $this->getMockBuilder('Magento\Tax\Service\V1\Data\TaxClass')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->converterMock
+ ->expects($this->once())
+ ->method('createTaxClassData')
+ ->with($taxClassModelMock)
+ ->will($this->returnValue($taxClassMock));
+ $this->searchResultBuilder
+ ->expects($this->once())
+ ->method('setItems')
+ ->will($this->returnValue([$taxClassMock]));
+
+ $this->taxClassService->searchTaxClass($searchCriteria);
+ }
+
+ /**
+ * @return TaxClassService
+ */
+ private function createService()
+ {
+ $this->taxClassCollectionFactory = $this
+ ->getMockBuilder('Magento\Tax\Model\Resource\TaxClass\CollectionFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create', 'getIterator'])
+ ->getMock();
+
+ $this->searchResultBuilder = $this
+ ->getMockBuilder('Magento\Tax\Service\V1\Data\SearchResultsBuilder')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->converterMock = $this->getMockBuilder('Magento\Tax\Model\Converter')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $taxClassService = $this->objectManager->getObject(
+ 'Magento\Tax\Service\V1\TaxClassService',
+ [
+ 'taxClassCollectionFactory' => $this->taxClassCollectionFactory,
+ 'taxClassModelFactory' => $this->taxClassModelFactoryMock,
+ 'searchResultsBuilder' => $this->searchResultBuilder,
+ 'converter' => $this->converterMock
+ ]
+ );
+
+ return $taxClassService;
+ }
+
+ /**
+ * @return \Magento\Framework\Service\V1\Data\SearchCriteria
+ */
+ private function createSearchCriteria()
+ {
+ /** @var \Magento\Framework\Service\V1\Data\Search\FilterGroupBuilder $filterGroupBuilder */
+ $filterGroupBuilder = $this->objectManager->getObject(
+ 'Magento\Framework\Service\V1\Data\Search\FilterGroupBuilder'
+ );
+ /** @var \Magento\Framework\Service\V1\Data\SearchCriteriaBuilder $searchCriteriaBuilder */
+ $searchCriteriaBuilder = $this->objectManager->getObject(
+ 'Magento\Framework\Service\V1\Data\SearchCriteriaBuilder',
+ ['filterGroupBuilder' => $filterGroupBuilder]
+ );
+ /** @var \Magento\Framework\Service\V1\Data\FilterBuilder $filterBuilder */
+ $filterBuilder = $this->objectManager->getObject('Magento\Framework\Service\V1\Data\FilterBuilder');
+ $productTaxClass = [TaxClass::KEY_NAME => 'Taxable Goods', TaxClass::KEY_TYPE => 'PRODUCT'];
+ $customerTaxClass = [TaxClass::KEY_NAME => 'Retail Customer', TaxClass::KEY_TYPE => 'CUSTOMER'];
+
+ $filter1 = $filterBuilder->setField(TaxClass::KEY_NAME)
+ ->setValue($productTaxClass[TaxClass::KEY_NAME])
+ ->create();
+ $filter2 = $filterBuilder->setField(TaxClass::KEY_NAME)
+ ->setValue($customerTaxClass[TaxClass::KEY_NAME])
+ ->create();
+ $filter3 = $filterBuilder->setField(TaxClass::KEY_TYPE)
+ ->setValue($productTaxClass[TaxClass::KEY_TYPE])
+ ->create();
+ $filter4 = $filterBuilder->setField(TaxClass::KEY_TYPE)
+ ->setValue($customerTaxClass[TaxClass::KEY_TYPE])
+ ->create();
+
+ /**
+ * (class_name == 'Retail Customer' || class_name == 'Taxable Goods)
+ * && ( class_type == 'CUSTOMER' || class_type == 'PRODUCT')
+ */
+ $searchCriteriaBuilder->addFilter([$filter1, $filter2]);
+ $searchCriteriaBuilder->addFilter([$filter3, $filter4]);
+ $searchCriteria = $searchCriteriaBuilder
+ ->setCurrentPage(1)
+ ->setPageSize(10)
+ ->setSortOrders(['class_name' => 1])
+ ->create();
+ return $searchCriteria;
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/ContextTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/ContextTest.php
index 29fed72c41e..78f88204505 100644
--- a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/ContextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/ContextTest.php
@@ -30,12 +30,12 @@ class ContextTest extends \PHPUnit_Framework_TestCase
/**
* @var \Magento\Tools\I18n\Code\Context
*/
- protected $_context;
+ protected $context;
protected function setUp()
{
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_context = $objectManagerHelper->getObject('Magento\Tools\I18n\Code\Context');
+ $this->context = $objectManagerHelper->getObject('Magento\Tools\I18n\Code\Context');
}
/**
@@ -45,7 +45,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
*/
public function testGetContextByPath($context, $path)
{
- $this->assertEquals($context, $this->_context->getContextByPath($path));
+ $this->assertEquals($context, $this->context->getContextByPath($path));
}
/**
@@ -55,7 +55,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
{
return array(
array(array(Context::CONTEXT_TYPE_MODULE, 'Magento_Module'), '/app/code/Magento/Module/Block/Test.php'),
- array(array(Context::CONTEXT_TYPE_THEME, 'theme/test.phtml'), '/app/design/theme/test.phtml'),
+ array(array(Context::CONTEXT_TYPE_THEME, 'area/theme/test.phtml'), '/app/design/area/theme/test.phtml'),
array(array(Context::CONTEXT_TYPE_LIB, 'lib/web/module/test.phtml'), '/lib/web/module/test.phtml'),
);
}
@@ -66,7 +66,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
*/
public function testGetContextByPathWithInvalidPath()
{
- $this->_context->getContextByPath('invalid_path');
+ $this->context->getContextByPath('invalid_path');
}
/**
@@ -76,7 +76,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
*/
public function testBuildPathToLocaleDirectoryByContext($path, $context)
{
- $this->assertEquals($path, $this->_context->buildPathToLocaleDirectoryByContext($context[0], $context[1]));
+ $this->assertEquals($path, $this->context->buildPathToLocaleDirectoryByContext($context[0], $context[1]));
}
/**
@@ -97,6 +97,6 @@ class ContextTest extends \PHPUnit_Framework_TestCase
*/
public function testBuildPathToLocaleDirectoryByContextWithInvalidType()
{
- $this->_context->buildPathToLocaleDirectoryByContext('invalid_type', 'Magento_Module');
+ $this->context->buildPathToLocaleDirectoryByContext('invalid_type', 'Magento_Module');
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php
index 193d16bcba1..7eefd5a326d 100644
--- a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/GeneratorTest.php
@@ -23,65 +23,73 @@
*/
namespace Magento\Test\Tools\I18n\Code\Dictionary;
-use Magento\Tools\I18n\Code\Context;
-
/**
- * @SuppressWarnings(PHPMD.LongVariable)
+ * Generator test
*/
class GeneratorTest extends \PHPUnit_Framework_TestCase
{
/**
* @var \Magento\Tools\I18n\Code\Parser\Parser|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_parserMock;
+ protected $parserMock;
/**
* @var \Magento\Tools\I18n\Code\Parser\Contextual|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_contextualParserMock;
+ protected $contextualParserMock;
/**
* @var \Magento\Tools\I18n\Code\Factory|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_factoryMock;
+ protected $factoryMock;
/**
* @var \Magento\Tools\I18n\Code\Dictionary\WriterInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_writerMock;
+ protected $writerMock;
/**
* @var \Magento\Tools\I18n\Code\Dictionary\Generator
*/
- protected $_generator;
+ protected $generator;
+
+ /**
+ * @var \Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $optionsResolverFactory;
protected function setUp()
{
- $this->_parserMock = $this->getMock('Magento\Tools\I18n\Code\Parser\Parser', array(), array(), '', false);
- $this->_contextualParserMock = $this->getMock(
+ $this->parserMock = $this->getMock('Magento\Tools\I18n\Code\Parser\Parser', array(), array(), '', false);
+ $this->contextualParserMock = $this->getMock(
'Magento\Tools\I18n\Code\Parser\Contextual',
array(),
array(),
'',
false
);
- $this->_writerMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary\WriterInterface');
- $this->_factoryMock = $this->getMock('Magento\Tools\I18n\Code\Factory', array(), array(), '', false);
- $this->_factoryMock->expects(
- $this->any()
- )->method(
- 'createDictionaryWriter'
- )->will(
- $this->returnValue($this->_writerMock)
+ $this->writerMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary\WriterInterface');
+ $this->factoryMock = $this->getMock('Magento\Tools\I18n\Code\Factory', array(), array(), '', false);
+ $this->factoryMock->expects($this->any())
+ ->method('createDictionaryWriter')
+ ->will($this->returnValue($this->writerMock));
+
+ $this->optionsResolverFactory = $this->getMock(
+ 'Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory',
+ [],
+ [],
+ '',
+ false
);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_generator = $objectManagerHelper->getObject(
+ $this->generator = $objectManagerHelper->getObject(
'Magento\Tools\I18n\Code\Dictionary\Generator',
array(
- 'parser' => $this->_parserMock,
- 'contextualParser' => $this->_contextualParserMock,
- 'factory' => $this->_factoryMock
+ 'parser' => $this->parserMock,
+ 'contextualParser' => $this->contextualParserMock,
+ 'factory' => $this->factoryMock,
+ 'optionsResolver' => $this->optionsResolverFactory
)
);
}
@@ -90,44 +98,123 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
{
$outputFilename = 'test';
- $this->_factoryMock->expects($this->once())->method('createDictionaryWriter')->with($outputFilename);
- $this->_parserMock->expects($this->any())->method('getPhrases')->will($this->returnValue(array()));
-
- $this->_generator->generate(array(), $outputFilename);
+ $phrase = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', [], [], '', false);
+ $this->factoryMock->expects($this->once())
+ ->method('createDictionaryWriter')
+ ->with($outputFilename)
+ ->will($this->returnSelf());
+ $this->parserMock->expects($this->any())->method('getPhrases')->will($this->returnValue(array($phrase)));
+ $options = [];
+ $optionResolver = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Options\Resolver', [], [], '', false);
+ $optionResolver->expects($this->once())
+ ->method('getOptions')
+ ->will($this->returnValue($options));
+ $this->optionsResolverFactory->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo(''), $this->equalTo(false))
+ ->will($this->returnValue($optionResolver));
+ $this->generator->generate('', $outputFilename);
+ $property = new \ReflectionProperty($this->generator, 'writer');
+ $property->setAccessible(true);
+ $this->assertNull($property->getValue($this->generator));
}
public function testUsingRightParserWhileWithoutContextParsing()
{
+ $baseDir = 'right_parser';
+ $outputFilename = 'file.csv';
$filesOptions = array('file1', 'file2');
-
- $this->_parserMock->expects($this->once())->method('parse')->with($filesOptions);
- $this->_parserMock->expects($this->once())->method('getPhrases')->will($this->returnValue(array()));
-
- $this->_generator->generate($filesOptions, 'file.csv');
+ $optionResolver = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Options\Resolver', [], [], '', false);
+ $optionResolver->expects($this->once())
+ ->method('getOptions')
+ ->will($this->returnValue($filesOptions));
+
+ $this->factoryMock->expects($this->once())
+ ->method('createDictionaryWriter')
+ ->with($outputFilename)
+ ->will($this->returnSelf());
+
+ $this->optionsResolverFactory->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo($baseDir), $this->equalTo(false))
+ ->will($this->returnValue($optionResolver));
+ $this->parserMock->expects($this->once())->method('parse')->with($filesOptions);
+ $phrase = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', [], [], '', false);
+ $this->parserMock->expects($this->once())->method('getPhrases')->will($this->returnValue(array($phrase)));
+ $this->generator->generate($baseDir, $outputFilename);
}
public function testUsingRightParserWhileWithContextParsing()
{
+ $baseDir = 'right_parser2';
+ $outputFilename = 'file.csv';
$filesOptions = array('file1', 'file2');
-
- $this->_contextualParserMock->expects($this->once())->method('parse')->with($filesOptions);
- $this->_contextualParserMock->expects($this->once())->method('getPhrases')->will($this->returnValue(array()));
-
- $this->_generator->generate($filesOptions, 'file.csv', true);
+ $optionResolver = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Options\Resolver', [], [], '', false);
+ $optionResolver->expects($this->once())
+ ->method('getOptions')
+ ->will($this->returnValue($filesOptions));
+ $this->optionsResolverFactory->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo($baseDir), $this->equalTo(true))
+ ->will($this->returnValue($optionResolver));
+
+ $this->contextualParserMock->expects($this->once())->method('parse')->with($filesOptions);
+ $phrase = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', [], [], '', false);
+ $this->contextualParserMock->expects($this->once())->method('getPhrases')->will($this->returnValue([$phrase]));
+
+ $this->factoryMock->expects($this->once())
+ ->method('createDictionaryWriter')
+ ->with($outputFilename)
+ ->will($this->returnSelf());
+
+ $this->generator->generate($baseDir, $outputFilename, true);
}
public function testWritingPhrases()
{
+ $baseDir = 'WritingPhrases';
+ $filesOptions = array('file1', 'file2');
+ $optionResolver = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Options\Resolver', [], [], '', false);
+ $optionResolver->expects($this->once())
+ ->method('getOptions')
+ ->will($this->returnValue($filesOptions));
+ $this->optionsResolverFactory->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo($baseDir), $this->equalTo(false))
+ ->will($this->returnValue($optionResolver));
+
$phrases = array(
$this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', array(), array(), '', false),
$this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', array(), array(), '', false)
);
- $this->_parserMock->expects($this->once())->method('getPhrases')->will($this->returnValue($phrases));
+ $this->parserMock->expects($this->once())->method('getPhrases')->will($this->returnValue($phrases));
+ $this->writerMock->expects($this->at(0))->method('write')->with($phrases[0]);
+ $this->writerMock->expects($this->at(1))->method('write')->with($phrases[1]);
- $this->_writerMock->expects($this->at(0))->method('write')->with($phrases[0]);
- $this->_writerMock->expects($this->at(1))->method('write')->with($phrases[1]);
+ $this->generator->generate($baseDir, 'file.csv');
+ }
- $this->_generator->generate(array('file1', 'file2'), 'file.csv');
+ /**
+ * @expectedException \UnexpectedValueException
+ * @expectedExceptionMessage No phrases found in the specified dictionary file.
+ */
+ public function testGenerateWithNoPhrases()
+ {
+ $baseDir = 'no_phrases';
+ $outputFilename = 'no_file.csv';
+ $filesOptions = array('file1', 'file2');
+ $optionResolver = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Options\Resolver', [], [], '', false);
+ $optionResolver->expects($this->once())
+ ->method('getOptions')
+ ->will($this->returnValue($filesOptions));
+ $this->optionsResolverFactory->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo($baseDir), $this->equalTo(true))
+ ->will($this->returnValue($optionResolver));
+
+ $this->contextualParserMock->expects($this->once())->method('parse')->with($filesOptions);
+ $this->contextualParserMock->expects($this->once())->method('getPhrases')->will($this->returnValue([]));
+ $this->generator->generate($baseDir, $outputFilename, true);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverFactoryTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverFactoryTest.php
new file mode 100644
index 00000000000..1796bd29d0b
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverFactoryTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Test\Tools\I18n\Code\Dictionary\Options;
+
+/**
+ * Class ResolverTest
+ */
+class ResolverFactoryTest extends \PHPUnit_Framework_TestCase
+{
+ public function testCreate()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /** @var \Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory $resolverFactory */
+ $resolverFactory = $objectManagerHelper
+ ->getObject('Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory');
+ $this->assertInstanceOf(
+ \Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory::DEFAULT_RESOLVER,
+ $resolverFactory->create('some_dir', true)
+ );
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage stdClass doesn't implement ResolverInterface
+ */
+ public function testCreateException()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /** @var \Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory $resolverFactory */
+ $resolverFactory = $objectManagerHelper->getObject(
+ 'Magento\Tools\I18n\Code\Dictionary\Options\ResolverFactory',
+ [
+ 'resolverClass' => 'stdClass'
+ ]
+ );
+ $resolverFactory->create('some_dir', true);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverTest.php
new file mode 100644
index 00000000000..72745173e17
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/ResolverTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Test\Tools\I18n\Code\Dictionary\Options;
+
+/**
+ * Class ResolverTest
+ */
+class ResolverTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @param string $directory
+ * @param bool $withContext
+ * @param array $result
+ * @dataProvider getOptionsDataProvider
+ */
+ public function testGetOptions($directory, $withContext, $result)
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /** @var \Magento\Tools\I18n\Code\Dictionary\Options\Resolver $resolver */
+ $resolver = $objectManagerHelper->getObject(
+ 'Magento\Tools\I18n\Code\Dictionary\Options\Resolver',
+ [
+ 'directory' => $directory,
+ 'withContext' => $withContext,
+ ]
+ );
+ $this->assertSame($result, $resolver->getOptions());
+ }
+
+ /**
+ * @return array
+ */
+ public function getOptionsDataProvider()
+ {
+ $sourceFirst = __DIR__ . '/_files/source';
+ $sourceSecond = __DIR__ . '/_files/source';
+ return [
+ [
+ $sourceFirst,
+ true,
+ [
+ [
+ 'type' => 'php',
+ 'paths' => [$sourceFirst . '/app/code/', $sourceFirst . '/app/design/'],
+ 'fileMask' => '/\.(php|phtml)$/'
+ ],
+ [
+ 'type' => 'js',
+ 'paths' => [
+ $sourceFirst . '/app/code/',
+ $sourceFirst . '/app/design/',
+ $sourceFirst . '/lib/web/mage/',
+ $sourceFirst . '/lib/web/varien/'
+ ],
+ 'fileMask' => '/\.(js|phtml)$/'
+ ],
+ [
+ 'type' => 'xml',
+ 'paths' => [$sourceFirst . '/app/code/', $sourceFirst . '/app/design/'],
+ 'fileMask' => '/\.xml$/'
+ ]
+ ]
+ ],
+ [
+ $sourceSecond,
+ false,
+ [
+ ['type' => 'php', 'paths' => array($sourceSecond), 'fileMask' => '/\.(php|phtml)$/'],
+ ['type' => 'js', 'paths' => array($sourceSecond), 'fileMask' => '/\.(js|phtml)$/'],
+ ['type' => 'xml', 'paths' => array($sourceSecond), 'fileMask' => '/\.xml$/']
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * @param string $directory
+ * @param bool $withContext
+ * @param string $message
+ * @dataProvider getOptionsWrongDirDataProvider
+ */
+ public function testGetOptionsWrongDir($directory, $withContext, $message)
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /** @var \Magento\Tools\I18n\Code\Dictionary\Options\Resolver $resolver */
+ $resolver = $objectManagerHelper->getObject(
+ 'Magento\Tools\I18n\Code\Dictionary\Options\Resolver',
+ [
+ 'directory' => $directory,
+ 'withContext' => $withContext,
+ ]
+ );
+ $this->setExpectedException('\InvalidArgumentException', $message);
+ $resolver->getOptions();
+ }
+
+ /**
+ * @return array
+ */
+ public function getOptionsWrongDirDataProvider()
+ {
+ return [
+ ['not_exist', true, 'Specified path is not a Magento root directory'],
+ ['not_exist', false, 'Specified path doesn\'t exist'],
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/code/.gitignore b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/code/.gitignore
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/code/.gitignore
@@ -0,0 +1 @@
+
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/design/.gitignore b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/design/.gitignore
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/app/design/.gitignore
@@ -0,0 +1 @@
+
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/mage/.gitignore b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/mage/.gitignore
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/mage/.gitignore
@@ -0,0 +1 @@
+
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/varien/.gitignore b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/varien/.gitignore
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/Options/_files/source/lib/web/varien/.gitignore
@@ -0,0 +1 @@
+
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/PhraseTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/PhraseTest.php
index 88b5fe72463..daefd09e605 100644
--- a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/PhraseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Dictionary/PhraseTest.php
@@ -37,7 +37,6 @@ class PhraseTest extends \PHPUnit_Framework_TestCase
{
$reflectionClass = new \ReflectionClass('Magento\Tools\I18n\Code\Dictionary\Phrase');
$phrase = $reflectionClass->newInstanceArgs($constructArguments);
-
$this->assertEquals($result, $phrase->{$getter}());
}
@@ -87,9 +86,9 @@ class PhraseTest extends \PHPUnit_Framework_TestCase
public function dataProviderWrongParametersWhilePhraseCreation()
{
return array(
- array(array(null, 'translation'), 'Missed phrase.'),
- array(array('phrase', null), 'Missed translation.'),
- array(array('phrase', 'translation', null, new \stdClass()), 'Wrong context type.')
+ array(array(null, 'translation'), 'Missed phrase'),
+ array(array('phrase', null), 'Missed translation'),
+ array(array('phrase', 'translation', null, new \stdClass()), 'Wrong context type')
);
}
@@ -140,7 +139,7 @@ class PhraseTest extends \PHPUnit_Framework_TestCase
/**
* @expectedException \DomainException
- * @expectedExceptionMessage Context value is empty.
+ * @expectedExceptionMessage Context value is empty
*/
public function testAddEmptyContextValue()
{
@@ -178,7 +177,6 @@ class PhraseTest extends \PHPUnit_Framework_TestCase
public function testGetKey()
{
$phrase = new Phrase('phrase', 'translation', 'context_type', 'context_value1');
-
$this->assertEquals('phrase::context_type', $phrase->getKey());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/FactoryTest.php
index 9f4f86575c0..fe9feae5d86 100644
--- a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/FactoryTest.php
@@ -28,20 +28,49 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
/**
* @var \Magento\Tools\I18n\Code\Factory
*/
- protected $_factory;
+ protected $factory;
protected function setUp()
{
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_factory = $objectManagerHelper->getObject('Magento\Tools\I18n\Code\Factory');
+ $this->factory = $objectManagerHelper->getObject('Magento\Tools\I18n\Code\Factory');
}
/**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Writer for "filename.invalid_type" is not exist.
+ * @param string $expectedInstance
+ * @param string $fileName
+ * @dataProvider createDictionaryWriterDataProvider
*/
- public function testGetContextByPathWithInvalidPath()
+ public function testCreateDictionaryWriter($expectedInstance, $fileName)
{
- $this->_factory->createDictionaryWriter('filename.invalid_type');
+ $this->assertInstanceOf(
+ $expectedInstance,
+ $this->factory->createDictionaryWriter($fileName)
+ );
+ }
+
+ /**
+ * @return array
+ */
+ public function createDictionaryWriterDataProvider()
+ {
+ return [
+ [
+ 'Magento\Tools\I18n\Code\Dictionary\Writer\Csv',
+ 'filename.invalid_type'
+ ],
+ [
+ 'Magento\Tools\I18n\Code\Dictionary\Writer\Csv',
+ 'filename'
+ ],
+ [
+ 'Magento\Tools\I18n\Code\Dictionary\Writer\Csv',
+ 'filename.csv'
+ ],
+ [
+ 'Magento\Tools\I18n\Code\Dictionary\Writer\Csv\Stdo',
+ ''
+ ],
+ ];
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Pack/GeneratorTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Pack/GeneratorTest.php
index b39c77cc28f..e7b3ecf535f 100644
--- a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Pack/GeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Pack/GeneratorTest.php
@@ -24,29 +24,29 @@
namespace Magento\Test\Tools\I18n\Code\Pack;
/**
- * @SuppressWarnings(PHPMD.LongVariable)
+ * Generator test
*/
class GeneratorTest extends \PHPUnit_Framework_TestCase
{
/**
* @var \Magento\Tools\I18n\Code\Dictionary\Loader\FileInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_dictionaryLoaderMock;
+ protected $dictionaryLoaderMock;
/**
* @var \Magento\Tools\I18n\Code\Pack\WriterInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_packWriterMock;
+ protected $packWriterMock;
/**
* @var \Magento\Tools\I18n\Code\Factory|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_factoryMock;
+ protected $factoryMock;
/**
* @var \Magento\Tools\I18n\Code\Dictionary|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_dictionaryMock;
+ protected $dictionaryMock;
/**
* @var \Magento\Tools\I18n\Code\Pack\Generator
@@ -55,18 +55,18 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_dictionaryLoaderMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Loader\FileInterface');
- $this->_packWriterMock = $this->getMock('Magento\Tools\I18n\Code\Pack\WriterInterface');
- $this->_factoryMock = $this->getMock('Magento\Tools\I18n\Code\Factory', array(), array(), '', false);
- $this->_dictionaryMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary', array(), array(), '', false);
+ $this->dictionaryLoaderMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Loader\FileInterface');
+ $this->packWriterMock = $this->getMock('Magento\Tools\I18n\Code\Pack\WriterInterface');
+ $this->factoryMock = $this->getMock('Magento\Tools\I18n\Code\Factory', array(), array(), '', false);
+ $this->dictionaryMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary', array(), array(), '', false);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_generator = $objectManagerHelper->getObject(
'Magento\Tools\I18n\Code\Pack\Generator',
array(
- 'dictionaryLoader' => $this->_dictionaryLoaderMock,
- 'packWriter' => $this->_packWriterMock,
- 'factory' => $this->_factoryMock
+ 'dictionaryLoader' => $this->dictionaryLoaderMock,
+ 'packWriter' => $this->packWriterMock,
+ 'factory' => $this->factoryMock
)
);
}
@@ -80,42 +80,56 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
$allowDuplicates = true;
$localeMock = $this->getMock('Magento\Tools\I18n\Code\Locale', array(), array(), '', false);
- $this->_factoryMock->expects(
- $this->once()
- )->method(
- 'createLocale'
- )->with(
- $localeString
- )->will(
- $this->returnValue($localeMock)
- );
- $this->_dictionaryLoaderMock->expects(
- $this->once()
- )->method(
- 'load'
- )->with(
- $dictionaryPath
- )->will(
- $this->returnValue($this->_dictionaryMock)
- );
- $this->_packWriterMock->expects(
- $this->once()
- )->method(
- 'write'
- )->with(
- $this->_dictionaryMock,
- $packPath,
- $localeMock,
- $mode
- );
+ $phrases = [$this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', [], [], '', false)];
+ $this->dictionaryMock->expects($this->once())
+ ->method('getPhrases')
+ ->will($this->returnValue([$phrases]));
+
+ $this->factoryMock->expects($this->once())
+ ->method('createLocale')
+ ->with($localeString)
+ ->will($this->returnValue($localeMock));
+ $this->dictionaryLoaderMock->expects($this->once())
+ ->method('load')
+ ->with($dictionaryPath)
+ ->will($this->returnValue($this->dictionaryMock));
+ $this->packWriterMock->expects($this->once())
+ ->method('write')
+ ->with($this->dictionaryMock, $packPath, $localeMock, $mode);
+
+ $this->_generator->generate($dictionaryPath, $packPath, $localeString, $mode, $allowDuplicates);
+ }
+
+ /**
+ * @expectedExceptionMessage No phrases have been found by the specified path.
+ * @expectedException \UnexpectedValueException
+ */
+ public function testGenerateEmptyFile()
+ {
+ $dictionaryPath = 'dictionary_path';
+ $packPath = 'pack_path';
+ $localeString = 'locale';
+ $mode = 'mode';
+ $allowDuplicates = true;
+ $localeMock = $this->getMock('Magento\Tools\I18n\Code\Locale', array(), array(), '', false);
+
+ $this->factoryMock->expects($this->once())
+ ->method('createLocale')
+ ->with($localeString)
+ ->will($this->returnValue($localeMock));
+ $this->dictionaryLoaderMock->expects($this->once())
+ ->method('load')
+ ->with($dictionaryPath)
+ ->will($this->returnValue($this->dictionaryMock));
$this->_generator->generate($dictionaryPath, $packPath, $localeString, $mode, $allowDuplicates);
}
public function testGenerateWithNotAllowedDuplicatesAndDuplicatesExist()
{
- $error = "Error. The phrase \"phrase1\" is translated differently in 1 places.\n" .
- "Error. The phrase \"phrase2\" is translated differently in 1 places.\n";
+ $error = "Duplicated translation is found, but it is not allowed.\n"
+ . "The phrase \"phrase1\" is translated differently in 1 places.\n"
+ . "The phrase \"phrase2\" is translated differently in 1 places.\n";
$this->setExpectedException('\RuntimeException', $error);
$allowDuplicates = false;
@@ -125,20 +139,16 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
$phraseSecondMock = $this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', array(), array(), '', false);
$phraseSecondMock->expects($this->once())->method('getPhrase')->will($this->returnValue('phrase2'));
- $this->_dictionaryLoaderMock->expects(
- $this->any()
- )->method(
- 'load'
- )->will(
- $this->returnValue($this->_dictionaryMock)
- );
- $this->_dictionaryMock->expects(
- $this->once()
- )->method(
- 'getDuplicates'
- )->will(
- $this->returnValue(array(array($phraseFirstMock), array($phraseSecondMock)))
- );
+ $this->dictionaryLoaderMock->expects($this->any())
+ ->method('load')
+ ->will($this->returnValue($this->dictionaryMock));
+ $phrases = [$this->getMock('Magento\Tools\I18n\Code\Dictionary\Phrase', [], [], '', false)];
+ $this->dictionaryMock->expects($this->once())
+ ->method('getPhrases')
+ ->will($this->returnValue([$phrases]));
+ $this->dictionaryMock->expects($this->once())
+ ->method('getDuplicates')
+ ->will($this->returnValue(array(array($phraseFirstMock), array($phraseSecondMock))));
$this->_generator->generate('dictionary_path', 'pack_path', 'locale', 'mode', $allowDuplicates);
}
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Parser/ParserTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Parser/ParserTest.php
new file mode 100644
index 00000000000..bac7c79b7a5
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/I18n/Code/Parser/ParserTest.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Test\Tools\I18n\Code\Parser;
+
+use Magento\Tools\I18n\Code\Parser as Parser;
+
+class ParserTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Tools\I18n\Code\Parser\AbstractParser|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $parser;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tools\I18n\Code\FilesCollector
+ */
+ protected $filesCollector;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tools\I18n\Code\Factory
+ */
+ protected $factory;
+
+
+ protected function setUp()
+ {
+ $this->filesCollector = $this->getMock('Magento\Tools\I18n\Code\FilesCollector');
+ $this->factory = $this->getMock('Magento\Tools\I18n\Code\Factory');
+
+ $this->parser = new Parser\Parser($this->filesCollector, $this->factory);
+ }
+
+ /**
+ * @param array $options
+ * @param array $phpFiles
+ * @param array $jsFiles
+ * @param array $phpMap
+ * @param array $jsMap
+ * @param array $expectedResult
+ * @dataProvider addPhraseDataProvider
+ */
+ public function testAddPhrase($options, $phpFiles, $jsFiles, $phpMap, $jsMap, $expectedResult)
+ {
+ // 1. Create mocks
+ $phpAdapter = new AdapterStub;
+ $jsAdapter = new AdapterStub;
+
+ // 2. Set mocks
+ $this->parser->addAdapter('php', $phpAdapter);
+ $this->parser->addAdapter('js', $jsAdapter);
+
+ //3. Set fixtures
+ $phpAdapter->setValueMap($phpMap);
+ $jsAdapter->setValueMap($jsMap);
+
+ $this->factory->expects($this->any())->method('createPhrase')->with()->will($this->returnValueMap([
+ [['phrase' => 'php phrase111', 'translation' => 'php phrase111', 'quote' => "'"], 'php phrase111'],
+ [['phrase' => 'php phrase112', 'translation' => 'php phrase112', 'quote' => '"'], 'php phrase112'],
+ [['phrase' => 'php phrase121', 'translation' => 'php phrase121', 'quote' => "'"], 'php phrase121'],
+ [['phrase' => 'php phrase122', 'translation' => 'php phrase122', 'quote' => '"'], 'php phrase122'],
+ [['phrase' => 'js phrase111', 'translation' => 'js phrase111', 'quote' => "'"], 'js phrase111'],
+ [['phrase' => 'js phrase112', 'translation' => 'js phrase112', 'quote' => '"'], 'js phrase112'],
+ [['phrase' => 'js phrase121', 'translation' => 'js phrase121', 'quote' => "'"], 'js phrase121'],
+ [['phrase' => 'js phrase122', 'translation' => 'js phrase122', 'quote' => '"'], 'js phrase122'],
+ ]));
+
+ //4. Set expectations
+ $this->filesCollector->expects($this->any())
+ ->method('getFiles')
+ ->will($this->returnValueMap([
+ [$options[0]['paths'], '', $phpFiles],
+ [$options[1]['paths'], '', $jsFiles],
+ ]));
+
+ $result = $this->parser->parse($options);
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ /**
+ * @return array
+ */
+ public function addPhraseDataProvider()
+ {
+ return [
+ [
+ [
+ ['type' => 'php', 'paths' => ['php/path/1', 'php/path/2']],
+ ['type' => 'js', 'paths' => ['js/path/1', 'js/path/2']],
+ ],
+ ['php/path1/file11', 'php/path1/file12', 'php/path2/file21'],
+ ['js/path1/file11', 'js/path1/file12', 'js/path2/file21'],
+ [
+ 'php/path1/file11' => [
+ [
+ 'phrase' => 'php phrase111',
+ 'quote' => "'"
+ ],
+ [ 'phrase' => 'php phrase112',
+ 'quote' => '"'
+ ]
+ ],
+ 'php/path1/file12' => [
+ [
+ 'phrase' => 'php phrase121',
+ 'quote' => "'"
+ ],
+ [ 'phrase' => 'php phrase122',
+ 'quote' => '"'
+ ]
+ ],
+ 'php/path2/file21' => []
+ ],
+ [
+ 'js/path1/file11' => [
+ [
+ 'phrase' => 'js phrase111',
+ 'quote' => "'"
+ ],
+ [ 'phrase' => 'js phrase112',
+ 'quote' => '"'
+ ]
+ ],
+ 'js/path1/file12' => [
+ [
+ 'phrase' => 'js phrase121',
+ 'quote' => "'"
+ ],
+ [ 'phrase' => 'js phrase122',
+ 'quote' => '"'
+ ]
+ ],
+ 'js/path2/file21' => []
+ ],
+ [
+ 'php phrase111' => 'php phrase111',
+ 'php phrase112' => 'php phrase112',
+ 'php phrase121' => 'php phrase121',
+ 'php phrase122' => 'php phrase122',
+ 'js phrase111' => 'js phrase111',
+ 'js phrase112' => 'js phrase112',
+ 'js phrase121' => 'js phrase121',
+ 'js phrase122' => 'js phrase122',
+ ]
+ ]
+ ];
+ }
+}
+
+class AdapterStub implements Parser\AdapterInterface
+{
+ /**
+ * @var string
+ */
+ private $file;
+
+ /**
+ * @var array
+ */
+ private $map = [];
+
+ /**
+ * {@inheritdoc}
+ */
+ public function parse($file)
+ {
+ $this->file = $file;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPhrases()
+ {
+ return $this->map[$this->file];
+ }
+
+ /**
+ * @param array $map
+ */
+ public function setValueMap($map)
+ {
+ $this->map = $map;
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
index eba8b1b6112..6e5cbd3a23b 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
@@ -31,27 +31,25 @@ class CssTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Framework\ObjectManager|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_objectManager;
- protected function setUp()
- {
- $this->_model = $this->getMock(
- 'Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css',
- array('_getCurrentTheme'),
- $this->_prepareModelArguments(),
- '',
- true
- );
- }
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $urlBuilder;
/**
- * @return array
+ * @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected function _prepareModelArguments()
+ protected $urlCoder;
+
+ protected function setUp()
{
$this->_objectManager = $this->getMock('Magento\Framework\ObjectManager');
+ $this->urlBuilder = $this->getMock('Magento\Backend\Model\Url', [], [], '', false);
+ $this->urlCoder = $this->getMock('Magento\Framework\Encryption\UrlCoder', [], [], '', false);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$constructArguments = $objectManagerHelper->getConstructArguments(
@@ -60,21 +58,24 @@ class CssTest extends \PHPUnit_Framework_TestCase
'formFactory' => $this->getMock('Magento\Framework\Data\FormFactory', array(), array(), '', false),
'objectManager' => $this->_objectManager,
'uploaderService' => $this->getMock(
- 'Magento\Theme\Model\Uploader\Service',
- array(),
- array(),
- '',
- false
- ),
- 'urlBuilder' => $this->getMock('Magento\Backend\Model\Url', array(), array(), '', false)
+ 'Magento\Theme\Model\Uploader\Service',
+ array(),
+ array(),
+ '',
+ false
+ ),
+ 'urlBuilder' => $this->urlBuilder,
+ 'urlCoder' => $this->urlCoder
)
);
- return $constructArguments;
- }
- protected function tearDown()
- {
- unset($this->_model);
+ $this->_model = $this->getMock(
+ 'Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css',
+ array('_getCurrentTheme'),
+ $constructArguments,
+ '',
+ true
+ );
}
public function testGetUploadCssFileNote()
@@ -141,4 +142,18 @@ class CssTest extends \PHPUnit_Framework_TestCase
$method->setAccessible(true);
return $method;
}
+
+ /**
+ * @covers \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css::getDownloadUrl
+ */
+ public function testGetterDownloadUrl()
+ {
+ $fileId = 1;
+ $themeId = 1;
+ $this->urlCoder->expects($this->atLeastOnce())->method('encode')->with($fileId)
+ ->will($this->returnValue('encoded'));
+ $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
+ ->with($this->anything(), ['theme_id' => $themeId, 'file' => 'encoded']);
+ $this->_model->getDownloadUrl($fileId, $themeId);
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php
index 81adb9ca815..c16b6c0f3cc 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php
@@ -267,7 +267,7 @@ class ErrorProcessorTest extends \PHPUnit_Framework_TestCase
'Exception' => array(
new \Exception('Non service exception', 5678),
WebapiException::HTTP_INTERNAL_ERROR,
- 'Non service exception',
+ 'Internal Error. Details are available in Magento log file. Report ID:',
[]
)
);
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php
index 00b5219e10d..21cb30a8561 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php
@@ -222,7 +222,7 @@ class RestTest extends \PHPUnit_Framework_TestCase
$this->_restController->dispatch($this->_requestMock);
/** Ensure that response contains proper error message. */
- $expectedMsg = 'Consumer ID fred is not authorized to access 5, 6';
+ $expectedMsg = 'Consumer is not authorized to access 5, 6';
AuthorizationException::NOT_AUTHORIZED;
$this->assertTrue($this->_responseMock->isException());
$exceptionArray = $this->_responseMock->getException();
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php
index da35a3dd5a4..29756dcb4b4 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php
@@ -35,39 +35,15 @@ class DataTest extends \PHPUnit_Framework_TestCase
*/
protected $_helperData;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_abstractItem;
-
protected function setUp()
{
$this->_product = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
- $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
- $scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(true));
+ $weeeConfig = $this->getMock('Magento\Weee\Model\Config', [], [], '', false);
+ $weeeConfig->expects($this->any())->method('isEnabled')->will($this->returnValue(true));
$weeeTax = $this->getMock('Magento\Weee\Model\Tax', [], [], '', false);
$weeeTax->expects($this->any())->method('getWeeeAmount')->will($this->returnValue('11.26'));
- $this->_abstractItem = $this->getMock(
- '\Magento\Sales\Model\Quote\Item\AbstractItem',
- array(
- '__wakeup',
- 'setDiscountCalculationPrice',
- 'setBaseDiscountCalculationPrice',
- 'getDiscountCalculationPrice',
- 'getBaseDiscountCalculationPrice',
- 'getCalculationPrice',
- 'getBaseCalculationPrice',
- 'setItemDiscountPrices',
- 'getQuote',
- 'getAddress',
- 'getOptionByCode'
- ),
- array(),
- '',
- false
- );
$arguments = array(
- 'scopeConfig' => $scopeConfig,
+ 'weeeConfig' => $weeeConfig,
'weeeTax' => $weeeTax
);
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -78,58 +54,4 @@ class DataTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals('11.26', $this->_helperData->getAmount($this->_product));
}
-
- /**
- * @covers \Magento\Weee\Helper\Data::addItemDiscountPrices
- * @covers \Magento\Weee\Helper\Data::setItemDiscountPrices
- *
- * @param string $getDiscountPrice
- * @param string $basePrice
- * @param string $price
- * @param string $baseDiscountCalculationPrice
- * @param string $callPriceCalculation
- *
- * @dataProvider addItemDiscountPricesDataProvider
- */
- public function testAddItemDiscountPrices(
- $getDiscountPrice, $basePrice, $price, $baseDiscountCalculationPrice, $callPriceCalculation
- ) {
- $this->_abstractItem->expects($this->once())->method('getDiscountCalculationPrice')
- ->will($this->returnValue($getDiscountPrice));
- $this->_abstractItem->expects($this->once())->method('getBaseDiscountCalculationPrice')
- ->will($this->returnValue($getDiscountPrice));
- $this->_abstractItem->expects($this->exactly($callPriceCalculation))->method('getCalculationPrice')
- ->will($this->returnValue($price));
- $this->_abstractItem->expects($this->exactly($callPriceCalculation))->method('getBaseCalculationPrice')
- ->will($this->returnValue($price));
- $this->_abstractItem->expects($this->once())->method('setDiscountCalculationPrice')
- ->with($basePrice);
- $this->_abstractItem->expects($this->once())->method('setBaseDiscountCalculationPrice')
- ->with($baseDiscountCalculationPrice);
-
- $this->assertEquals(
- $this->_helperData, $this->_helperData->addItemDiscountPrices($this->_abstractItem, $basePrice, $price)
- );
- }
-
- public function addItemDiscountPricesDataProvider()
- {
- return array(
- array(
- 'discount_price' => null,
- 'base_price' => '2',
- 'price' => '1',
- 'base_calculation_price' => '3',
- 'call_price_calculation' => 1
- ),
- array(
- 'discount_price' => '1',
- 'base_price' => '2',
- 'price' => '1',
- 'base_calculation_price' => '3',
- 'call_price_calculation' => 0
- )
- );
- }
-
}
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
index 9a9790902c5..83871288b2f 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
@@ -23,411 +23,628 @@
*/
namespace Magento\Weee\Model\Total\Quote;
-/**
- * @SuppressWarnings(PHPMD.TooManyFields)
- */
+use Magento\Tax\Model\Calculation;
+
class WeeeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_objectMock;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_weeeDataMock;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * Setup tax helper with an array of methodName, returnValue
+ *
+ * @param array $taxConfig
+ * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Helper\Data
*/
- protected $_configMock;
+ protected function setupTaxHelper($taxConfig)
+ {
+ $taxHelper = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false);
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_storeMock;
+ foreach ($taxConfig as $method => $value) {
+ $taxHelper->expects($this->any())->method($method)->will($this->returnValue($value));
+ }
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_quoteItemMock;
+ return $taxHelper;
+ }
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * Setup calculator to return tax rates
+ *
+ * @param array $taxRates
+ * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Model\Calculation
*/
- protected $_mageObjMock;
+ protected function setupTaxCalculation($taxRates)
+ {
+ $storeTaxRate = $taxRates['store_tax_rate'];
+ $customerTaxRate = $taxRates['customer_tax_rate'];
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_productModelMock;
+ $taxCalculation = $this->getMock('Magento\Tax\Model\Calculation', [], [], '', false);
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_contextMock;
+ $rateRequest = new \Magento\Framework\Object();
+ $defaultRateRequest = new \Magento\Framework\Object();
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_storeManagerInterfaceMock;
+ $taxCalculation->expects($this->any())->method('getRateRequest')->will($this->returnValue($rateRequest));
+ $taxCalculation
+ ->expects($this->any())
+ ->method('getRateOriginRequest')
+ ->will($this->returnValue($defaultRateRequest));
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_weeeTaxMock;
+ $taxCalculation
+ ->expects($this->any())
+ ->method('getRate')
+ ->will($this->onConsecutiveCalls($storeTaxRate, $customerTaxRate));
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_taxHelperMock;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_registryMock;
+ return $taxCalculation;
+ }
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * Setup weee helper with an array of methodName, returnValue
+ *
+ * @param array $weeeConfig
+ * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Weee\Helper\Data
*/
- protected $_scopeConfigInterfaceMock;
+ protected function setupWeeeHelper($weeeConfig)
+ {
+ $weeeHelper = $this->getMock('Magento\Weee\Helper\Data', [], [], '', false);
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_quoteModelMock;
+ foreach ($weeeConfig as $method => $value) {
+ $weeeHelper->expects($this->any())->method($method)->will($this->returnValue($value));
+ }
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_addressMock;
+ return $weeeHelper;
+ }
/**
- * @var \Magento\Weee\Model\Total\Quote\Weee
+ * Setup an item mock
+ *
+ * @param float $itemQty
+ * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Model\Quote\Item
*/
- protected $_model;
-
- protected function setUp()
+ protected function setupItemMock($itemQty)
{
- $this->_initializeMockObjects();
- $this->_prepareStaticMockExpects();
- $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_model = $objectManagerHelper->getObject(
- '\Magento\Weee\Model\Total\Quote\Weee',
- array(
- 'weeeData' => $this->_weeeDataMock,
- 'taxConfig' => $this->_configMock
- )
+ $itemMock = $this->getMock(
+ 'Magento\Sales\Model\Quote\Item',
+ [
+ 'getProduct',
+ 'getQuote',
+ 'getAddress',
+ 'getTotalQty',
+ '__wakeup',
+ ],
+ [],
+ '',
+ false
);
- }
- /**
- * Initialize mock objects
- */
- protected function _initializeMockObjects()
- {
- $quoteItemMethods = [
- '__wakeup',
- 'getProduct',
- 'setWeeeTaxAppliedAmount',
- 'setBaseWeeeTaxAppliedAmount',
- 'setWeeeTaxAppliedRowAmount',
- 'setBaseWeeeTaxAppliedRowAmnt',
- 'getHasChildren',
- 'getChildren',
- 'isChildrenCalculated',
- 'getTotalQty',
- 'getQuote'
- ];
+ $productMock = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
+ $itemMock->expects($this->any())->method('getProduct')->will($this->returnValue($productMock));
+ $itemMock->expects($this->any())->method('getTotalQty')->will($this->returnValue($itemQty));
- $this->_storeManagerInterfaceMock = $this->getMock(
- 'Magento\Store\Model\StoreManagerInterface', [], [], '', false
- );
- $this->_weeeTaxMock = $this->getMock(
- '\Magento\Weee\Model\Tax', ['__wakeup', 'getProductWeeeAttributes'], [], '', false
- );
- $this->_taxHelperMock = $this->getMock('\Magento\Tax\Helper\Data', [], [], '', false);
- $this->_registryMock = $this->getMock('\Magento\Framework\Registry', [], [], '', false);
- $this->_scopeConfigInterfaceMock = $this->getMock(
- '\Magento\Framework\App\Config\ScopeConfigInterface', ['isSetFlag', 'getValue'], [], '', false
- );
- $this->_weeeDataMock = $this->getMock('\Magento\Weee\Helper\Data', array(), array(), '', false);
- $this->_configMock = $this->getMock('\Magento\Tax\Model\Config', ['priceIncludesTax'], [], '', false);
- $this->_objectMock = $this->getMock('\Magento\Framework\Object', [], [], '', false);
- $this->_storeMock = $this->getMock('\Magento\Store\Model\Store', ['__wakeup', 'convertPrice'], [], '', false);
- $this->_quoteItemMock = $this->getMock('Magento\Sales\Model\Quote\Item', $quoteItemMethods, [], '', false);
- $this->_productModelMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
- $this->_quoteModelMock = $this->getMock('\Magento\Sales\Model\Quote',
- ['__wakeup', 'getBillingAddress', 'getStore'], [], '', false);
- $this->_addressMock = $this->getMock('\Magento\Sales\Model\Quote\Address', [
- '__wakeup',
- 'unsSubtotalInclTax',
- 'unsBaseSubtotalInclTax',
- 'getAllItems',
- 'getQuote',
- 'getAllNonNominalItems',
- 'getPrice'
- ], [], '', false);
+ return $itemMock;
}
/**
- * Prepare expects for mocked objects
+ * Setup address mock
+ *
+ * @param \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Model\Quote\Item $itemMock
+ * @return \PHPUnit_Framework_MockObject_MockObject
*/
- protected function _prepareStaticMockExpects()
+ protected function setupAddressMock($itemMock)
{
- $this->_addressMock->expects($this->any())->method('getQuote')
- ->will($this->returnValue($this->_quoteModelMock));
- $this->_addressMock->expects($this->any())->method('getAllItems')
- ->will($this->returnValue($this->_quoteModelMock));
- $this->_quoteModelMock->expects($this->any())->method('getStore')
- ->will($this->returnValue($this->_storeMock));
- $this->_quoteModelMock->expects($this->any())->method('getBillingAddress')
- ->will($this->returnValue($this->_addressMock));
- $this->_quoteModelMock->expects($this->any())->method('getPrice')
- ->will($this->returnValue(1));
- $this->_quoteItemMock->expects($this->any())->method('getProduct')
- ->will($this->returnValue($this->_productModelMock));
- $this->_quoteItemMock->expects($this->any())->method('getTotalQty')
- ->will($this->returnValue(1));
- $this->_quoteItemMock->expects($this->any())->method('getQuote')
- ->will($this->returnValue($this->_quoteModelMock));
- $this->_scopeConfigInterfaceMock->expects($this->any())->method('isSetFlag')
- ->will($this->returnValue(true));
- $this->_weeeTaxMock->expects($this->any())->method('getProductWeeeAttributes')
- ->will($this->returnValue(array($this->_objectMock)));
- $this->_weeeDataMock->expects($this->any())->method('getProductWeeeAttributes')
- ->will($this->returnValue(array($this->_objectMock)));
- $this->_weeeDataMock->expects($this->any())->method('getApplied')
- ->will($this->returnValue(array()));
- $this->_storeMock->expects($this->any())->method('convertPrice')
- ->will($this->returnValue(1));
- }
+ $addressMock = $this->getMock(
+ 'Magento\Sales\Model\Quote\Address',
+ [
+ '__wakeup',
+ 'getAllNonNominalItems',
+ 'getQuote',
+ ],
+ [],
+ '',
+ false
+ );
- /**
- * Collect items and apply discount to weee
- */
- public function testCollectWithAddItemDiscountPrices()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->once())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $quoteMock = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false);
+ $storeMock = $this->getMock('Magento\Store\Model\Store', ['__wakeup', 'convertPrice'], [], '', false);
+ $storeMock->expects($this->any())->method('convertPrice')->will($this->returnArgument(0));
+ $quoteMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
- /**
- * Collect items without applying discount to weee
- */
- public function testCollectWithoutAddItemDiscountPrices()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->never())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $addressMock->expects($this->any())->method('getAllNonNominalItems')->will($this->returnValue([$itemMock]));
+ $addressMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
- /**
- * Collect items without address item
- */
- public function testCollectWithoutAddressItem()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array()));
- $this->_addressMock->expects($this->never())->method('setAppliedTaxesReset');
- $this->_model->collect($this->_addressMock);
+ return $addressMock;
}
/**
- * Collect items with child
+ * Verify that correct fields of item has been set
+ *
+ * @param \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Model\Quote\Item $item
+ * @param $itemData
*/
- public function testCollectWithChildItem()
+ public function verifyItem(\Magento\Sales\Model\Quote\Item $item, $itemData)
{
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_quoteItemMock->expects($this->once())->method('isChildrenCalculated')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
+ foreach ($itemData as $key => $value) {
+ $this->assertEquals($value, $item->getData($key), 'item ' . $key . ' is incorrect');
+ }
}
/**
- * Collect items with price that includes tax
+ * Verify that correct fields of address has been set
*
- * @param array
+ * @param \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Model\Quote\Address $address
+ * @param $itemData
*/
- public function testCollectPriceIncludesTax()
+ public function verifyAddress(\Magento\Sales\Model\Quote\Address $address, $addressData)
{
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_addressMock->expects($this->once())->method('getAllNonNominalItems');
- $this->_addressMock->expects($this->once())->method('getAllNonNominalItems');
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->once())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_configMock->expects($this->once())->method('priceIncludesTax')
- ->will($this->returnValue(false));
- $this->_model->collect($this->_addressMock);
+ foreach ($addressData as $key => $value) {
+ $this->assertEquals($value, $address->getData($key), 'address ' . $key . ' is incorrect');
+ }
}
/**
- * Collect items with price that does not include tax
+ * Test the collect function of the weee collector
*
- * @param array
+ * @param array $taxConfig
+ * @param array $weeeConfig
+ * @param array $taxRates
+ * @param array $itemData
+ * @param float $itemQty
+ * @param array $addressData
+ * @dataProvider collectDataProvider
*/
- public function testCollectPriceNotIncludesTax()
+ public function testCollect($taxConfig, $weeeConfig, $taxRates, $itemData, $itemQty, $addressData = [])
{
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->once())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_configMock->expects($this->once())->method('priceIncludesTax')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $itemMock = $this->setupItemMock($itemQty);
+ $addressMock = $this->setupAddressMock($itemMock);
- /**
- * Collect taxable items
- */
- public function testCollectTaxable()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_addressMock->expects($this->once())->method('unsSubtotalInclTax');
- $this->_addressMock->expects($this->once())->method('unsBaseSubtotalInclTax');
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->once())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_configMock->expects($this->once())->method('priceIncludesTax')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $taxHelper = $this->setupTaxHelper($taxConfig);
+ $weeeHelper = $this->setupWeeeHelper($weeeConfig);
+ $calculator = $this->setupTaxCalculation($taxRates);
- /**
- * Collect does not taxable items
- */
- public function testCollectDataStoreDisabled()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_addressMock->expects($this->never())->method('unsSubtotalInclTax');
- $this->_addressMock->expects($this->never())->method('unsBaseSubtotalInclTax');
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->any())->method('includeInSubtotal')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->once(0))->method('isEnabled')
- ->will($this->returnValue(false));
- $this->_configMock->expects($this->never())->method('priceIncludesTax')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $arguments = [
+ 'taxData' => $taxHelper,
+ 'calculation' => $calculator,
+ '_weeeData' => $weeeHelper,
+ ];
- /**
- * Collect items and apply discount to weee
- */
- public function testCollectWithChildren()
- {
- $childQuoteItemMock = $this->getMock('Magento\Sales\Model\Quote\Item', [], [], '', false);
-
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_quoteItemMock->expects($this->any())->method('getHasChildren')
- ->will($this->returnValue(true));
- $this->_quoteItemMock->expects($this->any())->method('isChildrenCalculated')
- ->will($this->returnValue(true));
- $this->_quoteItemMock->expects($this->any())->method('getChildren')
- ->will($this->returnValue(array($childQuoteItemMock)));
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->once())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->weeeCollector = $helper->getObject('Magento\Weee\Model\Total\Quote\Weee', $arguments);
- public function testCollectWeeeIncludeInSubtotal()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(array($this->_quoteItemMock)));
- $this->_weeeDataMock->expects($this->any())->method('isDiscounted')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('isTaxable')
- ->will($this->returnValue(false));
- $this->_weeeDataMock->expects($this->once())->method('addItemDiscountPrices');
- $this->_weeeDataMock->expects($this->any())->method('isEnabled')
- ->will($this->returnValue(true));
- $this->_weeeDataMock->expects($this->any())->method('includeInSubtotal')
- ->will($this->returnValue(true));
- $this->_model->collect($this->_addressMock);
- }
+ $this->weeeCollector->collect($addressMock);
- /**
- * Collect empty items
- */
- public function testCollectWithoutItems()
- {
- $this->_addressMock->expects($this->any())->method('getAllNonNominalItems')
- ->will($this->returnValue(null));
- $this->assertEquals($this->_model, $this->_model->collect($this->_addressMock));
+ $this->verifyItem($itemMock, $itemData);
+ $this->verifyAddress($addressMock, $addressData);
}
/**
- * Fetch method test
+ * Data provider for testCollect
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * Multiple datasets
+ *
+ * @return array
*/
- public function testFetch()
+ public function collectDataProvider()
{
- $this->assertEquals($this->_model, $this->_model->fetch($this->_addressMock));
- }
+ $data = [];
+ $data['price_incl_tax_weee_taxable_unit'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => true,
+ 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => true,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 9.24,
+ 'base_weee_tax_applied_amount' => 9.24,
+ 'weee_tax_applied_row_amount' => 18.48,
+ 'base_weee_tax_applied_row_amnt' => 18.48,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 10,
+ 'base_extra_taxable_amount' => 10,
+ 'extra_row_taxable_amount' => 20,
+ 'base_extra_row_taxable_amount' => 20,
+ ],
+ 'item_qty' => 2,
+ 'address_data' => [
+ 'subtotal_incl_tax' => 20,
+ 'base_subtotal_incl_tax' => 20,
+ 'subtotal' => 18.48,
+ 'base_subtotal' => 18.48,
+ 'extra_tax_amount' => 0,
+ 'base_extra_tax_amount' => 0,
+ ]
+ ];
- /**
- * Process configuration array
- */
- public function testProcessConfigArray()
- {
- $this->assertEquals(
- $this->_configMock, $this->_model->processConfigArray($this->_configMock, $this->_storeMock)
- );
- }
+ $data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => true,
+ 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => false,
+ 'isTaxable' => true,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 9.24,
+ 'base_weee_tax_applied_amount' => 9.24,
+ 'weee_tax_applied_row_amount' => 18.48,
+ 'base_weee_tax_applied_row_amnt' => 18.48,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 10,
+ 'base_extra_taxable_amount' => 10,
+ 'extra_row_taxable_amount' => 20,
+ 'base_extra_row_taxable_amount' => 20,
+ ],
+ 'item_qty' => 2,
+ 'address_data' => [
+ 'subtotal_incl_tax' => 20,
+ 'base_subtotal_incl_tax' => 20,
+ 'subtotal' => 0,
+ 'base_subtotal' => 0,
+ 'extra_tax_amount' => 18.48,
+ 'base_extra_tax_amount' => 18.48,
+ ]
+ ];
- /**
- * Get label
- */
- public function testGetLabel()
- {
- $this->assertEquals('', $this->_model->getLabel());
+ $data['price_excl_tax_weee_taxable_unit'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => false,
+ 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => true,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 10,
+ 'base_weee_tax_applied_amount' => 10,
+ 'weee_tax_applied_row_amount' => 20,
+ 'base_weee_tax_applied_row_amnt' => 20,
+ 'weee_tax_applied_amount_incl_tax' => 10.83,
+ 'base_weee_tax_applied_amount_incl_tax' => 10.83,
+ 'weee_tax_applied_row_amount_incl_tax' => 21.66,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 21.66,
+ 'extra_taxable_amount' => 10,
+ 'base_extra_taxable_amount' => 10,
+ 'extra_row_taxable_amount' => 20,
+ 'base_extra_row_taxable_amount' => 20,
+ ],
+ 'item_qty' => 2,
+ ];
+
+ $data['price_incl_tax_weee_taxable_unit'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => true,
+ 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => true,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 9.24,
+ 'base_weee_tax_applied_amount' => 9.24,
+ 'weee_tax_applied_row_amount' => 18.48,
+ 'base_weee_tax_applied_row_amnt' => 18.48,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 10,
+ 'base_extra_taxable_amount' => 10,
+ 'extra_row_taxable_amount' => 20,
+ 'base_extra_row_taxable_amount' => 20,
+ ],
+ 'item_qty' => 2,
+ 'address_data' => [
+ 'subtotal_incl_tax' => 20,
+ 'base_subtotal_incl_tax' => 20,
+ 'subtotal' => 18.48,
+ 'base_subtotal' => 18.48,
+ 'extra_tax_amount' => 0,
+ 'base_extra_tax_amount' => 0,
+ ]
+ ];
+
+ $data['price_incl_tax_weee_non_taxable_unit'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => true,
+ 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => false,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 10,
+ 'base_weee_tax_applied_amount' => 10,
+ 'weee_tax_applied_row_amount' => 20,
+ 'base_weee_tax_applied_row_amnt' => 20,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 0,
+ 'base_extra_taxable_amount' => 0,
+ 'extra_row_taxable_amount' => 0,
+ 'base_extra_row_taxable_amount' => 0,
+ ],
+ 'item_qty' => 2,
+ ];
+
+ $data['price_excl_tax_weee_non_taxable_unit'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => false,
+ 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => false,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 10,
+ 'base_weee_tax_applied_amount' => 10,
+ 'weee_tax_applied_row_amount' => 20,
+ 'base_weee_tax_applied_row_amnt' => 20,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 0,
+ 'base_extra_taxable_amount' => 0,
+ 'extra_row_taxable_amount' => 0,
+ 'base_extra_row_taxable_amount' => 0,
+ ],
+ 'item_qty' => 2,
+ ];
+ $data['price_incl_tax_weee_taxable_row'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => true,
+ 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => true,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 9.24,
+ 'base_weee_tax_applied_amount' => 9.24,
+ 'weee_tax_applied_row_amount' => 18.48,
+ 'base_weee_tax_applied_row_amnt' => 18.48,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 10,
+ 'base_extra_taxable_amount' => 10,
+ 'extra_row_taxable_amount' => 20,
+ 'base_extra_row_taxable_amount' => 20,
+ ],
+ 'item_qty' => 2,
+ ];
+
+ $data['price_excl_tax_weee_taxable_row'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => false,
+ 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => true,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 10,
+ 'base_weee_tax_applied_amount' => 10,
+ 'weee_tax_applied_row_amount' => 20,
+ 'base_weee_tax_applied_row_amnt' => 20,
+ 'weee_tax_applied_amount_incl_tax' => 10.83,
+ 'base_weee_tax_applied_amount_incl_tax' => 10.83,
+ 'weee_tax_applied_row_amount_incl_tax' => 21.65,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 21.65,
+ 'extra_taxable_amount' => 10,
+ 'base_extra_taxable_amount' => 10,
+ 'extra_row_taxable_amount' => 20,
+ 'base_extra_row_taxable_amount' => 20,
+ ],
+ 'item_qty' => 2,
+ ];
+
+ $data['price_incl_tax_weee_non_taxable_row'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => true,
+ 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => false,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 10,
+ 'base_weee_tax_applied_amount' => 10,
+ 'weee_tax_applied_row_amount' => 20,
+ 'base_weee_tax_applied_row_amnt' => 20,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 0,
+ 'base_extra_taxable_amount' => 0,
+ 'extra_row_taxable_amount' => 0,
+ 'base_extra_row_taxable_amount' => 0,
+ ],
+ 'item_qty' => 2,
+ ];
+
+ $data['price_excl_tax_weee_non_taxable_row'] = [
+ 'tax_config' => [
+ 'priceIncludesTax' => false,
+ 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ ],
+ 'weee_config' => [
+ 'isEnabled' => true,
+ 'includeInSubtotal' => true,
+ 'isTaxable' => false,
+ 'getApplied' => [],
+ 'getProductWeeeAttributes' => [
+ new \Magento\Framework\Object(
+ [
+ 'name' => 'Recycling Fee',
+ 'amount' => 10,
+ ]
+ ),
+ ],
+ ],
+ 'tax_rates' => [
+ 'store_tax_rate' => 8.25,
+ 'customer_tax_rate' => 8.25,
+ ],
+ 'item' => [
+ 'weee_tax_applied_amount' => 10,
+ 'base_weee_tax_applied_amount' => 10,
+ 'weee_tax_applied_row_amount' => 20,
+ 'base_weee_tax_applied_row_amnt' => 20,
+ 'weee_tax_applied_amount_incl_tax' => 10,
+ 'base_weee_tax_applied_amount_incl_tax' => 10,
+ 'weee_tax_applied_row_amount_incl_tax' => 20,
+ 'base_weee_tax_applied_row_amnt_incl_tax' => 20,
+ 'extra_taxable_amount' => 0,
+ 'base_extra_taxable_amount' => 0,
+ 'extra_row_taxable_amount' => 0,
+ 'base_extra_row_taxable_amount' => 0,
+ ],
+ 'item_qty' => 2,
+ ];
+ return $data;
}
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Context.php b/dev/tools/Magento/Tools/I18n/Code/Context.php
index 32071baed7d..8d86b8072be 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Context.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Context.php
@@ -63,7 +63,7 @@ class Context
} elseif ($value = strstr($path, '/app/design/')) {
$type = self::CONTEXT_TYPE_THEME;
$value = explode('/', $value);
- $value = $value[3] . '/' . $value[4];
+ $value = $value[3] . '/' . $value[4] . '/' . $value[5];
} elseif ($value = strstr($path, '/lib/web/')) {
$type = self::CONTEXT_TYPE_LIB;
$value = ltrim($value, '/');
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Generator.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Generator.php
index 5a5f76d421a..e9395c85a67 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Generator.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Generator.php
@@ -36,21 +36,33 @@ class Generator
*
* @var \Magento\Tools\I18n\Code\ParserInterface
*/
- protected $_parser;
+ protected $parser;
/**
* Contextual parser
*
* @var \Magento\Tools\I18n\Code\ParserInterface
*/
- protected $_contextualParser;
+ protected $contextualParser;
/**
* Domain abstract factory
*
* @var \Magento\Tools\I18n\Code\Factory
*/
- protected $_factory;
+ protected $factory;
+
+ /**
+ * Generator options resolver
+ *
+ * @var Options\ResolverFactory
+ */
+ protected $optionResolverFactory;
+
+ /**
+ * @var WriterInterface
+ */
+ protected $writer;
/**
* Generator construct
@@ -58,32 +70,56 @@ class Generator
* @param ParserInterface $parser
* @param ParserInterface $contextualParser
* @param Factory $factory
+ * @param Options\ResolverFactory $optionsResolver
*/
- public function __construct(ParserInterface $parser, ParserInterface $contextualParser, Factory $factory)
- {
- $this->_parser = $parser;
- $this->_contextualParser = $contextualParser;
- $this->_factory = $factory;
+ public function __construct(
+ ParserInterface $parser,
+ ParserInterface $contextualParser,
+ Factory $factory,
+ Options\ResolverFactory $optionsResolver
+ ) {
+ $this->parser = $parser;
+ $this->contextualParser = $contextualParser;
+ $this->factory = $factory;
+ $this->optionResolverFactory = $optionsResolver;
}
/**
* Generate dictionary
*
- * @param array $filesOptions
+ * @param string $directory
* @param string $outputFilename
* @param bool $withContext
+ * @throws \UnexpectedValueException
* @return void
*/
- public function generate(array $filesOptions, $outputFilename, $withContext = false)
+ public function generate($directory, $outputFilename, $withContext = false)
{
- $writer = $this->_factory->createDictionaryWriter($outputFilename);
+ $optionResolver = $this->optionResolverFactory->create($directory, $withContext);
- $parser = $this->_getActualParser($withContext);
- $parser->parse($filesOptions);
+ $parser = $this->getActualParser($withContext);
+ $parser->parse($optionResolver->getOptions());
- foreach ($parser->getPhrases() as $phrase) {
- $writer->write($phrase);
+ $phraseList = $parser->getPhrases();
+ if (!count($phraseList)) {
+ throw new \UnexpectedValueException('No phrases found in the specified dictionary file.');
+ }
+ foreach ($phraseList as $phrase) {
+ $this->getDictionaryWriter($outputFilename)->write($phrase);
+ }
+ $this->writer = null;
+ }
+
+ /**
+ * @param string $outputFilename
+ * @return WriterInterface
+ */
+ protected function getDictionaryWriter($outputFilename)
+ {
+ if (null === $this->writer) {
+ $this->writer = $this->factory->createDictionaryWriter($outputFilename);
}
+ return $this->writer;
}
/**
@@ -92,8 +128,8 @@ class Generator
* @param bool $withContext
* @return \Magento\Tools\I18n\Code\ParserInterface
*/
- protected function _getActualParser($withContext)
+ protected function getActualParser($withContext)
{
- return $withContext ? $this->_contextualParser : $this->_parser;
+ return $withContext ? $this->contextualParser : $this->parser;
}
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Loader/File/AbstractFile.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Loader/File/AbstractFile.php
index baac6283128..7d781c1f9b1 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Loader/File/AbstractFile.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Loader/File/AbstractFile.php
@@ -143,7 +143,11 @@ abstract class AbstractFile implements FileInterface
try {
return $this->_factory->createPhrase($data);
} catch (\DomainException $e) {
- throw new \RuntimeException(sprintf('Invalid row #%d: "%s".', $this->_position, $e->getMessage()));
+ throw new \RuntimeException(
+ sprintf('Invalid row #%d: "%s".', $this->_position, $e->getMessage())
+ . "\n"
+ . 'Each row has to consist of 3 columns: original phrase, translation, context'
+ );
}
}
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/Resolver.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/Resolver.php
new file mode 100644
index 00000000000..d7040a3d619
--- /dev/null
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/Resolver.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Tools\I18n\Code\Dictionary\Options;
+
+/**
+ * Dictionary generator options resolver
+ */
+class Resolver implements ResolverInterface
+{
+ /**
+ * @var string
+ */
+ protected $directory;
+
+ /**
+ * @var array
+ */
+ protected $options;
+
+ /**
+ * @var bool
+ */
+ protected $withContext;
+
+ /**
+ * Resolver construct
+ *
+ * @param string $directory
+ * @param bool $withContext
+ */
+ public function __construct($directory, $withContext)
+ {
+ $this->directory = $directory;
+ $this->withContext = $withContext;
+ }
+
+ /**
+ * @return array
+ */
+ public function getOptions()
+ {
+ if (null === $this->options) {
+ if ($this->withContext) {
+ $this->directory = rtrim($this->directory, '\\/');
+ $this->options = array(
+ array(
+ 'type' => 'php',
+ 'paths' => array($this->directory . '/app/code/', $this->directory . '/app/design/'),
+ 'fileMask' => '/\.(php|phtml)$/'
+ ),
+ array(
+ 'type' => 'js',
+ 'paths' => array(
+ $this->directory . '/app/code/',
+ $this->directory . '/app/design/',
+ $this->directory . '/lib/web/mage/',
+ $this->directory . '/lib/web/varien/'
+ ),
+ 'fileMask' => '/\.(js|phtml)$/'
+ ),
+ array(
+ 'type' => 'xml',
+ 'paths' => array($this->directory . '/app/code/', $this->directory . '/app/design/'),
+ 'fileMask' => '/\.xml$/'
+ )
+ );
+ } else {
+ $this->options = array(
+ array('type' => 'php', 'paths' => array($this->directory), 'fileMask' => '/\.(php|phtml)$/'),
+ array('type' => 'js', 'paths' => array($this->directory), 'fileMask' => '/\.(js|phtml)$/'),
+ array('type' => 'xml', 'paths' => array($this->directory), 'fileMask' => '/\.xml$/')
+ );
+ }
+ foreach ($this->options as $option) {
+ $this->isValidPaths($option['paths']);
+ }
+ }
+ return $this->options;
+ }
+
+ /**
+ * @param array $directories
+ * @return void
+ * @throws \InvalidArgumentException
+ */
+ protected function isValidPaths($directories)
+ {
+ foreach ($directories as $path) {
+ if (!is_dir($path)) {
+ if ($this->withContext) {
+ throw new \InvalidArgumentException('Specified path is not a Magento root directory');
+ } else {
+ throw new \InvalidArgumentException('Specified path doesn\'t exist');
+ }
+ }
+ }
+ }
+}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverFactory.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverFactory.php
new file mode 100644
index 00000000000..83ee0f7c0dc
--- /dev/null
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverFactory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Tools\I18n\Code\Dictionary\Options;
+
+/**
+ * Options resolver factory
+ */
+class ResolverFactory
+{
+ /**
+ * Default option resolver class
+ */
+ const DEFAULT_RESOLVER = 'Magento\Tools\I18n\Code\Dictionary\Options\Resolver';
+
+ /**
+ * @var string
+ */
+ protected $resolverClass;
+
+ /**
+ * @param string $resolverClass
+ */
+ public function __construct($resolverClass = self::DEFAULT_RESOLVER)
+ {
+ $this->resolverClass = $resolverClass;
+ }
+
+ /**
+ * @param string $directory
+ * @param bool $withContext
+ * @return ResolverInterface
+ * @throws \InvalidArgumentException
+ */
+ public function create($directory, $withContext)
+ {
+ $resolver = new $this->resolverClass($directory, $withContext);
+ if (!$resolver instanceof ResolverInterface) {
+ throw new \InvalidArgumentException($this->resolverClass . ' doesn\'t implement ResolverInterface');
+ }
+ return $resolver;
+ }
+}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverInterface.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverInterface.php
new file mode 100644
index 00000000000..b6b77fb3b19
--- /dev/null
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Options/ResolverInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Tools\I18n\Code\Dictionary\Options;
+
+/**
+ * Generator options resolver interface
+ */
+interface ResolverInterface
+{
+ /**
+ * @return array
+ */
+ public function getOptions();
+}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Phrase.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Phrase.php
index 9b32be9b484..96042267e9e 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Phrase.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Phrase.php
@@ -105,7 +105,7 @@ class Phrase
public function setPhrase($phrase)
{
if (!$phrase) {
- throw new \DomainException('Missed phrase.');
+ throw new \DomainException('Missed phrase');
}
$this->_phrase = $phrase;
}
@@ -153,7 +153,7 @@ class Phrase
public function setTranslation($translation)
{
if (!$translation) {
- throw new \DomainException('Missed translation.');
+ throw new \DomainException('Missed translation');
}
$this->_translation = $translation;
}
@@ -199,7 +199,7 @@ class Phrase
public function addContextValue($contextValue)
{
if (empty($contextValue)) {
- throw new \DomainException('Context value is empty.');
+ throw new \DomainException('Context value is empty');
}
if (!in_array($contextValue, $this->_contextValue)) {
$this->_contextValue[] = $contextValue;
@@ -217,10 +217,10 @@ class Phrase
{
if (is_string($contextValue)) {
$contextValue = explode(',', $contextValue);
- } else if (null == $contextValue) {
+ } elseif (null == $contextValue) {
$contextValue = array();
- } else if (!is_array($contextValue)) {
- throw new \DomainException('Wrong context type.');
+ } elseif (!is_array($contextValue)) {
+ throw new \DomainException('Wrong context type');
}
$this->_contextValue = $contextValue;
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Writer/Csv.php b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Writer/Csv.php
index 2a5fd971e0d..cc647dd7268 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Dictionary/Writer/Csv.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Dictionary/Writer/Csv.php
@@ -61,8 +61,8 @@ class Csv implements WriterInterface
{
$fields = array($phrase->getPhrase(), $phrase->getTranslation());
$encloseQuote = $phrase->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;
- $fields[0] = $this->_compileString($fields[0], $encloseQuote);
- $fields[1] = $this->_compileString($fields[1], $encloseQuote);
+ $fields[0] = $this->compileString($fields[0], $encloseQuote);
+ $fields[1] = $this->compileString($fields[1], $encloseQuote);
if (($contextType = $phrase->getContextType()) && ($contextValue = $phrase->getContextValueAsString())) {
$fields[] = $contextType;
$fields[] = $contextValue;
@@ -80,7 +80,7 @@ class Csv implements WriterInterface
*
* @SuppressWarnings(PHPMD.EvalExpression)
*/
- protected function _compileString($string, $encloseQuote)
+ protected function compileString($string, $encloseQuote)
{
$evalString = 'return ' . $encloseQuote . $string . $encloseQuote . ';';
$result = @eval($evalString);
diff --git a/dev/tools/Magento/Tools/I18n/Code/Factory.php b/dev/tools/Magento/Tools/I18n/Code/Factory.php
index f499aa506d7..c6a274eb7e8 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Factory.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Factory.php
@@ -45,10 +45,9 @@ class Factory
} else {
switch (pathinfo($filename, \PATHINFO_EXTENSION)) {
case 'csv':
+ default:
$writer = new Dictionary\Writer\Csv($filename);
break;
- default:
- throw new \InvalidArgumentException(sprintf('Writer for "%s" is not exist.', $filename));
}
}
return $writer;
diff --git a/dev/tools/Magento/Tools/I18n/Code/Pack/Generator.php b/dev/tools/Magento/Tools/I18n/Code/Pack/Generator.php
index 3e5cad4ae34..f7f3b11cc76 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Pack/Generator.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Pack/Generator.php
@@ -37,21 +37,21 @@ class Generator
*
* @var \Magento\Tools\I18n\Code\Dictionary\Loader\FileInterface
*/
- protected $_dictionaryLoader;
+ protected $dictionaryLoader;
/**
* Pack writer
*
* @var \Magento\Tools\I18n\Code\Pack\WriterInterface
*/
- protected $_packWriter;
+ protected $packWriter;
/**
* Domain abstract factory
*
* @var \Magento\Tools\I18n\Code\Factory
*/
- protected $_factory;
+ protected $factory;
/**
* Loader construct
@@ -65,9 +65,9 @@ class Generator
Pack\WriterInterface $packWriter,
Factory $factory
) {
- $this->_dictionaryLoader = $dictionaryLoader;
- $this->_packWriter = $packWriter;
- $this->_factory = $factory;
+ $this->dictionaryLoader = $dictionaryLoader;
+ $this->packWriter = $packWriter;
+ $this->factory = $factory;
}
/**
@@ -88,14 +88,21 @@ class Generator
$mode = WriterInterface::MODE_REPLACE,
$allowDuplicates = false
) {
- $locale = $this->_factory->createLocale($locale);
- $dictionary = $this->_dictionaryLoader->load($dictionaryPath);
+ $locale = $this->factory->createLocale($locale);
+ $dictionary = $this->dictionaryLoader->load($dictionaryPath);
+
+ if (!count($dictionary->getPhrases())) {
+ throw new \UnexpectedValueException('No phrases have been found by the specified path.');
+ }
if (!$allowDuplicates && ($duplicates = $dictionary->getDuplicates())) {
- throw new \RuntimeException($this->_createDuplicatesPhrasesError($duplicates));
+ throw new \RuntimeException(
+ "Duplicated translation is found, but it is not allowed.\n"
+ . $this->createDuplicatesPhrasesError($duplicates)
+ );
}
- $this->_packWriter->write($dictionary, $packPath, $locale, $mode);
+ $this->packWriter->write($dictionary, $packPath, $locale, $mode);
}
/**
@@ -104,14 +111,14 @@ class Generator
* @param array $duplicates
* @return string
*/
- protected function _createDuplicatesPhrasesError($duplicates)
+ protected function createDuplicatesPhrasesError($duplicates)
{
$error = '';
foreach ($duplicates as $phrases) {
/** @var \Magento\Tools\I18n\Code\Dictionary\Phrase $phrase */
$phrase = $phrases[0];
$error .= sprintf(
- "Error. The phrase \"%s\" is translated differently in %d places.\n",
+ "The phrase \"%s\" is translated differently in %d places.\n",
$phrase->getPhrase(),
count($phrases)
);
diff --git a/dev/tools/Magento/Tools/I18n/Code/Pack/Writer/File/AbstractFile.php b/dev/tools/Magento/Tools/I18n/Code/Pack/Writer/File/AbstractFile.php
index 354c13765ec..52bb2cbe68c 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Pack/Writer/File/AbstractFile.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Pack/Writer/File/AbstractFile.php
@@ -127,10 +127,18 @@ abstract class AbstractFile implements WriterInterface
$files = array();
foreach ($dictionary->getPhrases() as $key => $phrase) {
if (!$phrase->getContextType() || !$phrase->getContextValue()) {
- throw new \RuntimeException(sprintf('Missed context in row #%d.', $key + 1));
+ throw new \RuntimeException(
+ sprintf('Missed context in row #%d.', $key + 1)
+ . "\n"
+ . 'Each row has to consist of 3 columns: original phrase, translation, context'
+ );
}
foreach ($phrase->getContextValue() as $context) {
- $path = $this->_context->buildPathToLocaleDirectoryByContext($phrase->getContextType(), $context);
+ try {
+ $path = $this->_context->buildPathToLocaleDirectoryByContext($phrase->getContextType(), $context);
+ } catch (\InvalidArgumentException $e) {
+ throw new \InvalidArgumentException($e->getMessage() . ' Row #' . ($key + 1) . '.');
+ }
$filename = $this->_packPath . $path . $this->_locale . '.' . $this->_getFileExtension();
$files[$filename][$phrase->getPhrase()] = $phrase;
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Parser/AbstractParser.php b/dev/tools/Magento/Tools/I18n/Code/Parser/AbstractParser.php
index b5397694abc..fff2c7423f1 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Parser/AbstractParser.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Parser/AbstractParser.php
@@ -24,7 +24,6 @@
namespace Magento\Tools\I18n\Code\Parser;
use Magento\Tools\I18n\Code;
-use Magento\Tools\I18n\Code\Parser\AdapterInterface;
/**
* Abstract parser
diff --git a/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/AbstractAdapter.php b/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/AbstractAdapter.php
index e5aa6eee5fb..83da3910b8e 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/AbstractAdapter.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/AbstractAdapter.php
@@ -87,17 +87,16 @@ abstract class AbstractAdapter implements AdapterInterface
);
}
if (!isset($this->_phrases[$phrase])) {
- $quote = '';
- if ($this->_isFirstAndLastCharIsQuote($phrase)) {
- $quote = $phrase[0];
- $phrase = $this->_stripFirstAndLastChar($phrase);
+ $enclosureCharacter = $this->getEnclosureCharacter($phrase);
+ if (!empty($enclosureCharacter)) {
+ $phrase = $this->trimEnclosure($phrase);
}
$this->_phrases[$phrase] = array(
'phrase' => $phrase,
'file' => $this->_file,
'line' => $line,
- 'quote' => $quote
+ 'quote' => $enclosureCharacter
);
}
}
@@ -121,9 +120,42 @@ abstract class AbstractAdapter implements AdapterInterface
*/
protected function _isFirstAndLastCharIsQuote($phrase)
{
- return ($phrase[0] == Phrase::QUOTE_DOUBLE ||
- $phrase[0] == Phrase::QUOTE_SINGLE) && $phrase[0] == $phrase[strlen(
- $phrase
- ) - 1];
+ $firstCharacter = $phrase[0];
+ $lastCharacter = $phrase[strlen($phrase) - 1];
+ return $this->isQuote($firstCharacter) && $firstCharacter == $lastCharacter;
+ }
+
+ /**
+ * Get enclosing character if any
+ *
+ * @param string $phrase
+ * @return string
+ */
+ protected function getEnclosureCharacter($phrase)
+ {
+ $quote = '';
+ if ($this->_isFirstAndLastCharIsQuote($phrase)) {
+ $quote = $phrase[0];
+ }
+
+ return $quote;
+ }
+
+ /**
+ * @param string $phrase
+ * @return string
+ */
+ protected function trimEnclosure($phrase)
+ {
+ return $this->_stripFirstAndLastChar($phrase);
+ }
+
+ /**
+ * @param string $char
+ * @return bool
+ */
+ protected function isQuote($char)
+ {
+ return in_array($char, [Phrase::QUOTE_DOUBLE, Phrase::QUOTE_SINGLE]);
}
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/Xml.php b/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/Xml.php
index 90a7b6881d9..48d30109e6d 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/Xml.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Parser/Adapter/Xml.php
@@ -45,8 +45,8 @@ class Xml extends AbstractAdapter
if ((string)$attributes['translate'] == 'true') {
$this->_addPhrase((string)$element);
} else {
- $nodesDelimiter = strpos($attributes, ' ') === false ? ',' : ' ';
- foreach (explode($nodesDelimiter, $attributes) as $value) {
+ $nodesDelimiter = strpos($attributes['translate'], ' ') === false ? ',' : ' ';
+ foreach (explode($nodesDelimiter, $attributes['translate']) as $value) {
$phrase = (string)$element->{$value};
if ($phrase) {
$this->_addPhrase($phrase);
diff --git a/dev/tools/Magento/Tools/I18n/Code/Parser/Parser.php b/dev/tools/Magento/Tools/I18n/Code/Parser/Parser.php
index 633394ea01c..e2378c999bd 100644
--- a/dev/tools/Magento/Tools/I18n/Code/Parser/Parser.php
+++ b/dev/tools/Magento/Tools/I18n/Code/Parser/Parser.php
@@ -56,8 +56,10 @@ class Parser extends AbstractParser
{
$phraseKey = $phraseData['phrase'];
- $this->_phrases[$phraseKey] = $this->_factory->createPhrase(
- array('phrase' => $phraseData['phrase'], 'translation' => $phraseData['phrase'])
- );
+ $this->_phrases[$phraseKey] = $this->_factory->createPhrase([
+ 'phrase' => $phraseData['phrase'],
+ 'translation' => $phraseData['phrase'],
+ 'quote' => $phraseData['quote']
+ ]);
}
}
diff --git a/dev/tools/Magento/Tools/I18n/Code/ServiceLocator.php b/dev/tools/Magento/Tools/I18n/Code/ServiceLocator.php
index 2d956eb5bc9..d72dbfb4d1f 100644
--- a/dev/tools/Magento/Tools/I18n/Code/ServiceLocator.php
+++ b/dev/tools/Magento/Tools/I18n/Code/ServiceLocator.php
@@ -85,7 +85,12 @@ class ServiceLocator
$parserContextual->addAdapter($type, $adapter);
}
- self::$_dictionaryGenerator = new Dictionary\Generator($parser, $parserContextual, self::_getFactory());
+ self::$_dictionaryGenerator = new Dictionary\Generator(
+ $parser,
+ $parserContextual,
+ self::_getFactory(),
+ new Dictionary\Options\ResolverFactory
+ );
}
return self::$_dictionaryGenerator;
}
diff --git a/dev/tools/Magento/Tools/I18n/bootstrap.php b/dev/tools/Magento/Tools/I18n/bootstrap.php
index 99f686e2d9c..1df747f6662 100644
--- a/dev/tools/Magento/Tools/I18n/bootstrap.php
+++ b/dev/tools/Magento/Tools/I18n/bootstrap.php
@@ -32,7 +32,7 @@ function i18n_tool_autoloader($className)
if (strpos($className, 'Magento\\Tools\\') !== false) {
$filePath = str_replace('\\', '/', str_replace('Magento\\Tools\\I18n\\', '', $className));
$filePath = BP . $filePath . '.php';
- } else if (strpos($className, 'Zend_') !== false) {
+ } elseif (strpos($className, 'Zend_') !== false) {
$filePath = BP . str_replace('_', '/', $className) . '.php';
}
if (isset($filePath) && file_exists($filePath)) {
diff --git a/dev/tools/Magento/Tools/I18n/generator.php b/dev/tools/Magento/Tools/I18n/generator.php
index 5b747682655..71de52268bb 100644
--- a/dev/tools/Magento/Tools/I18n/generator.php
+++ b/dev/tools/Magento/Tools/I18n/generator.php
@@ -27,63 +27,36 @@ use Magento\Tools\I18n\Code\ServiceLocator;
try {
$console = new \Zend_Console_Getopt(
array(
- 'directory|d=s' => 'Path to base directory for parsing',
- 'output|o=s' => 'Path(with filename) to output file, '.
- 'by default output the results into standard output stream',
- 'magento|m=s' => 'Indicates whether directory for parsing is Magento directory, "no" by default'
+ 'directory|d=s' => 'Path to a directory to parse',
+ 'output-file|o=s' => 'Path (with filename) to output file, '
+ . 'by default output the results into standard output stream',
+ 'magento|m-s' => 'Indicates whether the specified "directory" path is a Magento root directory,'
+ . ' "no" by default'
)
);
$console->parse();
- $directory = $console->getOption('directory') ?: null;
- $outputFilename = $console->getOption('output') ?: null;
- $isMagento = in_array($console->getOption('magento'), array('y', 'yes', 'Y', 'Yes', 'YES'));
-
- if (!$directory) {
- throw new \InvalidArgumentException('Directory parameter is required.');
- }
-
- if ($isMagento) {
- $directory = rtrim($directory, '\\/');
- $filesOptions = array(
- array(
- 'type' => 'php',
- 'paths' => array($directory . '/app/code/', $directory . '/app/design/'),
- 'fileMask' => '/\.(php|phtml)$/'
- ),
- array(
- 'type' => 'js',
- 'paths' => array(
- $directory . '/app/code/',
- $directory . '/app/design/',
- $directory . '/lib/web/mage/',
- $directory . '/lib/web/varien/'
- ),
- 'fileMask' => '/\.(js|phtml)$/'
- ),
- array(
- 'type' => 'xml',
- 'paths' => array($directory . '/app/code/', $directory . '/app/design/'),
- 'fileMask' => '/\.xml$/'
- )
- );
- } else {
- $filesOptions = array(
- array('type' => 'php', 'paths' => array($directory), 'fileMask' => '/\.(php|phtml)$/'),
- array('type' => 'js', 'paths' => array($directory), 'fileMask' => '/\.(js|phtml)$/'),
- array('type' => 'xml', 'paths' => array($directory), 'fileMask' => '/\.xml$/')
+ if (!count($console->getOptions())) {
+ throw new \Zend_Console_Getopt_Exception(
+ 'Required parameters are missed, please see usage description',
+ $console->getUsageMessage()
);
}
-
+ $directory = $console->getOption('directory');
+ if (empty($directory)) {
+ throw new \Zend_Console_Getopt_Exception('Directory is a required parameter.', $console->getUsageMessage());
+ }
+ $outputFilename = $console->getOption('output-file') ?: null;
+ $isMagento = in_array($console->getOption('magento'), array('y', 'yes', 'Y', 'Yes', 'YES', '1'));
$generator = ServiceLocator::getDictionaryGenerator();
- $generator->generate($filesOptions, $outputFilename, $isMagento);
+ $generator->generate($directory, $outputFilename, $isMagento);
fwrite(STDOUT, "\nDictionary successfully processed.\n");
} catch (\Zend_Console_Getopt_Exception $e) {
- fwrite(STDERR, $e->getUsageMessage() . "\n");
+ fwrite(STDERR, $e->getMessage() . "\n\n" . $e->getUsageMessage() . "\n");
exit(1);
} catch (\Exception $e) {
- fwrite(STDERR, 'Translate phrase generator failed: ' . $e->getMessage() . "\n");
+ fwrite(STDERR, $e->getMessage() . "\n");
exit(1);
}
diff --git a/dev/tools/Magento/Tools/I18n/pack.php b/dev/tools/Magento/Tools/I18n/pack.php
index 064a33b179e..ec21115103e 100644
--- a/dev/tools/Magento/Tools/I18n/pack.php
+++ b/dev/tools/Magento/Tools/I18n/pack.php
@@ -30,29 +30,32 @@ try {
'source|s=s' => 'Path to source dictionary file with translations',
'pack|p=s' => 'Path to language package',
'locale|l=s' => 'Target locale for dictionary, for example "de_DE"',
- 'mode|m=s' => 'Save mode for dictionary
+ 'mode|m-s' => 'Save mode for dictionary
- "replace" - replace language pack by new one
- - "merge" - merge language packages
- , by default "replace"',
+ - "merge" - merge language packages, by default "replace"',
'allow_duplicates|d=s' => 'Is allowed to save duplicates of translate, by default "no"'
)
);
$console->parse();
-
- $dictionaryPath = $console->getOption('source') ?: null;
- $packPath = $console->getOption('pack') ?: null;
- $locale = $console->getOption('locale') ?: null;
- $allowDuplicates = in_array($console->getOption('allow_duplicates'), array('y', 'Y', 'yes', 'Yes'));
- $saveMode = $console->getOption('mode') ?: null;
+ if (!count($console->getOptions())) {
+ throw new \UnexpectedValueException(
+ 'Required parameters are missed, please see usage description' . "\n\n" . $console->getUsageMessage()
+ );
+ }
+ $dictionaryPath = $console->getOption('source');
+ $packPath = $console->getOption('pack');
+ $locale = $console->getOption('locale');
+ $allowDuplicates = in_array($console->getOption('allow_duplicates'), array('y', 'Y', 'yes', 'Yes', '1'));
+ $saveMode = $console->getOption('mode');
if (!$dictionaryPath) {
- throw new \InvalidArgumentException('Dictionary source path parameter is required.');
+ throw new \Zend_Console_Getopt_Exception('Dictionary source path parameter is required.');
}
if (!$packPath) {
- throw new \InvalidArgumentException('Pack path parameter is required.');
+ throw new \Zend_Console_Getopt_Exception('Pack path parameter is required.');
}
if (!$locale) {
- throw new \InvalidArgumentException('Locale parameter is required.');
+ throw new \Zend_Console_Getopt_Exception('Locale parameter is required.');
}
$generator = ServiceLocator::getPackGenerator();
@@ -60,9 +63,9 @@ try {
fwrite(STDOUT, sprintf("\nSuccessfully saved %s language package.\n", $locale));
} catch (\Zend_Console_Getopt_Exception $e) {
- fwrite(STDERR, $e->getUsageMessage() . "\n");
+ fwrite(STDERR, $e->getMessage() . "\n\n" . $e->getUsageMessage() . "\n");
exit(1);
} catch (\Exception $e) {
- fwrite(STDERR, 'Language pack failed: ' . $e->getMessage() . "\n");
+ fwrite(STDERR, $e->getMessage() . "\n");
exit(1);
}
diff --git a/dev/tools/xml/translate.php b/dev/tools/xml/translate.php
deleted file mode 100644
index c16586e1344..00000000000
--- a/dev/tools/xml/translate.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-// Intended to be run from the magento root
-
-$search = $argv[1];
-$files = shell_exec("find . -name $search");
-$xsl = 'dev/tools/xml/translate.xslt';
-$saxon = 'dev/tools/xml/saxon9he.jar';
-
-foreach (preg_split("/((\r?\n)|(\r\n?))/", $files) as $file) {
- if (!empty($file)) {
- if (!file_exists($saxon)) {
- $url = 'http://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/9.5.1-1/Saxon-HE-9.5.1-1.jar';
- system("wget $url --output-document=$saxon");
- }
- $cmd = "java -jar $saxon -l:on -s:$file -xsl:$xsl -o:$file";
- echo "$cmd \n";
- system($cmd);
- }
-}
-
diff --git a/dev/tools/xml/translate.xslt b/dev/tools/xml/translate.xslt
deleted file mode 100644
index bd43044d9f5..00000000000
--- a/dev/tools/xml/translate.xslt
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <!-- This is an XSLT 2.0 file. Any software that supports XSLT 2.0 can be used to convert an xml file to use the
- new translate format. The software that I used is Saxon9HE, which requires java.
- The jar file can be downloaded from:
- http://saxon.sourceforge.net/
- The converter can be run with the following command:
- java -jar saxon9he.jar -l:on -s:file_to_convert.xml -xsl:translate.xslt -o:converted_file.xml
- -->
- <!--
- Known bugs:
- This script currently may vertically align long lists of attributes which can make it difficult to read diffs.
- This script will merge comments that are the same parent node.
- -->
- <xsl:output indent="yes" />
-
- <xsl:template name="refactor-translate">
- <xsl:param name="node" />
- <xsl:param name="translate">false</xsl:param>
- <xsl:variable name="to_translate" select="@translate" />
- <xsl:copy>
- <xsl:if test="$translate = 'true'">
- <xsl:attribute name="translate">true</xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="@*[name()!='translate']" />
- <xsl:if test="./comment() != ''">
- <xsl:comment><xsl:value-of select="comment()"/></xsl:comment>
- </xsl:if>
- <xsl:if test="text() != '' ">
- <xsl:value-of select="text()[normalize-space()]" />
- </xsl:if>
- <xsl:for-each select="$node/*">
- <xsl:choose>
- <xsl:when test="contains($to_translate, local-name())">
- <xsl:call-template name="refactor-translate">
- <xsl:with-param name="node" select="." />
- <xsl:with-param name="translate" select="'true'" />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="refactor-translate">
- <xsl:with-param name="node" select="." />
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="/">
- <xsl:call-template name="refactor-translate">
- <xsl:with-param name="node" select="." />
- </xsl:call-template>
- </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
index b1569c3b34b..9d1f17af07a 100644
--- a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
@@ -185,23 +185,4 @@ abstract class AbstractHelper
$url = base64_decode(strtr($url, '-_,', '+/='));
return $this->_urlBuilder->sessionUrlVar($url);
}
-
- /**
- * Translate array
- *
- * @param array $arr
- * @return array
- */
- public function translateArray($arr = array())
- {
- foreach ($arr as $k => $v) {
- if (is_array($v)) {
- $v = self::translateArray($v);
- } elseif ($k === 'label') {
- $v = __($v);
- }
- $arr[$k] = $v;
- }
- return $arr;
- }
}
diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php
index 690e06708c5..cf404e81667 100644
--- a/lib/internal/Magento/Framework/AppInterface.php
+++ b/lib/internal/Magento/Framework/AppInterface.php
@@ -35,7 +35,7 @@ interface AppInterface
/**
* Magento version
*/
- const VERSION = '2.0.0.0-dev85';
+ const VERSION = '2.0.0.0-dev86';
/**
* Launch application
diff --git a/lib/internal/Magento/Framework/Css/README.md b/lib/internal/Magento/Framework/Css/README.md
new file mode 100644
index 00000000000..b2d94d2c324
--- /dev/null
+++ b/lib/internal/Magento/Framework/Css/README.md
@@ -0,0 +1 @@
+CSS library contains common infrastructure to work with style sheets.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index 6f0481968e2..27fee5600f4 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -168,7 +168,7 @@ class Date extends AbstractElement
public function getElementHtml()
{
$this->addClass('input-text');
- $dateFormat = $this->getDateFormat();
+ $dateFormat = $this->getDateFormat() ?: $this->getFormat();
$timeFormat = $this->getTimeFormat();
if (empty($dateFormat)) {
throw new \Exception(
diff --git a/lib/internal/Magento/Framework/Exception/AuthorizationException.php b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
index faa069cf138..1dc55310c88 100644
--- a/lib/internal/Magento/Framework/Exception/AuthorizationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
@@ -27,5 +27,5 @@ namespace Magento\Framework\Exception;
class AuthorizationException extends LocalizedException
{
- const NOT_AUTHORIZED = 'Consumer ID %consumer_id is not authorized to access %resources';
+ const NOT_AUTHORIZED = 'Consumer is not authorized to access %resources';
}
diff --git a/app/code/Magento/Index/Helper/Data.php b/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
similarity index 90%
rename from app/code/Magento/Index/Helper/Data.php
rename to lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
index efac715dd89..1c1f9414d4f 100644
--- a/app/code/Magento/Index/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
@@ -21,8 +21,10 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Index\Helper;
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+namespace Magento\Framework\Exception;
+
+class CouldNotDeleteException extends LocalizedException
{
+
}
diff --git a/lib/internal/Magento/Framework/Less/README.md b/lib/internal/Magento/Framework/Less/README.md
new file mode 100644
index 00000000000..4edaafdf19a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Less/README.md
@@ -0,0 +1,2 @@
+Less library provides an ability to process LESS files in Magento application and convert
+LESS dynamic stylesheet language into CSS using external LESS parser.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Model/Exception.php b/lib/internal/Magento/Framework/Model/Exception.php
index 2439e4c86f0..7fdb87bc73b 100644
--- a/lib/internal/Magento/Framework/Model/Exception.php
+++ b/lib/internal/Magento/Framework/Model/Exception.php
@@ -30,6 +30,8 @@ namespace Magento\Framework\Model;
*/
class Exception extends \Exception
{
+ const ERROR_CODE_ENTITY_ALREADY_EXISTS = 456;
+
/**
* @var array
*/
diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
index 8fef03a495c..c3b1bad31bc 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
@@ -21,8 +21,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+
namespace Magento\Framework\Model\Resource\Db;
+use Magento\Framework\Model\Exception as ModelException;
+
/**
* Abstract resource model class
*/
@@ -227,13 +230,13 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
/**
* Get primary key field name
*
- * @throws \Magento\Framework\Model\Exception
+ * @throws ModelException
* @return string
*/
public function getIdFieldName()
{
if (empty($this->_idFieldName)) {
- throw new \Magento\Framework\Model\Exception(__('Empty identifier field name'));
+ throw new ModelException(__('Empty identifier field name'));
}
return $this->_idFieldName;
}
@@ -242,13 +245,13 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
* Returns main table name - extracted from "module/table" style and
* validated by db adapter
*
- * @throws \Magento\Framework\Model\Exception
+ * @throws ModelException
* @return string
*/
public function getMainTable()
{
if (empty($this->_mainTable)) {
- throw new \Magento\Framework\Model\Exception(__('Empty main table name'));
+ throw new ModelException(__('Empty main table name'));
}
return $this->getTable($this->_mainTable);
}
@@ -574,7 +577,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return $this
- * @throws \Magento\Framework\Model\Exception
+ * @throws ModelException
*/
protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
{
@@ -616,7 +619,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
} else {
$error = __('%1 already exist.', implode(', ', $existent));
}
- throw new \Magento\Framework\Model\Exception($error);
+ throw new ModelException($error, ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS);
}
return $this;
}
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 6f735ca1987..ac2a1d39b2b 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -199,16 +199,17 @@ class Template extends AbstractBlock
/**
* Get absolute path to template
*
+ * @param null $template
* @return string
*/
- public function getTemplateFile()
+ public function getTemplateFile($template = null)
{
$params = array('module' => $this->getModuleName());
$area = $this->getArea();
if ($area) {
$params['area'] = $area;
}
- $templateName = $this->_viewFileSystem->getTemplateFileName($this->getTemplate(), $params);
+ $templateName = $this->_viewFileSystem->getTemplateFileName($template ?: $this->getTemplate(), $params);
return $templateName;
}
diff --git a/lib/internal/Magento/Framework/View/README.md b/lib/internal/Magento/Framework/View/README.md
new file mode 100644
index 00000000000..6c04c6ab598
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/README.md
@@ -0,0 +1 @@
+View library contains common infrastructure to work with view related components.
\ No newline at end of file
diff --git a/lib/web/css/docs/source/forms.less b/lib/web/css/docs/source/forms.less
index f64e4546592..5563bec8133 100644
--- a/lib/web/css/docs/source/forms.less
+++ b/lib/web/css/docs/source/forms.less
@@ -387,7 +387,7 @@
// <tr>
// <th>@_type-inline-margin</th>
// <td class="vars_value">@form-field-type-inline-margin</td>
-// <td class="vars_value">0 0 @form-field-type-inline-vertical-margin</td>
+// <td class="vars_value">0 0 @form-field-vertical-indent</td>
// <td>Form fields margin if @form-field-type is set to 'inline'</td>
// </tr>
// <tr>
diff --git a/lib/web/css/docs/source/layout.less b/lib/web/css/docs/source/layout.less
index 45dc54f913b..10ba182f3ba 100644
--- a/lib/web/css/docs/source/layout.less
+++ b/lib/web/css/docs/source/layout.less
@@ -183,7 +183,7 @@ footer.footer {
// ## Three columns page layout
//
// ```html
-// <div class="page wrapper layout-3">
+// <div class="page-wrapper layout-3">
// <header class="header">Header</header>
// <section class="page main">
// <div class="columns">
@@ -198,7 +198,7 @@ footer.footer {
//
// ## Two columns page layout with sidebar on the left
// ```html
-// <div class="page wrapper layout-2-left">
+// <div class="page-wrapper layout-2-left">
// <header class="header">Header</header>
// <section class="page main">
// <div class="columns">
@@ -213,7 +213,7 @@ footer.footer {
// ## Two columns page layout with sidebar on the right
//
// ```html
-// <div class="page wrapper layout-2-right">
+// <div class="page-wrapper layout-2-right">
// <header class="header">Header</header>
// <section class="page main">
// <div class="columns">
@@ -228,7 +228,7 @@ footer.footer {
// ## One column page layout
//
// ```html
-// <div class="page wrapper layout-1">
+// <div class="page-wrapper layout-1">
// <header class="header">Header</header>
// <section class="page main">
// <div class="columns">
diff --git a/lib/web/css/docs/source/variables.less b/lib/web/css/docs/source/variables.less
index cd8659eba07..3b353807a9d 100644
--- a/lib/web/css/docs/source/variables.less
+++ b/lib/web/css/docs/source/variables.less
@@ -2055,7 +2055,7 @@
// <tr>
// <th>@_type-inline-margin</th>
// <td class="vars_value">@form-field-type-inline-margin</td>
-// <td class="vars_value">0 0 @form-field-type-inline-vertical-margin</td>
+// <td class="vars_value">0 0 @form-field-vertical-indent</td>
// <td>Form fields margin if @form-field-type is set to 'inline'</td>
// </tr>
// <tr>
diff --git a/lib/web/css/source/extend.less b/lib/web/css/source/extend.less
index 6d8bb939476..2b62cfa959d 100644
--- a/lib/web/css/source/extend.less
+++ b/lib/web/css/source/extend.less
@@ -1,5 +1,5 @@
-/**
-// * Magento
+// /**
+// // * Magento
// *
// * NOTICE OF LICENSE
// *
@@ -16,9 +16,8 @@
// * Do not edit or add to this file if you wish to upgrade Magento to newer
// * versions in the future. If you wish to customize Magento for your
// * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-
+// *
+// * @category design
+// * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+// */
diff --git a/lib/web/css/source/lib/abstract.less b/lib/web/css/source/lib/abstract.less
index 719bbbddaaf..ad977b19d1d 100644
--- a/lib/web/css/source/lib/abstract.less
+++ b/lib/web/css/source/lib/abstract.less
@@ -32,3 +32,6 @@
float: none !important;
}
}
+
+.responsive-smaller(@break) when (@break = @break-point-0) {
+}
diff --git a/lib/web/css/source/lib/breadcrumbs.less b/lib/web/css/source/lib/breadcrumbs.less
index 3c9c5a4c088..929def5b8aa 100644
--- a/lib/web/css/source/lib/breadcrumbs.less
+++ b/lib/web/css/source/lib/breadcrumbs.less
@@ -24,11 +24,10 @@
.mixin-breadcrumbs(
@_breadcrumbs-font-size: @breadcrumbs-font-size,
- @_breadcrumbs-separator-symbol: @breadcrumbs-separator-symbol,
- @_breadcrumbs-separator-color: @breadcrumbs-separator-color,
@_breadcrumbs-display: @breadcrumbs-display,
+ @_breadcrumbs-container-margin: @breadcrumbs-container-margin,
@_breadcrumbs-padding: @breadcrumbs-padding,
- @_breadcrumbs-hide-label: @breadcrumbs-hide-label,
+
// Breadcrumbs current
@_breadcrumbs-current-color: @breadcrumbs-current-color,
@_breadcrumbs-current-font-weight: @breadcrumbs-current-font-weight,
@@ -38,9 +37,11 @@
@_breadcrumbs-current-gradient-direction: @breadcrumbs-current-gradient-direction,
@_breadcrumbs-current-gradient-start-color: @breadcrumbs-current-gradient-start-color,
@_breadcrumbs-current-gradient-end-color: @breadcrumbs-current-gradient-end-color,
+
// Breadcrumbs link - gradient
@_breadcrumbs-link-gradient: @breadcrumbs-link-gradient,
@_breadcrumbs-link-gradient-direction: @breadcrumbs-link-gradient-direction,
+
// Breadcrumbs link color
@_breadcrumbs-link-color: @breadcrumbs-link-color,
@_breadcrumbs-link-background: @breadcrumbs-link-background,
@@ -71,9 +72,23 @@
@_breadcrumbs-link-border-active: @breadcrumbs-link-border-active,
@_breadcrumbs-link-text-decoration-active: @breadcrumbs-link-text-decoration-active,
@_breadcrumbs-link-gradient-start-color-active: @breadcrumbs-link-gradient-start-color-active,
- @_breadcrumbs-link-gradient-end-color-active: @breadcrumbs-link-gradient-end-color-active
+ @_breadcrumbs-link-gradient-end-color-active: @breadcrumbs-link-gradient-end-color-active,
+
+ // Breadcrumbs separating symbol
+ @_breadcrumbs-separator-symbol: @breadcrumbs-separator-symbol,
+ @_breadcrumbs-separator-color: @breadcrumbs-separator-color,
+
+ // Use icon as a separating symbol
+ @_breadcrumbs-icon-use: @breadcrumbs-icon-use,
+ @_breadcrumbs-icon-font-content: @breadcrumbs-icon-font-content,
+ @_icon-font: @breadcrumbs-icon-font,
+ @_icon-font-size: @breadcrumbs-icon-font-size,
+ @_icon-font-line-height: @breadcrumbs-icon-font-line-height,
+ @_icon-font-color: @breadcrumbs-icon-font-color,
+ @_icon-font-margin: @breadcrumbs-icon-font-margin,
+ @_icon-font-vertical-align: @breadcrumbs-icon-font-vertical-align
) {
- ._breadcrumbs-hide-label(@_breadcrumbs-hide-label);
+ .css(margin, @_breadcrumbs-container-margin);
.items {
.font-size(@_breadcrumbs-font-size);
.css(color, @_breadcrumbs-current-color);
@@ -146,23 +161,28 @@
.css(padding, @_breadcrumbs-padding);
.css(font-weight, @_breadcrumbs-current-font-weight);
}
- .mixin-breadcrumbs-separator(@_breadcrumbs-separator-symbol: @_breadcrumbs-separator-symbol);
-}
-.mixin-breadcrumbs-separator(
- @_breadcrumbs-separator-symbol: @breadcrumbs-separator-symbol,
- @_breadcrumbs-separator-color: @breadcrumbs-separator-color
-) when not (@_breadcrumbs-separator-symbol = '') {
- .item:not(:last-child) {
- &:after {
- .css(color, @_breadcrumbs-separator-color);
- .css(content, @_breadcrumbs-separator-symbol);
+ & when not (@_breadcrumbs-separator-symbol = '') and not (@_breadcrumbs-separator-symbol = false) { // Insert separating symbol to "content"
+ .item:not(:last-child) {
+ &:after {
+ .css(color, @_breadcrumbs-separator-color);
+ .css(content, @_breadcrumbs-separator-symbol);
+ }
}
}
-}
-._breadcrumbs-hide-label(@_breadcrumbs-hide-label) when (@_breadcrumbs-hide-label = true) {
- .label {
- .visually-hidden();
+ & when (@_breadcrumbs-icon-use = true) { // Use font icon as a separating symbol
+ .item:not(:last-child) {
+ .icon-font(
+ @_icon-font-content: @_breadcrumbs-icon-font-content,
+ @_icon-font: @_icon-font,
+ @_icon-font-size: @_icon-font-size,
+ @_icon-font-line-height: @_icon-font-line-height,
+ @_icon-font-color: @_icon-font-color,
+ @_icon-font-margin: @_icon-font-margin,
+ @_icon-font-vertical-align: @_icon-font-vertical-align,
+ @_icon-font-position: after
+ );
+ }
}
}
diff --git a/lib/web/css/source/lib/buttons.less b/lib/web/css/source/lib/buttons.less
index 7e577ee09e4..6390d4280ed 100644
--- a/lib/web/css/source/lib/buttons.less
+++ b/lib/web/css/source/lib/buttons.less
@@ -81,7 +81,7 @@
.css(cursor, @_button-cursor);
.css(display, @_button-display);
.css(font-family, @_button-font-family);
- .css(font-size, @_button-font-size);
+ .font-size(@_button-font-size);
.css(font-weight, @_button-font-weight);
.css(line-height, @_button-height);
//-moz-box-sizing: content-box; // fix Firefox button line-height problem
@@ -192,14 +192,22 @@
//
// Button as link
//-------------------------------------- */
-.button-as-link() {
+.button-as-link(
+ @_link-color: @link-color,
+ @_link-color-hover: @link-color-hover,
+ @_line-height: @line-height-base,
+ @_disabled_opacity: @button-disabled-opacity
+) {
background: none;
border: 0;
display: inline;
- .css(line-height, @line-height-base);
+ .css(line-height, @_line-height);
margin: 0;
padding: 0;
.link();
+ &:hover {
+ .css(color, @_link-color-hover);
+ }
&:hover,
&:active,
&:focus {
@@ -210,11 +218,11 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
- .css(color, @link-color);
+ .css(color, @_link-color);
text-decoration: underline;
cursor: default;
pointer-events: none; // Disabling of clicks
- .css(opacity, @button-disabled-opacity);
+ .css(opacity, @_disabled_opacity);
}
}
@@ -342,6 +350,21 @@
}
}
+//
+// Button revert secondary size
+//-------------------------------------- */
+.button-revert-secondary-size(
+ @_button-font-size: @button-font-size,
+ @_button-height: @button-height,
+ @_button-padding: @button-padding
+) {
+ .font-size(@_button-font-size);
+ .button-size(
+ @_button-height: @_button-height,
+ @_button-padding: @_button-padding
+ )
+}
+
//
// Inner buttons mixins
//-------------------------------------- */
diff --git a/lib/web/css/source/lib/forms.less b/lib/web/css/source/lib/forms.less
index e69cdaf45d7..abd46c86f4a 100644
--- a/lib/web/css/source/lib/forms.less
+++ b/lib/web/css/source/lib/forms.less
@@ -493,11 +493,11 @@
.css(margin, @_margin);
.css(border, @_border);
letter-spacing: -0.31em;
- word-spacing: -0.43em;
+ //word-spacing: -0.43em;
> * {
letter-spacing: normal;
- word-spacing: normal;
+ //word-spacing: normal;
}
> .legend {
@@ -526,12 +526,23 @@
.form-field(
@_type: @form-field-type,
+ @_type-inline-margin: @form-field-type-inline-margin,
+ @_type-inline-label-margin: @form-field-type-inline-label-margin,
+ @_type-inline-label-padding: @form-field-type-inline-label-padding,
+ @_type-inline-label-align: @form-field-type-inline-label-align,
+ @_type-inline-label-width: @form-field-type-inline-label-width,
+ @_type-inline-control-width: @form-field-type-inline-control-width,
+ @_vertical-indent: @form-field-vertical-indent,
+ @_additional-vertical-indent: @form-field-additional-vertical-indent,
+ @_type-block-margin: @form-field-type-block-margin,
+ @_type-block-label-margin: @form-field-type-block-label-margin,
+ @_type-block-label-padding: @form-field-type-block-label-padding,
+ @_type-block-label-align: @form-field-type-block-label-align,
+
@_border: @form-field-border,
@_column: @form-field-column,
@_column-padding: @form-field-column-padding,
- @_column-width: @form-field-column-width,
- @_type-block-margin: @form-field-type-block-margin,
- @_type-inline-margin: @form-field-type-inline-margin,
+ @_column-number: @form-field-column-number,
@_label-color: @form-field-label-color,
@_label-font-size: @form-field-label-font-size,
@@ -539,11 +550,6 @@
@_label-font-weight: @form-field-label-font-weight,
@_label-font-style: @form-field-label-font-style,
@_label-line-height: @form-field-label-line-height,
- @_type-block-label-margin: @form-field-type-block-label-margin,
- @_type-inline-label-padding: @form-field-type-inline-label-padding,
- @_type-inline-label-width: @form-field-type-inline-label-width,
-
- @_type-inline-control-width: @form-field-type-inline-control-width,
@_label-asterisk-color: @form-field-label-asterisk-color,
@_label-asterisk-font-size: @form-field-label-asterisk-font-size,
@@ -573,23 +579,33 @@
@_note-icon-font-position: @form-field-note-icon-font-position,
@_note-icon-font-text-hide: @form-field-note-icon-font-text-hide
) {
- ._form-field-type(
- @_type,
- @_type-block-margin,
- @_type-inline-margin,
- @_type-block-label-margin,
- @_type-inline-label-padding,
- @_type-inline-label-width,
- @_type-inline-control-width
- );
- ._form-field-column(
+ .css(border, @_border);
+
+ .form-field-type(
+ @_type,
+ @_type-inline-margin,
+ @_type-inline-label-margin,
+ @_type-inline-label-padding,
+ @_type-inline-label-align,
+ @_type-inline-label-width,
+ @_type-inline-control-width,
+ @_vertical-indent,
+ @_type-block-margin,
+ @_type-block-label-margin,
+ @_type-block-label-padding,
+ @_type-block-label-align
+ );
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .form-field-column(
@_column,
@_column-padding,
- @_column-width
+ @_column-number
);
- .css(border, @_border);
-
> .label {
.typography(
@_font-size: @_label-font-size,
@@ -604,75 +620,29 @@
}
}
- &.required > .label:after {
- content: '*';
- .typography(
- @_font-size: @_label-asterisk-font-size,
- @_color: @_label-asterisk-color,
- @_font-family: @_label-asterisk-font-family,
- @_font-weight: @_label-asterisk-font-weight,
- @_line-height: @_label-asterisk-line-height,
- @_font-style: @_label-asterisk-font-style
- );
- .css(margin, @_label-asterisk-margin);
- }
-
- .nested .field {
- margin: 5px 0;
- }
-
- &.choice {
- > .label {
- display: inline;
- }
- > input {
+ .choice {
+ input {
vertical-align: top;
}
}
.fields.group {
- display: flex;
- letter-spacing: -0.31em; // webkit
- *letter-spacing: normal; // reset IE < 8
- word-spacing: -0.43em; // IE < 8 && gecko
- margin-right: - extract(@_column-padding, 2);
- & > * {
- letter-spacing: normal;
- word-spacing: normal;
- }
+ .clearfix();
.field {
.box-sizing();
- vertical-align: top;
- margin: 0 !important;
- &.no-label:before {
- display: none;
- }
- .label {
- width: auto;
- float: none;
- text-align: left;
- padding-right: 0;
- }
- .control {
- float: none;
- width: auto;
- }
+ float: left;
}
&.group-2 .field {
width: 50% !important;
- display: inline-block;
}
&.group-3 .field {
width: 33.3% !important;
- display: inline-block;
}
&.group-4 .field {
width: 25% !important;
- display: inline-block;
}
&.group-5 .field {
width: 20% !important;
- display: inline-block;
}
}
@@ -701,11 +671,25 @@
vertical-align: middle;
}
.addbefore {
- float:left;
- order:1;
+ float: left;
+ order: 1;
}
}
+ .additional {
+ margin-top: @_additional-vertical-indent;
+ }
+
+ ._form-field-required(
+ @_label-asterisk-color,
+ @_label-asterisk-font-size,
+ @_label-asterisk-font-family,
+ @_label-asterisk-font-weight,
+ @_label-asterisk-font-style,
+ @_label-asterisk-line-height,
+ @_label-asterisk-margin
+ );
+
._form-field-note(
@_note-font-size,
@_note-color,
@@ -730,51 +714,138 @@
);
}
-.form-field-type-revert(
- @_type: @form-field-type-revert,
- @_type-block-margin: @form-field-type-block-margin,
+.form-field-type(
+ @_type: @form-field-type,
@_type-inline-margin: @form-field-type-inline-margin,
- @_type-block-label-margin: @form-field-type-block-label-margin,
+ @_type-inline-label-margin: @form-field-type-inline-label-margin,
@_type-inline-label-padding: @form-field-type-inline-label-padding,
+ @_type-inline-label-align: @form-field-type-inline-label-align,
@_type-inline-label-width: @form-field-type-inline-label-width,
- @_type-inline-control-width: @form-field-type-inline-control-width
-) when (@_type = block) and not (@_type = false) {
- ._form-field-type-block(
- @_type-block-margin,
- @_type-block-label-margin
- );
-}
-
-.form-field-type-revert(
- @_type: @form-field-type-revert,
+ @_type-inline-control-width: @form-field-type-inline-control-width,
+ @_vertical-indent: @form-field-vertical-indent,
@_type-block-margin: @form-field-type-block-margin,
- @_type-inline-margin: @form-field-type-inline-margin,
@_type-block-label-margin: @form-field-type-block-label-margin,
- @_type-inline-label-padding: @form-field-type-inline-label-padding,
- @_type-inline-label-width: @form-field-type-inline-label-width,
- @_type-inline-control-width: @form-field-type-inline-control-width
-) when (@_type = inline) and not (@_type = false) {
+ @_type-block-label-padding: @form-field-type-block-label-padding,
+ @_type-block-label-align: @form-field-type-block-label-align
+) when (@_type = inline) {
._form-field-type-inline(
@_type-inline-margin,
+ @_type-inline-label-margin,
@_type-inline-label-padding,
@_type-inline-label-width,
- @_type-inline-control-width
+ @_type-inline-control-width,
+ @_type-inline-label-align,
+ @_vertical-indent
);
- .fields.group {
- .field {
- .label {
- width: auto;
- float: none;
- padding-right: 0;
- }
- .control {
- float: none;
- width: auto;
- }
+}
+
+.form-field-type(
+ @_type: @form-field-type,
+ @_type-inline-margin: @form-field-type-inline-margin,
+ @_type-inline-label-margin: @form-field-type-inline-label-margin,
+ @_type-inline-label-padding: @form-field-type-inline-label-padding,
+ @_type-inline-label-align: @form-field-type-inline-label-align,
+ @_type-inline-label-width: @form-field-type-inline-label-width,
+ @_type-inline-control-width: @form-field-type-inline-control-width,
+ @_vertical-indent: @form-field-vertical-indent,
+ @_type-block-margin: @form-field-type-block-margin,
+ @_type-block-label-margin: @form-field-type-block-label-margin,
+ @_type-block-label-padding: @form-field-type-block-label-padding,
+ @_type-block-label-align: @form-field-type-block-label-align
+) when (@_type = block) {
+ ._form-field-type-block(
+ @_type-block-margin,
+ @_type-block-label-margin,
+ @_type-block-label-padding,
+ @_type-block-label-align
+ );
+}
+
+._form-field-type-inline(
+ @_type-inline-margin,
+ @_type-inline-label-margin,
+ @_type-inline-label-padding,
+ @_type-inline-label-width,
+ @_type-inline-control-width,
+ @_type-inline-label-align,
+ @_vertical-indent
+) {
+ .box-sizing();
+ .clearfix();
+ .css(margin, @_type-inline-margin);
+
+ &.choice:before,
+ &.no-label:before {
+ .box-sizing();
+ content: " ";
+ height: 1px;
+ float: left;
+ .css(width, @_type-inline-label-width);
+ .css(padding, @_type-inline-label-padding);
+ }
+ .description {
+ .box-sizing();
+ float: left;
+ .css(text-align, @_type-inline-label-align);
+ .css(width, @_type-inline-label-width);
+ .css(padding, @_type-inline-label-padding);
+ }
+ &:not(.choice) {
+ > .label {
+ .box-sizing();
+ float: left;
+ .css(text-align, @_type-inline-label-align);
+ .css(width, @_type-inline-label-width);
+ .css(padding, @_type-inline-label-padding);
+ .css(margin, @_type-inline-label-margin);
+ }
+ > .control {
+ float: left;
+ .css(width, @_type-inline-control-width);
}
}
}
+._form-field-type-block(
+ @_type-block-margin,
+ @_type-block-label-margin,
+ @_type-block-label-padding,
+ @_type-block-label-align
+) {
+ .css(margin, @_type-block-margin);
+ > .label {
+ display: inline-block;
+ .css(text-align, @_type-block-label-align);
+ .css(margin, @_type-block-label-margin);
+ .css(padding, @_type-block-label-padding);
+ }
+ .control {
+ }
+}
+
+._form-field-required(
+ @_color: @form-field-label-asterisk-color,
+ @_font-size: @form-field-label-asterisk-font-size,
+ @_font-family: @form-field-label-asterisk-font-family,
+ @_font-weight: @form-field-label-asterisk-font-weight,
+ @_font-style: @form-field-label-asterisk-font-style,
+ @_line-height: @form-field-label-asterisk-line-height,
+ @_margin: @form-field-label-asterisk-margin
+) {
+ &.required > .label:after {
+ content: '*';
+ .typography(
+ @_font-size: @_font-size,
+ @_color: @_color,
+ @_font-family: @_font-family,
+ @_font-weight: @_font-weight,
+ @_line-height: @_line-height,
+ @_font-style: @_font-style
+ );
+ .css(margin, @_margin);
+ }
+}
+
._form-field-note(
@_note-font-size,
@_note-color,
@@ -824,124 +895,119 @@
}
}
-._form-field-type(
- @_type,
- @_type-block-margin,
- @_type-inline-margin,
- @_type-block-label-margin,
- @_type-inline-label-padding,
- @_type-inline-label-width,
- @_type-inline-control-width
-) when (@_type = inline) {
- ._form-field-type-inline(
- @_type-inline-margin,
- @_type-inline-label-padding,
- @_type-inline-label-width,
- @_type-inline-control-width
- );
-}
-
-._form-field-type(
- @_type,
- @_type-block-margin,
- @_type-inline-margin,
- @_type-block-label-margin,
- @_type-inline-label-padding,
- @_type-inline-label-width,
- @_type-inline-control-width
-) when (@_type = block) {
+.form-field-type-revert(
+ @_type: @form-field-type-revert,
+ @_type-inline-margin: @form-field-type-inline-margin,
+ @_type-inline-label-margin: @form-field-type-inline-label-margin,
+ @_type-inline-label-padding: @form-field-type-inline-label-padding,
+ @_type-inline-label-align: @form-field-type-inline-label-align,
+ @_type-inline-label-width: @form-field-type-inline-label-width,
+ @_type-inline-control-width: @form-field-type-inline-control-width,
+ @_vertical-indent: @form-field-vertical-indent,
+ @_type-block-margin: @form-field-type-block-margin,
+ @_type-block-label-margin: @form-field-type-block-label-margin,
+ @_type-block-label-padding: @form-field-type-block-label-padding,
+ @_type-block-label-align: @form-field-type-block-label-align
+) when (@_type = block) and not (@_type = false) {
+ &:not(.choice) {
+ > .label {
+ width: auto;
+ float: none;
+ .box-sizing(content-box);
+ ._revert-type-block-label-align(
+ @_type-block-label-align
+ );
+ ._revert-type-block-label-padding(
+ @_type-block-label-padding
+ );
+ }
+ > .control {
+ width: auto;
+ float: none;
+ }
+ }
._form-field-type-block(
@_type-block-margin,
- @_type-block-label-margin
+ @_type-block-label-margin,
+ @_type-block-label-padding,
+ @_type-block-label-align
);
-}
-
-._form-field-type-inline(
- @_type-inline-margin,
- @_type-inline-label-padding,
- @_type-inline-label-width,
- @_type-inline-control-width
-) {
- .box-sizing();
- .clearfix();
- .css(margin, @_type-inline-margin);
- &:not(.choice) > .label {
- .box-sizing();
- float: left;
- text-align: right;
- .css(width, @_type-inline-label-width);
- .css(padding, @_type-inline-label-padding);
- }
-
- > .description {
- .box-sizing();
- float: left;
- text-align: right;
- .css(width, @_type-inline-label-width);
- .css(padding, @_type-inline-label-padding);
- }
-
&.choice:before,
&.no-label:before {
- .box-sizing();
- content: " ";
- height: 1px;
- float: left;
- .css(width, @_type-inline-label-width);
- .css(padding, @_type-inline-label-padding);
- }
-
- > .control {
- float: left;
- .css(width, @_type-inline-control-width);
+ display: none;
}
}
-._form-field-type-block(
- @_type-block-margin,
- @_type-block-label-margin
-) {
- .css(margin, @_type-block-margin);
- &:not(.choice) > .label {
- display: inline-block;
- width: auto;
- float: none;
- text-align: left;
- .css(margin, @_type-block-label-margin);
- }
-
- &.choice:before,
- &.no-label:before {
- .box-sizing();
- content: " ";
- height: auto;
- float: none;
- width: auto;
- .add-padding(0);
- }
-
- > .control {
- float: none;
- width: auto;
+.form-field-type-revert(
+ @_type: @form-field-type-revert,
+ @_type-inline-margin: @form-field-type-inline-margin,
+ @_type-inline-label-margin: @form-field-type-inline-label-margin,
+ @_type-inline-label-padding: @form-field-type-inline-label-padding,
+ @_type-inline-label-align: @form-field-type-inline-label-align,
+ @_type-inline-label-width: @form-field-type-inline-label-width,
+ @_type-inline-control-width: @form-field-type-inline-control-width,
+ @_vertical-indent: @form-field-vertical-indent,
+ @_type-block-margin: @form-field-type-block-margin,
+ @_type-block-label-margin: @form-field-type-block-label-margin,
+ @_type-block-label-padding: @form-field-type-block-label-padding,
+ @_type-block-label-align: @form-field-type-block-label-align
+) when (@_type = inline) and not (@_type = false) {
+ > .label {
+ ._revert-type-inline-label-margin(
+ @_type-inline-label-margin
+ );
}
+ ._form-field-type-inline(
+ @_type-inline-margin,
+ @_type-inline-label-margin,
+ @_type-inline-label-padding,
+ @_type-inline-label-width,
+ @_type-inline-control-width,
+ @_type-inline-label-align,
+ @_vertical-indent
+ );
}
-._form-field-column(
- @_column,
- @_column-padding,
- @_column-width
+.form-field-column(
+ @_column: @form-field-column,
+ @_column-padding: @form-field-column-padding,
+ @_column-number: @form-field-column-number
) when (@_column = true) {
+
.box-sizing();
+ //float: left;
display: inline-block;
.css(padding, @_column-padding);
- .css(width, @_column-width);
+ .form-field-column-number(@_column-number);
vertical-align: top;
- .nested .field { // todo
- width: 100%;
+ & + .fieldset {
+ clear: both;
}
}
+.form-field-column-number(@_column-number: @form-field-column-number) {
+ .css(width, 100% / @_column-number);
+}
+
+._revert-type-block-label-padding(
+ @_type-block-label-padding
+) when (@_type-block-label-padding = false) {
+ padding: 0;
+}
+
+._revert-type-block-label-align(
+ @_type-block-label-align
+) when (@_type-block-label-align = false) {
+ text-align: left;
+}
+
+._revert-type-inline-label-margin(
+ @_type-inline-label-margin
+) when (@_type-inline-label-margin = false) {
+ margin: 0;
+}
+
.form-hasrequired(
@_position: @form-hasrequired-position,
@_color: @form-hasrequired-color,
diff --git a/lib/web/css/source/lib/icons.less b/lib/web/css/source/lib/icons.less
index 01325c731fc..057aab40747 100644
--- a/lib/web/css/source/lib/icons.less
+++ b/lib/web/css/source/lib/icons.less
@@ -26,8 +26,8 @@
// Icons using font
//--------------------------------------
.font-face(
- @family-name: 'icons-blank-theme',
- @font-path: '@{baseDir}fonts/Blank-Theme-Icons/Blank-Theme-Icons',
+ @family-name: @icon-font-name,
+ @font-path: @icon-font-path,
@font-weight: normal,
@font-style: normal
);
diff --git a/lib/web/css/source/lib/layout.less b/lib/web/css/source/lib/layout.less
index 2186d106c11..920b3c2242a 100644
--- a/lib/web/css/source/lib/layout.less
+++ b/lib/web/css/source/lib/layout.less
@@ -51,7 +51,11 @@
max-width: @_layout-max-width;
}
-#layout-columns() when (@use-flex = false) {
+#layout-columns() {
+ & when (@use-flex = true) {
+ .box-sizing();
+ .mix-flex(flex, row wrap);
+ };
&:after {
content: " ";
display: block;
@@ -60,16 +64,6 @@
overlow: hidden;
visibility: hidden;
}
-}
-
-#layout-columns() {
- & when (@use-flex = true) {
- .box-sizing();
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- };
-
.main() {
.@{layout-class-1column} & {
.layout-column(1, 2, 100%);
@@ -134,14 +128,14 @@
}
}
-.flex-degradation(@_total-columns, @_order) when (@use-flex = false) and (@_order = 1) {
+.flex-degradation(@_total-columns, @_order) when (@_order = 1) {
float: left;
}
-.flex-degradation(@_total-columns, @_order) when (@use-flex = false) and (@_order = @_total-columns) {
+.flex-degradation(@_total-columns, @_order) when (@_order = @_total-columns) {
float: right;
}
-.flex-degradation(@_total-columns, @_order) when (@use-flex = false) and (@_total-columns = 3) and (@_order = 2) {
+.flex-degradation(@_total-columns, @_order) when (@_total-columns = 3) and (@_order = 2) {
display: inline-block;
}
diff --git a/lib/web/css/source/lib/loaders.less b/lib/web/css/source/lib/loaders.less
index 02ca2df5b96..c4fa1d95088 100644
--- a/lib/web/css/source/lib/loaders.less
+++ b/lib/web/css/source/lib/loaders.less
@@ -111,4 +111,5 @@
position: absolute;
right: 0;
top: 0;
+ z-index: 100;
}
diff --git a/lib/web/css/source/lib/popups.less b/lib/web/css/source/lib/popups.less
index 147e79b2601..e2647a2890f 100644
--- a/lib/web/css/source/lib/popups.less
+++ b/lib/web/css/source/lib/popups.less
@@ -87,10 +87,10 @@
@_popup-actions-toolbar-primary-actions-links-margin-top: @popup-actions-toolbar-primary-actions-links-margin-top,
@_popup-actions-toolbar-secondary-actions-links-margin-top: @popup-actions-toolbar-secondary-actions-links-margin-top,
) {
- .add-width(@_popup-width);
- .add-background(@_popup-background);
- .add-padding(@_popup-padding);
- .add-border(@_popup-border);
+ .css(background, @_popup-background);
+ .css(border, @_popup-border);
+ .css(padding, @_popup-padding);
+ .css(width, @_popup-width);
._popup-height(@_popup-height);
._popup-shadow(@_popup-shadow);
._popup-action-toolbar(
@@ -106,23 +106,24 @@
@_popup-actions-toolbar-primary-actions-links-margin-top,
@_popup-actions-toolbar-secondary-actions-links-margin-top
);
- .popup.header {
- .add-margin(@_popup-header-margin);
+ .popup-header {
+ .css(margin, @_popup-header-margin);
.title {
._popup-headings(
@_popup-title-headings,
@_popup-title-headings-level
);
}
+ .css(padding-right, @_popup-icon-font-size)
}
- .popup.content {
+ .popup-content {
._popup-height(@_popup-content-height);
- .add-margin(@_popup-content-margin);
+ .css(margin, @_popup-content-margin);
}
- .popup.footer {
- .add-margin(@_popup-footer-margin);
+ .popup-footer {
+ .css(margin, @_popup-footer-margin);
}
- .popup.actions {
+ .popup-actions {
.action.close {
position: @_popup-button-close-position;
._popup-button-close-icon(
@@ -142,32 +143,27 @@
._popup-button-close-reset(
@_popup-button-close-reset
);
- ._popup-position(
- @_popup-button-close-position-top,
- @_popup-button-close-position-bottom,
- @_popup-button-close-position-left,
- @_popup-button-close-position-right
- );
+ .css(top, @_popup-button-close-position-top);
+ .css(right, @_popup-button-close-position-right);
+ .css(bottom, @_popup-button-close-position-bottom);
+ .css(left, @_popup-button-close-position-left);
}
}
+ .css(top, @_popup-position-top);
+ .css(right, @_popup-position-right);
+ .css(bottom, @_popup-position-bottom);
+ .css(left, @_popup-position-left);
+
+ .css(margin-top, @_popup-margin-top);
+ .css(margin-right, @_popup-margin-right);
+ .css(margin-bottom, @_popup-margin-bottom);
+ .css(margin-left, @_popup-margin-left);
+
display: none;
- position: @_popup-position;
- ._popup-position(
- @_popup-position-top,
- @_popup-position-bottom,
- @_popup-position-left,
- @_popup-position-right
- );
- ._popup-margins(
- @_popup-margin-top,
- @_popup-margin-bottom,
- @_popup-margin-left,
- @_popup-margin-right
- );
- z-index: @_popup-z-index;
opacity: 0;
+ .css(position, @_popup-position);
+ .css(z-index, @_popup-z-index);
._popup-fade(@_popup-fade);
-
&.active {
opacity: 1;
}
@@ -186,8 +182,8 @@
right: 0;
bottom: 0;
left: 0;
- z-index: @_overlay-z-index;
- .add-background(@_overlay-background);
+ .css(background, @_overlay-background);
+ .css(z-index, @_overlay-z-index);
opacity: 0;
&.active {
opacity: @_overlay-opacity;
@@ -212,9 +208,10 @@
// Popup height
._popup-height(@_popup-height) when not (@_popup-height = auto) {
overflow-y: auto;
- max-height: @_popup-height;
+ .css(max-height, @_popup-height);
}
+
// Popup Headings
._popup-headings(
@_popup-title-headings,
@@ -272,7 +269,7 @@
@_popup-actions-toolbar-primary-actions-links-margin-top,
@_popup-actions-toolbar-secondary-actions-links-margin-top
) when (@_popup-action-toolbar = true) {
- .popup.footer {
+ .popup-footer {
.actions.toolbar {
.actions-toolbar(
@_actions-toolbar-actions-position: @_popup-actions-toolbar-actions-position,
@@ -290,77 +287,6 @@
}
}
-// Popup margins: top left bottom right
-._popup-margins(
- @_popup-margin-top,
- @_popup-margin-bottom,
- @_popup-margin-left,
- @_popup-margin-right
-) when not (@_popup-margin-top = '') {
- margin-top: @_popup-margin-top;
-}
-._popup-margins(
- @_popup-margin-top,
- @_popup-margin-bottom,
- @_popup-margin-left,
- @_popup-margin-right
-) when not (@_popup-margin-bottom = '') {
- margin-bottom: @_popup-margin-bottom;
-}
-._popup-margins(
- @_popup-margin-top,
- @_popup-margin-bottom,
- @_popup-margin-left,
- @_popup-margin-right
-) when not (@_popup-margin-left = '') {
- margin-left: @_popup-margin-left;
-}
-._popup-margins(
- @_popup-margin-top,
- @_popup-margin-bottom,
- @_popup-margin-left,
- @_popup-margin-right
-) when not (@_popup-margin-right = '') {
- margin-right: @_popup-margin-right;
-}
-
-// Popup position: top left bottom right
-._popup-position(
- @_popup-position-top,
- @_popup-position-bottom,
- @_popup-position-left,
- @_popup-position-right
-) when not (@_popup-position-top = '') {
- top: @_popup-position-top;
-}
-
-._popup-position(
- @_popup-position-top,
- @_popup-position-bottom,
- @_popup-position-left,
- @_popup-position-right
-) when not (@_popup-position-bottom = '') {
- bottom: @_popup-position-bottom;
-}
-
-._popup-position(
- @_popup-position-top,
- @_popup-position-bottom,
- @_popup-position-left,
- @_popup-position-right
-) when not (@_popup-position-left = '') {
- left: @_popup-position-left;
-}
-
-._popup-position(
- @_popup-position-top,
- @_popup-position-bottom,
- @_popup-position-left,
- @_popup-position-right
-) when not (@_popup-position-right = '') {
- right: @_popup-position-right;
-}
-
// Popup close button use icon
._popup-button-close-icon(
@_popup-button-close-icon,
@@ -397,39 +323,3 @@
) when (@_popup-button-close-reset = true) {
.button-reset();
}
-// Popup working with dropdown dialog
-.ui-dialog.popup {
- width: 420px;
- .map.popup {
- top: auto;
- left: auto;
- padding: 22px;
- }
- .action.close {
- position: @popup-button-close-position;
- ._popup-button-close-icon(
- @popup-button-close-icon,
- @popup-icon-font-content,
- @popup-icon-font,
- @popup-icon-font-size,
- @popup-icon-font-line-height,
- @popup-icon-font-color,
- @popup-icon-font-color-hover,
- @popup-icon-font-color-active,
- @popup-icon-font-margin,
- @popup-icon-font-vertical-align,
- @popup-icon-font-position,
- @popup-icon-font-text-hide
- );
- ._popup-button-close-reset(
- @popup-button-close-reset
- );
- ._popup-position(
- @popup-button-close-position-top,
- @popup-button-close-position-bottom,
- @popup-button-close-position-left,
- @popup-button-close-position-right
- );
- z-index: 1001;
- }
-}
diff --git a/lib/web/css/source/lib/responsive.less b/lib/web/css/source/lib/responsive.less
index 98cada4cccd..7282ffdf598 100644
--- a/lib/web/css/source/lib/responsive.less
+++ b/lib/web/css/source/lib/responsive.less
@@ -22,6 +22,13 @@
// * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
// */
+// Small screens only
+.responsive-smaller(@break-point-0) {};
+
+@media all and (max-width: @break-point-0) {
+ .responsive-smaller(@break-point-0);
+}
+
@media all and (min-width: @break-point-0) {
.responsive(@break-point-0);
}
diff --git a/lib/web/css/source/lib/sections.less b/lib/web/css/source/lib/sections.less
index 0e1a8eb2a68..915f17fab05 100644
--- a/lib/web/css/source/lib/sections.less
+++ b/lib/web/css/source/lib/sections.less
@@ -31,18 +31,18 @@
width: auto;
> .switch {
display: block;
+ height: @_tab-control-height-base;
position: relative;
z-index: 2;
- height: @_tab-control-height-base;
}
}
> .item.content {
+ .box-sizing();
.clearfix();
- margin-top: @_tab-control-height-base;
- width: 100%;
float: right;
+ margin-top: @_tab-control-height-base;
margin-left: -100%;
- .box-sizing();
+ width: 100%;
&.active {
display: block;
}
@@ -93,9 +93,9 @@
@_tab-content-padding-left: @tab-content-padding-left
) {
.data-tabs-base();
- .item.title {
+ > .item.title {
margin: 0 @_tab-control-margin-right 0 0;
- .switch {
+ > .switch {
.typography(
@_color: @_tab-control-color,
@_font-size: @_tab-control-font-size,
@@ -116,22 +116,23 @@
);
height: @_tab-control-height;
padding: @_tab-control-padding-top @_tab-control-padding-right @_tab-control-padding-bottom @_tab-control-padding-left;
- .add-border(@_tab-content-border);
- .add-background(@_tab-control-bg);
+ .css(border, @_tab-content-border);
+ .css(background, @_tab-control-bg);
border-bottom: none;
}
&:not(.disabled) > .switch:focus,
&:not(.disabled) > .switch:hover {
- .add-background(@_tab-control-bg-hover);
+ .css(background, @_tab-control-bg-hover);
}
&:not(.disabled) > .switch:active,
&.active > .switch,
&.active > .switch:focus,
&.active > .switch:hover {
- .add-background(@_tab-control-bg-active);
+ .css(background, @_tab-control-bg-active);
.css(color, @_tab-control-color-active);
}
- &.active > .switch {
+ &.active > .switch,
+ &.active > .switch:hover {
padding-bottom: @_tab-control-padding-bottom + @_tab-control-border-width;
}
}
@@ -191,7 +192,10 @@
@_accordion-control-font-weight: @accordion-control-font-weight,
@_accordion-control-line-height: @accordion-control-line-height,
- @_accordion-control-border: @accordion-control-border,
+ @_accordion-control-border-top: @accordion-control-border-top,
+ @_accordion-control-border-right: @accordion-control-border-right,
+ @_accordion-control-border-bottom: @accordion-control-border-bottom,
+ @_accordion-control-border-left: @accordion-control-border-left,
@_accordion-control-bg: @accordion-control-bg,
@_accordion-control-color: @accordion-control-color,
@@ -202,7 +206,7 @@
@_accordion-control-bg-hover: @accordion-control-bg-hover,
@_accordion-control-color-hover: @accordion-control-color-hover,
- @_accordion-control-text-decoration-hover: @accordion-control-color-hover,
+ @_accordion-control-text-decoration-hover: @accordion-control-text-decoration-hover,
@_accordion-control-bg-active: @accordion-control-bg-active,
@_accordion-control-color-active: @accordion-control-color-active,
@@ -223,18 +227,32 @@
@_accordion-content-padding: @accordion-content-padding
) {
.data-accordion-base();
+ & when (@_accordion-control-margin-bottom = 0) {
+ > .item.title {
+ .css(margin, 0);
+ }
+ }
+ & when not (@_accordion-control-margin-bottom = 0) {
+ > .item.title {
+ .css(margin, 0 0 @_accordion-control-margin-bottom);
+ }
+ }
> .item.title {
- margin: 0 0 @_accordion-control-margin-bottom;
> .switch {
- .add-border(@_accordion-control-border);
- .add-background(@_accordion-control-bg);
+ .css(background, @_accordion-control-bg);
+ .css(border-top,@_accordion-control-border-top);
+ .css(border-right,@_accordion-control-border-right);
+ .css(border-bottom,@_accordion-control-border-bottom);
+ .css(border-left,@_accordion-control-border-left);
+ height: @_accordion-control-height;
+ padding: @_accordion-control-padding-top @_accordion-control-padding-right @_accordion-control-padding-bottom @_accordion-control-padding-left;
.typography(
- @_font-size: @_accordion-control-font-size,
@_color: @_accordion-control-color,
@_font-family: @_accordion-control-font-family,
+ @_font-size: @_accordion-control-font-size,
+ @_font-style: @_accordion-control-font-style,
@_font-weight: @_accordion-control-font-weight,
- @_line-height: @_accordion-control-line-height,
- @_font-style: @_accordion-control-font-style
+ @_line-height: @_accordion-control-line-height
);
.link(
@_link-color: @_accordion-control-color,
@@ -246,25 +264,23 @@
@_link-color-active: @_accordion-control-color-active,
@_link-text-decoration-active: @_accordion-control-text-decoration-active
);
- height: @_accordion-control-height;
- padding: @_accordion-control-padding-top @_accordion-control-padding-right @_accordion-control-padding-bottom @_accordion-control-padding-left;
}
&:not(.disabled) > .switch:focus,
&:not(.disabled) > .switch:hover {
- .add-background(@_accordion-control-bg-hover);
+ .css(background, @_accordion-control-bg-hover);
}
&:not(.disabled) > .switch:active,
&.active > .switch,
&.active > .switch:focus,
&.active > .switch:hover {
- .add-background(@_accordion-control-bg-active);
+ .css(background, @_accordion-control-bg-active);
padding-bottom: @_accordion-control-padding-bottom;
}
}
> .item.content {
- .add-margin(@_accordion-content-margin);
- .add-padding(@_accordion-content-padding);
- .add-background(@_accordion-content-bg);
- .add-border(@_accordion-content-border);
+ .css(background, @_accordion-content-bg);
+ .css(border, @_accordion-content-border);
+ .css(margin, @_accordion-content-margin);
+ .css(padding, @_accordion-content-padding);
}
}
diff --git a/lib/web/css/source/lib/utilities.less b/lib/web/css/source/lib/utilities.less
index 1e817125703..7db499ac822 100644
--- a/lib/web/css/source/lib/utilities.less
+++ b/lib/web/css/source/lib/utilities.less
@@ -190,9 +190,8 @@
// Box-sizing
//--------------------------------------
.box-sizing(@type: border-box) {
- -moz-box-sizing: @type;
-webkit-box-sizing: @type;
- -ms-box-sizing: @type;
+ -moz-box-sizing: @type;
box-sizing: @type;
}
@@ -252,6 +251,31 @@
@{_property}:@_value;
}
+//
+// Add url to property
+//--------------------------------------
+// usage:
+// .column.left {
+// .url('images/fallback.png');
+// background:url("@{url}") repeat-y;
+// }
+// .columns {
+// .url('images/fallback.png', 'Magento_Catalog');
+// background:url("@{url}") repeat;
+// }
+
+@urls-resolved: false;
+
+.url (@_path) {
+ @url: "@{baseDir}@{_path}";
+}
+.url (@_path, @_module) when not (@_module = false) and not (@_module = '') and (@urls-resolved = false) {
+ @url: "@{_module}::@{_path}";
+}
+.url (@_path, @_module) when not (@_module = false) and not (@_module = '') and (@urls-resolved = true) {
+ @url: "@{baseDir}@{_module}/@{_path}";
+}
+
//
// Add padding when the variable is set
//--------------------------------------
@@ -391,3 +415,35 @@
}
}
+//
+// Flex layout
+//--------------------------------------
+
+.mix-flex(
+ @_display: flex,
+ @_flow: row wrap
+) {
+ display: ~"-webkit-@{_display}";
+ display: ~"-ms-@{_display}";
+ display: @_display;
+
+ -webkit-flex-flow: @_flow;
+ -ms-flex-flow: @_flow;
+ flex-flow: @_flow;
+}
+.mix-flex-flex(
+ @_flex: 1,
+ @_basis: 100%
+) {
+ -webkit-flex: @_flex @_basis;
+ -ms-flex: @_flex @_basis;
+ flex: @_flex @_basis;
+}
+.mix-flex-order(
+ @_order: 1
+) {
+ -webkit-order: @_order;
+ -ms-order: @_order;
+ order: @_order;
+}
+
diff --git a/lib/web/css/source/lib/variables.less b/lib/web/css/source/lib/variables.less
index a4e01f2aff2..52ae6ed1e44 100644
--- a/lib/web/css/source/lib/variables.less
+++ b/lib/web/css/source/lib/variables.less
@@ -25,17 +25,19 @@
// Typography
//--------------------------------------
-//Base
+// Base
@font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, 'Times New Roman', Times, serif;
@font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace;
@font-path: "../../fonts/";
+@icon-font-path: "@{baseDir}fonts/Blank-Theme-Icons/Blank-Theme-Icons";
+@icon-font-name: 'icons-blank-theme';
@color-primary: #333;
-@color-primary-dark: darken(@color-primary, 35%);
-@color-primary-darker: darken(@color-primary, 13.5%);
-@color-primary-lighter: lighten(@color-primary, 29%);
-@color-primary-light: lighten(@color-primary, 45%);
+@color-primary-dark: darken(@color-primary, 35%); // #000
+@color-primary-darker: darken(@color-primary, 13.5%); // #111
+@color-primary-lighter: lighten(@color-primary, 29%); // #7d7d7d
+@color-primary-light: lighten(@color-primary, 45%); // #a6a6a6
@color-secondary: #e8e8e8;
@color-secondary-light: lighten(@color-secondary, 5%);
@page-bg-color: #fff;
@@ -284,6 +286,7 @@
@layout-width: ''; // for the fixed width layout
@layout-max-width: 1280px;
@layout-indent: 20px;
+@layout-width-xs-indent: 10px;
// Classnames defining different layouts
@layout-class-1column: layout-1;
@@ -307,11 +310,15 @@
@layout-column-main-width-2-right: @layout-columns-width - @layout-column-right-width;
@layout-column-main-width-3: @layout-columns-width - @layout-column-left-width - @layout-column-right-width;
+// Checkout columns width
+@layout-column-checkout-left-width: 3;
+@layout-column-checkout-main-width: @layout-columns-width - @layout-column-checkout-left-width;
+
//
// Responsive
//--------------------------------------
// Settings variables (TO DO: should be global)
-@use-flex: false; // Use flexbox [true|false]
+@use-flex: true; // Use flexbox [true|false]
@responsive: true; // Theme is responsive [true|false]
@break-point-0: 600px; // catalog products in a row: (width <= 599) - 2 columns, (600 <= width <= 768) - 3 columns, (768 < width ) - 4 columns
@@ -345,7 +352,7 @@
@submenu-border: '';
@submenu-padding: 0 0 0 20px;
@submenu-font-size: '';
-@submenu-font-weight: @font-weight-bold;
+@submenu-font-weight: @font-weight-base;
@submenu-item-padding: 8px 0;
@submenu-item-background: '';
@@ -460,11 +467,9 @@
@tab-control-border-width: @border-width-base;
@tab-content-border: @tab-control-border-width solid @tab-control-border-color;
-@tab-content-margin-top: @tab-control-height + @tab-control-border-width;
@tab-content-padding: @indent-base;
@tab-content-margin-top: @tab-control-height + @tab-control-border-width + @tab-control-padding-top + @tab-control-padding-bottom;
-@tab-control-margin-right: @indent-xs-base;
@tab-content-padding-top: @indent-base;
@tab-content-padding-right: @indent-base;
@@ -478,7 +483,10 @@
@accordion-control-font-weight: @tab-control-font-weight;
@accordion-control-line-height: @accordion-control-height;
-@accordion-control-border: @tab-control-border-width solid @tab-control-border-color;
+@accordion-control-border-top: @tab-control-border-width solid @tab-control-border-color;
+@accordion-control-border-right: @tab-control-border-width solid @tab-control-border-color;
+@accordion-control-border-bottom: @tab-control-border-width solid @tab-control-border-color;
+@accordion-control-border-left: @tab-control-border-width solid @tab-control-border-color;
@accordion-control-bg: @tab-control-bg;
@accordion-control-color: @tab-control-color;
@@ -515,7 +523,7 @@
//--------------------------------------
// Button font style
-@button-font-family: '';
+@button-font-family: @font-family-base;
@button-font-size: @font-size-base;
@button-font-weight: @font-weight-bold;
@button-height: 30px;
@@ -533,52 +541,51 @@
@button-color: #333;
@button-background: #f2f2f2;
@button-border: 1px solid #cdcdcd;
-@button-gradient-start-color: '';
-@button-gradient-end-color: '';
+@button-gradient-start-color: false;
+@button-gradient-end-color: false;
@button-color-hover: #555;
@button-background-hover: #e2e2e2;
-@button-border-hover: 1px solid #cdcdcd;
-@button-gradient-start-color-hover: '';
-@button-gradient-end-color-hover: '';
+@button-border-hover: @button-border;
+@button-gradient-start-color-hover: false;
+@button-gradient-end-color-hover: false;
@button-background-active: #e2e2e2;
@button-color-active: #333;
@button-border-active: 1px solid #cdcdcd;
-@button-gradient-start-color-active: '';
-@button-gradient-end-color-active: '';
+@button-gradient-start-color-active: false;
+@button-gradient-end-color-active: false;
// Primary button
@button-primary-height: 30px;
-@button-primary-width: '';
-@button-primary-margin: '';
+@button-primary-width: false;
+@button-primary-margin: false;
@button-primary-padding: @button-padding;
@button-primary-gradient: false;
-@button-primary-gradient-direction: '';
+@button-primary-gradient-direction: false;
@button-primary-background: #1979c3;
@button-primary-border: 1px solid #1979c3;
@button-primary-color: #fff;
-@button-primary-gradient-start-color: '';
-@button-primary-gradient-end-color: '';
+@button-primary-gradient-start-color: false;
+@button-primary-gradient-end-color: false;
@button-primary-background-hover: #006bb4;
@button-primary-border-hover: 1px solid #006bb4;
@button-primary-color-hover: #fff;
-@button-primary-gradient-start-color-hover: '';
-@button-primary-gradient-end-color-hover: '';
+@button-primary-gradient-start-color-hover: false;
+@button-primary-gradient-end-color-hover: false;
@button-primary-background-active: #006bb4;
@button-primary-border-active: 1px solid #006bb4;
@button-primary-color-active: #fff;
-@button-primary-gradient-start-color-active: '';
-@button-primary-gradient-end-color-active: '';
-
+@button-primary-gradient-start-color-active: false;
+@button-primary-gradient-end-color-active: false;
// Gradient button
// Does button have gradient background:
@button-gradient: false;
-@button-gradient-direction: '';
+@button-gradient-direction: false;
// Button with icon
@button-icon-use: false;
@@ -620,7 +627,7 @@
@icon-sprite-position-y: 0;
@icon-sprite-grid: 26px;
-@icon-font: 'icons-blank-theme'; // Also used in: @button-icon-font, @rating-icon-font, @pager-icon-font
+@icon-font: @icon-font-name; // Also used in: @button-icon-font, @rating-icon-font, @pager-icon-font
@icon-font-position: @icon-position;
@icon-font-text-hide: @icon-text-hide;
@icon-font-margin: @icon-margin;
@@ -672,6 +679,7 @@
@icon-arrow-right-thin: '\e624';
@icon-arrow-left-thin: '\e625';
@icon-arrow-down-thin: '\e626';
+@icon-account: '\e627';
//
// Messages variables
@@ -812,7 +820,7 @@
@form-element-input-border-radius: 1px;
@form-element-input-height: 32px;
@form-element-input-width: 100%;
-@form-element-input-padding: 0 10px;
+@form-element-input-padding: 0 9px;
@form-element-input-margin: false;
@form-element-input-vertical-align: baseline;
@form-element-input-background-clip: padding-box; // border-box, content-box
@@ -840,7 +848,7 @@
// Form elements choice default variables
@form-element-choice-type: ''; //radio, checkbox
-@form-element-choice-vertical-align: top;
+@form-element-choice-vertical-align: false;
@form-element-choice-margin: 2px 5px 0 0;
@form-element-choice-disabled-opacity: @form-element-input-disabled-opacity;
@@ -998,23 +1006,29 @@
// Field
@form-field-type: block; //inline
@form-field-type-revert: inline; // block, false
-@form-field-border: none;
+@form-field-border: false;
@form-field-column: false;
-@form-field-column-padding: 0 20px 0 0;
-@form-field-column-width: 50%;
-@form-field-type-inline-vertical-margin: 29px;
-@form-field-type-block-margin: 0 0 @form-field-type-inline-vertical-margin;
-@form-field-type-inline-margin: 0 0 @form-field-type-inline-vertical-margin;
+@form-field-column-padding: 0 12px 0 0;
+@form-field-column-number: 2;
+@form-field-vertical-indent: 29px;
+@form-field-additional-vertical-indent: @form-field-vertical-indent;
+@form-field-type-block-margin: 0 0 @form-field-vertical-indent;
+@form-field-type-inline-margin: 0 0 @form-field-vertical-indent;
// form field label
+@form-field-label-align: false;
@form-field-label-color: false;
@form-field-label-font-size: false;
@form-field-label-font-family: false;
@form-field-label-font-weight: @font-weight-bold;
@form-field-label-font-style: false;
@form-field-label-line-height: false;
-@form-field-type-block-label-margin: 0 0 5px;
+@form-field-type-inline-label-margin: false;
@form-field-type-inline-label-padding: 6px 15px 0 0;
@form-field-type-inline-label-width: 25.8%;
+@form-field-type-inline-label-align: right;
+@form-field-type-block-label-margin: 0 0 5px;
+@form-field-type-block-label-padding: false;
+@form-field-type-block-label-align: @form-field-label-align;
// form field control
@form-field-type-inline-control-width: 74.2%;
// form field label asterisk
@@ -1070,7 +1084,7 @@
@pager-font-weight: @font-weight-base;
@pager-line-height: 32px;
@pager-item-margin: 0 1px;
-@pager-item-padding: 0 10px;
+@pager-item-padding: 0 4px;
@pager-actions-padding: 0;
// Pager current page
@@ -1126,9 +1140,9 @@
@pager-icon-text-hide: true;
@pager-icon-position: before;
@pager-icon-font: @icon-font;
-@pager-icon-font-margin: @icon-margin;
+@pager-icon-font-margin: 0 0 0 -6px;
@pager-icon-font-vertical-align: top;
-@pager-icon-font-size: 32px;
+@pager-icon-font-size: 46px;
@pager-icon-font-line-height: @icon-font-line-height;
// Pager link.action gradient: does element have gradient background
@@ -1173,7 +1187,7 @@
@rating-icon-font: @icon-font;
@rating-icon-font-size: 28px;
@rating-icon-letter-spacing: -10px;
-@rating-icon-color: #ccc;
+@rating-icon-color: #c7c7c7;
@rating-icon-color-active: #ff5601;
@rating-label-hide: false;
@@ -1185,7 +1199,7 @@
@dropdown-list-min-width: 100%; // Also used in: @dropdown-split-list-min-width
@dropdown-list-width: false; // Also used in: @dropdown-split-list-width
@dropdown-list-height: false; // Also used in: @dropdown-split-list-height
-@dropdown-list-position-top: false;
+@dropdown-list-position-top: 100%;
@dropdown-list-position-bottom: false;
@dropdown-list-position-left: false;
@dropdown-list-position-right: false;
@@ -1276,13 +1290,22 @@
// Breadcrumbs variables
//--------------------------------------
@breadcrumbs-font-size: @font-size-s;
+@breadcrumbs-container-margin: 0 0 20px;
-@breadcrumbs-separator-symbol: '>';
+@breadcrumbs-separator-symbol: false;
@breadcrumbs-separator-color: @breadcrumbs-current-color;
+@breadcrumbs-icon-use: true;
+@breadcrumbs-icon-font-content: @icon-next;
+@breadcrumbs-icon-font: @icon-font;
+@breadcrumbs-icon-font-size: 24px;
+@breadcrumbs-icon-font-line-height: 18px;
+@breadcrumbs-icon-font-color: false;
+@breadcrumbs-icon-font-margin: 0;
+@breadcrumbs-icon-font-vertical-align: top;
+
@breadcrumbs-display: false;
@breadcrumbs-padding: false;
-@breadcrumbs-hide-label: true;
// Breadcrumbs - current page
@breadcrumbs-current-color: #a3a3a3;
@@ -1335,7 +1358,7 @@
//
// Popups variables
//--------------------------------------
-@popup-width: 380px;
+@popup-width: auto;
@popup-height: auto;
@popup-padding: 22px;
@popup-background: #fff;
@@ -1345,20 +1368,20 @@
@popup-z-index: 1001;
@popup-position: fixed;
-@popup-position-top: 20%;
-@popup-position-right: '';
-@popup-position-bottom: '';
-@popup-position-left: 50%;
+@popup-position-top: 0;
+@popup-position-right: 0;
+@popup-position-bottom: 0;
+@popup-position-left: 0;
-@popup-margin-top: '';
-@popup-margin-right: '';
-@popup-margin-bottom: '';
-@popup-margin-left: -((@popup-width+(@popup-padding*2))/2);
+@popup-margin-top: false;
+@popup-margin-right: false;
+@popup-margin-bottom: false;
+@popup-margin-left: false;
@popup-content-height: auto;
-@popup-header-margin: '';
-@popup-content-margin: '';
-@popup-footer-margin: '';
+@popup-header-margin: 0 0 25px;
+@popup-content-margin: false;
+@popup-footer-margin: false;
@popup-title-headings: true; //false
@popup-title-headings-level: h3; // h1, h2, h3, h4, h5, h6
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot
index 9ebea234bb800c969e6bcf32312b9f2f645a486c..62bdd2789b80e4759cfb379c307f2186aafce389 100644
GIT binary patch
delta 714
zcmYjOO=}Zj5T2R$Yd6WRO`7c5rUp$yB2r@7=EFirQ@rFLR1bb2QX6U|NMi!+p@K9N
zyxB|Gs~|`P1red1#Df>1hhjbZ1H1`dJP00~q*PqyW#)OF_nDd9{Zl+B>E<NB<B5T;
z$nMKUZ_s!iy#@du`K+vVTD{5ZhuednQ~l2$jxqq)1BicZueI*c{oetA*Wi1VHWTKP
z_`!IKakkyr+<F1$4;epW{BFIw+IqCN!CwCg<J+CqRuAg%o$)KiXCJmYYX>Vg-!neo
z89}eRu?d0|n7A|4LCD}KHZUI?;$_V5kJ0>ipI`?TMPDpH9A2|4?NTD1qPf{Rl}iQ6
zBxX}gxMT_<|1Was0%l5es@BCxU@6CXImfmd7BF8d&_ybsi^dhc$4yhh=T>Fz?Q_ZO
zDEh(_bz0A`mHW*REbX>ywf64PNp5a0S3<F5jHHz0B&U+Du#6>?Wf>AuDN<S!A`+42
ziUctlC2`Dht+e!=#D)C1NHjS{Lmz9>GAMOlj?79cbcMETDUD?$&zW)vDLNSoRhPG$
zV&VUlhO1?VbZWjb<MA{^9galQa0e8Q>nfgX*_P2N!Zc6ghuaG6vc~VBq#92|r5z51
zAK1pWNjeVSRm#tmvpQsqF#hTIXful~MrmVdsa)3)qZy;Nh+eUL=?s6LD*s$OK2N+G
u*}JD|zaT7`065zFwtJF;^+Xk?gT2HX$>L6M)w>l6wOJi{r}y7_U+^#9-fyY^
delta 250
zcmX?M^2dO!MuLH1gZM-?GnW0qJ-HJd<_iWeFfi-^;)LYf!~&_%Gqn>x$kZQa<9fir
zz*xY*Ak34InwY}4FU637L8Jz#&MX5cz<z-F4UoSD$XCh8EvcBtpy3VV-vIL0<m4wO
z=Gznl^@_Ft`4PE^6$K2o49|f4J3zidUSe+QiG*;VUeP~5J0=(87nd+F17#S*CxGM`
zm{}%wGdeJ;O+Lfu%&4|mfXPx=nGq-h#Pb(R?1<;L`O3h}0@A>6KA`_LjGk;DZqBGZ
WIYWHSWC@7~Hjr`#?afsZ=NJK&K0zq}
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg
index 77168dfe5e7..26dd7b7fecd 100644
--- a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg
+++ b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg
@@ -46,4 +46,5 @@
<glyph unicode="" d="M1.994 518.75h748.928l-283.278 291.206h200.254l354.108-363.956-354.108-363.956h-200.254l283.278 291.174h-748.928v145.532z" />
<glyph unicode="" d="M1022.006 375.25h-748.928l283.278-291.206h-200.254l-354.108 363.956 354.108 363.956h200.254l-283.278-291.174h748.928v-145.532z" />
<glyph unicode="" d="M85.174 468.026l0.504-106.238 426.322-426.324 426.32 426.324 0.504 106.238-389.444-389.444 0.002 880.006h-74.764v-880.004z" />
+<glyph unicode="" d="M511.963 831.086c-211.529 0-383.049-171.52-383.049-383.086s171.483-383.086 383.049-383.086c211.602 0 383.086 171.483 383.086 383.086s-171.483 383.086-383.086 383.086zM511.963 794.514c191.086 0 346.514-155.429 346.514-346.514 0-79.909-27.429-153.344-73.070-212.041-5.486 1.975-11.008 3.84-16.274 6.107-34.926 14.629-73.801 31.781-108.654 46.153-9.911 2.706-19.931 5.413-29.842 8.155-11.849 8.155-23.589 35.365-29.915 48.933-6.29 0.914-12.654 1.792-19.017 2.633 0.914 20.992 13.934 22.126 19.017 38.071 4.498 14.080 0.512 32.439 7.57 45.495 4.937 9.070 16.128 9.070 21.65 16.933 5.083 6.985 8.411 19.273 9.984 27.941 2.853 15.799 5.339 37.339-2.158 53.029-4.279 8.96-6.985 9.874-8.229 20.736-1.426 13.275 3.913 56.43 4.133 65.755 0.512 24.21-0.073 26.149-5.925 49.737 0 0-7.058 21.358-18.213 27.831l-22.272 3.803-13.714 12.727c-55.369 34.085-114.761 10.167-146.505-2.67-45.824-14.885-74.789-59.758-54.565-155.538 3.474-16.421-8.96-23.698-8.155-32.658 1.829-19.566 2.158-66.487 20.59-78.080 1.719-1.061 14.811-4.352 14.738-3.438 1.792-19.017 3.621-38.071 5.376-57.015 4.608-12.654 15.689-14.080 18.907-31.927l-14.153-3.438c-6.363-13.568-17.993-40.777-29.879-48.933-9.947-2.706-19.931-5.413-29.879-8.155-34.889-14.373-73.691-31.488-108.654-46.153-1.902-0.768-3.877-1.39-5.815-2.158-43.776 58.112-70.071 130.011-70.071 208.165 0 191.086 155.429 346.514 346.478 346.514z" />
</font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf
index 62a247a28417c5749234becf3f584ab3145ae464..67e7a7f1588bfaee162257fda8b9526699071887 100644
GIT binary patch
delta 731
zcmYjPJ!n%=6u#%&zn7o)Y||u9n;NtYiAYJ(v}r7aR8g=)p@{f{NNuQXgEThK4(-xd
z=-9<(br9*G;83W8h=YsJp;$+8bZ~QY5FGqoq~hgV&iTG`&v(vy_wE;dm)e4a5E1c2
zNKu@*StxnC@&=gq*mLvEdaM7|(WVeI06e`^Uv0tn05{;BrR9yqkME9$fWgN<Hx}v-
zdGS|Ah~#DD#~UE*2l)ed9XQiyuC2ci7mk3R0q-xb%um!e_5x9V8pOS3eZ3`W;ydt5
z;B$}b&4t6cJ8ysw(WKK_SzW`RSZD4(eS4j9yL6Ru2iIt#ugzjhT#;=#DdOT44i9>q
zh^Kk9RO9kko`({pGzgDvUgrK;b}&yvV>PbS<cZN(7Wr}(WmU>ku9)Wn=gA}MNk0kE
zwDciWhPICoY}eY-7R{g;K`Hb`S<LJ-s@2BM%!!}coE;CxQZZIav6~u5dD5|t)Q)3W
zDy>-?!$ic)1`$gJ>N@$CMXZhT-NeP*`Dkydhl4uglw(Pmw(1sZqsf!T2`ObAtI%h_
zW#ZocShzB~IVC6mA1N3u6VU02@sT9D5t&Fds)HFwx}K-e*$Fw;=qPA(!-A|d9&-2&
zt#n_aSA`<s$fJ-Ag;=>R&T8#v%NY~4R$BjbygQkL6041MjMARx%5IOYEK#ypzH}D<
zr-F+Oo+I{l@^<FIsp?M=QNeYK<GrstC%*GMUZLU6m-uUi<W^@paW@<e9%N8EeDE#t
GiT(gL#Bf;v
delta 267
zcmexkv_Zd~fsuiMft#U$ftkU;KUm+0ZxV9=P-G7fCnV=47D$DjsbyeblmYU6(i4jd
zfV2RRp8=#f(sL@)j<az+0P=z2!aNzNi7AZxQVbawL~4NYW*I;M_5;jsfcz~$zDh=J
zNyR({4R0X-29UodCqLOTG2aGcsAvmNAR;%hqJY7c;Te#B2gp~*OUz9@kq{2lEcyp%
z$>f6k;u4@kfk1r1#2xO8YLgh98PztsFj@*LgZu%+^A}6(i08NY%D~M6Qpa#Up#L_E
do}40P&Zs?kj@X*XKH?E<V6SU$UMGHz5db`7K-2&L
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff
index ab9ef635f29a7d8f4e6fd6dc4b2ebe78f357808e..809752bf8e5bb222801a256a45bcdcea3b03d190 100644
GIT binary patch
delta 594
zcmeyM@<C0w+~3X3KP1GTfkC){fr|kMgeMBC)c<E-;QKH3=Le5}u)Yxk1OFGGL;?u&
zO=1pA&P^;}U=Roa@_j&9D)dZUdSWq1YyptZ0mT9tsfj5-u@ykR83;3_{hXWu6a<Pr
z0P<BpnEe3r+l<_j3I+y279f8E2rptV)HsuySOGLpa0^g?4UBaH81fQxQ-NZ87#J8Q
zgYb!j@GS-T#U&s|KMxVD<Cg`BHVXnt22LQs_f3dFcX9xu9^<FUb&PNLN?py2%o!M%
z7&{rX7<48VGet7-if=x{q{LJIW6ICVqQ5h`f7}1I?*`Es-+`>}8Qmac|J@!;X8=X)
zfs!2E>7w6*yT9xIHt7Bx+-+Up6dTai+uGaKn=vb8PR7ipzQ(@B-ufx^%UWl&^t1wD
z&w?2}6J~St&upJNY376})4C^4nlPzvM(^al*}V%}X0_E%>Fnv6);VLs_MR!-i@SSU
z7k78JENGa>QPN*GgEe?<Kyh|mY)xMLeC__K`j+md-iq#+dG)<rGdj9^dMbK>a6;X*
zuD(i++IH5Kx`zDv=Ely(j>e9R+LWq{n$E7y?yj!*qXn0{Z+3qV{%!z-!QC8uzov-%
znj+fG!^JT92cI*e`eYk^5ZS<QA|vLwG(Vo-<|_j?C{`F4&M&#u1EVKj;5TQ~nam-u
Uh6^a!$iNW5z@W2vm%uhg09yUmivR!s
delta 324
zcmeyM_CZCs+~3X3KP1GTfkCK%fr|kMgeD5B)H5?M@G*a2wBF|*tZxKl{{TuPfH2=A
z=78kf!~zBe{s<u72ZW_U&(x+T7K6l=0QnqHERd0!m;w}A1LT{5Fyp=y!wjGxQ0xhi
zuL8pC2bkYv<d#%0FbIJ3fz+;<$6%=8otszzG*Dm*P=F1LwF4OP5_405VtW`E7$<}9
ziG=Vi1^LA#AV)tB5v|~t1&Y=R0!ao=Ai?`fh(Tv^0HfaIdd4@L3=B++oeY``+LJ4p
zA~#=QQsSBXir<$}ZL)=cGmxwiFp<ga3Em&iZ}XLbn+0eD1H<`%{@XBm@)-ehM(xQg
Sf@^@z31DE*-n>h28zTS!XG#J9
diff --git a/lib/web/fonts/Blank-Theme-Icons/selection.json b/lib/web/fonts/Blank-Theme-Icons/selection.json
new file mode 100644
index 00000000000..307b07ce972
--- /dev/null
+++ b/lib/web/fonts/Blank-Theme-Icons/selection.json
@@ -0,0 +1,875 @@
+{
+ "IcoMoonType": "selection",
+ "icons": [
+ {
+ "icon": {
+ "paths": [
+ "M511.963 128.914c-211.529 0-383.049 171.52-383.049 383.086s171.483 383.086 383.049 383.086c211.602 0 383.086-171.483 383.086-383.086s-171.483-383.086-383.086-383.086zM511.963 165.486c191.086 0 346.514 155.429 346.514 346.514 0 79.909-27.429 153.344-73.070 212.041-5.486-1.975-11.008-3.84-16.274-6.107-34.926-14.629-73.801-31.781-108.654-46.153-9.911-2.706-19.931-5.413-29.842-8.155-11.849-8.155-23.589-35.365-29.915-48.933-6.29-0.914-12.654-1.792-19.017-2.633 0.914-20.992 13.934-22.126 19.017-38.071 4.498-14.080 0.512-32.439 7.57-45.495 4.937-9.070 16.128-9.070 21.65-16.933 5.083-6.985 8.411-19.273 9.984-27.941 2.853-15.799 5.339-37.339-2.158-53.029-4.279-8.96-6.985-9.874-8.229-20.736-1.426-13.275 3.913-56.43 4.133-65.755 0.512-24.21-0.073-26.149-5.925-49.737 0 0-7.058-21.358-18.213-27.831l-22.272-3.803-13.714-12.727c-55.369-34.085-114.761-10.167-146.505 2.67-45.824 14.885-74.789 59.758-54.565 155.538 3.474 16.421-8.96 23.698-8.155 32.658 1.829 19.566 2.158 66.487 20.59 78.080 1.719 1.061 14.811 4.352 14.738 3.438 1.792 19.017 3.621 38.071 5.376 57.015 4.608 12.654 15.689 14.080 18.907 31.927l-14.153 3.438c-6.363 13.568-17.993 40.777-29.879 48.933-9.947 2.706-19.931 5.413-29.879 8.155-34.889 14.373-73.691 31.488-108.654 46.153-1.902 0.768-3.877 1.39-5.815 2.158-43.776-58.112-70.071-130.011-70.071-208.165 0-191.086 155.429-346.514 346.478-346.514z"
+ ],
+ "grid": 0,
+ "tags": [
+ "account"
+ ]
+ },
+ "properties": {
+ "order": 40,
+ "id": 4,
+ "prevSize": 32,
+ "code": 58919,
+ "name": "account",
+ "ligatures": ""
+ },
+ "setIdx": 0,
+ "iconIdx": 0
+ },
+ {
+ "icon": {
+ "paths": [
+ "M938.824 533.972l-0.504-106.238-426.32-426.322-426.322 426.322-0.504 106.238 389.444-389.442v880.006h74.764v-880.006z"
+ ],
+ "grid": 0,
+ "tags": [
+ "arrow-up-thin"
+ ]
+ },
+ "properties": {
+ "order": 36,
+ "id": 3,
+ "prevSize": 32,
+ "code": 58915,
+ "name": "arrow-up-thin",
+ "ligatures": ""
+ },
+ "setIdx": 0,
+ "iconIdx": 1
+ },
+ {
+ "icon": {
+ "paths": [
+ "M1.994 441.25h748.928l-283.278-291.206h200.254l354.108 363.956-354.108 363.956h-200.254l283.278-291.174h-748.928v-145.532z"
+ ],
+ "grid": 0,
+ "tags": [
+ "arrow-right-thin"
+ ]
+ },
+ "properties": {
+ "order": 37,
+ "id": 2,
+ "prevSize": 32,
+ "code": 58916,
+ "name": "arrow-right-thin",
+ "ligatures": ""
+ },
+ "setIdx": 0,
+ "iconIdx": 2
+ },
+ {
+ "icon": {
+ "paths": [
+ "M1022.006 584.75h-748.928l283.278 291.206h-200.254l-354.108-363.956 354.108-363.956h200.254l-283.278 291.174h748.928v145.532z"
+ ],
+ "grid": 0,
+ "tags": [
+ "arrow-left-thin"
+ ]
+ },
+ "properties": {
+ "order": 38,
+ "id": 1,
+ "prevSize": 32,
+ "code": 58917,
+ "name": "arrow-left-thin",
+ "ligatures": ""
+ },
+ "setIdx": 0,
+ "iconIdx": 3
+ },
+ {
+ "icon": {
+ "paths": [
+ "M85.174 491.974l0.504 106.238 426.322 426.324 426.32-426.324 0.504-106.238-389.444 389.444 0.002-880.006h-74.764v880.004z"
+ ],
+ "grid": 0,
+ "tags": [
+ "arrow-down-thin"
+ ]
+ },
+ "properties": {
+ "order": 39,
+ "id": 0,
+ "prevSize": 32,
+ "code": 58918,
+ "name": "arrow-down-thin",
+ "ligatures": ""
+ },
+ "setIdx": 0,
+ "iconIdx": 4
+ },
+ {
+ "icon": {
+ "paths": [
+ "M676.571 322.304c-59.867-28.197-131.255-2.523-159.415 57.307-1.975 4.133-3.657 9.362-5.157 15.397-1.499-6.034-3.182-11.264-5.157-15.397-28.197-59.831-99.547-85.504-159.415-57.307-59.831 28.197-85.504 99.547-57.271 159.378 28.197 59.867 221.806 231.424 221.806 231.424s0-0.219 0.037-0.585c0.037 0.366 0.037 0.585 0.037 0.585s193.646-171.557 221.806-231.424c28.233-59.831 2.597-131.182-57.271-159.378z"
+ ],
+ "grid": 0,
+ "tags": [
+ "wishlist full"
+ ]
+ },
+ "properties": {
+ "order": 1,
+ "id": 32,
+ "prevSize": 32,
+ "code": 58880,
+ "name": "wishlist-full",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 0
+ },
+ {
+ "icon": {
+ "paths": [
+ "M676.571 322.304c-59.831-28.197-131.218-2.523-159.451 57.307-1.938 4.133-3.657 9.362-5.157 15.397-1.463-6.034-3.182-11.264-5.157-15.397-28.16-59.831-99.547-85.504-159.378-57.307-59.831 28.197-85.467 99.547-57.271 159.378s221.806 231.424 221.806 231.424 0-0.219 0.037-0.585c0 0.402 0 0.622 0 0.622s193.646-171.557 221.842-231.424c28.233-59.867 2.597-131.218-57.271-159.415zM690.213 480.768c-25.417 43.776-174.007 184.722-174.007 184.722l-1.573-2.999c0 0-155.465-140.398-181.211-183.991-30.61-51.822-7.753-108.946 38.949-128.439 43.52-18.176 101.888 27.319 123.502 73.143 1.499 3.182 17.627 1.463 18.798 6.107 1.134-4.645 12.727-2.926 14.226-6.107 21.577-45.824 81.042-93.989 128-72.411 46.007 21.138 66.926 72.155 33.317 129.975z"
+ ],
+ "grid": 0,
+ "tags": [
+ "wishlist empty"
+ ]
+ },
+ "properties": {
+ "order": 2,
+ "id": 31,
+ "prevSize": 32,
+ "code": 58881,
+ "name": "wishlist-empty",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 1
+ },
+ {
+ "icon": {
+ "paths": [
+ "M512 255.89l-296.85 512.256h593.701l-296.85-512.256zM544.219 705.865h-62.757v-49.92h62.757v49.92zM528.713 616.631h-31.269l-20.809-140.654-1.207-72.704h72.521v72.704l-19.237 140.654z"
+ ],
+ "grid": 0,
+ "tags": [
+ "warning"
+ ]
+ },
+ "properties": {
+ "order": 3,
+ "id": 30,
+ "prevSize": 32,
+ "code": 58882,
+ "name": "warning",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 2
+ },
+ {
+ "icon": {
+ "paths": [
+ "M628.846 371.456c-34.085-28.343-75.63-42.24-116.773-42.24-47.47 0-94.757 18.578-130.085 54.382l-32.073-29.586-0.585 102.693 110.994 0.658-39.424-41.253c25.198-24.027 58.002-36.315 91.136-36.352 29.842 0.037 59.721 9.947 84.517 30.574 31.488 26.222 47.689 63.744 47.726 101.815 0 5.449-0.366 10.971-1.024 16.457l51.383-9.874c0.073-2.231 0.146-4.425 0.146-6.619 0.037-52.37-22.491-104.521-65.938-140.654zM603.794 607.232c-25.307 24.466-58.405 37.010-91.867 37.047-29.879-0.037-59.721-9.984-84.517-30.574-31.488-26.222-47.689-63.744-47.726-101.778 0-6.327 0.475-12.617 1.353-18.871l-51.602 9.691c-0.146 3.072-0.256 6.107-0.256 9.179-0.037 52.334 22.491 104.521 65.975 140.617 34.048 28.343 75.593 42.24 116.736 42.24h0.11c47.799 0 95.378-18.907 130.743-55.223l33.938 33.829 0.219-106.094-112.055-0.293 38.949 40.229z"
+ ],
+ "grid": 0,
+ "tags": [
+ "update"
+ ]
+ },
+ "properties": {
+ "order": 4,
+ "id": 29,
+ "prevSize": 32,
+ "code": 58883,
+ "name": "update",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 3
+ },
+ {
+ "icon": {
+ "paths": [
+ "M696.942 335.067l-19.273-6.107h-74.496v-38.583l-12.544-21.029-22.711-13.495h-111.141l-23.333 13.495-12.581 21.029v38.619h-73.765l-18.761 6.656-17.189 14.153v88.869h19.017v0.073h17.554v329.435h36.571v-0.293h255.415v0.293h36.571v-329.435h18.286v-0.073h18.286v-86.601l-15.909-17.006zM457.435 292.425h109.129v36.571h-109.129v-36.571zM639.707 731.282h-255.415v-292.571h255.415v292.571zM676.279 402.066h-328.558v-36.498h328.558v36.498zM457.435 476.489h-36.571v218.587h36.571v-218.587zM530.578 476.489h-36.571v218.587h36.571v-218.587zM603.721 476.489h-36.571v218.587h36.571v-218.587z"
+ ],
+ "grid": 0,
+ "tags": [
+ "trash"
+ ]
+ },
+ "properties": {
+ "order": 5,
+ "id": 28,
+ "prevSize": 32,
+ "code": 58884,
+ "name": "trash",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 4
+ },
+ {
+ "icon": {
+ "paths": [
+ "M804.645 444.599c-1.499-4.681-5.888-7.899-10.789-7.899h-206.958l-64.073-196.754c-1.536-4.645-5.888-7.826-10.825-7.826-4.901 0-9.289 3.182-10.825 7.863l-64.439 196.754h-206.592c-4.901 0-9.289 3.218-10.825 7.863-1.499 4.681 0.146 9.874 4.096 12.763l167.205 121.783-64.439 197.851c-1.536 4.681 0.146 9.838 4.133 12.727 3.95 2.889 9.399 2.889 13.349 0l168.338-122.185 167.936 122.149c2.011 1.463 4.315 2.231 6.693 2.231s4.681-0.768 6.693-2.231c4.023-2.889 5.669-8.009 4.133-12.727l-64.439-197.851 167.57-121.783c3.95-2.889 5.632-8.046 4.059-12.727z"
+ ],
+ "grid": 0,
+ "tags": [
+ "star"
+ ]
+ },
+ "properties": {
+ "order": 6,
+ "id": 27,
+ "prevSize": 32,
+ "code": 58885,
+ "name": "star",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 5
+ },
+ {
+ "icon": {
+ "paths": [
+ "M807.241 544.146v-67.145l-9.509-3.145-71.936-23.442-19.2-46.373 36.937-78.080-47.506-47.506-8.923 4.498-67.438 34.304-46.373-19.2-29.111-81.298h-67.182l-26.624 81.445-46.336 19.163-78.043-36.901-47.506 47.506 4.498 8.96 34.267 67.438-19.2 46.336-81.298 29.074v67.218l9.472 3.072 71.973 23.515 19.163 46.373-36.901 78.080 47.506 47.506 8.887-4.498 67.474-34.304 46.373 19.2 29.111 81.298h67.182l3.072-9.509 23.515-71.936 46.373-19.2 78.080 36.937 47.506-47.506-4.498-8.923-34.304-67.438 19.2-46.373 81.298-29.147zM512 606.062c-51.968 0-94.062-42.13-94.062-94.062 0-52.005 42.094-94.062 94.062-94.062 51.931 0 94.098 42.057 94.098 94.062-0.037 51.931-42.167 94.062-94.098 94.062z"
+ ],
+ "grid": 0,
+ "tags": [
+ "settings"
+ ]
+ },
+ "properties": {
+ "order": 7,
+ "id": 26,
+ "prevSize": 32,
+ "code": 58886,
+ "name": "settings",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 6
+ },
+ {
+ "icon": {
+ "paths": [
+ "M339.602 420.059l172.398 183.881 172.398-183.881z"
+ ],
+ "grid": 0,
+ "tags": [
+ "pointer down"
+ ]
+ },
+ "properties": {
+ "order": 8,
+ "id": 19,
+ "prevSize": 32,
+ "code": 58887,
+ "name": "pointer-down",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 7
+ },
+ {
+ "icon": {
+ "paths": [
+ "M606.939 510.062l-158.391-162.853-27.794 26.075 132.827 136.558-136.521 140.361 27.173 26.587 153.198-157.55-0.146-0.146z"
+ ],
+ "grid": 0,
+ "tags": [
+ "next"
+ ]
+ },
+ "properties": {
+ "order": 9,
+ "id": 18,
+ "prevSize": 32,
+ "code": 58888,
+ "name": "next",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 8
+ },
+ {
+ "icon": {
+ "paths": [
+ "M127.634 219.429v73.143h768.731v-73.143h-768.731zM127.634 548.571h768.731v-73.143h-768.731v73.143zM127.634 804.571h768.731v-73.143h-768.731v73.143z"
+ ],
+ "grid": 0,
+ "tags": [
+ "menu"
+ ]
+ },
+ "properties": {
+ "order": 10,
+ "id": 17,
+ "prevSize": 32,
+ "code": 58889,
+ "name": "menu",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 9
+ },
+ {
+ "icon": {
+ "paths": [
+ "M512 217.783c-102.437 0-185.417 83.054-185.417 185.454 0 102.437 185.417 403.017 185.417 403.017s185.454-300.581 185.454-403.017c-0.037-102.437-83.017-185.454-185.454-185.454zM512 459.557c-31.122 0-56.357-25.198-56.357-56.357 0-31.086 25.234-56.357 56.357-56.357 31.159 0 56.393 25.271 56.393 56.357-0.037 31.159-25.271 56.357-56.393 56.357z"
+ ],
+ "grid": 0,
+ "tags": [
+ "location"
+ ]
+ },
+ "properties": {
+ "order": 11,
+ "id": 16,
+ "prevSize": 32,
+ "code": 58890,
+ "name": "location",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 10
+ },
+ {
+ "icon": {
+ "paths": [
+ "M219.429 474.405h255.927v-254.793h-255.927v254.793zM548.571 219.611v109.349h256v-109.349h-256zM219.429 803.547h255.927v-254.793h-255.927v254.793zM548.571 475.246h256v-109.349h-256v109.349zM548.571 658.103h256v-109.349h-256v109.349zM548.571 804.389h256v-109.349h-256v109.349z"
+ ],
+ "grid": 0,
+ "tags": [
+ "list"
+ ]
+ },
+ "properties": {
+ "order": 12,
+ "id": 15,
+ "prevSize": 32,
+ "code": 58891,
+ "name": "list",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 11
+ },
+ {
+ "icon": {
+ "paths": [
+ "M579.511 282.99c-30.793 0-57.381 25.161-57.381 55.954 0 28.635 18.907 47.579 47.579 47.579 31.415 0 58.002-23.771 58.002-55.991 0-28.709-20.224-47.543-48.201-47.543zM593.518 623.506c-9.801 0-48.311 59.502-69.266 59.502-5.595 0-8.375-4.937-8.375-9.801 0-11.227 7.68-28.709 11.849-39.205l50.322-136.375c25.198-67.84-6.985-86.016-37.047-86.016-40.558 0-76.946 20.297-104.887 46.848-9.106 9.070-39.863 38.437-39.863 51.054 0 4.133 4.169 9.070 9.106 9.070 12.544 0 46.153-60.855 72.009-60.855 5.595 0 11.886 6.29 6.985 18.871l-48.896 123.173c-4.937 11.849-28.709 69.23-28.709 102.802 0 26.587 17.518 38.437 42.679 38.437 70.656 0 152.43-86.711 152.43-107.008 0-6.29-4.864-10.496-8.338-10.496z"
+ ],
+ "grid": 0,
+ "tags": [
+ "info"
+ ]
+ },
+ "properties": {
+ "order": 13,
+ "id": 14,
+ "prevSize": 32,
+ "code": 58892,
+ "name": "info",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 12
+ },
+ {
+ "icon": {
+ "paths": [
+ "M219.063 366.080h147.017v-147.017h-147.017v147.017zM438.491 366.080h147.017v-147.017h-147.017v147.017zM657.92 219.063v147.017h147.017v-147.017h-147.017zM219.063 585.509h147.017v-147.017h-147.017v147.017zM438.491 585.509h147.017v-147.017h-147.017v147.017zM657.92 585.509h147.017v-147.017h-147.017v147.017zM219.063 804.937h147.017v-147.017h-147.017v147.017zM438.491 804.937h147.017v-147.017h-147.017v147.017zM657.92 804.937h147.017v-147.017h-147.017v147.017z"
+ ],
+ "grid": 0,
+ "tags": [
+ "grid"
+ ]
+ },
+ "properties": {
+ "order": 14,
+ "id": 13,
+ "prevSize": 32,
+ "code": 58893,
+ "name": "grid",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 13
+ },
+ {
+ "icon": {
+ "paths": [
+ "M711.607 558.409l-5.486 5.522c21.065-27.794 32.878-60.197 32.219-94.72-1.975-99.218-106.679-177.627-233.874-175.141-127.232 2.487-228.791 84.992-226.816 184.21 1.938 99.182 106.679 177.554 233.911 175.067 28.635-0.585 50.432 5.815 75.63-2.121l159.232 78.702c-0.037 0.037-71.058-124.965-34.816-171.52z"
+ ],
+ "grid": 0,
+ "tags": [
+ "comment reflected"
+ ]
+ },
+ "properties": {
+ "order": 15,
+ "id": 6,
+ "prevSize": 32,
+ "code": 58894,
+ "name": "comment-reflected",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 14
+ },
+ {
+ "icon": {
+ "paths": [
+ "M236.946 493.714h550.107v36.571h-550.107v-36.571z"
+ ],
+ "grid": 0,
+ "tags": [
+ "collapse"
+ ]
+ },
+ "properties": {
+ "order": 16,
+ "id": 5,
+ "prevSize": 32,
+ "code": 58895,
+ "name": "collapse",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 15
+ },
+ {
+ "icon": {
+ "paths": [
+ "M749.129 296.302c-152.101 93.257-262.473 210.907-312.064 269.934l-121.417-95.159-53.65 43.264 209.847 213.394c36.096-92.489 150.491-273.298 290.158-401.737l-12.873-29.696z"
+ ],
+ "grid": 0,
+ "tags": [
+ "checkmark"
+ ]
+ },
+ "properties": {
+ "order": 17,
+ "id": 4,
+ "prevSize": 32,
+ "code": 58896,
+ "name": "checkmark",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 16
+ },
+ {
+ "icon": {
+ "paths": [
+ "M434.871 700.050c-35.218 0-63.707 28.526-63.707 63.744 0 35.182 28.489 63.671 63.707 63.671 35.182 0 63.707-28.489 63.707-63.671-0-35.218-28.526-63.744-63.707-63.744zM654.848 700.050c-35.218 0-63.707 28.526-63.707 63.744 0 35.182 28.489 63.671 63.707 63.671 35.145 0 63.707-28.489 63.707-63.671 0-35.218-28.562-63.744-63.707-63.744zM784.274 343.259c-163.511 0-427.227 0-427.227 0s-25.929-70.071-49.957-113.371c-24.027-43.227-57.893-32.037-57.893-32.037-26.843 0-39.314 16.055-39.314 42.971 0 26.843 16.457 48.64 43.337 48.64l16.603 14.848 121.929 330.533 356.425 0.256c0 0 65.17-261.705 61.806-251.355 11.959-36.974-3.255-40.485-25.71-40.485zM392.485 467.456c-18.725 0-33.902-15.177-33.902-33.902s15.177-33.902 33.902-33.902 33.902 15.177 33.902 33.902-15.177 33.902-33.902 33.902zM464.933 580.608c-18.725 0-33.902-15.177-33.902-33.902s15.177-33.902 33.902-33.902 33.902 15.177 33.902 33.902-15.177 33.902-33.902 33.902zM502.199 467.456c-18.725 0-33.902-15.177-33.902-33.902s15.177-33.902 33.902-33.902 33.902 15.177 33.902 33.902-15.177 33.902-33.902 33.902zM574.647 580.608c-18.725 0-33.865-15.177-33.865-33.902s15.177-33.902 33.865-33.902 33.938 15.177 33.938 33.902-15.214 33.902-33.938 33.902zM611.913 467.456c-18.725 0-33.938-15.177-33.938-33.902s15.214-33.902 33.938-33.902 33.865 15.177 33.865 33.902-15.141 33.902-33.865 33.902zM684.361 580.608c-18.725 0-33.865-15.177-33.865-33.902s15.141-33.902 33.865-33.902 33.938 15.177 33.938 33.902-15.214 33.902-33.938 33.902zM721.627 467.456c-18.725 0-33.938-15.177-33.938-33.902s15.214-33.902 33.938-33.902 33.865 15.177 33.865 33.902-15.141 33.902-33.865 33.902z"
+ ],
+ "grid": 0,
+ "tags": [
+ "cart"
+ ]
+ },
+ "properties": {
+ "order": 18,
+ "id": 3,
+ "prevSize": 32,
+ "code": 58897,
+ "name": "cart",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 17
+ },
+ {
+ "icon": {
+ "paths": [
+ "M642.487 381.696c11.959 0 21.65-9.691 21.65-21.65v-77.934c0-11.959-9.691-21.65-21.65-21.65-11.922 0-21.65 9.691-21.65 21.65v77.934c0.037 11.959 9.728 21.65 21.65 21.65zM381.842 381.696c11.922 0 21.65-9.691 21.65-21.65v-77.934c0-11.959-9.728-21.65-21.65-21.65-11.959 0-21.65 9.691-21.65 21.65v77.934c0.037 11.959 9.691 21.65 21.65 21.65zM671.269 323.438v0.402c8.997 7.973 14.702 19.566 14.702 32.549 0 23.991-19.456 43.447-43.483 43.447-23.991 0-43.447-19.456-43.447-43.447 0-12.946 5.705-24.576 14.702-32.549v-0.402h-203.154v0.402c8.997 7.973 14.702 19.566 14.702 32.549 0 23.991-19.456 43.447-43.447 43.447-24.027 0-43.447-19.456-43.447-43.447 0-12.946 5.669-24.576 14.665-32.549v-0.402h-96.841v440.101h511.561v-440.101h-96.512zM732.087 725.431h-437.76v-291.694h437.76v291.694zM619.301 552.887h-55.15v55.113h55.15v-55.113zM619.301 469.979h-55.15v55.113h55.15v-55.113zM619.301 633.49h-55.15v55.15h55.15v-55.15zM696.942 469.979h-55.15v55.113h55.15v-55.113zM696.942 552.887h-55.15v55.113h55.15v-55.113zM386.267 633.49h-55.113v55.15h55.113v-55.15zM463.982 633.49h-55.15v55.15h55.15v-55.15zM463.982 552.887h-55.15v55.113h55.15v-55.113zM386.267 552.887h-55.113v55.113h55.113v-55.113zM541.586 552.887h-55.113v55.113h55.113v-55.113zM541.586 469.979h-55.113v55.113h55.113v-55.113zM463.982 469.979h-55.15v55.113h55.15v-55.113zM541.586 633.49h-55.113v55.15h55.113v-55.15z"
+ ],
+ "grid": 0,
+ "tags": [
+ "calendar"
+ ]
+ },
+ "properties": {
+ "order": 19,
+ "id": 2,
+ "prevSize": 32,
+ "code": 58898,
+ "name": "calendar",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 18
+ },
+ {
+ "icon": {
+ "paths": [
+ "M512 282.258l-209.006 253.257h136.338v206.19h145.298v-206.19h136.375z"
+ ],
+ "grid": 0,
+ "tags": [
+ "arrow up"
+ ]
+ },
+ "properties": {
+ "order": 20,
+ "id": 1,
+ "prevSize": 32,
+ "code": 58899,
+ "name": "arrow-up",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 19
+ },
+ {
+ "icon": {
+ "paths": [
+ "M584.631 488.485v-206.226h-145.298v206.226h-136.338l209.006 253.221 209.006-253.221z"
+ ],
+ "grid": 0,
+ "tags": [
+ "arrow down"
+ ]
+ },
+ "properties": {
+ "order": 21,
+ "id": 0,
+ "prevSize": 32,
+ "code": 58900,
+ "name": "arrow-down",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 20
+ },
+ {
+ "icon": {
+ "paths": [
+ "M836.462 776.082c0 0-109.641-112.677-153.381-156.233-19.054-19.017-32.073-31.927-32.073-31.927 14.848-21.211 26.405-44.361 34.633-69.339s12.361-51.237 12.361-78.848c0-35.621-6.802-69.083-20.334-100.462-13.568-31.305-32-58.697-55.406-82.030-23.369-23.442-50.725-41.874-82.066-55.406-31.305-13.605-64.768-20.37-100.389-20.37-35.584 0-69.047 6.802-100.425 20.37-31.305 13.531-58.551 31.963-81.664 55.406-23.077 23.296-41.435 50.688-54.967 81.993-13.568 31.378-20.334 64.841-20.334 100.462s6.802 69.083 20.334 100.389c13.531 31.305 31.89 58.661 54.967 82.103 23.113 23.333 50.322 41.801 81.664 55.369 31.378 13.568 64.841 20.297 100.425 20.297 27.648 0 53.943-4.023 78.885-12.288s48.091-19.858 69.303-34.706c0 0 11.922 11.959 29.696 29.806 48.421 48.603 155.026 159.159 155.026 159.159 16.018 6.985 41.728-0.439 54.455-11.337s19.858-33.682 9.289-52.407zM612.718 512.987c-9.838 22.747-23.223 42.569-40.155 59.429-16.933 16.933-36.718 30.354-59.429 40.192-22.638 9.874-46.848 14.775-72.521 14.775-26.258 0-50.688-4.937-73.362-14.775-22.674-9.838-42.496-23.259-59.429-40.192-16.896-16.859-30.354-36.681-40.155-59.429-9.838-22.601-14.738-47.104-14.738-73.289 0-25.673 4.901-50.030 14.738-72.997 9.838-22.93 23.259-42.898 40.155-59.794 16.933-16.969 36.754-30.354 59.429-40.155 22.674-9.911 47.104-14.738 73.362-14.738 25.673 0 49.883 4.864 72.521 14.738 22.674 9.801 42.496 23.186 59.429 40.155 16.933 16.933 30.318 36.901 40.155 59.831 9.874 22.967 14.738 47.323 14.738 72.997 0 26.149-4.901 50.651-14.738 73.253z"
+ ],
+ "grid": 0,
+ "tags": [
+ "search"
+ ]
+ },
+ "properties": {
+ "order": 22,
+ "id": 25,
+ "prevSize": 32,
+ "code": 58901,
+ "name": "search",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 21
+ },
+ {
+ "icon": {
+ "paths": [
+ "M695.845 357.339l-29.147-29.111-154.697 154.734-154.734-154.734-29.111 29.111 154.734 154.734-154.624 154.624 29.111 29.074 154.624-154.587 154.661 154.587 29.038-29.074-154.587-154.624z"
+ ],
+ "grid": 0,
+ "tags": [
+ "remove"
+ ]
+ },
+ "properties": {
+ "order": 23,
+ "id": 24,
+ "prevSize": 32,
+ "code": 58902,
+ "name": "remove",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 22
+ },
+ {
+ "icon": {
+ "paths": [
+ "M470.418 509.842l132.791-136.558-27.794-26.075-158.354 162.853 9.618 9.033-0.11 0.146 153.234 157.55 27.136-26.587z"
+ ],
+ "grid": 0,
+ "tags": [
+ "prev"
+ ]
+ },
+ "properties": {
+ "order": 24,
+ "id": 23,
+ "prevSize": 32,
+ "code": 58903,
+ "name": "prev",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 23
+ },
+ {
+ "icon": {
+ "paths": [
+ "M512 420.059l-172.398 183.881h344.795z"
+ ],
+ "grid": 0,
+ "tags": [
+ "pointer up"
+ ]
+ },
+ "properties": {
+ "order": 25,
+ "id": 22,
+ "prevSize": 32,
+ "code": 58904,
+ "name": "pointer-up",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 24
+ },
+ {
+ "icon": {
+ "paths": [
+ "M392.119 337.957v348.087l239.726-174.043z"
+ ],
+ "grid": 0,
+ "tags": [
+ "pointer right"
+ ]
+ },
+ "properties": {
+ "order": 26,
+ "id": 21,
+ "prevSize": 32,
+ "code": 58905,
+ "name": "pointer-right",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 25
+ },
+ {
+ "icon": {
+ "paths": [
+ "M392.119 512l239.726 174.043v-348.087z"
+ ],
+ "grid": 0,
+ "tags": [
+ "pointer left"
+ ]
+ },
+ "properties": {
+ "order": 27,
+ "id": 20,
+ "prevSize": 32,
+ "code": 58906,
+ "name": "pointer-left",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 26
+ },
+ {
+ "icon": {
+ "paths": [
+ "M237.714 768.841h73.728v-513.682h-73.728v513.682zM786.286 256.914h-440.283v292.169h440.283l-148.078-144.128 148.078-148.041z"
+ ],
+ "grid": 0,
+ "tags": [
+ "flag"
+ ]
+ },
+ "properties": {
+ "order": 28,
+ "id": 12,
+ "prevSize": 32,
+ "code": 58907,
+ "name": "flag",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 27
+ },
+ {
+ "icon": {
+ "paths": [
+ "M787.054 493.641h-256.219v-256.695h-36.571v256.695h-257.317v36.571h257.317v256.841h36.571v-256.841h256.219z"
+ ],
+ "grid": 0,
+ "tags": [
+ "expand"
+ ]
+ },
+ "properties": {
+ "order": 29,
+ "id": 11,
+ "prevSize": 32,
+ "code": 58908,
+ "name": "expand",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 28
+ },
+ {
+ "icon": {
+ "paths": [
+ "M769.134 365.714v-36.571h-513.17v25.271l-1.097 1.097 1.097 1.097v9.106h0.622v292.571h-0.622v8.558l-1.097 1.097 1.097 1.097v25.819h513.17v-36.571h-0.585v-292.571h0.585zM703.89 658.286h-387.657l119.881-119.881-25.856-25.856-117.138 117.138v-236.361l220.014 217.088 25.856-25.856-1.39-1.353 194.377-194.341v245.87l-122.149-122.149-25.856 25.856 119.918 119.845zM317.221 365.714h386.158l-191.781 191.781-194.377-191.781z"
+ ],
+ "grid": 0,
+ "tags": [
+ "envelope"
+ ]
+ },
+ "properties": {
+ "order": 30,
+ "id": 10,
+ "prevSize": 32,
+ "code": 58909,
+ "name": "envelope",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 29
+ },
+ {
+ "icon": {
+ "paths": [
+ "M310.747 749.641h109.166v-328.485h-109.166v328.485zM604.050 604.416v145.225h109.202v-145.225h-109.202zM457.399 749.641h109.202v-475.319h-109.202v475.319z"
+ ],
+ "grid": 0,
+ "tags": [
+ "compare full"
+ ]
+ },
+ "properties": {
+ "order": 31,
+ "id": 9,
+ "prevSize": 32,
+ "code": 58910,
+ "name": "compare-full",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 30
+ },
+ {
+ "icon": {
+ "paths": [
+ "M310.747 749.641h109.166v-328.485h-109.166v328.485zM347.941 456.375h36.864v256.768h-36.864v-256.768zM604.050 604.416v145.225h109.202v-145.225h-109.202zM677.339 713.289h-36.827v-71.863h36.827v71.863zM457.399 749.641h109.202v-475.319h-109.202v475.319zM494.263 310.162h36.827v402.834h-36.827v-402.834z"
+ ],
+ "grid": 0,
+ "tags": [
+ "compare empty"
+ ]
+ },
+ "properties": {
+ "order": 32,
+ "id": 8,
+ "prevSize": 32,
+ "code": 58911,
+ "name": "compare-empty",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 31
+ },
+ {
+ "icon": {
+ "paths": [
+ "M519.57 294.107c-127.232-2.487-231.936 75.922-233.911 175.141-0.695 34.487 11.154 66.926 32.219 94.72l-5.486-5.522c36.242 46.519-34.816 171.52-34.816 171.52l159.232-78.702c25.161 7.936 46.994 1.536 75.63 2.121 127.232 2.487 231.973-75.886 233.911-175.067 2.011-99.255-99.511-181.723-226.779-184.21z"
+ ],
+ "grid": 0,
+ "tags": [
+ "comment"
+ ]
+ },
+ "properties": {
+ "order": 33,
+ "id": 7,
+ "prevSize": 32,
+ "code": 58912,
+ "name": "comment",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 32
+ },
+ {
+ "icon": {
+ "paths": [
+ "M514.158 470.418l136.558 132.791 26.075-27.794-162.853-158.354-166.729 162.743 26.587 27.136z"
+ ],
+ "grid": 0,
+ "tags": [
+ "up"
+ ]
+ },
+ "properties": {
+ "order": 34,
+ "id": 34,
+ "prevSize": 32,
+ "code": 58913,
+ "name": "up",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 33
+ },
+ {
+ "icon": {
+ "paths": [
+ "M509.842 553.582l-136.558-132.791-26.075 27.794 162.853 158.354 166.729-162.743-26.587-27.136z"
+ ],
+ "grid": 0,
+ "tags": [
+ "down"
+ ]
+ },
+ "properties": {
+ "order": 35,
+ "id": 33,
+ "prevSize": 32,
+ "code": 58914,
+ "name": "down",
+ "ligatures": ""
+ },
+ "setIdx": 1,
+ "iconIdx": 34
+ }
+ ],
+ "height": 1024,
+ "metadata": {
+ "name": "Blank-Theme-Icons"
+ },
+ "preferences": {
+ "showGlyphs": true,
+ "showQuickUse": true,
+ "fontPref": {
+ "prefix": "icon-",
+ "metadata": {
+ "fontFamily": "Blank-Theme-Icons",
+ "majorVersion": 1,
+ "minorVersion": 0
+ },
+ "metrics": {
+ "emSize": 1024,
+ "baseline": 6.25,
+ "whitespace": 50
+ },
+ "resetPoint": 58880,
+ "showMetrics": false
+ },
+ "imagePref": {},
+ "historySize": 100,
+ "showCodes": true,
+ "gridSize": 16,
+ "showLiga": false,
+ "search": "",
+ "showGrid": false
+ }
+}
\ No newline at end of file
diff --git a/lib/web/i18n/de_DE.csv b/lib/web/i18n/de_DE.csv
new file mode 100644
index 00000000000..a7e20aa7ef5
--- /dev/null
+++ b/lib/web/i18n/de_DE.csv
@@ -0,0 +1,20 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv
new file mode 100644
index 00000000000..9732f2f19b5
--- /dev/null
+++ b/lib/web/i18n/en_US.csv
@@ -0,0 +1,22 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+"Please wait...","Please wait..."
+Loading...,Loading...
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/i18n/es_ES.csv b/lib/web/i18n/es_ES.csv
new file mode 100644
index 00000000000..a7e20aa7ef5
--- /dev/null
+++ b/lib/web/i18n/es_ES.csv
@@ -0,0 +1,20 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/i18n/fr_FR.csv b/lib/web/i18n/fr_FR.csv
new file mode 100644
index 00000000000..a7e20aa7ef5
--- /dev/null
+++ b/lib/web/i18n/fr_FR.csv
@@ -0,0 +1,20 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/i18n/nl_NL.csv b/lib/web/i18n/nl_NL.csv
new file mode 100644
index 00000000000..a7e20aa7ef5
--- /dev/null
+++ b/lib/web/i18n/nl_NL.csv
@@ -0,0 +1,20 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/i18n/pt_BR.csv b/lib/web/i18n/pt_BR.csv
new file mode 100644
index 00000000000..a7e20aa7ef5
--- /dev/null
+++ b/lib/web/i18n/pt_BR.csv
@@ -0,0 +1,20 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/i18n/zh_CN.csv b/lib/web/i18n/zh_CN.csv
new file mode 100644
index 00000000000..a7e20aa7ef5
--- /dev/null
+++ b/lib/web/i18n/zh_CN.csv
@@ -0,0 +1,20 @@
+"Insert Widget...","Insert Widget..."
+"No records found.","No records found."
+"Recent items","Recent items"
+"Show all...","Show all..."
+"Method ","Method "
+"Please wait...","Please wait..."
+Loading...,Loading...
+Cancel,Cancel
+Save,Save
+Translate,Translate
+Submit,Submit
+Close,Close
+"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s."
+"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s."
+"Maximum length of this field must be equal or less than %1 symbols.","Maximum length of this field must be equal or less than %1 symbols."
+"This is a required field.","This is a required field."
+"Please enter a valid year (1900-%1).","Please enter a valid year (1900-%1)."
+"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
+"Please enter a date in the past.","Please enter a date in the past."
+"Please enter a date between %min and %max.","Please enter a date between %min and %max."
diff --git a/lib/web/mage/accordion.js b/lib/web/mage/accordion.js
index 32eeb82d30c..fe378e33ec5 100644
--- a/lib/web/mage/accordion.js
+++ b/lib/web/mage/accordion.js
@@ -93,6 +93,13 @@
if(!this.options.multipleCollapsible) {
this._super();
}
+ $.each(this.collapsibles, function() {
+ $(this).on("beforeOpen", function() {
+ var section = $(this);
+ section.addClass('allow').prevAll().addClass('allow');
+ section.nextAll().removeClass('allow');
+ });
+ });
}
});
})(jQuery);
diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
index 3655d039c59..cdf94246435 100644
--- a/lib/web/mage/collapsible.js
+++ b/lib/web/mage/collapsible.js
@@ -50,6 +50,10 @@
icons: {
activeHeader: null,
header: null
+ },
+ collateral: {
+ element: null,
+ openedState: null
}
},
@@ -69,6 +73,7 @@
this._createIcons();
this.icons = true;
}
+
this._bind("click");
},
@@ -78,6 +83,9 @@
if (this.options.openedState) {
this.element.addClass(this.options.openedState);
}
+ if (this.options.collateral.element && this.options.collateral.openedState) {
+ $(this.options.collateral.element).addClass(this.options.collateral.openedState);
+ }
if (this.options.ajaxContent) {
this._loadContent();
}
@@ -153,6 +161,9 @@
if(options.openedState) {
this.element.removeClass(options.openedState);
}
+ if (this.options.collateral.element && this.options.collateral.openedState) {
+ $(this.options.collateral.element).removeClass(this.options.collateral.openedState);
+ }
if(options.closedState){
this.element.removeClass(options.closedState);
}
@@ -300,6 +311,9 @@
if (this.options.openedState) {
this.element.removeClass(this.options.openedState);
}
+ if (this.options.collateral.element && this.options.collateral.openedState) {
+ $(this.options.collateral.element).removeClass(this.options.collateral.openedState);
+ }
if(this.options.closedState) {
this.element.addClass(this.options.closedState);
}
@@ -343,6 +357,9 @@
if (this.options.openedState) {
this.element.addClass(this.options.openedState);
}
+ if (this.options.collateral.element && this.options.collateral.openedState) {
+ $(this.options.collateral.element).addClass(this.options.collateral.openedState);
+ }
if (this.options.closedState) {
this.element.removeClass(this.options.closedState);
}
diff --git a/lib/web/mage/gallery.less b/lib/web/mage/gallery.less
index 4643d3d9a31..a64d7674812 100644
--- a/lib/web/mage/gallery.less
+++ b/lib/web/mage/gallery.less
@@ -23,9 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@baseDir: "../"; //default
-@import "../css/source/lib/lib.less";
-@import "../css/source/theme.less";
-
@gallery-sprite-svg: '../images/sprite-gallery.svg';
@gallery-sprite-png: '../images/sprite-gallery.png';
@gallery-lightbox-offset: 20px;
@@ -55,6 +52,8 @@
@gallery-lens-border-color: @border-color-base;
@gallery-lens-border-width: @border-width-base;
+@import "../css/source/lib/lib.less";
+@import "../css/source/theme.less";
.loading-mask {
.loading();
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index 5327434a5c9..f03f72041b5 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -54,7 +54,9 @@
}
$('.action.toggle.nav').on('click', function() {
- $('.page.wrapper').toggleClass('open');
+ $('.page-wrapper').toggleClass('open');
+ $('body').toggleClass('open');
+ $('html').toggleClass('open');
});
},
--
GitLab